-
Notifications
You must be signed in to change notification settings - Fork 211
PM-2525 Swap dates shown on challenge details page #7127
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,9 @@ import moment from 'moment'; | |
| * @return {Date} | ||
| */ | ||
| export function phaseEndDate(phase) { | ||
| if (phase.actualEndDate) { | ||
| return new Date(phase.actualEndDate); | ||
| } | ||
| // Case 1: phase is still open. take the `scheduledEndDate` | ||
| // Case 2: phase is not open but `scheduledStartDate` is a future date. | ||
| // This means phase is not yet started. So take the `scheduledEndDate` | ||
|
|
@@ -17,7 +20,7 @@ export function phaseEndDate(phase) { | |
| return new Date(phase.scheduledEndDate); | ||
| } | ||
| // for other cases, take the `actualEndDate` as phase is already closed | ||
| return new Date(phase.scheduledEndDate || phase.actualEndDate); | ||
| return new Date(phase.actualEndDate || phase.scheduledEndDate); | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -26,12 +29,15 @@ export function phaseEndDate(phase) { | |
| * @return {Date} | ||
| */ | ||
| export function phaseStartDate(phase) { | ||
| if (phase.actualStartDate) { | ||
| return new Date(phase.actualStartDate); | ||
| } | ||
| // Case 1: Phase is not yet started. take the `scheduledStartDate` | ||
| if (phase.isOpen !== true && moment(phase.scheduledStartDate).isAfter()) { | ||
| return new Date(phase.scheduledStartDate); | ||
| } | ||
| // For all other cases, take the `actualStartDate` as phase is already started | ||
| return new Date(phase.scheduledStartDate || phase.actualStartDate); | ||
| return new Date(phase.actualStartDate || phase.scheduledStartDate); | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. [❗❗ |
||
| } | ||
|
|
||
| /** | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[❗❗
correctness]The change from
new Date(phase.scheduledEndDate || phase.actualEndDate)tonew Date(phase.actualEndDate || phase.scheduledEndDate)alters the logic to prioritizeactualEndDateoverscheduledEndDate. Ensure this change aligns with the intended business logic, as it may affect how end dates are calculated for phases that are already closed.