diff --git a/NEMO/apps/kiosk/templates/kiosk/tool_reservation.html b/NEMO/apps/kiosk/templates/kiosk/tool_reservation.html index ad055baa..1f1ade7b 100644 --- a/NEMO/apps/kiosk/templates/kiosk/tool_reservation.html +++ b/NEMO/apps/kiosk/templates/kiosk/tool_reservation.html @@ -56,9 +56,9 @@

When would you like to reserve the {{ tool }}?

{% for item in tool_reservation_times %} unavailable_times.push([{{ item.start|date:"U" }},{{ item.end|date:"U" }}]); {% endfor %} - let date_picker = $('#date').pickadate({format: "dddd, mmmm d", formatSubmit: "yyyy-mm-dd", firstDay: 1, hiddenName: true, onSet: refresh_times}); - let start_time_picker = $('#start').pickatime({interval: 15, formatSubmit: "H:i", hiddenName: true, formatLabel: format_label}); - let end_time_picker = $('#end').pickatime({interval: 15, formatSubmit: "H:i", hiddenName: true, formatLabel: format_label}); + let date_picker = $('#date').pickadate({format: "{{ pick_date_format }}", formatSubmit: "yyyy-mm-dd", firstDay: 1, hiddenName: true, onSet: refresh_times}); + let start_time_picker = $('#start').pickatime({interval: 15, format: "{{ pick_time_format }}", formatSubmit: "HH:mm", hiddenName: true, formatLabel: format_label}); + let end_time_picker = $('#end').pickatime({interval: 15, format: "{{ pick_time_format }}", formatSubmit: "H:i", hiddenName: true, formatLabel: format_label}); // set initial date if ('{{ date|default_if_none:'' }}') { date_picker.pickadate('picker').set('select', '{{ date }}', {format: 'yyyy-mm-dd'}) @@ -77,11 +77,11 @@

When would you like to reserve the {{ tool }}?

let start = times[0]; let end = times[1]; if (date_time_selected >= start && date_time_selected < end) { - return 'h:i A !alre!ad!y re!serve!d'; + return '{{ pick_time_format }} !alre!ad!y re!serve!d'; } } } - return "h:i A"; + return '{{ pick_time_format }}'; } revert(120) diff --git a/NEMO/context_processors.py b/NEMO/context_processors.py index 18f3e5f3..ae728fdc 100644 --- a/NEMO/context_processors.py +++ b/NEMO/context_processors.py @@ -1,5 +1,11 @@ from NEMO.models import Area, Notification, PhysicalAccessLevel, Tool, User -from NEMO.utilities import date_input_js_format, datetime_input_js_format, time_input_js_format +from NEMO.utilities import ( + date_input_js_format, + datetime_input_js_format, + time_input_js_format, + convert_js_time_format_to_pick_time, + convert_js_date_format_to_pick_date, +) from NEMO.views.customization import CustomizationBase from NEMO.views.notifications import get_notification_counts diff --git a/NEMO/templates/mobile/new_reservation.html b/NEMO/templates/mobile/new_reservation.html index eea20145..13783cbf 100644 --- a/NEMO/templates/mobile/new_reservation.html +++ b/NEMO/templates/mobile/new_reservation.html @@ -69,9 +69,9 @@

When would you like to reserve the {{ item }}?

{% for times in item_reservation_times %} unavailable_times.push([{{ times.start|date:"U" }},{{ times.end|date:"U" }}]); {% endfor %} - let date_picker = $('#date').pickadate({format: "dddd, mmmm d", formatSubmit: "yyyy-mm-dd", firstDay: 1, hiddenName: true, onSet: refresh_times}); - let start_time_picker = $('#start').pickatime({interval: 15, formatSubmit: "H:i", hiddenName: true, formatLabel: format_label}); - let end_time_picker = $('#end').pickatime({interval: 15, formatSubmit: "H:i", hiddenName: true, formatLabel: format_label}); + let date_picker = $('#date').pickadate({format: "{{ pick_date_format }}", formatSubmit: "yyyy-mm-dd", firstDay: 1, hiddenName: true, onSet: refresh_times}); + let start_time_picker = $('#start').pickatime({interval: 15, format: "{{ pick_time_format }}", formatSubmit: "H:i", hiddenName: true, formatLabel: format_label }); + let end_time_picker = $('#end').pickatime({interval: 15, format: "{{ pick_time_format }}", formatSubmit: "H:i", hiddenName: true, formatLabel: format_label}); // set initial date if ('{{ date|default_if_none:'' }}') { @@ -93,11 +93,11 @@

When would you like to reserve the {{ item }}?

let start = times[0]; let end = times[1]; if (date_time_selected >= start && date_time_selected < end) { - return 'h:i A !alre!ad!y re!serve!d'; + return '{{ pick_time_format }} !alre!ad!y re!serve!d'; } } } - return "h:i A"; + return "{{ pick_time_format }}"; } diff --git a/NEMO/utilities.py b/NEMO/utilities.py index 09a23124..9895dc63 100644 --- a/NEMO/utilities.py +++ b/NEMO/utilities.py @@ -74,6 +74,21 @@ def convert_py_format_to_js(string_format: str) -> str: return string_format +def convert_js_time_format_to_pick_time(string_format: str) -> str: + return ( + string_format.replace("mm", "i") + .replace("m", "i") + .replace("tt", "a") + .replace("t", "a") + .replace("TT", "A") + .replace("T", "A") + ) + + +def convert_js_date_format_to_pick_date(string_format: str) -> str: + return string_format.replace("M", "m").replace("S", "").replace("W", "") + + time_input_format = get_format("TIME_INPUT_FORMATS")[0] date_input_format = get_format("DATE_INPUT_FORMATS")[0] datetime_input_format = get_format("DATETIME_INPUT_FORMATS")[0]