Merge pull request 'staging' (#2) from staging into master

Reviewed-on: ordo/adw-gantt#2

edit-mode/function/function.js

@@ -633,7 +633,67 @@ function expandTask() {
 	gantt.render();
 }
 
-function resetActivity() {
+// Function to get the earliest planned start date among all tasks
+function getEarliestTaskDate() {
+	var earliestDate = null;
+	gantt.eachTask(function (task) {
+		var taskStartDate = task.planned_start || task.start_date;
+		if (!earliestDate || task.planned_start < earliestDate) {
+			earliestDate = taskStartDate;
+			if (task.start_date < earliestDate) {
+				earliestDate = task.start_date;
+			}
+		}
+	});
+	return earliestDate;
+}
+
+// Function to get the latest planned end date among all tasks
+function getLatestTaskDate() {
+	var latestDate = null;
+	gantt.eachTask(function (task) {
+		var taskEndDate = task.planned_end || task.end_date;
+		if (!latestDate || task.planned_end > latestDate) {
+			latestDate = taskEndDate;
+			if (task.end_date > latestDate) {
+				latestDate = task.end_date;
+			}
+		}
+	});
+	return latestDate;
+}
+
+function batchUpdate(){
+	let data = localStorage.getItem('batchEntity');
+	$("body").addClass("loading");
+	return gantt.ajax.post({
+		headers: {
+			"Content-Type": "application/json",
+			"Authorization": `Bearer ${token}`
+		},
+		url: base_url + "activity/batch-update/" + ganttId,
+		data: data
+	}).then(function (response) {
+		$("body").removeClass("loading");
 		localStorage.setItem('batchEntity', '');
-	gantt.alert("Actiivity Saved");
+	}).catch(function (error) {
+		$("body").removeClass("loading")
+
+		gantt.alert({
+			title: "Peringatan",
+			type: "alert-error",
+			text: "Update activity gagal"
+		});
+	});
+}
+
+$(window).on('beforeunload', function(event) {
+    let batchEntity = localStorage.getItem('batchEntity');
+	if (batchEntity && batchEntity != '') {
+		event.preventDefault()
+		return event.returnValue = 'You have unsaved changes. Are you sure you want to leave this page?';
 	}
+});
+
+const batchEntityData = localStorage.getItem('batchEntity');
+window.parent.postMessage({ batchEntity: batchEntityData }, '*');

edit-mode/function/ganttConfig.js

@@ -22,7 +22,12 @@ const axiosInstance = axios.create({
 		"Content-type": "application/json"
 	}
 });
-
+const axiosInstanceMultipart = axios.create({
+	headers: {
+		"Content-Type": "multipart/form-data",
+		"Authorization": `Bearer ${token}`,
+	}
+});
 axiosInstance.interceptors.request.use(async (config) => {
 	try {
 		$("body").addClass("loading");

edit-mode/function/ganttEvent.js

@@ -168,11 +168,11 @@ gantt.attachEvent("onGanttScroll", function (left, top){
     var max_allowed_date = gantt.date.add(gantt.config.end_date, -1, "day");
     
     var repaint = false;
-    if (+left_date <= +min_allowed_date){
+      if (earliest && +left_date <= +min_allowed_date && +left_date >= +earliest){
         gantt.config.start_date = gantt.date.add(gantt.config.start_date, -1, "day");
         repaint = true;
     }
-    if (+right_date >= +max_allowed_date){
+      if (latest && +right_date >= +max_allowed_date && +right_date <= +latest){
         gantt.config.end_date = gantt.date.add(gantt.config.end_date, 1, "day");
         repaint = true;
     }

edit-mode/function/ganttSettings.js

@@ -136,7 +136,7 @@ $(document).ready(function () {
     });
 
     $("#save-activity").on('click', function (event) {
-        resetActivity();
+        batchUpdate();
     });
 
     $("#gantt-synchronize").on('click', function (event) {

edit-mode/function/reportActivity.js

@@ -418,23 +418,32 @@ $(document).ready(function () {
     }
 
     async function submitRaMaterial(formData, id) {
-        let qty_actual = $("#volume_pekerjaan_material").val();
+        try {
+            const qty_actual = $("#volume_pekerjaan_material").val();
             formData.set('qty', qty_actual);
             const result = await axiosInstance
-            .post(`${base_url}report-activity-material/add`, formData)
+                .post(`${base_url}report-activity-material/add`, formData);
-            .then(res => res)
-            .catch((error) => error.response);
 
-        // console.log("cek result", result);
+            const reportId = result.data.data.report_id;
+            const image = formData.get("files");
+            const imageFormData = new FormData();
+            imageFormData.append("ref_id", reportId);
+            imageFormData.append("category", "report_activity");
+            imageFormData.append("files", image, image.name);
 
-        if (result && result.status == 200) {
+            const resultImage = await axiosInstanceMultipart.post(`${base_url}image/upload`, imageFormData);
+
+            if (result.status === 200 && resultImage.status === 200) {
                 gantt.alert("Add report activity material Success!");
                 resetFormAddRaMaterial();
                 tableRaMaterialActual.draw();
             } else {
+                throw new Error("Add report activity material failed.");
+            }
+        } catch (error) {
             resetFormAddRaMaterial();
             $("body").removeClass("loading");
-            gantt.alert("Add report activity material failed, try again later!");
+            gantt.alert("Add report activity material failed.");
         }
     }
 

edit-mode/function/restActivityLink.js

@@ -1,4 +1,6 @@
 let geom = [];
+let latest;
+let earliest;
 $("body").addClass("loading");
 gantt.ajax.get({
     url: `${base_url}activity/${ganttId}/${proyekId}/get`,
@@ -33,6 +35,8 @@ gantt.ajax.get({
         gantt.parse(data);
         getGanttOpen();
         gantt.parse(data);
+        earliest = getEarliestTaskDate();
+        latest = getLatestTaskDate();
     });
 }).catch(function (error) {
     $("body").removeClass("loading");
@@ -77,6 +81,8 @@ function refresData(id) {
             gantt.parse(data);
             getGanttOpen();
             gantt.parse(data);
+            earliest = getEarliestTaskDate();
+            latest = getLatestTaskDate();
         });
         if (id) {
             if (gantt.isTaskExists(id)) {
@@ -176,56 +182,56 @@ var dp = gantt.createDataProcessor(function (entity, action, data, id) {
                 });
             }
             data['geom'] = geom.find(obj => obj.activity_id == id)?.geom;
-            // let existingEntity = localStorage.getItem('batchEntity');
+            let existingEntity = localStorage.getItem('batchEntity');
-            // if (existingEntity) {
+            if (existingEntity) {
-            //     existingEntity = JSON.parse(existingEntity);
+                existingEntity = JSON.parse(existingEntity);
-            //     // Now batchEntity is an object containing your data, and you can access its properties like batchEntity.entity and batchEntity.data
+                // Now batchEntity is an object containing your data, and you can access its properties like batchEntity.entity and batchEntity.data
-            // }
-            // let batchEntity = {
-            //     entity: entity,
-            //     data: data
-            // };
-            // let toBeSet = []
-            // if (existingEntity) {
-            //     toBeSet = [...existingEntity, batchEntity]
-            // } else {
-            //     toBeSet = [batchEntity]
-            // }
-            // localStorage.setItem('batchEntity', JSON.stringify(toBeSet));
-            $("body").addClass("loading");
-            return gantt.ajax.put({
-                headers: {
-                    "Content-Type": "application/json",
-                    "Authorization": `Bearer ${token}`
-                },
-                url: base_url + entity + "/" + id,
-                data: JSON.stringify(data)
-            }).then(function (response) {
-                $("body").removeClass("loading");
-                if (entity == "task") {
-                    let parent = data.parent;
-                    let responseText = JSON.parse(response.responseText)
-                    let resData = responseText
-                    let updateBobot = resData.update_bobot || false
-                    if (updateBobot) {
-                        if (parent && parent > 0) {
-                            updateActivity(parent);
-                        }
-                    } else if (parent && parent > 0) {
-                        updateActivity(parent);
-                    }
-                    if (!parent) {
-                        refresData();
             }
+            let batchEntity = {
+                entity: entity,
+                data: data
+            };
+            let toBeSet = []
+            if (existingEntity) {
+                toBeSet = [...existingEntity, batchEntity]
+            } else {
+                toBeSet = [batchEntity]
             }
-            }).catch(function (error) {
+            localStorage.setItem('batchEntity', JSON.stringify(toBeSet));
-                $("body").removeClass("loading");
+            // $("body").addClass("loading");
-                gantt.alert({
+            // return gantt.ajax.put({
-                    title: "Peringatan",
+            //     headers: {
-                    type: "alert-error",
+            //         "Content-Type": "application/json",
-                    text: "Update activity gagal"
+            //         "Authorization": `Bearer ${token}`
-                });
+            //     },
-            });
+            //     url: base_url + entity + "/" + id,
+            //     data: JSON.stringify(data)
+            // }).then(function (response) {
+            //     $("body").removeClass("loading");
+            //     if (entity == "task") {
+            //         let parent = data.parent;
+            //         let responseText = JSON.parse(response.responseText)
+            //         let resData = responseText
+            //         let updateBobot = resData.update_bobot || false
+            //         if (updateBobot) {
+            //             if (parent && parent > 0) {
+            //                 updateActivity(parent);
+            //             }
+            //         } else if (parent && parent > 0) {
+            //             updateActivity(parent);
+            //         }
+            //         if (!parent) {
+            //             refresData();
+            //         }
+            //     }
+            // }).catch(function (error) {
+            //     $("body").removeClass("loading");
+            //     gantt.alert({
+            //         title: "Peringatan",
+            //         type: "alert-error",
+            //         text: "Update activity gagal"
+            //     });
+            // });
 
             break;
         case "delete":

edit-mode/index.html

@@ -87,9 +87,9 @@
 			<button title="Dashboard Project" class="btn btn-sm btn-icon-toolbar" id="dashboard-project"><i
 					class="fa fa-chart-line icon-toolbar"></i></button>
 			<span class="icon-toolbar-separator">|</span>
-			<!-- <button title="Save" class="btn btn-sm btn-icon-toolbar" id="save-activity"><i
+			<button title="Save" class="btn btn-sm btn-icon-toolbar" id="save-activity"><i
 					class="fa fa-save icon-toolbar"></i></button>
-			<span class="icon-toolbar-separator">|</span> -->
+			<span class="icon-toolbar-separator">|</span>
 			<button title="Synchronize to Report Activity" class="btn btn-sm btn-icon-toolbar" id="gantt-synchronize"><i
 					class="fa fa-sync icon-toolbar"></i></button>
 			<span class="icon-toolbar-separator">|</span>

view-mode/function/overlaySCurve.js

@@ -145,19 +145,22 @@ var lineOverlay = overlayControl.addOverlay(function(container) {
 	var values = getProgressLine();
   var scaleLabels = [];
 
-  if(parts[2] && parts[2] == '1'){
+//   if(parts[2] && parts[2] == '1'){
+//     values.dates.forEach(function(date){
+//       var dateScale = new Date(date);
+//       scaleLabels.push(dateToStr(dateScale));
+//     })
+//   } else {
+//     var chartScale = getChartScaleRange();
+
+//     chartScale.forEach(function(date){
+//       scaleLabels.push(dateToStr(date));
+//     });
+//   }
     values.dates.forEach(function(date){
       var dateScale = new Date(date);
       scaleLabels.push(dateToStr(dateScale));
     })
-  } else {
-    var chartScale = getChartScaleRange();
-
-    chartScale.forEach(function(date){
-      scaleLabels.push(dateToStr(date));
-    });
-  }
-
 	var canvas = document.createElement("canvas");
 	container.appendChild(canvas);
 	canvas.style.height = container.offsetHeight + "px";