diff --git a/edit-mode/function/expenseResource.js b/edit-mode/function/expenseResource.js index 602ca20..55dd594 100644 --- a/edit-mode/function/expenseResource.js +++ b/edit-mode/function/expenseResource.js @@ -12,14 +12,14 @@ function resetFormAssignexpense() { var rupiahExpense = document.getElementById('price-req-expense'); - rupiahExpense.addEventListener('keyup', function (e) { - rupiahExpense.value = formatRibuanInput(this.value); - }); +rupiahExpense.addEventListener('keyup', function (e) { + rupiahExpense.value = formatRibuanInput(this.value); +}); var qtyExpense = document.getElementById('qty-req-expense'); - qtyExpense.addEventListener('keyup', function (e) { - qtyExpense.value = formatRibuanInput(this.value); - }); +qtyExpense.addEventListener('keyup', function (e) { + qtyExpense.value = formatRibuanInput(this.value); +}); $(document).ready(function () { var tableexpense = $("#table-expense").DataTable({ @@ -158,7 +158,7 @@ $(document).ready(function () { let expense_id = null; let payload = { - description: desc_req_expense, + description: desc_req_expense.trim(), type: "expense", fom_date: required_date, required_date: required_date, @@ -181,10 +181,10 @@ $(document).ready(function () { let payloadAssign = { proyek_id: proyekId, activity_id: activityId, - material_id : material_id , + material_id: material_id, qty_planning: qty_planning, plan_date: plan_date, - type: "expense", + type: "expense", } $.ajax({ data: JSON.stringify(payloadAssign), diff --git a/edit-mode/function/ganttSettings.js b/edit-mode/function/ganttSettings.js index ffd0dd1..5104100 100644 --- a/edit-mode/function/ganttSettings.js +++ b/edit-mode/function/ganttSettings.js @@ -131,8 +131,8 @@ $(document).ready(function () { }); $("#dashboard-project").on('click', function (event) { - // window.location.href = `https://project.ospro.id/#/dashboard-project/${projectId}/${ganttId}`; - window.location.href = `http://localhost:3000/#/dashboard-project/${projectId}/${ganttId}`; + window.location.href = `https://project.ospro.id/#/dashboard-project/${projectId}/${ganttId}false-header`; + // window.location.href = `http://localhost:3000/#/dashboard-project/${projectId}/${ganttId}/false-header`; }); $("#gantt-baseline").on('click', function (event) {