Merge pull request #1612 from alxlab-zone66x/feature/1611

#1611 Breaks bug when Time Format is set to regular
alextselegidis · Nov 5, 2024 · 4722013 · 4722013
2 parents 7145fd6 + 71a7b7f
commit 4722013
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/assets/js/utils/working_plan.js b/assets/js/utils/working_plan.js
@@ -529,20 +529,21 @@ App.Utils.WorkingPlan = (function () {
              * @param {jQuery.Event} event
              */
             $(document).on('click', '.save-break', (event) => {
+                const timeFormat = vars('time_format') === 'regular' ? 'h:mm a' : 'HH:mm';
                 // Break's start time must always be prior to break's end.
                 const element = event.target;
 
                 const $modifiedRow = $(element).closest('tr');
 
-                const startMoment = moment($modifiedRow.find('.break-start input').val(), 'HH:mm');
+                const startMoment = moment($modifiedRow.find('.break-start input').val(), timeFormat);
 
-                const endMoment = moment($modifiedRow.find('.break-end input').val(), 'HH:mm');
+                const endMoment = moment($modifiedRow.find('.break-end input').val(), timeFormat);
 
                 if (startMoment.isAfter(endMoment)) {
                     $modifiedRow.find('.break-end input').val(
                         startMoment
                             .add(1, 'hour')
-                            .format(vars('time_format') === 'regular' ? 'h:mm a' : 'HH:mm')
+                            .format(timeFormat)
                             .toLowerCase(),
                     );
                 }