ordo
/
surveyor_indonesia_gantt
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request 'dev-wahyu' (#52) from dev-wahyu into staging 

Reviewed-on: ordo/adw-gantt#52
pull/1/head
farhantock 11 months ago
parent
3a96ed4d24 c229d9ec47
commit
e73b52e19a
2 changed files with 55 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      edit-mode/function/materialResource.js
  2. 108
      view-mode/function/reportActivity.js

1
edit-mode/function/materialResource.js
Unescape View File

@ -61,6 +61,7 @@ $(document).ready(function () {
});
function deleteMaterialAssign(id) {
searchReport(id);
$.ajax({
url: `${base_url}assign-material/delete/${id}`,
type: "DELETE",

108
view-mode/function/reportActivity.js
Unescape View File

@ -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}`)

Write Preview
Loading…
Cancel
Save