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

Merge pull request 'dev-ibnu' (#20) from dev-ibnu into staging 

Reviewed-on: ordo/adw-gantt#20
pull/1/head
ibnu 1 year ago
parent
9bccc82509 fd1b431b99
commit
418cf9e01e
1 changed files with 9 additions and 36 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. 45
      edit-mode/function/ganttConfig.js

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

@ -285,19 +285,6 @@ var allColumns = [
return text.planned_start;
}
},
// {
// name: "early_start", label: "Early Start", align: "center", min_width: 80, editor: editor.early_start, resize: true, template: function (text) {
// let siblingId = gantt.getPrevSibling(text.id);
// if(siblingId){
// let tempText = gantt.getTask(siblingId);
// console.log("iddd ", gantt.getTask(siblingId));
// return moment(tempText.end_date).format('YYYY-MM-DD');
// }
// return text.planned_start;
// }
// },
{ name: "early_start", label: "Early Start", align: "center", min_width: 80, editor: editor.early_start, resize: true },
{ name: "start_date", label: "Actual Start", align: "center", min_width: 80, editor: editor.start_date, resize: true },
{
name: "planned_end", label: "Baseline Finish", align: "center", min_width: 80, editor: editor.planned_end, resize: true, template: function (text) {
if (!text.planned_end) {
@ -306,25 +293,11 @@ var allColumns = [
return text.planned_end;
}
},
// { name: "early_end", label: "Early Finish", align: "center", min_width: 80, editor: editor.early_end, resize: true },
// {
// name: "early_end", label: "Early Finish", align: "center", min_width: 80, editor: editor.early_end, resize: true, 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 moment(text.start_date).add(plannedDuration-1, 'days').format('YYYY-MM-DD');
// // return text.planned_end;
// }
// },
{ name: "early_end", label: "Early Finish", align: "center", min_width: 80, resize: true },
{ name: "end_date", label: "Actual Finish", align: "center", min_width: 80, resize: true },
{ name: "start_date", label: "Early Start", align: "center", min_width: 80, editor: editor.start_date, resize: true },
{ name: "end_date", label: "Early Finish", align: "center", min_width: 80, editor: editor.end_date, resize: true },
{ name: "actual_start", label: "Actual Start", align: "center", min_width: 80, resize: true },
{ name: "actual_end", label: "Actual Finish", align: "center", min_width: 80, resize: true },
{
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);
@ -381,7 +354,7 @@ var allColumns = [
})
return plannedDuration;
}},
{ name: "duration", label: "Actual Duration (Day)", align: "center", min_width: 50, resize: true, editor: editor.duration },
{ 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) {
if (!text.rencana_biaya) {
@ -549,8 +522,8 @@ let columnShows = {
planned_start: false,
planned_end: false,
planned_duration: false,
early_start: false,
early_end: false,
actual_start: false,
actual_end: false,
duration: true,
rencana_biaya: true,
cost_actual: true,
@ -577,8 +550,8 @@ gantt.config.columns = createColumnsConfig({
planned_start: true,
planned_end: true,
planned_duration: true,
early_start: true,
early_end: true,
actual_start: true,
actual_end: true,
duration: true,
rencana_biaya: true,
cost_actual: true,

Write Preview
Loading…
Cancel
Save