From 4a6da3ddc0a96210009ee767ed15bc8a54b94151 Mon Sep 17 00:00:00 2001 From: Laurent Fasani Date: Mon, 11 Mar 2024 15:52:34 +0100 Subject: [PATCH] Fix adjustTaskToWorkingDates to have a better feedback when moving A better solution would be to implement getNextWorkingDate or getPreviousWorkingDate which gives the exact date on not an approximate date which computation is based on delta. Signed-off-by: Laurent Fasani --- src/helpers/adjust-task-to-working-dates.ts | 85 ++++++++++++--------- 1 file changed, 47 insertions(+), 38 deletions(-) diff --git a/src/helpers/adjust-task-to-working-dates.ts b/src/helpers/adjust-task-to-working-dates.ts index 149c6db3..8eb51e5f 100644 --- a/src/helpers/adjust-task-to-working-dates.ts +++ b/src/helpers/adjust-task-to-working-dates.ts @@ -1,10 +1,6 @@ import { BarMoveAction } from "../types/gantt-task-actions"; -import { - Task, ViewMode, -} from "../types/public-types"; +import { Task, ViewMode } from "../types/public-types"; import { countHolidays } from "./count-holidays"; -import { getDateByOffset } from "./get-date-by-offset"; -import { getDatesDiff } from "./get-dates-diff"; type AdjustTaskToWorkingDatesParams = { action: BarMoveAction; @@ -26,7 +22,7 @@ export const adjustTaskToWorkingDates = ({ viewMode, }: AdjustTaskToWorkingDatesParams) => { switch (changedTask.type) { - case 'milestone': + case "milestone": if (checkIsHoliday(changedTask.start)) { const nextWorkingDate = getNextWorkingDate(changedTask.start); @@ -41,8 +37,7 @@ export const adjustTaskToWorkingDates = ({ default: switch (action) { - case 'end': - { + case "end": { if (checkIsHoliday(changedTask.end)) { return { ...changedTask, @@ -53,8 +48,7 @@ export const adjustTaskToWorkingDates = ({ return changedTask; } - case 'start': - { + case "start": { if (checkIsHoliday(changedTask.start)) { return { ...changedTask, @@ -65,43 +59,58 @@ export const adjustTaskToWorkingDates = ({ return changedTask; } - case 'move': - { - const fullLength = getDatesDiff( - originalTask.end, - originalTask.start, - viewMode, - ); + case "move": { + let newStart = changedTask.start; + let newEnd = changedTask.end; + const movingToTheRight = + changedTask.start.getTime() - originalTask.start.getTime() > 0; - const holidaysLength = countHolidays( + const originalHolidaysLength = countHolidays( originalTask.start, originalTask.end, checkIsHoliday, - viewMode, + viewMode ); - - const resStartDate = checkIsHoliday(changedTask.start) - ? getPreviousWorkingDate(changedTask.start) - : changedTask.start; - - const defaultChangedDiff = getDatesDiff( - changedTask.end, - resStartDate, - viewMode, - ); - - let resEndDate = getDateByOffset(changedTask.end, -defaultChangedDiff, viewMode); - - const interationsLength = fullLength - holidaysLength; - - for (let i = 0; i < interationsLength; ++i) { - resEndDate = getNextWorkingDate(resEndDate); + const durationWithoutHolidays = + originalTask.end.getTime() - + originalTask.start.getTime() - + originalHolidaysLength * 24 * 3600 * 1000; + if (movingToTheRight) { + if (checkIsHoliday(changedTask.start)) { + newStart = getNextWorkingDate(changedTask.start); + } + + newEnd = new Date(newStart.getTime() + durationWithoutHolidays); + const newHolidaysLength = countHolidays( + newStart, + newEnd, + checkIsHoliday, + viewMode + ); + if (checkIsHoliday(newEnd) || newHolidaysLength > 0) { + newEnd = new Date(newEnd.getTime() + 2 * 24 * 3600 * 1000); + } + } else { + if (checkIsHoliday(changedTask.end)) { + newEnd = getPreviousWorkingDate(changedTask.end); + } + newStart = new Date(newEnd.getTime() - durationWithoutHolidays); + + const newHolidaysLength = countHolidays( + newStart, + newEnd, + checkIsHoliday, + viewMode + ); + if (checkIsHoliday(newStart) || newHolidaysLength > 0) { + newStart = new Date(newStart.getTime() - 2 * 24 * 3600 * 1000); + } } return { ...changedTask, - end: resEndDate, - start: resStartDate, + start: newStart, + end: newEnd, }; }