|
|
@ -347,14 +347,17 @@ var allColumns = [ |
|
|
|
</div>` |
|
|
|
</div>` |
|
|
|
} }, |
|
|
|
} }, |
|
|
|
// { name: "status", label: "Status", align: "center", editor: editor.status, resize: true },
|
|
|
|
// { name: "status", label: "Status", align: "center", editor: editor.status, resize: true },
|
|
|
|
{ name: "bobot_planning", label: "Bobot Activity (%)", align: "center", resize: true, min_width: 115, template: function (text) { |
|
|
|
{ name: "bobot_planning", label: "Bobot Activity (%)", align: "center", editor: editor.bobot_planning, resize: true, min_width: 115, template: function (text) { |
|
|
|
|
|
|
|
if(text.bobot_planning > 100){ |
|
|
|
|
|
|
|
gantt.alert("Bobot tidak boleh lebih dari 100%!"); |
|
|
|
|
|
|
|
} |
|
|
|
if(!text.bobot_planning){ |
|
|
|
if(!text.bobot_planning){ |
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
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", min_width: 125, template: function (text) { |
|
|
|
{ name: "progress", label: "Actual Progress (%)", align: "center", editor: progressEditor ,min_width: 125, template: function (text) { |
|
|
|
let progress = text.progress |
|
|
|
let progress = text.progress |
|
|
|
progress = progress*100 |
|
|
|
progress = progress*100 |
|
|
|
return roundToTwo(progress); |
|
|
|
return roundToTwo(progress); |
|
|
@ -362,6 +365,9 @@ var allColumns = [ |
|
|
|
{ name:"progress_actual", label: "Total Actual Progress (%)", align: "center", min_width: 150, template: function (text) { |
|
|
|
{ name:"progress_actual", label: "Total Actual Progress (%)", align: "center", min_width: 150, template: function (text) { |
|
|
|
let progress = text.progress |
|
|
|
let progress = text.progress |
|
|
|
progress = progress*100 |
|
|
|
progress = progress*100 |
|
|
|
|
|
|
|
if(progress > 100){ |
|
|
|
|
|
|
|
gantt.alert("Bobot tidak boleh lebih dari 100%!"); |
|
|
|
|
|
|
|
} |
|
|
|
let bobot = text.bobot_planning |
|
|
|
let bobot = text.bobot_planning |
|
|
|
let actual = (progress*bobot) / 100 |
|
|
|
let actual = (progress*bobot) / 100 |
|
|
|
return roundToTwo(actual); |
|
|
|
return roundToTwo(actual); |
|
|
|