@outbuild-company/schedule-core 1.23.0 → 1.24.0

package/dist/index.js

@@ -11977,14 +11977,65 @@ function createOutbuildP6ActivityDraft(activity) {
   if (state === void 0) return void 0;
   return {
     ...state,
-    remainingDurationHours: draftRemainingDuration(activity)
+    ...outbuildProgressExecution(activity, activity.durationHours)
   };
 }
-function draftRemainingDuration(activity) {
+var COMPLETED_PHYSICAL_PERCENT = 100;
+var NOT_STARTED_PHYSICAL_PERCENT = 0;
+function outbuildProgressExecution(activity, originalDurationHours) {
   if (activity.progress === NOT_STARTED_PROGRESS) {
-    return activity.durationHours;
+    return {
+      executionStatus: P6_EXECUTION_STATUS.NOT_STARTED,
+      actualStart: null,
+      actualFinish: null,
+      remainingDurationHours: originalDurationHours,
+      physicalPercentComplete: NOT_STARTED_PHYSICAL_PERCENT,
+      actualDurationHours: 0,
+      atCompletionDurationHours: originalDurationHours,
+      durationPercentComplete: 0
+    };
+  }
+  const actualStart = cloneValidDate(activity.startDate, "actualStart");
+  if (isCompletedProgress(activity.progress)) {
+    const hasMeasurableDuration = originalDurationHours > 0;
+    return {
+      executionStatus: P6_EXECUTION_STATUS.COMPLETED,
+      actualStart,
+      actualFinish: cloneValidDate(activity.endDate, "actualFinish"),
+      remainingDurationHours: 0,
+      physicalPercentComplete: COMPLETED_PHYSICAL_PERCENT,
+      actualDurationHours: originalDurationHours,
+      atCompletionDurationHours: originalDurationHours,
+      durationPercentComplete: hasMeasurableDuration ? COMPLETED_PHYSICAL_PERCENT : NOT_STARTED_PHYSICAL_PERCENT
+    };
   }
-  return isCompletedProgress(activity.progress) ? 0 : null;
+  return {
+    executionStatus: P6_EXECUTION_STATUS.IN_PROGRESS,
+    actualStart,
+    actualFinish: null,
+    remainingDurationHours: originalDurationHours,
+    physicalPercentComplete: activity.progress,
+    actualDurationHours: 0,
+    atCompletionDurationHours: originalDurationHours,
+    durationPercentComplete: 0
+  };
+}
+function awaitsOutbuildExecution(draft) {
+  return draft.executionStatus === P6_EXECUTION_STATUS.NOT_STARTED && draft.actualStart === null;
+}
+function reconcileOutbuildProgress(activity, draft) {
+  const isProgressed = activity.progress !== NOT_STARTED_PROGRESS;
+  if (!isProgressed || !awaitsOutbuildExecution(draft)) return draft;
+  const inferred = outbuildProgressExecution(
+    activity,
+    draft.originalDurationHours
+  );
+  const keepsRecordedRemaining = inferred.executionStatus === P6_EXECUTION_STATUS.IN_PROGRESS && draft.remainingDurationHours !== null;
+  return {
+    ...draft,
+    ...inferred,
+    ...keepsRecordedRemaining ? { remainingDurationHours: draft.remainingDurationHours } : {}
+  };
 }
 
 // src/p6/inactive-drafts.ts
@@ -12037,17 +12088,41 @@ function ordinaryInputChanges(before, activity) {
     ...before.startDate.getTime() !== activity.startDate.getTime() ? { plannedStart: new Date(activity.startDate) } : {},
     ...before.endDate.getTime() !== activity.endDate.getTime() ? { plannedFinish: new Date(activity.endDate) } : {},
     ...durationChanged ? { originalDurationHours: activity.durationHours } : {},
-    ...durationChanged || before.progress !== activity.progress ? remainingInputChanges(before, activity) : {}
+    ...durationChanged || before.progress !== activity.progress ? executionInputChanges(before, activity, durationChanged) : {}
   };
 }
-function remainingInputChanges(before, activity) {
+function executionInputChanges(before, activity, durationChanged) {
   const current = activity.p6;
-  if (current.actualStart !== null || current.remainingDurationHours !== before.p6.remainingDurationHours)
-    return {};
-  const remaining = draftRemainingDuration(activity);
+  const hasExplicitRemainingCorrection = current.remainingDurationHours !== before.p6.remainingDurationHours;
+  if (hasExplicitRemainingCorrection) return {};
+  const progressChanged = before.progress !== activity.progress;
+  const resetsToNotStarted = progressChanged && activity.progress === NOT_STARTED_PROGRESS;
+  if (awaitsOutbuildExecution(current) || resetsToNotStarted) {
+    const originalDurationHours = durationChanged ? activity.durationHours : current.originalDurationHours;
+    return outbuildProgressExecution(activity, originalDurationHours);
+  }
+  const isStarted = current.actualStart !== null;
+  if (!isStarted || !progressChanged) return {};
+  return startedProgressChanges(current, activity);
+}
+function startedProgressChanges(current, activity) {
+  const mirrorsPhysicalPercent = current.percentCompleteType === P6_PERCENT_COMPLETE_TYPE.PHYSICAL;
+  if (!isCompletedProgress(activity.progress)) {
+    return {
+      ...current.actualFinish === null ? {} : {
+        executionStatus: P6_EXECUTION_STATUS.IN_PROGRESS,
+        actualFinish: null
+      },
+      ...mirrorsPhysicalPercent ? { physicalPercentComplete: activity.progress } : {}
+    };
+  }
+  const finishesAfterActualStart = current.actualStart !== null && activity.endDate.getTime() >= current.actualStart.getTime();
+  if (current.actualFinish !== null || !finishesAfterActualStart) return {};
   return {
-    remainingDurationHours: remaining,
-    ...remaining !== null ? { atCompletionDurationHours: remaining } : {}
+    executionStatus: P6_EXECUTION_STATUS.COMPLETED,
+    actualFinish: new Date(activity.endDate),
+    remainingDurationHours: 0,
+    physicalPercentComplete: COMPLETED_PROGRESS
   };
 }
 
@@ -26243,8 +26318,8 @@ var P6ActivityStatusError = class extends Error {
   }
   code;
 };
-var COMPLETED_PHYSICAL_PERCENT = 100;
-var NOT_STARTED_PHYSICAL_PERCENT = 0;
+var COMPLETED_PHYSICAL_PERCENT2 = 100;
+var NOT_STARTED_PHYSICAL_PERCENT2 = 0;
 function validateP6ActivityStatus(activity) {
   validateRemainingDuration(activity.remainingDurationHours);
   validateDates(activity);
@@ -26270,11 +26345,11 @@ function normalizeP6ActualDatePatch(current, patch) {
     executionStatus,
     ...actualFinish !== null ? {
       remainingDurationHours: 0,
-      physicalPercentComplete: COMPLETED_PHYSICAL_PERCENT
+      physicalPercentComplete: COMPLETED_PHYSICAL_PERCENT2
     } : {},
     ...unStarting ? {
       remainingDurationHours: current.originalDurationHours,
-      physicalPercentComplete: NOT_STARTED_PHYSICAL_PERCENT
+      physicalPercentComplete: NOT_STARTED_PHYSICAL_PERCENT2
     } : {}
   };
   validateP6ActivityDraftStatus({ ...current, ...normalized2 });
@@ -30307,7 +30382,7 @@ function initializeDataDate(input, activities) {
 function attachImportedDataDate(activities, imported, settings) {
   for (const activity of activities) {
     const importedP6 = Object.hasOwn(imported, activity.id) ? imported[activity.id] : void 0;
-    const p6 = importedP6 ?? createOutbuildP6ActivityDraft(activity);
+    const p6 = importedP6 === void 0 ? createOutbuildP6ActivityDraft(activity) : reconcileOutbuildProgress(activity, importedP6);
     if (p6 === void 0) continue;
     activity.p6 = p6;
     if (!hasActiveDataDate(settings)) continue;