Fix drag and drop for due + edit dates

Leantime · Sep 21, 2024 · 37dd4c6 · 37dd4c6
1 parent a33d185
commit 37dd4c6
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 9 deletions.
diff --git a/app/Domain/Calendar/Js/calendarController.js b/app/Domain/Calendar/Js/calendarController.js
@@ -359,6 +359,7 @@ leantime.calendarController = (function () {
                             title: jQuery(eventEl).find(".titleContainer strong").text(),
                             borderColor: 'var(--accent2)',
                             enitityType: "ticket",
+                            dateContext: "edit",
                             duration: '01:00',
                             url: '#/tickets/showTicket/' + jQuery(eventEl).attr("data-val"),
                         };

diff --git a/app/Domain/Calendar/Templates/showMyCalendar.tpl.php b/app/Domain/Calendar/Templates/showMyCalendar.tpl.php
@@ -133,11 +133,13 @@
             backgroundColor: '<?= $calendar['backgroundColor'] ?? "var(--accent2)" ?>',
             borderColor: '<?= $calendar['borderColor'] ?? "var(--accent2)" ?>',
             enitityType: "event",
+            dateContext: '<?= $calendar['dateContext'] ?? "plan" ?>',
             <?php else : ?>
             url: '<?=CURRENT_URL ?>#/tickets/showTicket/<?php echo $calendar['id'] ?>?projectId=<?php echo $calendar['projectId'] ?>',
             backgroundColor: '<?= $calendar['backgroundColor'] ?? "var(--accent2)" ?>',
             borderColor: '<?= $calendar['borderColor'] ?? "var(--accent2)" ?>',
             enitityType: "ticket",
+            dateContext: '<?= $calendar['dateContext'] ?? "edit" ?>',
             <?php endif; ?>
         },
         <?php endforeach; ?>
@@ -203,14 +205,28 @@
                 eventDrop: function (event) {
 
                     if(event.event.extendedProps.enitityType == "ticket") {
-                        jQuery.ajax({
-                            type : 'PATCH',
-                            url  : leantime.appUrl + '/api/tickets',
-                            data : {
+
+                        let dataVal = {};
+
+                        if(event.event.extendedProps.dateContext == "due") {
+
+                            dataVal = {
+                                id: event.event.extendedProps.enitityId,
+                                dateToFinish: event.event.startStr
+                            }
+
+                        }else{
+                            dataVal = {
                                 id: event.event.extendedProps.enitityId,
                                 editFrom: event.event.startStr,
                                 editTo: event.event.endStr
                             }
+                        }
+
+                        jQuery.ajax({
+                            type : 'PATCH',
+                            url  : leantime.appUrl + '/api/tickets',
+                            data : dataVal
                         });
 
                     }else if(event.event.extendedProps.enitityType == "event") {
@@ -229,15 +245,31 @@
                 eventResize: function (event) {
 
                     if(event.event.extendedProps.enitityType == "ticket") {
-                        jQuery.ajax({
-                            type : 'PATCH',
-                            url  : leantime.appUrl + '/api/tickets',
-                            data : {
+
+                        let dataVal = {};
+
+                        if(event.event.extendedProps.dateContext == "due") {
+
+                            dataVal = {
+                                id: event.event.extendedProps.enitityId,
+                                dateToFinish: event.event.startStr
+                            }
+
+                        }else{
+                            dataVal = {
                                 id: event.event.extendedProps.enitityId,
                                 editFrom: event.event.startStr,
                                 editTo: event.event.endStr
                             }
-                        })
+                        }
+
+                        jQuery.ajax({
+                            type : 'PATCH',
+                            url  : leantime.appUrl + '/api/tickets',
+                            data : dataVal
+                        });
+
+
                     }else if(event.event.extendedProps.enitityType == "event") {
 
                         jQuery.ajax({