From 9f6a2e71cbb3f032044da25bdf427960437fce1c Mon Sep 17 00:00:00 2001
From: ibnu <ibnuhamdani234@gmail.com>
Date: Thu, 24 Aug 2023 09:55:36 +0700
Subject: [PATCH 1/2] conflict

---
 edit-mode/function/function.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/edit-mode/function/function.js b/edit-mode/function/function.js
index 1847960..417b4df 100644
--- a/edit-mode/function/function.js
+++ b/edit-mode/function/function.js
@@ -556,10 +556,10 @@ function updateShowHideColumn(data) {
 		processData: false,
 		contentType: false,
 		success: function (data) {
-			console.log(data);
+			// console.log(data);
 		},
 		error: function (data) {
-			console.log(data);
+			// console.log(data);
 		}
 	});
 }
@@ -570,6 +570,8 @@ function colAjaxReq(type) {
 		type: "GET",
 		success: function (data) {
 			let ganttColumnsByType = data.data;
+			// console.log("ini gantt field ", ganttColumnsByType);
+			// console.log("ini column ", gantt.config.columns);
 			let isFound = false;
 			x = gantt.config.columns.filter((val) => {
 				isFound = ganttColumnsByType.find(obj => {
@@ -577,6 +579,10 @@ function colAjaxReq(type) {
 				});
 				if (isFound)
 					return val;
+				if (isFound == false){
+					// console.log("ini gantt field !isFound ", val);
+				}
+					
 			});
 			gantt.config.columns = x.filter(item => item);
 			allColumns = gantt.config.columns;

From d28bdacb245f22160e6ac27c6177c931055bb3e5 Mon Sep 17 00:00:00 2001
From: ibnu <ibnuhamdani234@gmail.com>
Date: Sun, 27 Aug 2023 13:02:56 +0700
Subject: [PATCH 2/2] update notif data not found req material

---
 edit-mode/function/materialResource.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/edit-mode/function/materialResource.js b/edit-mode/function/materialResource.js
index f540f4d..9efa127 100644
--- a/edit-mode/function/materialResource.js
+++ b/edit-mode/function/materialResource.js
@@ -164,10 +164,11 @@ $(document).ready(function () {
 					results: dataIntegrasiMaterial
 				};
             }, error: function (jqXHR, textStatus, errorThrown) {
+                // console.log("textStatus ", textStatus);
                 if (textStatus != "abort") {
-                    gantt.alert(`Status: ${textStatus}`);
-                    gantt.alert(`Error thrown: ${errorThrown}`);
-                    gantt.alert(`Error accessing URL: ${adwIntegrationUrl}/request-material/get-material-integration`);
+                    // gantt.alert(`Status: ${textStatus}`);
+                    gantt.alert(`Data Not Found`);
+                    // gantt.alert(`Error accessing URL: ${adwIntegrationUrl}/request-material/get-material-integration`);
                 }
             }
 		}