From c049cfcb66cf9a976cd6901b329f3750bbeffba4 Mon Sep 17 00:00:00 2001
From: Muhammad Sulaiman Yusuf <ms.yusuf@outlook.co.id>
Date: Wed, 23 Nov 2022 15:45:25 +0700
Subject: [PATCH] change other expense to overhead & fix ribuan

---
 edit-mode/function/expenseResource.js | 6 +++---
 edit-mode/function/ganttConfig.js     | 6 +++---
 edit-mode/function/reportActivity.js  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/edit-mode/function/expenseResource.js b/edit-mode/function/expenseResource.js
index 24055f1..d283cc2 100644
--- a/edit-mode/function/expenseResource.js
+++ b/edit-mode/function/expenseResource.js
@@ -10,12 +10,12 @@ function resetFormAssignexpense() {
 };
 
 
-var rupiah = document.getElementById('price-req-expense');
+var rupiahExpense = document.getElementById('price-req-expense');
         rupiah.addEventListener('keyup', function (e) {
         rupiah.value = formatRibuanInput(this.value);
     });
 
-var qty = document.getElementById('qty-req-expense');
+var qtyExpense = document.getElementById('qty-req-expense');
         qty.addEventListener('keyup', function (e) {
         qty.value = formatRibuanInput(this.value);
     });
@@ -86,7 +86,7 @@ $(document).ready(function () {
     });
 
     $('#modal-expense').on('show.bs.modal', function (event) {
-        $('#modal-expense-title').html("Other Expense " + activityName);
+        $('#modal-expense-title').html("Overhead " + activityName);
         tableexpense.draw();
     });
 
diff --git a/edit-mode/function/ganttConfig.js b/edit-mode/function/ganttConfig.js
index be64cdc..fc6f7d4 100644
--- a/edit-mode/function/ganttConfig.js
+++ b/edit-mode/function/ganttConfig.js
@@ -310,7 +310,7 @@ var allColumns = [
 					${html}
 				</div>`
 	} },
-	{ name: "expenses", label: "Other Expense", align: "center", min_width: 150, resize: true, template: function (text) {
+	{ name: "expenses", label: "Overhead", align: "center", min_width: 150, resize: true, template: function (text) {
 		if(text.type=="project" || text.type=="milestone" || text.type=="header"){
 			return;
 		}
@@ -318,10 +318,10 @@ var allColumns = [
 		var assign_expense = text.assign_expense
 
 		if(!assign_expense || !assign_expense.length){
-			html = `<span class="badge badge-pill badge-danger">No Expense</span>`;
+			html = `<span class="badge badge-pill badge-danger">No Overhead</span>`;
 		}else{
 			if(assign_expense.length > 0 ){
-				html = `<span class="text-capitalize badge badge-pill badge-primary">See Expense</span>`;
+				html = `<span class="text-capitalize badge badge-pill badge-primary">See Overhead</span>`;
 			}
 		}
 		return `<div class="d-flex justify-content-center align-items-center" data-toggle="modal" data-target="#modal-expense" style="min-width:100%;height:100%;">
diff --git a/edit-mode/function/reportActivity.js b/edit-mode/function/reportActivity.js
index 47f3ef6..005dc69 100644
--- a/edit-mode/function/reportActivity.js
+++ b/edit-mode/function/reportActivity.js
@@ -116,7 +116,7 @@ $(document).ready(function () {
             { data: 'material_name', name: 'material_name' },
 			{ data: 'type', name: 'type', render: function(data, type){
 				if(data == 'expense')
-					return "Lainnya"
+					return "Overhead"
 				return "Material"
 			}},
             {