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

Update for new time format

Browse source
This commit is contained in:
Andrea 2018-04-12 16:05:52 +02:00
parent 9c7ae5dfdc
commit 7d8746f40a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/assets/js/backend_calendar_extra_periods_modal.js
View file

@ -153,7 +153,7 @@ window.BackendCalendarExtraPeriodsModal = window.BackendCalendarExtraPeriodsModa
} }
$dialog.find('#extra-start').val(GeneralFunctions.formatDate(start, GlobalVariables.dateFormat, true)); $dialog.find('#extra-start').val(GeneralFunctions.formatDate(start, GlobalVariables.dateFormat, true));
$dialog.find('#extra-end').val((GlobalVariables.timeFormat === 'h:mm tt') ? '8:00 PM' : '19:00'); $dialog.find('#extra-end').val(GlobalVariables.timeFormat === 'regular' ? '8:00 PM' : '19:00');
$dialog.find('.modal-header h3').text(EALang.new_extra_period_title); $dialog.find('.modal-header h3').text(EALang.new_extra_period_title);
$dialog.modal('show'); $dialog.modal('show');
}); });
@ -175,6 +175,7 @@ window.BackendCalendarExtraPeriodsModal = window.BackendCalendarExtraPeriodsModa
start.addDays(1); start.addDays(1);
start.set({'hour': 8}); start.set({'hour': 8});
start.set({'minute': 30}); start.set({'minute': 30});
var end = GlobalVariables.timeFormat === 'regular' ? '8:00 PM' : '19:00'
var dateFormat; var dateFormat;
@ -193,7 +194,7 @@ window.BackendCalendarExtraPeriodsModal = window.BackendCalendarExtraPeriodsModa
$dialog.find('#extra-start').datetimepicker({ $dialog.find('#extra-start').datetimepicker({
dateFormat: dateFormat, dateFormat: dateFormat,
timeFormat: (GlobalVariables.timeFormat === 'h:mm tt') ? 'h:mm TT' : GlobalVariables.timeFormat, timeFormat: GlobalVariables.timeFormat === 'regular' ? 'h:mm tt' : GlobalVariables.timeFormat,
// Translation // Translation
dayNames: [EALang.sunday, EALang.monday, EALang.tuesday, EALang.wednesday, dayNames: [EALang.sunday, EALang.monday, EALang.tuesday, EALang.wednesday,
@ -223,7 +224,7 @@ window.BackendCalendarExtraPeriodsModal = window.BackendCalendarExtraPeriodsModa
$dialog.find('#extra-start').draggable(); $dialog.find('#extra-start').draggable();
$dialog.find('#extra-end').timepicker({ $dialog.find('#extra-end').timepicker({
timeFormat: (GlobalVariables.timeFormat === 'h:mm tt') ? 'h:mm TT' : GlobalVariables.timeFormat, timeFormat: GlobalVariables.timeFormat === 'regular' ? 'h:mm tt' : GlobalVariables.timeFormat,
currentText: EALang.now, currentText: EALang.now,
closeText: EALang.close, closeText: EALang.close,
timeOnlyTitle: EALang.select_time, timeOnlyTitle: EALang.select_time,
@ -231,8 +232,7 @@ window.BackendCalendarExtraPeriodsModal = window.BackendCalendarExtraPeriodsModa
hourText: EALang.hour, hourText: EALang.hour,
minuteText: EALang.minutes minuteText: EALang.minutes
}); });
$dialog.find('#extra-end').val((GlobalVariables.timeFormat === 'h:mm tt') ? '8:00 PM' : '19:00'); $dialog.find('#extra-end').val(end);
$dialog.find('#extra-end').draggable();
// Clear the extra notes field. // Clear the extra notes field.
$dialog.find('#extra-notes').val(''); $dialog.find('#extra-notes').val('');