From 1e772fd47e10336fa08c3db80b18040e38becb3c Mon Sep 17 00:00:00 2001 From: wahyu Date: Wed, 11 Oct 2023 13:45:53 +0700 Subject: [PATCH] fix actual dates --- edit-mode/function/expenseResource.js | 32 +++++++++++++++++++++++++++ edit-mode/function/reportActivity.js | 7 ++++++ 2 files changed, 39 insertions(+) diff --git a/edit-mode/function/expenseResource.js b/edit-mode/function/expenseResource.js index b2ece13..d27ad63 100644 --- a/edit-mode/function/expenseResource.js +++ b/edit-mode/function/expenseResource.js @@ -60,6 +60,7 @@ $(document).ready(function () { }); function deleteexpenseAssign(id) { + searchReport(id); $.ajax({ url: `${base_url}assign-material/delete/${id}`, type: "DELETE", @@ -74,6 +75,37 @@ $(document).ready(function () { }); } + function searchReport(id) { + var payload = { + "columns": [ + { + "name": "assign_material_id", + "logic_operator": "=", + "value": id, + "operator": "AND" + } + ], + // "joins": [{ "name": "m_proyek", "column_join": "proyek_id", "column_results": ["kode_sortname", "nama"] }], + } + $.ajax({ + data: JSON.stringify(payload), + url: `${base_url}report-activity-material/search`, + type: "POST", + success: function (data) { + data.data.forEach(element => { + let activityId = element.activity_id; + let task = gantt.getTask(activityId); + task.actual_start = null; + task.actual_end = null; + }); + actionHappen = true; + }, + error: function (data) { + // gantt.alert("Failed to get the data."); + } + }); + } + $("#modal-expense").on("click", "#show-form-expense", function () { $(this).hide(); $("#hide-form-expense").show(); diff --git a/edit-mode/function/reportActivity.js b/edit-mode/function/reportActivity.js index 1d64488..da3ea74 100644 --- a/edit-mode/function/reportActivity.js +++ b/edit-mode/function/reportActivity.js @@ -375,6 +375,13 @@ $(document).ready(function () { }); async function submitStatus(formData) { + let activityId = formData.get("activity_id"); + let statusActivity = formData.get("status_activity"); + let task = gantt.getTask(activityId); + if (statusActivity != "done") { + task.actual_start = null; + task.actual_end = null; + } const result = await axiosInstance .post(`${base_url}report-activity-material/update-status`, formData) .then(res => res)