From 2fc16ac3ef7a495ea0e2c14025ead5f267f0ba8b Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Wed, 23 Aug 2023 08:22:24 +0700 Subject: [PATCH 1/3] Change columns name --- edit-mode/function/function.js | 6 +++++- edit-mode/function/ganttConfig.js | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/edit-mode/function/function.js b/edit-mode/function/function.js index 1847960..760dfda 100644 --- a/edit-mode/function/function.js +++ b/edit-mode/function/function.js @@ -538,7 +538,11 @@ function setUpForShowHideColumn(data) { columns.map((val, index) => { configColumn[val.column_name] = val.show }); - + if (!isBaselineSet) { + configColumn.planned_start = undefined; + configColumn.planned_end = undefined; + configColumn.planned_duration = undefined; + } gantt.config.columns = createColumnsConfig(configColumn); gantt.render(); diff --git a/edit-mode/function/ganttConfig.js b/edit-mode/function/ganttConfig.js index 4370aa7..ccc5457 100644 --- a/edit-mode/function/ganttConfig.js +++ b/edit-mode/function/ganttConfig.js @@ -282,7 +282,7 @@ var allColumns = [ return text.planned_start; } }, - { name: "start_date", label: "Actual Start", align: "center", min_width: 80, editor: editor.start_date, resize: true }, + { name: "start_date", label: "Early Start", align: "center", min_width: 80, editor: editor.start_date, resize: true }, { name: "planned_end", label: "Baseline Finish", align: "center", min_width: 80, editor: editor.planned_end, resize: true, template: function (text) { if (!text.planned_end) { @@ -291,7 +291,7 @@ var allColumns = [ return text.planned_end; } }, - { name: "end_date", label: "Actual Finish", align: "center", min_width: 80, editor: editor.end_date, resize: true }, + { name: "end_date", label: "Early Finish", align: "center", min_width: 80, editor: editor.end_date, resize: true }, { name: "bobot_planning", label: "Bobot (%)", align: "center", editor: editor.bobot_planning, resize: true, min_width: 115, template: function (text) { @@ -349,7 +349,7 @@ var allColumns = [ }) return plannedDuration; }}, - { name: "duration", label: "Actual Duration (Day)", align: "center", min_width: 50, resize: true, editor: editor.duration }, + { name: "duration", label: "Early Duration (Day)", align: "center", min_width: 50, resize: true, editor: editor.duration }, { name: "rencana_biaya", label: "Cost Planning", align: "right", min_width: 100, resize: true, template: function (text) { if (!text.rencana_biaya) { From cec485918fa7d0027e91cd0b9738eed07e8f573b Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Wed, 23 Aug 2023 10:00:41 +0700 Subject: [PATCH 2/3] quick fix --- edit-mode/function/function.js | 1 + 1 file changed, 1 insertion(+) diff --git a/edit-mode/function/function.js b/edit-mode/function/function.js index 760dfda..d17b12f 100644 --- a/edit-mode/function/function.js +++ b/edit-mode/function/function.js @@ -542,6 +542,7 @@ function setUpForShowHideColumn(data) { configColumn.planned_start = undefined; configColumn.planned_end = undefined; configColumn.planned_duration = undefined; + configColumn.baseline_progress = undefined; } gantt.config.columns = createColumnsConfig(configColumn); From 9c588a0ce561857336ad77df7e231e1861bc3c5a Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Wed, 23 Aug 2023 12:31:28 +0700 Subject: [PATCH 3/3] Fix link lag --- edit-mode/function/function.js | 16 +++++++++++++++- edit-mode/function/restActivityLink.js | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/edit-mode/function/function.js b/edit-mode/function/function.js index d17b12f..c84423e 100644 --- a/edit-mode/function/function.js +++ b/edit-mode/function/function.js @@ -708,4 +708,18 @@ $(window).on('beforeunload', function(event) { function sendStorage(){ const batchEntityData = localStorage.getItem('batchEntity'); window.parent.postMessage({ batchEntity: batchEntityData }, '*'); -} \ No newline at end of file +} + +function updateLinksLag(data) { + data.data.forEach(task => { + data.links.forEach(link => { + if (link.target == task.id) { + let predecessor = data.data.find(item => item.id == link.source); + if (predecessor) { + let lag = gantt.calculateDuration(new Date(predecessor.end_date), new Date(task.start_date)); + link.lag = lag; + } + } + }); + }); +} diff --git a/edit-mode/function/restActivityLink.js b/edit-mode/function/restActivityLink.js index 269062b..7d9665b 100644 --- a/edit-mode/function/restActivityLink.js +++ b/edit-mode/function/restActivityLink.js @@ -38,6 +38,7 @@ gantt.ajax.get({ }) }); gantt.silent(function () { + updateLinksLag(data); gantt.parse(data); getGanttOpen(); gantt.parse(data); @@ -90,6 +91,7 @@ function refresData(id) { }) }); gantt.silent(function () { + updateLinksLag(data); gantt.parse(data); getGanttOpen(); gantt.parse(data);