maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

Fixes #101 - JS code would not parse dates correctly.

Browse source
This commit is contained in:
Alex Tselegidis 2016-01-10 23:54:17 +01:00
parent e252307e66
commit 51e69a097f
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/assets/js/backend_calendar.js
View file

@ -537,10 +537,10 @@ var BackendCalendar = {
// Id must exist on the object in order for the model to update // Id must exist on the object in order for the model to update
// the record and not to perform an insert operation. // the record and not to perform an insert operation.
var startDatetime = Date.parse($dialog.find('#start-datetime').val(), var startDatetime = $dialog.find('#start-datetime')
'dd/MM/yyyy HH:mm').toString('yyyy-MM-dd HH:mm:ss'); .datepicker('getDate').toString('yyyy-MM-dd HH:mm:ss');
var endDatetime = Date.parse($dialog.find('#end-datetime').val(), var endDatetime = $dialog.find('#end-datetime')
'dd/MM/yyyy HH:mm').toString('yyyy-MM-dd HH:mm:ss'); .datepicker('getDate').toString('yyyy-MM-dd HH:mm:ss');
var appointment = { var appointment = {
'id_services': $dialog.find('#select-service').val(), 'id_services': $dialog.find('#select-service').val(),
@ -1910,12 +1910,8 @@ var BackendCalendar = {
}); });
var startDatetime = new Date().addMinutes(GlobalVariables.bookAdvanceTimeout), var startDatetime = new Date().addMinutes(GlobalVariables.bookAdvanceTimeout),
formattedStartDatetime = GeneralFunctions.formatDate(startDatetime, GlobalVariables.dateFormat, true); endDatetime = new Date().addMinutes(GlobalVariables.bookAdvanceTimeout).addMinutes(serviceDuration),
var endDatetime = new Date().addMinutes(GlobalVariables.bookAdvanceTimeout) dateFormat;
.addMinutes(serviceDuration),
formattedEndDatetime = GeneralFunctions.formatDate(endDatetime, GlobalVariables.dateFormat, true);
var dateFormat;
switch(GlobalVariables.dateFormat) { switch(GlobalVariables.dateFormat) {
case 'DMY': case 'DMY':
@ -1927,6 +1923,8 @@ var BackendCalendar = {
case 'YMD': case 'YMD':
dateFormat = 'yy/mm/dd'; dateFormat = 'yy/mm/dd';
break; break;
default:
throw new Error('Invalid GlobalVariables.dateFormat value.');
} }
$dialog.find('#start-datetime').datetimepicker({ $dialog.find('#start-datetime').datetimepicker({
@ -1956,7 +1954,8 @@ var BackendCalendar = {
minuteText: EALang['minutes'], minuteText: EALang['minutes'],
firstDay: 1 firstDay: 1
}); });
$dialog.find('#start-datetime').val(formattedStartDatetime); // $dialog.find('#start-datetime').val(formattedStartDatetime);
$dialog.find('#start-datetime').datepicker('setDate', startDatetime);
$dialog.find('#end-datetime').datetimepicker({ $dialog.find('#end-datetime').datetimepicker({
'dateFormat': dateFormat, 'dateFormat': dateFormat,
@ -1985,7 +1984,8 @@ var BackendCalendar = {
minuteText: EALang['minutes'], minuteText: EALang['minutes'],
firstDay: 1 firstDay: 1
}); });
$dialog.find('#end-datetime').val(formattedEndDatetime); // $dialog.find('#end-datetime').val(formattedEndDatetime);
$dialog.find('#end-datetime').datepicker('setDate', endDatetime);
}, },
/** /**
@ -2021,8 +2021,8 @@ var BackendCalendar = {
} }
// :: CHECK APPOINTMENT START AND END TIME // :: CHECK APPOINTMENT START AND END TIME
var start = Date.parse($('#start-datetime').val(), 'dd/MM/yyyy HH:mm'); var start = $('#start-datetime').datepicker('getDate');
var end = Date.parse($('#end-datetime').val(), 'dd/MM/yyyy HH:mm'); var end = $('#end-datetime').datepicker('getDate');
if (start > end) { if (start > end) {
$dialog.find('#start-datetime').parents().eq(1).addClass('error'); $dialog.find('#start-datetime').parents().eq(1).addClass('error');
$dialog.find('#end-datetime').parents().eq(1).addClass('error'); $dialog.find('#end-datetime').parents().eq(1).addClass('error');