Merge pull request 'upload 2023-10-20' (#55) from staging into master

Reviewed-on: ordo/adw-gantt#55

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",

edit-mode/index.html

@@ -702,8 +702,8 @@
 								<tr>
 									<th scope="col">Deskripsi</th>
 									<th scope="col">Tipe</th>
-									<th scope="col">Volume Kumulatif Plan</th>
+									<th scope="col">Volume Plan</th>
-									<th scope="col">Volume Kumulatif Aktual</th>
+									<th scope="col">Volume Actual</th>
 									<th scope="col">UOM</th>
 									<th scope="col">Aksi</th>
 								</tr>
@@ -784,7 +784,7 @@
 								<tr>
 									<th scope="col">Human Resource</th>
 									<th scope="col">Report Date</th>
-									<th scope="col">Volume Pekerjaan</th>
+									<th scope="col">Volume Actual</th>
 									<th scope="col">Volume Plan</th>
 									<th scope="col">Keterangan</th>
 									<th scope="col">Actions</th>

view-mode/function/reportActivity.js

@@ -79,60 +79,60 @@ $(document).ready(function () {
         ]
     });
 
-    var tableRaMaterialActual = $("#table_activity_material_actual").DataTable({
+    // var tableRaMaterialActual = $("#table_activity_material_actual").DataTable({
-        "processing": true,
+    //     "processing": true,
-        "serverSide": true,
+    //     "serverSide": true,
-        "ajax": {
+    //     "ajax": {
-            "url": `${base_url}report-activity-material/datatables`,
+    //         "url": `${base_url}report-activity-material/datatables`,
-            "data": function (d) {
+    //         "data": function (d) {
-                d.idAmi = assignMaterialId;
+    //             d.idAmi = assignMaterialId;
-                d.idAct = activityId;
+    //             d.idAct = activityId;
-                d.type  = 'actual';
+    //             d.type  = 'actual';
-            }
+    //         }
-        },
+    //     },
-        "columns": [
+    //     "columns": [
-            { data: 'human_resource', name: 'human_resource' },
+    //         { data: 'human_resource', name: 'human_resource' },
-            {
+    //         {
-                data: 'report_date', render: function (data, type) {
+    //             data: 'report_date', render: function (data, type) {
-                    return data ? formatDate(data) : '-'
+    //                 return data ? formatDate(data) : '-'
-                }
+    //             }
-            },
+    //         },
-            {
+    //         {
-                data: 'qty', render: function (data, type) {
+    //             data: 'qty', render: function (data, type) {
-                    return data ? formatRupiah(data) : '-'
+    //                 return data ? formatRupiah(data) : '-'
-                }
+    //             }
-            },
+    //         },
-            { data: 'description', name: 'description' },
+    //         { data: 'description', name: 'description' },
-        ],
+    //     ],
-        "order": [[1, 'asc']],
+    //     "order": [[1, 'asc']],
-    });
+    // });
-
+
-    var tableRaMaterialPlan = $("#table_activity_material_plan").DataTable({
+    // var tableRaMaterialPlan = $("#table_activity_material_plan").DataTable({
-        "processing": true,
+    //     "processing": true,
-        "serverSide": true,
+    //     "serverSide": true,
-        "ajax": {
+    //     "ajax": {
-            "url": `${base_url}report-activity-material/datatables`,
+    //         "url": `${base_url}report-activity-material/datatables`,
-            "data": function (d) {
+    //         "data": function (d) {
-                d.idAmi = assignMaterialId;
+    //             d.idAmi = assignMaterialId;
-                d.idAct = activityId;
+    //             d.idAct = activityId;
-                d.type  = 'plan';
+    //             d.type  = 'plan';
-            }
+    //         }
-        },
+    //     },
-        "columns": [
+    //     "columns": [
-            { data: 'material_name', name: 'material_name'},
+    //         { data: 'material_name', name: 'material_name'},
-            {
+    //         {
-                data: 'qty_planning', render: function (data, type) {
+    //             data: 'qty_planning', render: function (data, type) {
-                    return data ? formatRupiah(parseInt(data)) : '-'
+    //                 return data ? formatRupiah(parseInt(data)) : '-'
-                }
+    //             }
-            },
+    //         },
-            { data: 'uom', name: 'uom' },
+    //         { data: 'uom', name: 'uom' },
-            {
+    //         {
-                data: 'plan_date', render: function (data, type) {
+    //             data: 'plan_date', render: function (data, type) {
-                    return data ? formatDate(data) : '-'
+    //                 return data ? formatDate(data) : '-'
-                }
+    //             }
-            },
+    //         },
-        ]
+    //     ]
-    });
+    // });
 
     $('#modal_report_activity').on('show.bs.modal', function (event) {
         $("#report_activity_title").html(`Report Activity ${activityName}`)