Make sure that editing a working plan exception and changing the date…

… will not keep the previous entry in place (#1515)
alextselegidis · May 24, 2024 · 07bc7b3 · 07bc7b3
1 parent af2e3a0
commit 07bc7b3
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/application/controllers/Calendar.php b/application/controllers/Calendar.php
@@ -468,6 +468,8 @@ public function save_working_plan_exception(): void
 
             $date = request('date');
 
+            $original_date = request('original_date');
+
             $working_plan_exception = request('working_plan_exception');
 
             if (!$working_plan_exception) {
@@ -478,6 +480,10 @@ public function save_working_plan_exception(): void
 
             $this->providers_model->save_working_plan_exception($provider_id, $date, $working_plan_exception);
 
+            if ($date !== $original_date) {
+                $this->providers_model->delete_working_plan_exception($provider_id, $original_date);
+            }
+
             json_response([
                 'success' => true,
             ]);

diff --git a/assets/js/http/calendar_http_client.js b/assets/js/http/calendar_http_client.js
@@ -131,17 +131,26 @@ App.Http.Calendar = (function () {
      * @param {Number} providerId Contains the working plan exceptions data.
      * @param {Function} successCallback The ajax success callback function.
      * @param {Function} errorCallback The ajax failure callback function.
+     * @param {Date} [originalDate] On edit, provide the original date.
      *
      * @return {*|jQuery}
      */
-    function saveWorkingPlanException(date, workingPlanException, providerId, successCallback, errorCallback) {
+    function saveWorkingPlanException(
+        date,
+        workingPlanException,
+        providerId,
+        successCallback,
+        errorCallback,
+        originalDate,
+    ) {
         const url = App.Utils.Url.siteUrl('calendar/save_working_plan_exception');
 
         const data = {
             csrf_token: vars('csrf_token'),
             date: date,
             working_plan_exception: workingPlanException,
             provider_id: providerId,
+            original_date: originalDate,
         };
 
         return $.post(url, data)

diff --git a/assets/js/utils/calendar_default_view.js b/assets/js/utils/calendar_default_view.js
@@ -90,11 +90,11 @@ App.Utils.CalendarDefaultView = (function () {
             const data = lastFocusedEventData.extendedProps.data;
 
             if (data.hasOwnProperty('workingPlanException')) {
-                const date = lastFocusedEventData.extendedProps.data.date;
+                const originalDate = lastFocusedEventData.extendedProps.data.date;
                 const workingPlanException = lastFocusedEventData.extendedProps.data.workingPlanException;
                 const provider = lastFocusedEventData.extendedProps.data.provider;
 
-                App.Components.WorkingPlanExceptionsModal.edit(date, workingPlanException).done(
+                App.Components.WorkingPlanExceptionsModal.edit(originalDate, workingPlanException).done(
                     (date, workingPlanException) => {
                         const successCallback = () => {
                             App.Layouts.Backend.displayNotification(lang('working_plan_exception_saved'));
@@ -103,6 +103,10 @@ App.Utils.CalendarDefaultView = (function () {
 
                             workingPlanExceptions[date] = workingPlanException;
 
+                            if (date !== originalDate) {
+                                delete workingPlanExceptions[originalDate];
+                            }
+
                             for (const index in vars('available_providers')) {
                                 const availableProvider = vars('available_providers')[index];
 
@@ -122,6 +126,7 @@ App.Utils.CalendarDefaultView = (function () {
                             provider.id,
                             successCallback,
                             null,
+                            originalDate,
                         );
                     },
                 );

diff --git a/assets/js/utils/calendar_table_view.js b/assets/js/utils/calendar_table_view.js
@@ -165,11 +165,11 @@ App.Utils.CalendarTableView = (function () {
             let endMoment;
 
             if (lastFocusedEventData.extendedProps.data.workingPlanException) {
-                const date = lastFocusedEventData.extendedProps.data.date;
+                const originalDate = lastFocusedEventData.extendedProps.data.date;
                 const workingPlanException = lastFocusedEventData.extendedProps.data.workingPlanException;
                 const provider = lastFocusedEventData.extendedProps.data.provider;
 
-                App.Components.WorkingPlanExceptionsModal.edit(date, workingPlanException).done(
+                App.Components.WorkingPlanExceptionsModal.edit(originalDate, workingPlanException).done(
                     (date, workingPlanException) => {
                         const successCallback = () => {
                             App.Layouts.Backend.displayNotification(lang('working_plan_exception_saved'));
@@ -178,6 +178,10 @@ App.Utils.CalendarTableView = (function () {
 
                             workingPlanExceptions[date] = workingPlanException;
 
+                            if (date !== originalDate) {
+                                delete workingPlanExceptions[originalDate];
+                            }
+
                             for (const index in vars('available_providers')) {
                                 const availableProvider = vars('available_providers')[index];
 
@@ -197,6 +201,7 @@ App.Utils.CalendarTableView = (function () {
                             provider.id,
                             successCallback,
                             null,
+                            originalDate,
                         );
                     },
                 );