Browse Source

Merge pull request 'dev-ibnu' (#32) from dev-ibnu into staging

Reviewed-on: ordo/adw-gantt#32
pull/1/head
ibnu 1 year ago
parent
commit
c0451ac8bb
  1. 10
      edit-mode/function/function.js
  2. 7
      edit-mode/function/materialResource.js

10
edit-mode/function/function.js

@ -561,10 +561,10 @@ function updateShowHideColumn(data) {
processData: false, processData: false,
contentType: false, contentType: false,
success: function (data) { success: function (data) {
console.log(data); // console.log(data);
}, },
error: function (data) { error: function (data) {
console.log(data); // console.log(data);
} }
}); });
} }
@ -575,6 +575,8 @@ function colAjaxReq(type) {
type: "GET", type: "GET",
success: function (data) { success: function (data) {
let ganttColumnsByType = data.data; let ganttColumnsByType = data.data;
// console.log("ini gantt field ", ganttColumnsByType);
// console.log("ini column ", gantt.config.columns);
let isFound = false; let isFound = false;
x = gantt.config.columns.filter((val) => { x = gantt.config.columns.filter((val) => {
isFound = ganttColumnsByType.find(obj => { isFound = ganttColumnsByType.find(obj => {
@ -582,6 +584,10 @@ function colAjaxReq(type) {
}); });
if (isFound) if (isFound)
return val; return val;
if (isFound == false){
// console.log("ini gantt field !isFound ", val);
}
}); });
gantt.config.columns = x.filter(item => item); gantt.config.columns = x.filter(item => item);
allColumns = gantt.config.columns; allColumns = gantt.config.columns;

7
edit-mode/function/materialResource.js

@ -164,10 +164,11 @@ $(document).ready(function () {
results: dataIntegrasiMaterial results: dataIntegrasiMaterial
}; };
}, error: function (jqXHR, textStatus, errorThrown) { }, error: function (jqXHR, textStatus, errorThrown) {
// console.log("textStatus ", textStatus);
if (textStatus != "abort") { if (textStatus != "abort") {
gantt.alert(`Status: ${textStatus}`); // gantt.alert(`Status: ${textStatus}`);
gantt.alert(`Error thrown: ${errorThrown}`); gantt.alert(`Data Not Found`);
gantt.alert(`Error accessing URL: ${adwIntegrationUrl}/request-material/get-material-integration`); // gantt.alert(`Error accessing URL: ${adwIntegrationUrl}/request-material/get-material-integration`);
} }
} }
} }

Loading…
Cancel
Save