fix(ZMS-3466): closing new opening hours

it-at-m · Jan 28, 2025 · e92684e · e92684e
1 parent 484cbb4
commit e92684e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/zmsadmin/js/page/availabilityDay/helpers.js b/zmsadmin/js/page/availabilityDay/helpers.js
@@ -105,14 +105,11 @@ export const getNewAvailability = (timestamp, tempId, scope, existingAvailabilit
     const dayEndTime = moment('22:00:00', 'HH:mm:ss')
     let startTime = moment('07:00:00', 'HH:mm:ss')
 
-    // Only use current time if the selected date is today
     if (now.format('YYYY-MM-DD') === currentTime.format('YYYY-MM-DD') && currentTime.isAfter(startTime)) {
-        // Round up to next half hour
         startTime = moment(currentTime).add(30 - (currentTime.minutes() % 30), 'minutes')
     }
     let endTime = moment(startTime).add(1, 'hour')
 
-    // Adjust if end time would exceed 22:00
     if (endTime.isAfter(dayEndTime)) {
         startTime = moment(dayEndTime).subtract(1, 'hour')
         endTime = moment(dayEndTime)
@@ -134,13 +131,11 @@ export const getNewAvailability = (timestamp, tempId, scope, existingAvailabilit
         } else {
             const lastAvail = todayAvailabilities[todayAvailabilities.length - 1]
             startTime = moment(lastAvail.endTime, 'HH:mm:ss')
-            // Only check current time if it's today
             if (now.format('YYYY-MM-DD') === currentTime.format('YYYY-MM-DD') && startTime.isBefore(currentTime)) {
                 startTime = moment(currentTime).add(30 - (currentTime.minutes() % 30), 'minutes')
             }
             endTime = moment(startTime).add(1, 'hour')
 
-            // Check end time limit again after adjusting for overlaps
             if (endTime.isAfter(dayEndTime)) {
                 startTime = moment(dayEndTime).subtract(1, 'hour')
                 endTime = moment(dayEndTime)

diff --git a/zmsadmin/js/page/availabilityDay/index.js b/zmsadmin/js/page/availabilityDay/index.js
@@ -458,12 +458,8 @@ class AvailabilityPage extends Component {
         state.stateChanged = false;
 
         this.setState(state, () => {
-            Promise.all([
-                this.getValidationList(),
-                this.getConflictList()
-            ]).then(() => {
-                this.setState({ selectedAvailability: null });
-            });
+            this.getValidationList();
+            this.getConflictList();
 
             $('body').scrollTop(0);
         });