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

move report info to header

pull/1/head
Muhammad Sulaiman Yusuf 2 years ago
parent
b8b55535d7
commit
94094eed46
2 changed files with 73 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 91
      edit-mode/function/reportActivity.js
  2. 20
      edit-mode/index.html

91
edit-mode/function/reportActivity.js
Unescape View File

@ -21,9 +21,9 @@ function resetFormAddRaMaterial() {
$('#btn_add_ra_material').prop("disabled", false); $('#btn_add_ra_material').prop("disabled", false);
} }
var qtyActual = document.getElementById('volume_pekerjaan_material'); var qtyActual = document.getElementById('volume_pekerjaan_material');
qtyActual.addEventListener('keyup', function (e) { qtyActual.addEventListener('keyup', function (e) {
qtyActual.value = formatRibuanInput(this.value); qtyActual.value = formatRibuanInput(this.value);
}); });
$(document).ready(function () { $(document).ready(function () {
@ -74,7 +74,38 @@ $(document).ready(function () {
} }
}); });
var tableRa = $("#table_report").DataTable({ var tableRa = $("#table_report").on('xhr.dt', function(e, settings, json, xhr){
$('#report-activity-information-status').attr("class", "");
if(json?.data?.length > 0) {
let firstData = json.data[0];
const statusReport = firstData.status_activity;
let reportStartDate = firstData.start_activity ?? "-";
reportStartDate = reportStartDate.split(" ")[0];
let reportFinishDate = firstData.finish_activity ?? "-";
reportFinishDate = reportFinishDate.split(" ")[0];
if(statusReport == 'on-progress') {
$('#report-activity-information-status').attr("class", "badge badge-warning");
} else if(statusReport == 'done') {
$('#report-activity-information-status').attr("class", "badge badge-success");
} else if(statusReport == 'open') {
$('#report-activity-information-status').attr("class", "badge badge-primary");
}
if(moment(reportStartDate, "YYYY-MM-DD",true).isValid()){
reportStartDate = moment(reportStartDate, "YYYY-MM-DD").format("DD-MM-YYYY");
}
if(moment(reportFinishDate, "YYYY-MM-DD",true).isValid()){
reportFinishDate = moment(reportFinishDate, "YYYY-MM-DD").format("DD-MM-YYYY");
}
$("#report-activity-information-status").text(statusReport ?? "-");
$("#report-activity-information-start").text(reportStartDate);
$("#report-activity-information-end").text(reportFinishDate);
}
}).DataTable({
"processing": true, "processing": true,
"serverSide": true, "serverSide": true,
"ajax": { "ajax": {
@ -87,6 +118,7 @@ $(document).ready(function () {
{ 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) {
console.log("render", [data, type]);
return data ? formatRupiah(data) : '-' return data ? formatRupiah(data) : '-'
} }
}, },
@ -99,28 +131,22 @@ $(document).ready(function () {
} }
}, },
{ data: 'uom', name: 'uom' }, { data: 'uom', name: 'uom' },
{ // {
data: 'start_activity', render: function (data, type) { // data: 'start_activity', render: function (data, type) {
console.log("start", data) // return data ? formatDate(data) : '-'
return data ? formatDate(data) : '-' // }
} // },
}, // {
{ // data: 'finish_activity', render: function (data, type) {
data: 'finish_activity', render: function (data, type) { // return data ? formatDate(data) : '-'
console.log("finish", data) // }
return data ? formatDate(data) : '-' // },
} // {
}, // data: 'status_activity', render: function (data, type) {
{ // console.log("status", data)
data: 'status_activity', render: function (data, type) { // return val
console.log("status", data) // }
const val = !data ? '-' : // },
data == "done" ? `<span class="badge badge-success">${data}</span>` :
data == "open" ? `<span class="badge badge-primary">${data}</span>` :
`<span class="badge badge-warning">${data}</span>`
return val
}
},
{ {
data: 'action', data: 'action',
name: 'action', name: 'action',
@ -130,6 +156,7 @@ $(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,
@ -142,9 +169,9 @@ $(document).ready(function () {
} }
}, },
"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) : '-'
} }
}, },
@ -184,13 +211,13 @@ $(document).ready(function () {
}, },
{ 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) : '-'
} }
}, },
] ]
}); });
$('#select_ra_hr').select2({ $('#select_ra_hr').select2({
dropdownParent: rAModal, dropdownParent: rAModal,
@ -520,7 +547,7 @@ $(document).ready(function () {
// console.log(" okeee ",{ assignMaterialId, activityId, materialName }); // console.log(" okeee ",{ assignMaterialId, activityId, materialName });
$("#report_activity_material_title").html(`Report Activity Actual Material ${materialName}`) $("#report_activity_material_title").html(`Report Activity Actual Material ${materialName}`)
$("#modal_report_activity").hide(); $("#modal_report_activity").hide();
$("#form_report_activity_material").show(); $("#form_report_activity_material").show();
$("#activity_material_plan").hide(); $("#activity_material_plan").hide();
$("#activity_material_actual").show(); $("#activity_material_actual").show();
@ -642,4 +669,4 @@ $(document).ready(function () {
} }
}); });
}); });
}); });

20
edit-mode/index.html
Unescape View File

@ -542,8 +542,6 @@
<button id="show_form_ra" type="button" class="success btn btn-success btn-sm btn-update-status" <button id="show_form_ra" type="button" class="success btn btn-success btn-sm btn-update-status"
data-toggle="tooltip" title="Input Update Status" data-placement="top" aria-hidden="true"><i data-toggle="tooltip" title="Input Update Status" data-placement="top" aria-hidden="true"><i
class="fa fa-cog" aria-hidden="true"></i></button> class="fa fa-cog" aria-hidden="true"></i></button>
<!-- <button id="hide_form_ra" type="button" class="elm-hide btn btn-primary btn-sm"><i class="fa fa-chevron-up"
aria-hidden="true"></i></button> -->
</div> </div>
</div> </div>
<div class="modal-body"> <div class="modal-body">
@ -554,7 +552,6 @@
<div class="form-row"> <div class="form-row">
<div class="col-md-4 form-group"> <div class="col-md-4 form-group">
<label>Status</label> <label>Status</label>
<!-- <input type="date" id="ra_date" name="report_date" class="form-control form-control-sm" required /> -->
<select class="form-control" name="status_activity" id="ra_select_status"> <select class="form-control" name="status_activity" id="ra_select_status">
<option value="">Select Status --</option> <option value="">Select Status --</option>
<option value="open">Open</option> <option value="open">Open</option>
@ -583,6 +580,20 @@
<hr /> <hr />
</form> </form>
<div id="report-activity-information">
<h5>Activity Status Information</h5>
<p style="margin-bottom:2px">
<span>Status</span> : <span id="report-activity-information-status">-</span>
</p>
<p style="margin-bottom:2px">
<span>Start Activity</span> : <span id="report-activity-information-start">-</span>
</p>
<p style="margin-bottom:2px">
<span>End Activity</span> : <span id="report-activity-information-end">-</span>
</p>
<hr/>
</div>
<div class="table-responsive"> <div class="table-responsive">
<table id="table_report" class="table table-sm" style="width: 100%;"> <table id="table_report" class="table table-sm" style="width: 100%;">
<thead> <thead>
@ -591,9 +602,6 @@
<th scope="col">Volume Kumulatif Plan</th> <th scope="col">Volume Kumulatif Plan</th>
<th scope="col">Volume Kumulatif Aktual</th> <th scope="col">Volume Kumulatif Aktual</th>
<th scope="col">UOM</th> <th scope="col">UOM</th>
<th scope="col">Start Activity</th>
<th scope="col">Finish Activity</th>
<th scope="col">Status</th>
<th scope="col">Aksi</th> <th scope="col">Aksi</th>
</tr> </tr>
</thead> </thead>

Write Preview
Loading…
Cancel
Save