From 8338cc72dbb620a2562d09956518c4e440a36353 Mon Sep 17 00:00:00 2001
From: Dion Moult <dion@thinkmoult.com>
Date: Wed, 2 Jun 2021 17:31:55 +1000
Subject: [PATCH] New styles on sequencing gantt chart to show dependency
 arrows, critical path, task groups, and milestones

---
 .../blenderbim/bim/data/gantt/index.mustache  | 13 +++++
 .../bim/module/sequence/operator.py           | 53 +++++++++++++------
 2 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/src/blenderbim/blenderbim/bim/data/gantt/index.mustache b/src/blenderbim/blenderbim/bim/data/gantt/index.mustache
index 832f8e4a8b..b90f6a4cb1 100644
--- a/src/blenderbim/blenderbim/bim/data/gantt/index.mustache
+++ b/src/blenderbim/blenderbim/bim/data/gantt/index.mustache
@@ -3,6 +3,19 @@
 <div style="position:relative" class="gantt" id="GanttChartDIV"></div>
 <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,
+    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
+    vWeekMinorDateDisplayFormat: 'dd mon', // Set format to display dates in the "Minor" header of the "Week" view
+    vLang: 'en',
+    vShowTaskInfoLink: 1, // Show link in tool tip (0/1)
+    vShowEndWeekDate: 0,  // Show/Hide the date for the last day of the week in header for daily
+    vUseSingleCell: 10000, // Set the threshold cell per table row (Helps performance for large data.
+    vFormatArr: ['Day', 'Week', 'Month', 'Quarter'], // Even with setUseSingleCell using Hour format on such a large chart can cause issues in some browsers,
+    vTotalHeight: 1000,
+});
 var json_data = `
 {{{json_data}}}
 `;
diff --git a/src/blenderbim/blenderbim/bim/module/sequence/operator.py b/src/blenderbim/blenderbim/bim/module/sequence/operator.py
index d353a2c08e..c9231f80fb 100644
--- a/src/blenderbim/blenderbim/bim/module/sequence/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/sequence/operator.py
@@ -661,6 +661,15 @@ class GenerateGanttChart(bpy.types.Operator):
     def execute(self, context):
         self.file = IfcStore.get_file()
         self.json = []
+        self.sequence_type_map = {
+            None: "FS",
+            "START_START": "SS",
+            "START_FINISH": "SF",
+            "FINISH_START": "FS",
+            "FINISH_FINISH": "FF",
+            "USERDEFINED": "FS",
+            "NOTDEFINED": "FS",
+        }
         for task_id in Data.work_schedules[self.work_schedule]["RelatedObjects"]:
             self.create_new_task_json(task_id)
         with open(os.path.join(bpy.context.scene.BIMProperties.data_dir, "gantt", "index.html"), "w") as f:
@@ -671,23 +680,35 @@ class GenerateGanttChart(bpy.types.Operator):
 
     def create_new_task_json(self, task_id):
         task = self.file.by_id(task_id)
-        self.json.append(
-            {
-                "pID": task.id(),
-                "pName": 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 "",
-                "pPlanEnd": task.TaskTime.ScheduleFinish if task.TaskTime else "",
-                "pClass": "ggroupblack",
-                "pMile": 1 if task.IsMilestone else 0,
-                "pComp": 0,
-                "pGroup": 1,
-                "pParent": task.Nests[0].RelatingObject.id() if task.Nests else 0,
-                "pOpen": 1,
-                "pCost": 1,
-            }
+        data = {
+            "pID": task.id(),
+            "pName": 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 "",
+            "pPlanEnd": task.TaskTime.ScheduleFinish if task.TaskTime else "",
+            "pMile": 1 if task.IsMilestone else 0,
+            "pComp": 0,
+            "pGroup": 1 if task.IsNestedBy else 0,
+            "pParent": task.Nests[0].RelatingObject.id() if task.Nests else 0,
+            "pOpen": 1,
+            "pCost": 1,
+        }
+        if task.TaskTime and task.TaskTime.IsCritical:
+            data["pClass"] = "gtaskred"
+        elif data["pGroup"]:
+            data["pClass"] = "ggroupblack"
+        elif data["pMile"]:
+            data["pClass"] = "gmilestone"
+        else:
+            data["pClass"] = "gtaskblue"
+        data["pDepend"] = ",".join(
+            [
+                "{}{}".format(rel.RelatingProcess.id(), self.sequence_type_map[rel.SequenceType])
+                for rel in task.IsSuccessorFrom or []
+            ]
         )
+        self.json.append(data)
         for task_id in Data.tasks[task_id]["RelatedObjects"]:
             self.create_new_task_json(task_id)