From 41a2f0d9462a8c1d53cc6bbc518522c265336e78 Mon Sep 17 00:00:00 2001
From: Wahyu Ramadhan <ssjrama@gmail.com>
Date: Thu, 24 Aug 2023 12:09:52 +0700
Subject: [PATCH] fix milestone dateformat

---
 edit-mode/function/milestone.js | 23 ++++++++++++++++-------
 edit-mode/index.html            |  4 ++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/edit-mode/function/milestone.js b/edit-mode/function/milestone.js
index 1d67187..bfd7158 100644
--- a/edit-mode/function/milestone.js
+++ b/edit-mode/function/milestone.js
@@ -70,7 +70,16 @@ $(document).ready(function () {
         $("#name_milestone").val(data.text);
     });
     
+    $('#due_milestone').datepicker({
+      format: 'dd-mm-yyyy', // Set the desired format
+      autoclose: true     // Close the datepicker when a date is selected
+    });
 
+    $('#deadline_milestone').datepicker({
+      format: 'dd-mm-yyyy', // Set the desired format
+      autoclose: true     // Close the datepicker when a date is selected
+    });
+    
     $('#modal-material').on('show.bs.modal', function (event) {
 
     });
@@ -88,8 +97,8 @@ $(document).ready(function () {
         console.log("cek data form", data);
         let parent = data.milestone_parent;
         var taskId = 0;
-        var start = moment(data.due_date, "YYYY-MM-DD");
-        var end = moment(data.deadline, "YYYY-MM-DD");
+        var start = moment(data.due_date, "DD-MM-YYYY");
+        var end = moment(data.deadline, "DD-MM-YYYY");
         let duration = moment.duration(start.diff(end)).asDays();
         let nameMilestone = data.status!="" ? data.status : data.id_milestone
         // console.log("cek duration", Math.abs(duration));
@@ -97,8 +106,8 @@ $(document).ready(function () {
             taskId = gantt.addTask({
                 id: Math.floor(Math.random() * 1000) + 5000,
                 text: nameMilestone,
-                start_date: data.due_date,
-                end_date: data.deadline,
+                start_date: start.format("YYYY-MM-DD"),
+                end_date: end.format("YYYY-MM-DD"),
                 duration: Math.abs(duration),
                 type: "milestone",
                 type_activity:"milestone"
@@ -107,8 +116,8 @@ $(document).ready(function () {
             taskId = gantt.addTask({
                 id: Math.floor(Math.random() * 1000) + 5000,
                 text: nameMilestone,
-                start_date: data.due_date,
-                end_date: data.deadline,
+                start_date: start.format("YYYY-MM-DD"),
+                end_date: end.format("YYYY-MM-DD"),
                 duration: Math.abs(duration),
                 type: "milestone",
                 type_activity:"milestone"
@@ -124,4 +133,4 @@ $(document).ready(function () {
             gantt.alert("Add Milestone Failed!");
         }
     });
-});
\ No newline at end of file
+});
diff --git a/edit-mode/index.html b/edit-mode/index.html
index dd17be9..f488395 100644
--- a/edit-mode/index.html
+++ b/edit-mode/index.html
@@ -602,11 +602,11 @@
 						<div class="form-row">
 							<div class="col-md-6 form-group">
 								<label>Due Date</label>
-								<input id="due_milestone" type="date" name="due_date" class="form-control form-control-sm" />
+								<input id="due_milestone" type="text" name="due_date" class="form-control form-control-sm" />
 							</div>
 							<div class="col-md-6 form-group">
 								<label>Deadline</label>
-								<input id="deadline_milestone" type="date" name="deadline" class="form-control form-control-sm" />
+								<input id="deadline_milestone" type="text" name="deadline" class="form-control form-control-sm" />
 							</div>
 						</div>
 					</div>