ct-gantt-core 1.0.15 → 1.0.16

package/dist/index.cjs

@@ -35,6 +35,7 @@ __export(index_exports, {
   addHours: () => addHours,
   addPlannedDuration: () => addPlannedDuration,
   alignPlannedDate: () => alignPlannedDate,
+  calendarIncludesWeekends: () => calendarIncludesWeekends,
   checkCyclicDependency: () => checkCyclicDependency,
   computeHourScale: () => computeHourScale,
   computeImpact: () => computeImpact,
@@ -110,8 +111,13 @@ var DEFAULT_WORKLOAD_COLORS = {
 var RESOURCE_COLOR_PALETTE = [DEFAULT_RESOURCE_COLORS.booking];
 var RESOURCE_EDITOR_COLOR_OPTIONS = [
   "#409eff",
-  "#79bbff",
-  "#909399"
+  "#66b1ff",
+  "#67c23a",
+  "#e6a23c",
+  "#f56c6c",
+  "#909399",
+  "#9b87c4",
+  "#36cfc9"
 ];
 var EDITOR_COLOR_OPTIONS = [
   "#409eff",
@@ -391,11 +397,14 @@ function alignPlannedDate(date, calendarId = "standard", direction = 1) {
   }
   return current;
 }
+function calendarIncludesWeekends(calendarId) {
+  return calendarId === "delivery";
+}
 function plannedDurationBetween(start, end, calendarId = "standard") {
   const first = toDate(start);
   const last = toDate(end);
   if (last.getTime() < first.getTime()) return 0;
-  if (calendarId === "delivery") return inclusiveDays(first, last);
+  if (calendarIncludesWeekends(calendarId)) return inclusiveDays(first, last);
   let duration = 0;
   for (let current = first; current <= last; current = addDays(current, 1)) {
     const day = current.getDay();
@@ -982,14 +991,19 @@ function isLaneFree(laneEnd, start, hourMode) {
 }
 
 // src/engines/computeWorkload.ts
-function computeWorkload(tasks, people, departments = [], range, groupBy, defaultCapacityPerDay, includeIdle = false, includeWeekends) {
+function computeWorkload(tasks, people, departments = [], range, groupBy, defaultCapacityPerDay, includeIdle = false, includeWeekends, dateSource = "plan") {
   const dated = range ?? inferRange(tasks);
   if (!dated) return { dates: [], departments: [], ungrouped: [] };
   const dates = datesBetween(dated.start, dated.end);
   const dateIndex = new Map(dates.map((date, index) => [date, index]));
+  const parentIds = /* @__PURE__ */ new Set();
+  for (const task of tasks) {
+    if (task.parentId) parentIds.add(task.parentId);
+  }
+  const isCountable = (task) => task.type === "task" || task.type === "summary" && !parentIds.has(task.id);
   const activeIds = /* @__PURE__ */ new Set();
   for (const task of tasks) {
-    if (task.type === "summary" || task.type === "milestone") continue;
+    if (!isCountable(task)) continue;
     for (const id of task.resources ?? []) activeIds.add(id);
   }
   const candidates = mergePeopleWithTaskResources(people, tasks);
@@ -997,7 +1011,7 @@ function computeWorkload(tasks, people, departments = [], range, groupBy, defaul
   const rows = new Map(members.map((person) => [person.id, createPerson(person, dates, defaultCapacityPerDay)]));
   const tasksByPerson = /* @__PURE__ */ new Map();
   for (const task of tasks) {
-    if (task.type === "summary" || task.type === "milestone") continue;
+    if (!isCountable(task)) continue;
     for (const id of task.resources ?? []) {
       const list = tasksByPerson.get(id);
       if (list) list.push(task);
@@ -1005,10 +1019,10 @@ function computeWorkload(tasks, people, departments = [], range, groupBy, defaul
     }
   }
   for (const task of tasks) {
-    if (task.type === "summary" || task.type === "milestone") continue;
+    if (!isCountable(task)) continue;
     const ids = task.resources ?? [];
     if (!ids.length) continue;
-    const values = task.dailyWorkloads ?? averageTaskWorkload(task, includeWeekends);
+    const values = task.dailyWorkloads ?? averageTaskWorkload(task, includeWeekends, dateSource);
     for (const personId of ids) {
       const row = rows.get(personId);
       if (!row) continue;
@@ -1069,15 +1083,17 @@ function datesBetween(start, end) {
   for (let date = toDate(start); date <= toDate(end); date = addDays(date, 1)) values.push(formatDate(date));
   return values;
 }
-function averageTaskWorkload(task, includeWeekends) {
-  const total = task.workload ?? (task.duration ?? inclusiveDays(task.plan.start, task.plan.end)) * 8;
-  const allDates = datesBetween(task.plan.start, task.plan.end);
+function averageTaskWorkload(task, includeWeekends, dateSource = "plan") {
+  const sourceStart = dateSource === "actual" ? task.actual.start : task.plan.start;
+  const sourceEnd = dateSource === "actual" ? task.actual.end : task.plan.end;
+  const allDates = datesBetween(sourceStart, sourceEnd);
   const workdays = allDates.filter((date) => {
     const day = toDate(date).getDay();
     return day !== 0 && day !== 6;
   });
-  const withWeekends = includeWeekends ?? task.calendarId === "delivery";
+  const withWeekends = task.includeWeekends ?? includeWeekends ?? calendarIncludesWeekends(task.calendarId);
   const dates = withWeekends ? allDates : workdays;
+  const total = task.workload ?? dates.length * 8;
   const hours = dates.length ? total / dates.length : 0;
   return Object.fromEntries(dates.map((date) => [date, hours]));
 }
@@ -1532,6 +1548,7 @@ function createGanttEngine(options = {}) {
   addHours,
   addPlannedDuration,
   alignPlannedDate,
+  calendarIncludesWeekends,
   checkCyclicDependency,
   computeHourScale,
   computeImpact,