gantt-task-react-powern 0.6.20 → 0.6.21

package/dist/index.js

@@ -822,7 +822,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: " + ~~Math.round((task.end.getTime() - task.start.getTime()) / (1000 * 60 * 60 * 24)) + " day(s)"), React__default.createElement("p", {
+  }, "Duration: " + task.plannedDuration + " 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,
@@ -833,7 +833,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: " + ~~Math.round((task.actualEnd.getTime() - task.actualStart.getTime()) / (1000 * 60 * 60 * 24)) + " day(s)"), React__default.createElement("p", {
+  }, "Duration: " + task.actualDuration + " day(s)"), React__default.createElement("p", {
     className: styles$2.tooltipDefaultContainerParagraph
   }, !!task.progress && "Progress: " + task.progress + " %"));
 };
@@ -3991,12 +3991,41 @@ function computeCriticalPath(taskID, taskMap) {
   taskMap[taskID].paths = [];
 
   for (var j = 0; j < dependents.length; j++) {
-    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 depStart = taskMap[dependents[j]].task.start.getTime();
+    var depEnd = taskMap[dependents[j]].task.end.getTime();
+    var depDuration = depEnd - depStart;
+    var startWeek = Math.floor((depStart / 86400000 + 4) / 7);
+    var endWeek = Math.floor((depEnd / 86400000 + 4) / 7);
+    var offTime = 0;
+
+    for (var d = 0; d < ((_taskMap$dependents$j = taskMap[dependents[j]].task.calendar) === null || _taskMap$dependents$j === void 0 ? void 0 : (_taskMap$dependents$j2 = _taskMap$dependents$j.off_days) === null || _taskMap$dependents$j2 === void 0 ? void 0 : _taskMap$dependents$j2.length) || 0; d++) {
+      var _taskMap$dependents$j, _taskMap$dependents$j2;
+
+      for (var w = startWeek; w <= endWeek; w++) {
+        var dayOfTheWeek = taskMap[dependents[j]].task.calendar.off_days[d];
+        var offDay = 86400000 * (7 * w - 4 + dayOfTheWeek);
+
+        if (offDay >= depStart && offDay <= depEnd && (offDay > taskMap[taskID].end || taskMap[taskID].task.calendar.off_days.includes(dayOfTheWeek))) {
+          offTime += 86400000;
+        }
+      }
+    }
+
+    for (var h = 0; h < ((_taskMap$dependents$j3 = taskMap[dependents[j]].task.calendar) === null || _taskMap$dependents$j3 === void 0 ? void 0 : (_taskMap$dependents$j4 = _taskMap$dependents$j3.holidays) === null || _taskMap$dependents$j4 === void 0 ? void 0 : _taskMap$dependents$j4.length) || 0; h++) {
+      var _taskMap$dependents$j3, _taskMap$dependents$j4;
+
+      var holiday = taskMap[dependents[j]].task.calendar.holidays[h];
+
+      if (holiday >= depStart && holiday <= depEnd) {
+        offTime += 86400000;
+      }
+    }
+
+    var overlap = Math.max(taskMap[taskID].end - depStart, 0);
     var paths = taskMap[dependents[j]].paths;
 
     for (var k = 0; k < paths.length; k++) {
-      var totalDuration = taskMap[taskID].end - taskMap[taskID].start - overlap + paths[k].duration;
+      var totalDuration = taskMap[taskID].end - taskMap[taskID].start - overlap - offTime + paths[k].duration;
 
       if (taskMap[taskID].paths.length < 2) {
         taskMap[taskID].paths.push({
@@ -4019,7 +4048,7 @@ function computeCriticalPath(taskID, taskMap) {
     }
 
     if (paths.length === 0) {
-      var immediateChildDuration = taskMap[taskID].end - taskMap[taskID].start + depDuration - overlap;
+      var immediateChildDuration = taskMap[taskID].end - taskMap[taskID].start + depDuration - overlap - offTime;
 
       if (taskMap[taskID].paths.length < 2) {
         taskMap[taskID].paths.push({