From 48d476c2b307a53469657dd6cd9d907dfb2fbabd Mon Sep 17 00:00:00 2001
From: Dion Moult <dion@thinkmoult.com>
Date: Fri, 25 Mar 2022 16:09:15 +1100
Subject: [PATCH] Gantt charts now show ISO durations and task captions

---
 src/blenderbim/blenderbim/bim/data/gantt/index.mustache   | 4 +++-
 src/blenderbim/blenderbim/bim/module/sequence/operator.py | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/blenderbim/blenderbim/bim/data/gantt/index.mustache b/src/blenderbim/blenderbim/bim/data/gantt/index.mustache
index 67c5179f05..e75c171e3b 100644
--- a/src/blenderbim/blenderbim/bim/data/gantt/index.mustache
+++ b/src/blenderbim/blenderbim/bim/data/gantt/index.mustache
@@ -38,7 +38,7 @@
 <script type="text/javascript">
 var g = new JSGantt.GanttChart(document.getElementById('GanttChartDIV'), 'day');
 g.setOptions({
-    vCaptionType: 'Complete',  // Set to Show Caption : None,Caption,Resource,Duration,Complete,
+    vCaptionType: 'Caption',  // Set to Show Caption : None,Caption,Resource,Duration,Complete,
     vQuarterColWidth: 36,
     vDateTaskDisplayFormat: 'day dd month yyyy', // Shown in tool tip box
     vDayMajorDateDisplayFormat: 'mon yyyy - Week ww',// Set format to dates in the "Major" header of the "Day" view
@@ -50,6 +50,8 @@ g.setOptions({
     vFormatArr: ['Day', 'Week', 'Month', 'Quarter'], // Even with setUseSingleCell using Hour format on such a large chart can cause issues in some browsers,
     vShowRes: false, // Disable the resource column.
     vShowComp: false, // Disable the completion column.
+    vShowDur: false, // Disable the duration column, because jsgantt doesn't calculate durations the way we want.
+    vAdditionalHeaders: {ifcduration: {title: 'Duration'}},
     vUseToolTip: false, // Disable tooltips.
     vTotalHeight: 900,
 });
diff --git a/src/blenderbim/blenderbim/bim/module/sequence/operator.py b/src/blenderbim/blenderbim/bim/module/sequence/operator.py
index a8a600e131..2894ade408 100644
--- a/src/blenderbim/blenderbim/bim/module/sequence/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/sequence/operator.py
@@ -989,6 +989,7 @@ class GenerateGanttChart(bpy.types.Operator):
         data = {
             "pID": task.id(),
             "pName": task.Name,
+            "pCaption": task.Name,
             "pStart": task.TaskTime.ScheduleStart if task.TaskTime else "",
             "pEnd": task.TaskTime.ScheduleFinish if task.TaskTime else "",
             "pPlanStart": task.TaskTime.ScheduleStart if task.TaskTime else "",
@@ -999,6 +1000,7 @@ class GenerateGanttChart(bpy.types.Operator):
             "pParent": task.Nests[0].RelatingObject.id() if task.Nests else 0,
             "pOpen": 1,
             "pCost": 1,
+            "ifcduration": task.TaskTime.ScheduleDuration if task.TaskTime else "",
         }
         if task.TaskTime and task.TaskTime.IsCritical:
             data["pClass"] = "gtaskred"