From 71a7b7fc2d4e303eaf76ac7be379ad98dfe562bf Mon Sep 17 00:00:00 2001 From: Alexandre Marcoux Date: Fri, 1 Nov 2024 17:22:59 -0400 Subject: [PATCH] #1611 Breaks bug when Time Format is set to regular Change-Id: I20004227c27353d6f237aefbe4eb8db0eefe5142 --- assets/js/utils/working_plan.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/assets/js/utils/working_plan.js b/assets/js/utils/working_plan.js index eb11b8a6..394302a7 100755 --- 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(), ); }