diff --git a/edit-mode/function/function.js b/edit-mode/function/function.js index 1e10fd7..d92e5f5 100644 --- a/edit-mode/function/function.js +++ b/edit-mode/function/function.js @@ -487,6 +487,31 @@ function updateShowHideColumn(data) }); } +function colAjaxReq(type) { + let ajx = $.ajax({ + url: `${base_url}gantt-show-hide/get-column-by-type/${type}`, + type: "GET", + success: function (data) { + let ganttColumnsByType = data.data; + let isFound = false; + x = gantt.config.columns.filter((val) => { + isFound = ganttColumnsByType.find(obj => { + return obj.column_name == val.name; + }); + if(isFound) + return val; + }); + gantt.config.columns = x.filter(item => item); + allColumns = gantt.config.columns; + gantt.render(); + } + }); +} + +async function reRenderColumns(type){ + await colAjaxReq(type); +} + function updateProperty(payload){ if(userToVersionGanttId > 0 && readOnly && parseInt(readOnly)==0){ $.ajax({ diff --git a/edit-mode/function/ganttSettings.js b/edit-mode/function/ganttSettings.js index 53cad54..f4c6af0 100644 --- a/edit-mode/function/ganttSettings.js +++ b/edit-mode/function/ganttSettings.js @@ -183,6 +183,8 @@ async function initGanttSettings() { if (result && result.status==200){ var config_dayoff = result.data.data.config_dayoff; + var type_gantt = result.data.data.calculation_type; + reRenderColumns(type_gantt); var dayoff = []; if(config_dayoff && config_dayoff.length > 0){ dayoff = config_dayoff.split(','); @@ -252,7 +254,6 @@ function getColumnsSelection(node){ unselectedColumn.forEach(function(node){ checkedColumns[node.name] = false; }); - // console.log("checkedColumns", checkedColumns) return checkedColumns; }