gantt-task-react-powern 0.6.25 → 0.6.27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +56 -54
- package/dist/index.js.map +1 -1
- package/dist/index.modern.js +56 -54
- package/dist/index.modern.js.map +1 -1
- package/package.json +1 -1
package/dist/index.modern.js
CHANGED
|
@@ -4645,8 +4645,6 @@ function computeCriticalPath(taskID, taskMap) {
|
|
|
4645
4645
|
taskMap[taskID].paths = [];
|
|
4646
4646
|
|
|
4647
4647
|
for (var j = 0; j < dependents.length; j++) {
|
|
4648
|
-
var _taskMap$dependents$j, _taskMap$dependents$j2, _taskMap$dependents$j3, _taskMap$dependents$j4;
|
|
4649
|
-
|
|
4650
4648
|
var depStart = taskMap[dependents[j]].task.start.getTime();
|
|
4651
4649
|
var depEnd = taskMap[dependents[j]].task.end.getTime();
|
|
4652
4650
|
var depDuration = depEnd - depStart;
|
|
@@ -4654,25 +4652,27 @@ function computeCriticalPath(taskID, taskMap) {
|
|
|
4654
4652
|
var endWeek = Math.floor((depEnd / 86400000 + 4) / 7);
|
|
4655
4653
|
var offTime = 0;
|
|
4656
4654
|
|
|
4657
|
-
if (
|
|
4658
|
-
|
|
4659
|
-
for (var
|
|
4660
|
-
var
|
|
4661
|
-
|
|
4655
|
+
if (taskMap[dependents[j]].task.calendar) {
|
|
4656
|
+
if (taskMap[dependents[j]].task.calendar.off_days && taskMap[dependents[j]].task.calendar.off_days.length) {
|
|
4657
|
+
for (var d = 0; d < taskMap[dependents[j]].task.calendar.off_days.length || 0; d++) {
|
|
4658
|
+
for (var w = startWeek; w <= endWeek; w++) {
|
|
4659
|
+
var dayOfTheWeek = taskMap[dependents[j]].task.calendar.off_days[d];
|
|
4660
|
+
var offDay = 86400000 * (7 * w - 4 + dayOfTheWeek);
|
|
4662
4661
|
|
|
4663
|
-
|
|
4664
|
-
|
|
4662
|
+
if (offDay >= depStart && offDay <= depEnd && (offDay > taskMap[taskID].end || taskMap[taskID].task.calendar.off_days.includes(dayOfTheWeek))) {
|
|
4663
|
+
offTime += 86400000;
|
|
4664
|
+
}
|
|
4665
4665
|
}
|
|
4666
4666
|
}
|
|
4667
4667
|
}
|
|
4668
|
-
}
|
|
4669
4668
|
|
|
4670
|
-
|
|
4671
|
-
|
|
4672
|
-
|
|
4669
|
+
if (taskMap[dependents[j]].task.calendar.holidays && taskMap[dependents[j]].task.calendar.holidays.length) {
|
|
4670
|
+
for (var h = 0; h < taskMap[dependents[j]].task.calendar.holidays.length || 0; h++) {
|
|
4671
|
+
var holiday = taskMap[dependents[j]].task.calendar.holidays[h];
|
|
4673
4672
|
|
|
4674
|
-
|
|
4675
|
-
|
|
4673
|
+
if (holiday >= depStart && holiday <= depEnd) {
|
|
4674
|
+
offTime += 86400000;
|
|
4675
|
+
}
|
|
4676
4676
|
}
|
|
4677
4677
|
}
|
|
4678
4678
|
}
|
|
@@ -4680,49 +4680,51 @@ function computeCriticalPath(taskID, taskMap) {
|
|
|
4680
4680
|
var overlap = Math.max(taskMap[taskID].end - depStart, 0);
|
|
4681
4681
|
var paths = taskMap[dependents[j]].paths;
|
|
4682
4682
|
|
|
4683
|
-
|
|
4684
|
-
var
|
|
4683
|
+
if (paths && paths.length) {
|
|
4684
|
+
for (var k = 0; k < paths.length; k++) {
|
|
4685
|
+
var totalDuration = taskMap[taskID].end - taskMap[taskID].start - overlap - offTime + paths[k].duration;
|
|
4685
4686
|
|
|
4686
|
-
|
|
4687
|
-
|
|
4688
|
-
|
|
4689
|
-
|
|
4690
|
-
|
|
4691
|
-
|
|
4692
|
-
|
|
4693
|
-
|
|
4694
|
-
|
|
4695
|
-
|
|
4696
|
-
|
|
4697
|
-
|
|
4698
|
-
|
|
4699
|
-
|
|
4700
|
-
|
|
4701
|
-
|
|
4702
|
-
|
|
4687
|
+
if (taskMap[taskID].paths.length < 2) {
|
|
4688
|
+
taskMap[taskID].paths.push({
|
|
4689
|
+
duration: totalDuration,
|
|
4690
|
+
task: dependents[j],
|
|
4691
|
+
parent: taskID,
|
|
4692
|
+
visited: false
|
|
4693
|
+
});
|
|
4694
|
+
} else if (totalDuration > taskMap[taskID].paths[0].duration) {
|
|
4695
|
+
taskMap[taskID].paths[0].duration = totalDuration;
|
|
4696
|
+
taskMap[taskID].paths[0].task = dependents[j];
|
|
4697
|
+
taskMap[taskID].paths[0].parent = taskID;
|
|
4698
|
+
taskMap[taskID].paths[0].visited = false;
|
|
4699
|
+
} else if (totalDuration > taskMap[taskID].paths[1].duration) {
|
|
4700
|
+
taskMap[taskID].paths[1].duration = totalDuration;
|
|
4701
|
+
taskMap[taskID].paths[1].task = dependents[j];
|
|
4702
|
+
taskMap[taskID].paths[1].parent = taskID;
|
|
4703
|
+
taskMap[taskID].paths[1].visited = false;
|
|
4704
|
+
}
|
|
4703
4705
|
}
|
|
4704
|
-
}
|
|
4705
4706
|
|
|
4706
|
-
|
|
4707
|
-
|
|
4707
|
+
if (paths.length === 0) {
|
|
4708
|
+
var immediateChildDuration = taskMap[taskID].end - taskMap[taskID].start + depDuration - overlap - offTime;
|
|
4708
4709
|
|
|
4709
|
-
|
|
4710
|
-
|
|
4711
|
-
|
|
4712
|
-
|
|
4713
|
-
|
|
4714
|
-
|
|
4715
|
-
|
|
4716
|
-
|
|
4717
|
-
|
|
4718
|
-
|
|
4719
|
-
|
|
4720
|
-
|
|
4721
|
-
|
|
4722
|
-
|
|
4723
|
-
|
|
4724
|
-
|
|
4725
|
-
|
|
4710
|
+
if (taskMap[taskID].paths.length < 2) {
|
|
4711
|
+
taskMap[taskID].paths.push({
|
|
4712
|
+
duration: immediateChildDuration,
|
|
4713
|
+
task: dependents[j],
|
|
4714
|
+
parent: taskID,
|
|
4715
|
+
visited: false
|
|
4716
|
+
});
|
|
4717
|
+
} else if (immediateChildDuration > taskMap[taskID].paths[0].duration) {
|
|
4718
|
+
taskMap[taskID].paths[0].duration = immediateChildDuration;
|
|
4719
|
+
taskMap[taskID].paths[0].task = dependents[j];
|
|
4720
|
+
taskMap[taskID].paths[0].parent = taskID;
|
|
4721
|
+
taskMap[taskID].paths[0].visited = false;
|
|
4722
|
+
} else if (immediateChildDuration > taskMap[taskID].paths[1].duration) {
|
|
4723
|
+
taskMap[taskID].paths[1].duration = immediateChildDuration;
|
|
4724
|
+
taskMap[taskID].paths[1].task = dependents[j];
|
|
4725
|
+
taskMap[taskID].paths[1].parent = taskID;
|
|
4726
|
+
taskMap[taskID].paths[1].visited = false;
|
|
4727
|
+
}
|
|
4726
4728
|
}
|
|
4727
4729
|
}
|
|
4728
4730
|
}
|