gantt-task-react-powern 0.5.8 → 0.5.9

package/dist/index.js

@@ -678,7 +678,7 @@ var StandardTooltipContent = function StandardTooltipContent(_ref2) {
     }
   }, task.name + ": Planned dates: "), React__default.createElement("b", null, task.start.getMonth() + 1 + "/" + task.start.getDate() + "/" + task.start.getFullYear() + " - " + (task.end.getMonth() + 1) + "/" + task.end.getDate() + "/" + task.end.getFullYear()), task.end.getTime() - task.start.getTime() !== 0 && React__default.createElement("p", {
     className: styles$2.tooltipDefaultContainerParagraph
-  }, "Duration: " + ~~((task.end.getTime() - task.start.getTime()) / (1000 * 60 * 60 * 24)) + " day(s)"), React__default.createElement("p", {
+  }, "Duration: " + ~~Math.ceil((task.end.getTime() - task.start.getTime()) / (1000 * 60 * 60 * 24)) + " day(s)"), React__default.createElement("p", {
     className: styles$2.tooltipDefaultContainerParagraph
   }, !!task.progress && "Progress: " + task.progress + " %"));else return React__default.createElement("div", {
     className: styles$2.tooltipDefaultContainer,
@@ -689,7 +689,7 @@ var StandardTooltipContent = function StandardTooltipContent(_ref2) {
     }
   }, task.name + ": Actual dates: "), React__default.createElement("b", null, task.actualStart.getMonth() + 1 + "/" + task.actualStart.getDate() + "/" + task.actualStart.getFullYear() + " - " + (task.actualEnd.getMonth() + 1) + "/" + task.actualEnd.getDate() + "/" + task.actualEnd.getFullYear()), task.actualEnd.getTime() - task.actualStart.getTime() !== 0 && React__default.createElement("p", {
     className: styles$2.tooltipDefaultContainerParagraph
-  }, "Duration: " + ~~((task.actualEnd.getTime() - task.actualStart.getTime()) / (1000 * 60 * 60 * 24)) + " day(s)"), React__default.createElement("p", {
+  }, "Duration: " + ~~Math.ceil((task.actualEnd.getTime() - task.actualStart.getTime()) / (1000 * 60 * 60 * 24)) + " day(s)"), React__default.createElement("p", {
     className: styles$2.tooltipDefaultContainerParagraph
   }, !!task.progress && "Progress: " + task.progress + " %"));
 };
@@ -3505,6 +3505,7 @@ function getCriticalPaths(leafTasks) {
     computeCriticalPath(sortedTaskList[_i4], taskMap);
   }
 
+  console.debug(taskMap);
   var taskChainList = [];
 
   for (var _i5 = 0; _i5 < sortedTaskList.length; _i5++) {
@@ -3597,11 +3598,12 @@ function computeCriticalPath(taskID, taskMap) {
   taskMap[taskID].paths = [];
 
   for (var j = 0; j < dependents.length; j++) {
-    var duration = taskMap[dependents[j]].task.end.getTime() - taskMap[dependents[j]].task.start.getTime() - Math.max(taskMap[taskID].end - taskMap[dependents[j]].task.start.getTime(), 0);
+    var depDuration = taskMap[dependents[j]].task.end.getTime() - taskMap[dependents[j]].task.start.getTime();
+    var overlap = Math.max(taskMap[taskID].end - taskMap[dependents[j]].task.start.getTime(), 0);
     var paths = taskMap[dependents[j]].paths;
 
     for (var k = 0; k < paths.length; k++) {
-      var totalDuration = taskMap[taskID].end - taskMap[taskID].start + duration + paths[k].duration;
+      var totalDuration = taskMap[taskID].end - taskMap[taskID].start - overlap + paths[k].duration;
 
       if (taskMap[taskID].paths.length < 2) {
         taskMap[taskID].paths.push({
@@ -3623,20 +3625,22 @@ function computeCriticalPath(taskID, taskMap) {
       }
     }
 
+    var immediateChildDuration = taskMap[taskID].end - taskMap[taskID].start + depDuration - overlap;
+
     if (taskMap[taskID].paths.length < 2) {
       taskMap[taskID].paths.push({
-        duration: duration,
+        duration: immediateChildDuration,
         task: dependents[j],
         parent: taskID,
         visited: false
       });
-    } else if (duration > taskMap[taskID].paths[0].duration) {
-      taskMap[taskID].paths[0].duration = duration;
+    } else if (immediateChildDuration > taskMap[taskID].paths[0].duration) {
+      taskMap[taskID].paths[0].duration = immediateChildDuration;
       taskMap[taskID].paths[0].task = dependents[j];
       taskMap[taskID].paths[0].parent = taskID;
       taskMap[taskID].paths[0].visited = false;
-    } else if (duration > taskMap[taskID].paths[1].duration) {
-      taskMap[taskID].paths[1].duration = duration;
+    } else if (immediateChildDuration > taskMap[taskID].paths[1].duration) {
+      taskMap[taskID].paths[1].duration = immediateChildDuration;
       taskMap[taskID].paths[1].task = dependents[j];
       taskMap[taskID].paths[1].parent = taskID;
       taskMap[taskID].paths[1].visited = false;