Browse Source

change reporting ux

pull/1/head
Muhammad Sulaiman Yusuf 2 years ago
parent
commit
47ef536301
  1. 14
      edit-mode/function/ganttConfig.js

14
edit-mode/function/ganttConfig.js

@ -336,7 +336,7 @@ var allColumns = [
let bobot_planning = parseFloat(text.bobot_planning); let bobot_planning = parseFloat(text.bobot_planning);
return roundToTwo(bobot_planning); return roundToTwo(bobot_planning);
} }, } },
{ name: "progress", label: "Actual Progress (%)", align: "center", editor: progressEditor, min_width: 125, template: function (text) { { name: "progress", label: "Actual Progress (%)", align: "center", min_width: 125, template: function (text) {
let progress = text.progress let progress = text.progress
progress = progress*100 progress = progress*100
return progress; return progress;
@ -349,11 +349,16 @@ var allColumns = [
return roundToTwo(actual); return roundToTwo(actual);
}, resize: true }, }, resize: true },
{ name: "jumlah_pekerjaan", label: "Volume Plan", align: "center", min_width: 100, resize: true, editor:editor.job_count }, { name: "jumlah_pekerjaan", label: "Volume Plan", align: "center", min_width: 100, resize: true, editor:editor.job_count },
{ name: "jobs_done", label: "Volume Actual", align: "center", min_width: 100, resize: true, template: function (text) { { name: "jobs_done", label: "Report", align: "center", min_width: 100, resize: true, template: function (text) {
if(text.type=="project" || text.type=="milestone" || text.type=="header"){ if(text.type=="project" || text.type=="milestone" || text.type=="header"){
return; return;
} }
let html = text.jobs_done ? text.jobs_done : 0;
if(text.jobs_done == 0){
html = `<span class="badge badge-pill badge-danger">No Report</span>`;
}else{
html = `<span class="text-capitalize badge badge-pill badge-primary">See Report</span>`;
}
return `<div class="d-flex justify-content-center align-items-center" data-toggle="modal" data-target="#modal_report_activity" style="min-width:100%;height:100%;"> return `<div class="d-flex justify-content-center align-items-center" data-toggle="modal" data-target="#modal_report_activity" style="min-width:100%;height:100%;">
${html} ${html}
</div>` </div>`
@ -632,6 +637,9 @@ gantt.config.branch_loading = true;
gantt.config.smart_scales = true; gantt.config.smart_scales = true;
gantt.config.smart_rendering = true; gantt.config.smart_rendering = true;
// drag process
gantt.config.drag_progress = false;
// gantt initialization // gantt initialization
$(document).ready(function () { $(document).ready(function () {
initializationProject(); initializationProject();

Loading…
Cancel
Save