Fixed issue with wrong tooltip data displaying without 'parent' data (#94)

Author: savvinsergey

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.9.1
+ * Fixed issue with wrong tooltip data displaying without 'parent' data
+ * Fixed issue with wrong duration in the tooltip
 ## 1.9.0
  * Added ability to use sub tasks
 ## 1.8.6

package.json

@@ -1,6 +1,6 @@
 {
   "name": "powerbi-visuals-gantt",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "A Gantt chart is a type of bar chart which illustrates a project timeline or schedule. The Gantt Chart visual shows the Tasks, Start Dates, Durations, % Complete, and Resources for a project. The Gantt Chart visual can be used to show current schedule status using percent-complete shadings and a vertical \"TODAY\" line. The Legend may be used to group or filter tasks based upon data values.",
   "repository": {
     "type": "git",

pbiviz.json

@@ -4,7 +4,7 @@
     "displayName": "Gantt",
     "guid": "Gantt1448688115699",
     "visualClassName": "Gantt",
-    "version": "1.9.0",
+    "version": "1.9.1",
     "description": "A Gantt chart is a type of bar chart which illustrates a project timeline or schedule. The Gantt Chart visual shows the Tasks, Start Dates, Durations, % Complete, and Resources for a project. The Gantt Chart visual can be used to show current schedule status using percent-complete shadings and a vertical \"TODAY\" line. The Legend may be used to group or filter tasks based upon data values.",
     "supportUrl": "http://community.powerbi.com",
     "gitHubUrl": "https://github.com/Microsoft/powerbi-visuals-gantt"

src/gantt.ts

@@ -858,7 +858,7 @@ module powerbi.extensibility.visual {
             if (values.Parent) {
                 tasks
                     .filter((task: Task) => task.parent.indexOf(".") === -1)
-                    .forEach((task: Task) => Gantt.childrenOfTaskProcessing(tasks, task, settings, formatters, durationUnit));
+                    .forEach((task: Task) => Gantt.childrenOfTaskProcessing(tasks, task, settings, durationUnit));
 
                 tasks
                     .sort((a, b) => {
@@ -872,13 +872,16 @@ module powerbi.extensibility.visual {
                     });
             }
 
+            tasks.forEach((task: Task) => {
+                task.tooltipInfo = Gantt.getTooltipInfo(task, formatters, durationUnit);
+            });
+
             return tasks;
         }
 
         private static childrenOfTaskProcessing(tasks: Task[],
                                                 task: Task,
                                                 settings: GanttSettings,
-                                                formatters: GanttChartFormatters,
                                                 durationUnit: string): void {
             let childrenOfTask: Task[] = tasks.filter((childTask: Task) =>
                 (childTask.parent.substr(0, task.parent.length) === task.parent &&
@@ -889,7 +892,7 @@ module powerbi.extensibility.visual {
             if (childrenOfTask.length) {
                 childrenOfTask.forEach((childTask: Task) => {
                     task.children.push(childTask.name);
-                    Gantt.childrenOfTaskProcessing(tasks, childTask, settings, formatters, durationUnit);
+                    Gantt.childrenOfTaskProcessing(tasks, childTask, settings, durationUnit);
                 });
 
                 if ((!settings.subTasks.inheritParentLegend && !task.taskType) ||
@@ -898,15 +901,13 @@ module powerbi.extensibility.visual {
                 }
 
                 if (settings.subTasks.parentDurationByChildren) {
-                    Gantt.setParentDurationByChildren(task, childrenOfTask);
+                    Gantt.setParentDurationByChildren(task, childrenOfTask, durationUnit);
                 }
 
                 if (settings.subTasks.parentCompletionByChildren) {
                     Gantt.setParentCompletionByChildren(task, childrenOfTask);
                 }
             }
-
-            task.tooltipInfo = Gantt.getTooltipInfo(task, formatters, durationUnit);
         }
 
         /**
@@ -929,9 +930,10 @@ module powerbi.extensibility.visual {
          * @param task Parent task
          * @param children Sub tasks of parent task
          */
-        private static setParentDurationByChildren(task: Task, children: Task[]): void {
+        private static setParentDurationByChildren(task: Task, children: Task[], durationUnit: string): void {
             task.start = (_.minBy(children, (childTask: Task) => childTask.start)).start;
             task.end = (_.maxBy(children, (childTask: Task) => childTask.end)).end;
+            task.duration =  d3.time[durationUnit].range(task.start, task.end).length;
         }
 
         /**

test/visualTest.ts

@@ -397,6 +397,38 @@ module powerbi.extensibility.visual.test {
                 });
             });
 
+            describe("Verify tooltips have info according 'parent' data", () => {
+                function checkTasksHaveTooltipInfo(done: () => void) {
+                    visualBuilder.updateRenderTimeout(dataView, () => {
+                        let tasks = d3.select(visualBuilder.element.get(0)).selectAll(".task").data();
+                        for (let task of tasks) {
+                            expect(task.tooltipInfo.length).not.toEqual(0);
+                        }
+
+                        done();
+                    });
+                }
+
+                it("With parent data", (done) => {
+                    dataView = defaultDataViewBuilder.getDataView([
+                        GanttData.ColumnTask,
+                        GanttData.ColumnStartDate,
+                        GanttData.ColumnDuration,
+                        GanttData.ColumnParent]);
+
+                    checkTasksHaveTooltipInfo(done);
+                });
+
+                it("Without parent data", (done) => {
+                    dataView = defaultDataViewBuilder.getDataView([
+                        GanttData.ColumnTask,
+                        GanttData.ColumnStartDate,
+                        GanttData.ColumnDuration]);
+
+                    checkTasksHaveTooltipInfo(done);
+                });
+            });
+
             it("Verify Font Size set to default", (done) => {
                 visualBuilder.updateRenderTimeout(dataView, () => {
                     let element = d3.select(visualBuilder.element.get(0));
@@ -790,6 +822,9 @@ module powerbi.extensibility.visual.test {
 
                             expect(parent.start).toEqual(start);
                             expect(parent.end).toEqual(end);
+
+                            const newDuration: number = d3.time["day"].range(start, end).length;
+                            expect(parent.duration).toEqual(newDuration);
                         });
 
                         done();