fixed tooltip issue (#97)

Author: mvgaliev

.gitignore

@@ -6,3 +6,4 @@ typings
 .api
 *.log
 /coverage
+package-lock.json

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.9.3
+ * Fixed issue with tooltip duration
+ * Fixed issue with line length with float value and 'second' duration
 ## 1.9.2
  * Fixed issue with wrong selection of children tasks from legend
 ## 1.9.1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "powerbi-visuals-gantt",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "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.2",
+    "version": "1.9.3",
     "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

@@ -174,6 +174,7 @@ module powerbi.extensibility.visual {
         extraInformation: ExtraInformation[];
         daysOffList: DayOffData[];
         wasDowngradeDurationUnit: boolean;
+        stepDurationTransformation?: number;
     }
 
     export type DayOffData = [Date, number];
@@ -735,6 +736,7 @@ module powerbi.extensibility.visual {
                 let completion: number = 0;
                 let taskType: TaskTypeMetadata = null;
                 let wasDowngradeDurationUnit: boolean = false;
+                let stepDurationTransformation: number = 0;
 
                 const selectionBuider: ISelectionIdBuilder = host
                     .createSelectionIdBuilder()
@@ -756,7 +758,7 @@ module powerbi.extensibility.visual {
 
                             if (duration && duration % 1 !== 0) {
                                 durationUnit = Gantt.downgradeDurationUnit(durationUnit);
-                                let stepDurationTransformation: number =
+                                stepDurationTransformation =
                                     GanttDurationUnitType.indexOf(settings.general.durationUnit) - GanttDurationUnitType.indexOf(durationUnit);
 
                                 duration = Gantt.transformDuration(duration, durationUnit, stepDurationTransformation);
@@ -820,9 +822,15 @@ module powerbi.extensibility.visual {
                     identity: selectionId,
                     extraInformation,
                     daysOffList: [],
-                    wasDowngradeDurationUnit
+                    wasDowngradeDurationUnit,
+                    stepDurationTransformation
                 };
+                tasks.push(task);
+            });
 
+            Gantt.downgradeDurationUnitIfNeed(tasks, durationUnit);
+
+            tasks.forEach(task => {
                 task.end = d3.time[durationUnit].offset(task.start, task.duration);
                 if (settings.daysOff.show && duration) {
                     let datesDiff: number = 0;
@@ -851,8 +859,6 @@ module powerbi.extensibility.visual {
                 if (task.parent !== task.name) {
                     task.visibility = collapsedTasks.indexOf(task.parent) === -1;
                 }
-
-                tasks.push(task);
             });
 
             if (values.Parent) {
@@ -879,6 +885,21 @@ module powerbi.extensibility.visual {
             return tasks;
         }
 
+        public static downgradeDurationUnitIfNeed(tasks: Task[], durationUnit: string) {
+            const downgradedDurationUnitTasks = tasks.filter(t => t.wasDowngradeDurationUnit);
+
+            if (downgradedDurationUnitTasks.length) {
+                let maxStepDurationTransformation: number = 0;
+                downgradedDurationUnitTasks.forEach(x => maxStepDurationTransformation = x.stepDurationTransformation > maxStepDurationTransformation ? x.stepDurationTransformation : maxStepDurationTransformation);
+
+                tasks.filter(x => x.stepDurationTransformation !== maxStepDurationTransformation).forEach(task => {
+                    task.duration = Gantt.transformDuration(task.duration, durationUnit, maxStepDurationTransformation);
+                    task.stepDurationTransformation = maxStepDurationTransformation;
+                    task.wasDowngradeDurationUnit = true;
+                });
+            }
+        }
+
         private static childrenOfTaskProcessing(tasks: Task[],
                                                 task: Task,
                                                 settings: GanttSettings,
@@ -990,6 +1011,11 @@ module powerbi.extensibility.visual {
             duration: number,
             newDurationUnit: string | DurationUnits,
             stepDurationTransformation: number): number {
+
+            if (!stepDurationTransformation) {
+                return Math.floor(duration);
+            }
+
             let transformedDuration: number = duration;
             switch (newDurationUnit) {
                 case DurationUnits.Hour:
@@ -1074,6 +1100,9 @@ module powerbi.extensibility.visual {
             let oneHourDuration: number = MinutesInAHour;
             let oneMinuteDuration: number = 1;
             switch (durationUnit) {
+                case DurationUnits.Hour:
+                    oneHourDuration = 1;
+                    break;
                 case DurationUnits.Minute:
                     oneDayDuration = MinutesInADay;
                     break;

test/visualBuilder.ts

@@ -141,6 +141,10 @@ module powerbi.extensibility.visual.test {
                 .children("g#legendGroup");
         }
 
+        public downgradeDurationUnit(tasks: any, durationUnit: string) {
+            VisualClass.downgradeDurationUnitIfNeed(tasks, durationUnit);
+        }
+
         public static getSolidColorStructuralObject(color: string): any {
             return { solid: { color: color } };
         }

test/visualTest.ts

@@ -167,6 +167,32 @@ module powerbi.extensibility.visual.test {
                 });
             });
 
+            it("When task duration is float and duration unit 'second',  it should be round", (done) => {
+                defaultDataViewBuilder.valuesDuration = GanttData.getRandomUniqueNumbers(100, 1, 2, false);
+                dataView = defaultDataViewBuilder.getDataView([
+                    GanttData.ColumnType,
+                    GanttData.ColumnTask,
+                    GanttData.ColumnStartDate,
+                    GanttData.ColumnResource,
+                    GanttData.ColumnCompletePrecntege]);
+
+                dataView.metadata.objects = {
+                    general: {
+                        durationUnit: "second"
+                    }
+                };
+
+                visualBuilder.updateRenderTimeout(dataView, () => {
+                    let tasks: Task[] = d3.select(visualBuilder.element.get(0)).selectAll(".task").data();
+
+                    for (let task of tasks) {
+                        expect(task.duration).toEqual(defaultTaskDuration);
+                    }
+
+                    done();
+                });
+            });
+
             it("When task start time is missing, it should be set to today date", (done) => {
                 dataView = defaultDataViewBuilder.getDataView([
                     GanttData.ColumnType,
@@ -687,6 +713,40 @@ module powerbi.extensibility.visual.test {
                     });
 
                 });
+
+                describe("Duration units downgrade", () => {
+                    const firstTaskDuration = 4404;
+                    const secondTaskDuration = 1;
+                    const thirdTaskDuration = 1.12;
+                    const secondInHour = 3600;
+
+                    it("hour to second", done => {
+                        const tasks = [
+                            {
+                                wasDowngradeDurationUnit: true,
+                                stepDurationTransformation: 2,
+                                duration: firstTaskDuration
+                            },
+                            {
+                                wasDowngradeDurationUnit: false,
+                                stepDurationTransformation: 0,
+                                duration: secondTaskDuration
+                            },
+                            {
+                                wasDowngradeDurationUnit: false,
+                                stepDurationTransformation: 0,
+                                duration: thirdTaskDuration
+                            }
+                        ];
+
+                        visualBuilder.downgradeDurationUnit(tasks, "second");
+                        expect(tasks[0].duration).toEqual(firstTaskDuration);
+                        expect(tasks[1].duration).toEqual(Math.floor(secondTaskDuration * secondInHour));
+                        expect(tasks[2].duration).toEqual(Math.floor(thirdTaskDuration * secondInHour));
+
+                        done();
+                    });
+                });
             });
 
             describe("Days off", () => {