diff --git a/edit-mode/function/materialResource.js b/edit-mode/function/materialResource.js
index 9635d96..c865919 100644
--- a/edit-mode/function/materialResource.js
+++ b/edit-mode/function/materialResource.js
@@ -61,6 +61,7 @@ $(document).ready(function () {
});
function deleteMaterialAssign(id) {
+ searchReport(id);
$.ajax({
url: `${base_url}assign-material/delete/${id}`,
type: "DELETE",
diff --git a/edit-mode/index.html b/edit-mode/index.html
index 872751d..8f2aced 100644
--- a/edit-mode/index.html
+++ b/edit-mode/index.html
@@ -702,8 +702,8 @@
Deskripsi |
Tipe |
- Volume Kumulatif Plan |
- Volume Kumulatif Aktual |
+ Volume Plan |
+ Volume Actual |
UOM |
Aksi |
@@ -784,7 +784,7 @@
Human Resource |
Report Date |
- Volume Pekerjaan |
+ Volume Actual |
Volume Plan |
Keterangan |
Actions |
diff --git a/view-mode/function/reportActivity.js b/view-mode/function/reportActivity.js
index 3c9088d..91ed799 100644
--- a/view-mode/function/reportActivity.js
+++ b/view-mode/function/reportActivity.js
@@ -79,60 +79,60 @@ $(document).ready(function () {
]
});
- var tableRaMaterialActual = $("#table_activity_material_actual").DataTable({
- "processing": true,
- "serverSide": true,
- "ajax": {
- "url": `${base_url}report-activity-material/datatables`,
- "data": function (d) {
- d.idAmi = assignMaterialId;
- d.idAct = activityId;
- d.type = 'actual';
- }
- },
- "columns": [
- { data: 'human_resource', name: 'human_resource' },
- {
- data: 'report_date', render: function (data, type) {
- return data ? formatDate(data) : '-'
- }
- },
- {
- data: 'qty', render: function (data, type) {
- return data ? formatRupiah(data) : '-'
- }
- },
- { data: 'description', name: 'description' },
- ],
- "order": [[1, 'asc']],
- });
-
- var tableRaMaterialPlan = $("#table_activity_material_plan").DataTable({
- "processing": true,
- "serverSide": true,
- "ajax": {
- "url": `${base_url}report-activity-material/datatables`,
- "data": function (d) {
- d.idAmi = assignMaterialId;
- d.idAct = activityId;
- d.type = 'plan';
- }
- },
- "columns": [
- { data: 'material_name', name: 'material_name'},
- {
- data: 'qty_planning', render: function (data, type) {
- return data ? formatRupiah(parseInt(data)) : '-'
- }
- },
- { data: 'uom', name: 'uom' },
- {
- data: 'plan_date', render: function (data, type) {
- return data ? formatDate(data) : '-'
- }
- },
- ]
- });
+ // var tableRaMaterialActual = $("#table_activity_material_actual").DataTable({
+ // "processing": true,
+ // "serverSide": true,
+ // "ajax": {
+ // "url": `${base_url}report-activity-material/datatables`,
+ // "data": function (d) {
+ // d.idAmi = assignMaterialId;
+ // d.idAct = activityId;
+ // d.type = 'actual';
+ // }
+ // },
+ // "columns": [
+ // { data: 'human_resource', name: 'human_resource' },
+ // {
+ // data: 'report_date', render: function (data, type) {
+ // return data ? formatDate(data) : '-'
+ // }
+ // },
+ // {
+ // data: 'qty', render: function (data, type) {
+ // return data ? formatRupiah(data) : '-'
+ // }
+ // },
+ // { data: 'description', name: 'description' },
+ // ],
+ // "order": [[1, 'asc']],
+ // });
+
+ // var tableRaMaterialPlan = $("#table_activity_material_plan").DataTable({
+ // "processing": true,
+ // "serverSide": true,
+ // "ajax": {
+ // "url": `${base_url}report-activity-material/datatables`,
+ // "data": function (d) {
+ // d.idAmi = assignMaterialId;
+ // d.idAct = activityId;
+ // d.type = 'plan';
+ // }
+ // },
+ // "columns": [
+ // { data: 'material_name', name: 'material_name'},
+ // {
+ // data: 'qty_planning', render: function (data, type) {
+ // return data ? formatRupiah(parseInt(data)) : '-'
+ // }
+ // },
+ // { data: 'uom', name: 'uom' },
+ // {
+ // data: 'plan_date', render: function (data, type) {
+ // return data ? formatDate(data) : '-'
+ // }
+ // },
+ // ]
+ // });
$('#modal_report_activity').on('show.bs.modal', function (event) {
$("#report_activity_title").html(`Report Activity ${activityName}`)