Browse Source

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

Reviewed-on: ordo/adw-gantt#23
pull/1/head
ibnu 1 year ago
parent
commit
fe0a2e59de
  1. 23
      edit-mode/function/function.js
  2. 2
      edit-mode/function/restActivityLink.js

23
edit-mode/function/function.js

@ -538,7 +538,12 @@ function setUpForShowHideColumn(data) {
columns.map((val, index) => { columns.map((val, index) => {
configColumn[val.column_name] = val.show configColumn[val.column_name] = val.show
}); });
if (!isBaselineSet) {
configColumn.planned_start = undefined;
configColumn.planned_end = undefined;
configColumn.planned_duration = undefined;
configColumn.baseline_progress = undefined;
}
gantt.config.columns = createColumnsConfig(configColumn); gantt.config.columns = createColumnsConfig(configColumn);
gantt.render(); gantt.render();
@ -703,4 +708,18 @@ $(window).on('beforeunload', function(event) {
function sendStorage(){ function sendStorage(){
const batchEntityData = localStorage.getItem('batchEntity'); const batchEntityData = localStorage.getItem('batchEntity');
window.parent.postMessage({ batchEntity: batchEntityData }, '*'); window.parent.postMessage({ batchEntity: batchEntityData }, '*');
} }
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;
}
}
});
});
}

2
edit-mode/function/restActivityLink.js

@ -38,6 +38,7 @@ gantt.ajax.get({
}) })
}); });
gantt.silent(function () { gantt.silent(function () {
updateLinksLag(data);
gantt.parse(data); gantt.parse(data);
getGanttOpen(); getGanttOpen();
gantt.parse(data); gantt.parse(data);
@ -90,6 +91,7 @@ function refresData(id) {
}) })
}); });
gantt.silent(function () { gantt.silent(function () {
updateLinksLag(data);
gantt.parse(data); gantt.parse(data);
getGanttOpen(); getGanttOpen();
gantt.parse(data); gantt.parse(data);

Loading…
Cancel
Save