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

Merge branch 'master' of https://git.oslog.id/ibnu/generic-ospro-gantt into dev-wahyun

pull/1/head
wahyun 11 months ago
parent
279437d600 65954526a3
commit
9a31d4e7eb
2 changed files with 42 additions and 32 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. 70
      edit-mode/function/ganttConfig.js
  2. 4
      edit-mode/function/reportActivity.js

70
edit-mode/function/ganttConfig.js
Unescape View File

@ -5,7 +5,7 @@ const timestamp = getUrlParameter("timestamp");
let base_url = getUrlParameter("base_url");
const role_name = getUrlParameter("role_name");
const company_id = getUrlParameter("company_id");
const base_url_image = "https://adw-api.ospro.id/assets/image/";
const base_url_image = "https://project-api.ospro.id/assets/image/";
const adwIntegrationUrl = "https://adw-api.ospro.id/api";
let userToVersionGanttId = 0
@ -305,7 +305,7 @@ var allColumns = [
}
return moment(text.planned_start).format("DD-MM-YYYY");
}
},
},
{
name: "planned_end", label: "Baseline Finish", align: "center", min_width: 80, editor: editor.planned_end, resize: true, template: function (text) {
if (!text.planned_end) {
@ -314,35 +314,39 @@ var allColumns = [
return moment(text.planned_end).format("DD-MM-YYYY");
}
},
{ name: "start_date", label: "Early Start", align: "center", min_width: 80, editor: editor.start_date, resize: true, template: function (text) {
{
name: "start_date", label: "Early Start", align: "center", min_width: 80, editor: editor.start_date, resize: true, template: function (text) {
return moment(text.start_date).format("DD-MM-YYYY");
}
},
{ name: "end_date", label: "Early Finish", align: "center", min_width: 80, editor: editor.end_date, resize: true, template: function (text) {
},
{
name: "end_date", label: "Early Finish", align: "center", min_width: 80, editor: editor.end_date, resize: true, template: function (text) {
return moment(text.end_date).format("DD-MM-YYYY");
}
},
{ name: "actual_start", label: "Actual Start", align: "center", min_width: 80, resize: true, template: function (text) {
if (!text.actual_start) {
return '';
}
},
{
name: "actual_start", label: "Actual Start", align: "center", min_width: 80, resize: true, template: function (text) {
if (!text.actual_start) {
return '';
}
return moment(text.actual_start).format("DD-MM-YYYY");
}
},
{ name: "actual_end", label: "Actual Finish", align: "center", min_width: 80, resize: true, template: function (text) {
if (!text.actual_end) {
return '';
}
},
{
name: "actual_end", label: "Actual Finish", align: "center", min_width: 80, resize: true, template: function (text) {
if (!text.actual_end) {
return '';
}
return moment(text.actual_end).format("DD-MM-YYYY");
}
},
},
{
name: "bobot_planning", label: "Bobot (%)", align: "center", editor: editor.bobot_planning, resize: true, min_width: 115, template: function (text) {
let bobot = parseFloat(text.bobot_planning);
console.log("bobot roundToTwo ", roundToTwo(bobot));
console.log("bobot toFixed ", bobot.toFixed(2));
if (bobot.toFixed(2) > 100) {
gantt.alert("Bobot tidak boleh lebih dari 100%!");
return;
}
@ -369,7 +373,7 @@ var allColumns = [
if (todayDuration < 0) {
todayDuration = 0;
}
progress = todayDuration/endDuration * 100
progress = todayDuration / endDuration * 100
if (todayDuration > endDuration) {
progress = 100;
}
@ -383,18 +387,20 @@ var allColumns = [
return roundToTwo(progress);
}, resize: true
},
{ name: "planned_duration", label: "Baseline Duration (Day)", align: "center", min_width: 50, resize: true, editor: editor.duration, template: function (text) {
let start;
let end;
text.planned_start ? start = text.planned_start : start = text.start_date;
text.planned_end ? end = text.planned_end : end = text.end_date;
let plannedDuration = gantt.calculateDuration({
start_date: new Date(start),
end_date: new Date(end)
})
return plannedDuration;
}},
{
name: "planned_duration", label: "Baseline Duration (Day)", align: "center", min_width: 50, resize: true, editor: editor.duration, template: function (text) {
let start;
let end;
text.planned_start ? start = text.planned_start : start = text.start_date;
text.planned_end ? end = text.planned_end : end = text.end_date;
let plannedDuration = gantt.calculateDuration({
start_date: new Date(start),
end_date: new Date(end)
})
return plannedDuration;
}
},
{ name: "duration", label: "Duration (Day)", align: "center", min_width: 50, resize: true, editor: editor.duration },
{
name: "rencana_biaya", label: "Cost Planning", align: "right", min_width: 100, resize: true, template: function (text) {
@ -502,14 +508,14 @@ var allColumns = [
name: "progress_actual", label: "Total Actual Progress (%)", align: "center", min_width: 150, template: function (text) {
let progress = text.progress
progress = progress * 100
console.log("progress roundToTwo ", roundToTwo(progress));
console.log("progress toFixed ", progress.toFixed(2));
if (progress.toFixed(2) > 100) {
gantt.alert("Progress tidak boleh lebih dari 100%!");
return;
}
let bobot = text.bobot_planning
let actual = (progress * bobot) / 100
return roundToTwo(actual);

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

@ -2,6 +2,7 @@ var rAModal = $('#modal_report_activity > .modal-dialog > .modal-content');
var rAmaterialModal = $('#modal_report_activity_material > .modal-dialog > .modal-content');
var assignMaterialId;
var materialName;
var materialId;
var idStatus;
function resetFormAddRa() {
@ -173,6 +174,7 @@ $(document).ready(function () {
d.idAmi = assignMaterialId;
d.idAct = activityId;
d.materialName = materialName;
d.materialId = materialId;
d.type = 'actual';
},
"error": function (xhr, error, code) {
@ -587,6 +589,7 @@ $(document).ready(function () {
$("#table_report").on("click", ".btn-lihat-actual", function () {
assignMaterialId = $(this).data('id');
materialName = $(this).data('material-name');
materialId = $(this).data('material-id');
var attributeString = this.outerHTML;
if (attributeString.includes('"=""')) {
@ -623,6 +626,7 @@ $(document).ready(function () {
$("#table_report").on("click", ".btn-lihat-plan", function () {
assignMaterialId = $(this).data('id');
materialName = $(this).data('material-name');
materialId = $(this).data('material-id');
var attributeString = this.outerHTML;
if (attributeString.includes('"=""')) {
materialName = materialName + '"';

Write Preview
Loading…
Cancel
Save