From 40c16f9d12348149188922eb95963c5adaa280f6 Mon Sep 17 00:00:00 2001 From: Emre Date: Mon, 27 Mar 2023 13:49:38 +0300 Subject: [PATCH 1/2] fix typo --- src/common/phase-helper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/phase-helper.js b/src/common/phase-helper.js index af23b4bb..e5b5cb7f 100644 --- a/src/common/phase-helper.js +++ b/src/common/phase-helper.js @@ -249,7 +249,7 @@ class ChallengePhaseHelper { if (updatedPhase.name === "Post-Mortem") { updatedPhase.predecessor = "a93544bc-c165-4af4-b55e-18f3593b457a"; } - if (_.undefined(updatedPhase.actualEndDate) && updatedPhase.name !== "Iterative Review") { + if (_.isUndefined(updatedPhase.actualEndDate) && updatedPhase.name !== "Iterative Review") { updatedPhase.duration = _.defaultTo(_.get(newPhase, "duration"), updatedPhase.duration); } if (_.isUndefined(updatedPhase.predecessor)) { From c065c71aa574c88b560c74c0efd7ae2688d6c3bc Mon Sep 17 00:00:00 2001 From: Emre Date: Mon, 27 Mar 2023 18:01:36 +0300 Subject: [PATCH 2/2] fix: phase --- src/common/phase-helper.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/phase-helper.js b/src/common/phase-helper.js index e5b5cb7f..6a753098 100644 --- a/src/common/phase-helper.js +++ b/src/common/phase-helper.js @@ -298,13 +298,15 @@ class ChallengePhaseHelper { } iterativeReviewSet = true; } - } else { + } else if (_.isUndefined(phase.actualStartDate)) { phase.scheduledStartDate = predecessorPhase.scheduledEndDate; } - phase.scheduledEndDate = moment(phase.scheduledStartDate) + if (_.isUndefined(phase.actualEndDate)) { + phase.scheduledEndDate = moment(phase.scheduledStartDate) .add(phase.duration, "seconds") .toDate() .toISOString(); + } } return updatedPhases; }