Browse Source

change other expense to overhead & fix ribuan

pull/1/head
Muhammad Sulaiman Yusuf 2 years ago
parent
commit
c049cfcb66
  1. 6
      edit-mode/function/expenseResource.js
  2. 6
      edit-mode/function/ganttConfig.js
  3. 2
      edit-mode/function/reportActivity.js

6
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.addEventListener('keyup', function (e) {
rupiah.value = formatRibuanInput(this.value); 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.addEventListener('keyup', function (e) {
qty.value = formatRibuanInput(this.value); qty.value = formatRibuanInput(this.value);
}); });
@ -86,7 +86,7 @@ $(document).ready(function () {
}); });
$('#modal-expense').on('show.bs.modal', function (event) { $('#modal-expense').on('show.bs.modal', function (event) {
$('#modal-expense-title').html("Other Expense " + activityName); $('#modal-expense-title').html("Overhead " + activityName);
tableexpense.draw(); tableexpense.draw();
}); });

6
edit-mode/function/ganttConfig.js

@ -310,7 +310,7 @@ var allColumns = [
${html} ${html}
</div>` </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"){ if(text.type=="project" || text.type=="milestone" || text.type=="header"){
return; return;
} }
@ -318,10 +318,10 @@ var allColumns = [
var assign_expense = text.assign_expense var assign_expense = text.assign_expense
if(!assign_expense || !assign_expense.length){ 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{ }else{
if(assign_expense.length > 0 ){ 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%;"> return `<div class="d-flex justify-content-center align-items-center" data-toggle="modal" data-target="#modal-expense" style="min-width:100%;height:100%;">

2
edit-mode/function/reportActivity.js

@ -116,7 +116,7 @@ $(document).ready(function () {
{ data: 'material_name', name: 'material_name' }, { data: 'material_name', name: 'material_name' },
{ data: 'type', name: 'type', render: function(data, type){ { data: 'type', name: 'type', render: function(data, type){
if(data == 'expense') if(data == 'expense')
return "Lainnya" return "Overhead"
return "Material" return "Material"
}}, }},
{ {

Loading…
Cancel
Save