gantt-task-react-powern 0.6.42 → 0.6.44

package/dist/helpers/calendar-helper.d.ts

@@ -5,6 +5,8 @@ export declare function parseTimeToMinutes(t: string): number;
 export declare function isHoliday(date: Date, cal: CalendarDefinition): boolean;
 /** True if the date's weekday is in off_days or is a holiday. */
 export declare function isOffDay(date: Date, cal: CalendarDefinition): boolean;
+/** Gets the timestamps (Milliseconds - UTC) of all off-days for a calendar between a start and end date*/
+export declare function getOffDays(calendar: CalendarDefinition, start: Date, end: Date): number[];
 /** True if the date is a regular working day (not off_day, not holiday). */
 export declare function isWorkingDay(date: Date, cal: CalendarDefinition): boolean;
 export declare function getShiftsForDay(date: Date, cal: CalendarDefinition): Array<{

package/dist/index.js

@@ -381,6 +381,187 @@ var TaskListHeaderDefault = function TaskListHeaderDefault(_ref) {
 
 var styles$1 = {"taskListWrapper":"_3ZbQT","taskListTableRow":"_34SS0","taskListLookAheadRow":"_GzvG4","taskListMilestoneRow":"_3Ykml","taskListCell":"_3lLk3","taskListNameWrapper":"_nI1Xw","taskListExpander":"_2QjE6","taskListExpanderPlaceholder":"_1fnLB","taskListEmptyExpander":"_2TfEi","taskListText":"_2ZvXU"};
 
+function parseTimeToMinutes(t) {
+  var parts = t.split(":").map(Number);
+  return parts[0] * 60 + parts[1] + (parts[2] ? parts[2] / 60 : 0);
+}
+
+function toDateString(date) {
+  var y = date.getFullYear();
+  var m = String(date.getMonth() + 1).padStart(2, "0");
+  var d = String(date.getDate()).padStart(2, "0");
+  return y + "-" + m + "-" + d;
+}
+
+function isHoliday(date, cal) {
+  if (cal.holidays && cal.holidays.length > 0) {
+    return cal.holidays.includes(toDateString(date));
+  } else {
+    return false;
+  }
+}
+function isOffDay(date, cal) {
+  if (cal.off_days && cal.off_days.length > 0) {
+    return cal.off_days.includes(date.getUTCDay()) || isHoliday(date, cal);
+  } else {
+    return false;
+  }
+}
+function getOffDays(calendar, start, end) {
+  var daysOff = [];
+  if (!calendar) return daysOff;
+  var currentDate = new Date(start);
+
+  while (currentDate <= end) {
+    if (isOffDay(currentDate, calendar)) {
+      daysOff.push(currentDate.getTime());
+    }
+
+    currentDate.setDate(currentDate.getDate() + 1);
+  }
+
+  return daysOff;
+}
+var parsedShiftsCache = new WeakMap();
+var offDayCache = new WeakMap();
+
+function parsedShifts(cal) {
+  var shifts = parsedShiftsCache.get(cal);
+
+  if (!shifts) {
+    var _cal$shifts;
+
+    shifts = ((_cal$shifts = cal.shifts) != null ? _cal$shifts : []).map(function (_ref) {
+      var s = _ref[0],
+          e = _ref[1];
+      return {
+        start: parseTimeToMinutes(s),
+        end: parseTimeToMinutes(e)
+      };
+    });
+    parsedShiftsCache.set(cal, shifts);
+  }
+
+  return shifts;
+}
+
+function isOffDayCached(date, cal) {
+  var perCal = offDayCache.get(cal);
+
+  if (!perCal) {
+    perCal = new Map();
+    offDayCache.set(cal, perCal);
+  }
+
+  var key = date.getFullYear() * 10000 + (date.getMonth() + 1) * 100 + date.getDate();
+  var off = perCal.get(key);
+
+  if (off === undefined) {
+    off = isOffDay(date, cal);
+    perCal.set(key, off);
+  }
+
+  return off;
+}
+
+var NO_SHIFTS = [];
+function getShiftsForDay(date, cal) {
+  if (!cal.shifts || isOffDayCached(date, cal)) return NO_SHIFTS;
+  return parsedShifts(cal);
+}
+function getWorkingIntervals(start, end, cal) {
+  if (start >= end) return [];
+  var intervals = [];
+  var cursor = new Date(start);
+  cursor.setHours(0, 0, 0, 0);
+
+  while (cursor <= end) {
+    var shifts = getShiftsForDay(cursor, cal);
+
+    for (var _iterator = _createForOfIteratorHelperLoose(shifts), _step; !(_step = _iterator()).done;) {
+      var shift = _step.value;
+      var shiftStart = new Date(cursor);
+      shiftStart.setHours(Math.floor(shift.start / 60), Math.floor(shift.start % 60), Math.round(shift.start % 1 * 60), 0);
+      var shiftEnd = new Date(cursor);
+      shiftEnd.setHours(Math.floor(shift.end / 60), Math.floor(shift.end % 60), Math.round(shift.end % 1 * 60), 0);
+      var intervalStart = shiftStart < start ? start : shiftStart;
+      var intervalEnd = shiftEnd > end ? end : shiftEnd;
+
+      if (intervalStart < intervalEnd) {
+        intervals.push({
+          start: intervalStart,
+          end: intervalEnd
+        });
+      }
+    }
+
+    cursor.setDate(cursor.getDate() + 1);
+  }
+
+  return intervals;
+}
+function snapToWorkingTime(date, cal, direction) {
+  var MAX_DAYS = 60;
+  var result = new Date(date);
+
+  for (var attempt = 0; attempt < MAX_DAYS * 24 * 60; attempt++) {
+    var dayStart = new Date(result);
+    dayStart.setHours(0, 0, 0, 0);
+    var shifts = getShiftsForDay(dayStart, cal);
+
+    if (shifts.length > 0) {
+      if (direction === "forward") {
+        var currentMins = result.getHours() * 60 + result.getMinutes() + result.getSeconds() / 60;
+
+        for (var _iterator2 = _createForOfIteratorHelperLoose(shifts), _step2; !(_step2 = _iterator2()).done;) {
+          var shift = _step2.value;
+
+          if (currentMins <= shift.end) {
+            if (currentMins < shift.start) {
+              result.setHours(Math.floor(shift.start / 60), Math.round(shift.start % 60), 0, 0);
+            }
+
+            return result;
+          }
+        }
+
+        result.setDate(result.getDate() + 1);
+        result.setHours(0, 0, 0, 0);
+      } else {
+        var _currentMins = result.getHours() * 60 + result.getMinutes() + result.getSeconds() / 60;
+
+        for (var i = shifts.length - 1; i >= 0; i--) {
+          if (_currentMins >= shifts[i].start) {
+            if (_currentMins > shifts[i].end) {
+              result.setHours(Math.floor(shifts[i].end / 60), Math.round(shifts[i].end % 60), 0, 0);
+            }
+
+            return result;
+          }
+        }
+
+        result.setDate(result.getDate() - 1);
+        result.setHours(23, 59, 59, 0);
+      }
+    } else {
+      if (direction === "forward") {
+        result.setDate(result.getDate() + 1);
+        result.setHours(0, 0, 0, 0);
+      } else {
+        result.setDate(result.getDate() - 1);
+        result.setHours(23, 59, 59, 0);
+      }
+    }
+  }
+
+  return date;
+}
+function getQuarterNumber(date, quarterStart) {
+  var month = date.getMonth();
+  var offset = (month - quarterStart + 12) % 12;
+  return Math.floor(offset / 3) + 1;
+}
+
 var localeDateStringCache = {};
 
 var toLocaleDateStringFactory = function toLocaleDateStringFactory(locale) {
@@ -605,7 +786,8 @@ var TaskListTableDefault = function TaskListTableDefault(_ref) {
       var actualDuration = function () {
         if (!t.actualStart || t.actualStart.getTime() === 0) return null;
         var endRef = t.actualEnd && t.actualEnd.getTime() > 0 ? t.actualEnd : new Date();
-        return Math.ceil((endRef.getTime() - t.actualStart.getTime()) / (1000 * 60 * 60 * 24));
+        var offTimeDays = t.calendar ? getOffDays(t.calendar, t.actualStart, t.actualEnd) : [];
+        return Math.ceil((endRef.getTime() - t.actualStart.getTime()) / (1000 * 60 * 60 * 24)) - offTimeDays.length;
       }();
 
       return React__default.createElement(React__default.Fragment, null, React__default.createElement("div", {
@@ -750,43 +932,6 @@ var Tooltip = function Tooltip(_ref) {
     type: type
   }));
 };
-
-function getOffTime(task, taskStart, taskEnd, _message) {
-  var start = taskStart.getTime();
-  var end = taskEnd.getTime();
-  var startWeek = Math.floor((start / 86400000 + 4) / 7);
-  var endWeek = Math.floor((end / 86400000 + 4) / 7);
-  var offTime = 0;
-
-  if (task.calendar) {
-    if (task.calendar.off_days && task.calendar.off_days.length) {
-      for (var d = 0; d < task.calendar.off_days.length || 0; d++) {
-        for (var w = startWeek; w <= endWeek; w++) {
-          var dayOfTheWeek = task.calendar.off_days[d];
-          var offDay = 86400000 * (7 * w - 4 + dayOfTheWeek);
-
-          if (offDay >= start && offDay <= end) {
-            offTime += 86400000;
-          }
-        }
-      }
-    }
-
-    if (task.calendar.holidays && task.calendar.holidays.length) {
-      for (var h = 0; h < task.calendar.holidays.length || 0; h++) {
-        var holiday = task.calendar.holidays[h];
-        var holiday_timestamp = new Date(holiday).getTime();
-
-        if (holiday_timestamp >= start && holiday_timestamp <= end) {
-          offTime += 86400000;
-        }
-      }
-    }
-  }
-
-  return offTime;
-}
-
 var StandardTooltipContent = function StandardTooltipContent(_ref2) {
   var _task$plannedDuration, _task$actualDuration;
 
@@ -798,8 +943,10 @@ var StandardTooltipContent = function StandardTooltipContent(_ref2) {
     fontSize: fontSize,
     fontFamily: fontFamily
   };
-  var computedPlannedDuration = task.start && task.end && task.end.getTime() - task.start.getTime() > 0 ? Math.max(1, Math.round((task.end.getTime() - task.start.getTime() - getOffTime(task, task.start, task.end)) / (1000 * 60 * 60 * 24))) : (_task$plannedDuration = task.plannedDuration) != null ? _task$plannedDuration : 0;
-  var computedActualDuration = task.actualStart && task.actualEnd && task.actualEnd.getTime() - task.actualStart.getTime() > 0 ? Math.max(1, Math.round((task.actualEnd.getTime() - task.actualStart.getTime() - getOffTime(task, task.actualStart, task.actualEnd)) / (1000 * 60 * 60 * 24))) : (_task$actualDuration = task.actualDuration) != null ? _task$actualDuration : 0;
+  var actualOffTimeDays = task.calendar ? getOffDays(task.calendar, task.actualStart, task.actualEnd) : [];
+  var plannedOffTimeDays = task.calendar ? getOffDays(task.calendar, task.start, task.end) : [];
+  var computedPlannedDuration = task.start && task.end && task.end.getTime() - task.start.getTime() > 0 ? Math.max(1, Math.round((task.end.getTime() - task.start.getTime()) / (1000 * 60 * 60 * 24)) - plannedOffTimeDays.length) : (_task$plannedDuration = task.plannedDuration) != null ? _task$plannedDuration : 0;
+  var computedActualDuration = task.actualStart && task.actualEnd && task.actualEnd.getTime() - task.actualStart.getTime() > 0 ? Math.max(1, Math.round((task.actualEnd.getTime() - task.actualStart.getTime()) / (1000 * 60 * 60 * 24)) - actualOffTimeDays.length) : (_task$actualDuration = task.actualDuration) != null ? _task$actualDuration : 0;
   if (type == "planned") return React__default.createElement("div", {
     className: styles$2.tooltipDefaultContainer,
     style: style
@@ -1258,172 +1405,6 @@ var TaskList = function TaskList(_ref) {
   }, React__default.createElement(TaskListTable, Object.assign({}, tableProps))))));
 };
 
-function parseTimeToMinutes(t) {
-  var parts = t.split(":").map(Number);
-  return parts[0] * 60 + parts[1] + (parts[2] ? parts[2] / 60 : 0);
-}
-
-function toDateString(date) {
-  var y = date.getFullYear();
-  var m = String(date.getMonth() + 1).padStart(2, "0");
-  var d = String(date.getDate()).padStart(2, "0");
-  return y + "-" + m + "-" + d;
-}
-
-function isHoliday(date, cal) {
-  if (cal.holidays && cal.holidays.length > 0) {
-    return cal.holidays.includes(toDateString(date));
-  } else {
-    return false;
-  }
-}
-function isOffDay(date, cal) {
-  if (cal.off_days && cal.off_days.length > 0) {
-    return cal.off_days.includes(date.getDay()) || isHoliday(date, cal);
-  } else {
-    return false;
-  }
-}
-var parsedShiftsCache = new WeakMap();
-var offDayCache = new WeakMap();
-
-function parsedShifts(cal) {
-  var shifts = parsedShiftsCache.get(cal);
-
-  if (!shifts) {
-    var _cal$shifts;
-
-    shifts = ((_cal$shifts = cal.shifts) != null ? _cal$shifts : []).map(function (_ref) {
-      var s = _ref[0],
-          e = _ref[1];
-      return {
-        start: parseTimeToMinutes(s),
-        end: parseTimeToMinutes(e)
-      };
-    });
-    parsedShiftsCache.set(cal, shifts);
-  }
-
-  return shifts;
-}
-
-function isOffDayCached(date, cal) {
-  var perCal = offDayCache.get(cal);
-
-  if (!perCal) {
-    perCal = new Map();
-    offDayCache.set(cal, perCal);
-  }
-
-  var key = date.getFullYear() * 10000 + (date.getMonth() + 1) * 100 + date.getDate();
-  var off = perCal.get(key);
-
-  if (off === undefined) {
-    off = isOffDay(date, cal);
-    perCal.set(key, off);
-  }
-
-  return off;
-}
-
-var NO_SHIFTS = [];
-function getShiftsForDay(date, cal) {
-  if (!cal.shifts || isOffDayCached(date, cal)) return NO_SHIFTS;
-  return parsedShifts(cal);
-}
-function getWorkingIntervals(start, end, cal) {
-  if (start >= end) return [];
-  var intervals = [];
-  var cursor = new Date(start);
-  cursor.setHours(0, 0, 0, 0);
-
-  while (cursor <= end) {
-    var shifts = getShiftsForDay(cursor, cal);
-
-    for (var _iterator = _createForOfIteratorHelperLoose(shifts), _step; !(_step = _iterator()).done;) {
-      var shift = _step.value;
-      var shiftStart = new Date(cursor);
-      shiftStart.setHours(Math.floor(shift.start / 60), Math.floor(shift.start % 60), Math.round(shift.start % 1 * 60), 0);
-      var shiftEnd = new Date(cursor);
-      shiftEnd.setHours(Math.floor(shift.end / 60), Math.floor(shift.end % 60), Math.round(shift.end % 1 * 60), 0);
-      var intervalStart = shiftStart < start ? start : shiftStart;
-      var intervalEnd = shiftEnd > end ? end : shiftEnd;
-
-      if (intervalStart < intervalEnd) {
-        intervals.push({
-          start: intervalStart,
-          end: intervalEnd
-        });
-      }
-    }
-
-    cursor.setDate(cursor.getDate() + 1);
-  }
-
-  return intervals;
-}
-function snapToWorkingTime(date, cal, direction) {
-  var MAX_DAYS = 60;
-  var result = new Date(date);
-
-  for (var attempt = 0; attempt < MAX_DAYS * 24 * 60; attempt++) {
-    var dayStart = new Date(result);
-    dayStart.setHours(0, 0, 0, 0);
-    var shifts = getShiftsForDay(dayStart, cal);
-
-    if (shifts.length > 0) {
-      if (direction === "forward") {
-        var currentMins = result.getHours() * 60 + result.getMinutes() + result.getSeconds() / 60;
-
-        for (var _iterator2 = _createForOfIteratorHelperLoose(shifts), _step2; !(_step2 = _iterator2()).done;) {
-          var shift = _step2.value;
-
-          if (currentMins <= shift.end) {
-            if (currentMins < shift.start) {
-              result.setHours(Math.floor(shift.start / 60), Math.round(shift.start % 60), 0, 0);
-            }
-
-            return result;
-          }
-        }
-
-        result.setDate(result.getDate() + 1);
-        result.setHours(0, 0, 0, 0);
-      } else {
-        var _currentMins = result.getHours() * 60 + result.getMinutes() + result.getSeconds() / 60;
-
-        for (var i = shifts.length - 1; i >= 0; i--) {
-          if (_currentMins >= shifts[i].start) {
-            if (_currentMins > shifts[i].end) {
-              result.setHours(Math.floor(shifts[i].end / 60), Math.round(shifts[i].end % 60), 0, 0);
-            }
-
-            return result;
-          }
-        }
-
-        result.setDate(result.getDate() - 1);
-        result.setHours(23, 59, 59, 0);
-      }
-    } else {
-      if (direction === "forward") {
-        result.setDate(result.getDate() + 1);
-        result.setHours(0, 0, 0, 0);
-      } else {
-        result.setDate(result.getDate() - 1);
-        result.setHours(23, 59, 59, 0);
-      }
-    }
-  }
-
-  return date;
-}
-function getQuarterNumber(date, quarterStart) {
-  var month = date.getMonth();
-  var offset = (month - quarterStart + 12) % 12;
-  return Math.floor(offset / 3) + 1;
-}
-
 var styles$5 = {"gridRow":"_2dZTy","gridRowLookAhead":"_2RRca","gridRowLine":"_3rUKi","gridTick":"_RuwuK","gridTickWeekStart":"_1q0EV","gridTickDashed":"_Zh9jh","darkerGridRow":"_2M-tt"};
 
 var GridBody = function GridBody(_ref) {
@@ -1696,6 +1677,7 @@ var TopPartOfCalendar = function TopPartOfCalendar(_ref) {
   }, value));
 };
 
+var MONTH_LABEL_HALF_WIDTH = 32;
 var Calendar = function Calendar(_ref) {
   var dateSetup = _ref.dateSetup,
       locale = _ref.locale,
@@ -1957,6 +1939,8 @@ var Calendar = function Calendar(_ref) {
     var topDefaultHeight = headerHeight * 0.5;
     var dates = dateSetup.dates;
     var weekStartDay = (_projectCalendar$week = projectCalendar === null || projectCalendar === void 0 ? void 0 : projectCalendar.week_start) != null ? _projectCalendar$week : 1;
+    var chartWidth = columnWidth * dates.length;
+    var monthStartIndex = 0;
 
     for (var i = 0; i < dates.length; i++) {
       var date = dates[i];
@@ -1988,32 +1972,23 @@ var Calendar = function Calendar(_ref) {
         x: columnWidth * i + columnWidth * 0.5,
         className: styles$6.calendarTopText + " " + styles$6.textAnchorMiddle
       }, bottomValue));
+      var isMonthEnd = i + 1 === dates.length || date.getMonth() !== dates[i + 1].getMonth();
 
-      if (i + 1 !== dates.length && date.getMonth() !== dates[i + 1].getMonth()) {
+      if (isMonthEnd) {
         var topValue = shortMonth(date) + " " + date.getFullYear();
+        var segmentStart = columnWidth * monthStartIndex;
+        var segmentEnd = columnWidth * (i + 1);
+        var xText = Math.min(Math.max((segmentStart + segmentEnd) / 2, MONTH_LABEL_HALF_WIDTH), chartWidth - MONTH_LABEL_HALF_WIDTH);
         topValues.push(React__default.createElement(TopPartOfCalendar, {
           key: topValue + i,
           value: topValue,
-          x1Line: columnWidth * (i + 1),
-          y1Line: 0,
-          y2Line: topDefaultHeight,
-          xText: topValues.length === 0 ? columnWidth * (i + 1) * 0.5 : columnWidth * (i + 1) - date.getDate() * columnWidth * 0.5,
-          yText: topDefaultHeight * 0.9
-        }));
-      }
-
-      if (i + 1 === dates.length) {
-        var _topValue = shortMonth(date) + " " + date.getFullYear();
-
-        topValues.push(React__default.createElement(TopPartOfCalendar, {
-          key: _topValue + "last",
-          value: _topValue,
-          x1Line: columnWidth * (i + 1),
+          x1Line: segmentEnd,
           y1Line: 0,
           y2Line: topDefaultHeight,
-          xText: columnWidth * (i + 1) - date.getDate() * columnWidth * 0.5,
+          xText: xText,
           yText: topDefaultHeight * 0.9
         }));
+        monthStartIndex = i + 1;
       }
     }
 
@@ -3460,7 +3435,8 @@ var TaskGanttContent = function TaskGanttContent(_ref) {
                 return s.x2 > s.x1;
               });
               finalTask.actualSegments = actSegs.length > 0 ? actSegs : undefined;
-              var actDays = Math.max(1, Math.round((finalTask.actualEnd.getTime() - finalTask.actualStart.getTime()) / (1000 * 60 * 60 * 24)));
+              var offTimeDays = finalTask.calendar ? getOffDays(finalTask.calendar, finalTask.actualStart, finalTask.actualEnd) : [];
+              var actDays = Math.max(1, Math.round((finalTask.actualEnd.getTime() - finalTask.actualStart.getTime()) / (1000 * 60 * 60 * 24)) - offTimeDays.length);
               finalTask.actualDuration = actDays;
             } else {
               if (ganttEvent.action === "end") {
@@ -3495,13 +3471,10 @@ var TaskGanttContent = function TaskGanttContent(_ref) {
                 return s.x2 > s.x1;
               });
               finalTask.plannedSegments = planSegs.length > 0 ? planSegs : undefined;
-              var totalDaysOff = 0;
-              cal.off_days.forEach(function (day) {
-                if (day < finalTask.end.getTime() && day > finalTask.start.getTime()) {
-                  totalDaysOff++;
-                }
-              });
-              var planDays = Math.max(1, Math.round((finalTask.end.getTime() - finalTask.start.getTime()) / (1000 * 60 * 60 * 24)) - totalDaysOff);
+
+              var _offTimeDays = finalTask.calendar ? getOffDays(finalTask.calendar, finalTask.start, finalTask.end) : [];
+
+              var planDays = Math.max(1, Math.round((finalTask.end.getTime() - finalTask.start.getTime()) / (1000 * 60 * 60 * 24)) - _offTimeDays.length);
               finalTask.plannedDuration = planDays;
             }
           } else {
@@ -3600,7 +3573,8 @@ var TaskGanttContent = function TaskGanttContent(_ref) {
               return s.x2 > s.x1;
             });
             newChangedTask.actualSegments = actSegs.length > 0 ? actSegs : undefined;
-            var actDays = Math.max(1, Math.round((newChangedTask.actualEnd.getTime() - newChangedTask.actualStart.getTime()) / (1000 * 60 * 60 * 24)));
+            var offTimeDays = newChangedTask.calendar ? getOffDays(newChangedTask.calendar, newChangedTask.actualStart, newChangedTask.actualEnd) : [];
+            var actDays = Math.max(1, Math.round((newChangedTask.actualEnd.getTime() - newChangedTask.actualStart.getTime()) / (1000 * 60 * 60 * 24)) - offTimeDays.length);
             newChangedTask.actualDuration = actDays;
           } else {
             if (action === "end") {
@@ -3647,13 +3621,10 @@ var TaskGanttContent = function TaskGanttContent(_ref) {
               return s.x2 > s.x1;
             });
             newChangedTask.plannedSegments = planSegs.length > 0 ? planSegs : undefined;
-            var totalDaysOff = 0;
-            cal.off_days.forEach(function (day) {
-              if (day < newChangedTask.end.getTime() && day > newChangedTask.start.getTime()) {
-                totalDaysOff++;
-              }
-            });
-            var planDays = Math.max(1, Math.round((newChangedTask.end.getTime() - newChangedTask.start.getTime()) / (1000 * 60 * 60 * 24)) - totalDaysOff);
+
+            var _offTimeDays2 = newChangedTask.calendar ? getOffDays(newChangedTask.calendar, newChangedTask.start, newChangedTask.end) : [];
+
+            var planDays = Math.max(1, Math.round((newChangedTask.end.getTime() - newChangedTask.start.getTime()) / (1000 * 60 * 60 * 24)) - _offTimeDays2.length);
             newChangedTask.plannedDuration = planDays;
           }
         } else if (action === "move" || action === "end" || action === "start") {
@@ -5079,54 +5050,19 @@ function getCriticalPaths(leafTasks) {
 
   return [[], []];
 }
-
-function getOffTime$1(tIndex, taskMap, start, end) {
-  var startWeek = Math.floor((start / 86400000 + 4) / 7);
-  var endWeek = Math.floor((end / 86400000 + 4) / 7);
-  var offTime = [];
-
-  if (taskMap[tIndex].task.calendar) {
-    if (taskMap[tIndex].task.calendar.off_days && taskMap[tIndex].task.calendar.off_days.length) {
-      for (var d = 0; d < taskMap[tIndex].task.calendar.off_days.length || 0; d++) {
-        for (var w = startWeek; w <= endWeek; w++) {
-          var dayOfTheWeek = taskMap[tIndex].task.calendar.off_days[d];
-          var offDay = 86400000 * (7 * w - 4 + dayOfTheWeek);
-
-          if (offDay >= start && offDay <= end) {
-            offTime.push(offDay);
-          }
-        }
-      }
-    }
-
-    if (taskMap[tIndex].task.calendar.holidays && taskMap[tIndex].task.calendar.holidays.length) {
-      for (var h = 0; h < taskMap[tIndex].task.calendar.holidays.length || 0; h++) {
-        var holiday = taskMap[tIndex].task.calendar.holidays[h];
-        var holiday_timestamp = new Date(holiday).getTime();
-
-        if (holiday_timestamp >= start && holiday_timestamp <= end) {
-          offTime.push(holiday_timestamp);
-        }
-      }
-    }
-  }
-
-  return offTime;
-}
-
 function computeCriticalPath(taskID, taskMap) {
   var task = taskMap[taskID].task;
   var dependents = taskMap[taskID].dependents;
   taskMap[taskID].start = task.start.getTime();
   taskMap[taskID].end = task.end.getTime();
   taskMap[taskID].paths = [];
-  var parent_off_time = getOffTime$1(taskID, taskMap, taskMap[taskID].start, taskMap[taskID].end);
+  var parent_off_time = getOffDays(taskMap[taskID].calendar, taskMap[taskID].start, taskMap[taskID].end);
 
   for (var j = 0; j < dependents.length; j++) {
     var depStart = taskMap[dependents[j]].task.start.getTime();
     var depEnd = taskMap[dependents[j]].task.end.getTime();
     var depDuration = depEnd - depStart;
-    var child_off_time = getOffTime$1(dependents[j], taskMap, depStart, depEnd);
+    var child_off_time = getOffDays(dependents[j].calendar, taskMap[dependents[j]].task.start, taskMap[dependents[j]].task.end);
     var overlap = Math.max(taskMap[taskID].end - depStart, 0);
 
     for (var t = 0; t < parent_off_time.length; t++) {