Skip to content

Commit feb9f84

Browse files
authored
Merge pull request #3749 from Northeastern-Electric-Racing/#3712-maintenence---end-date-change-display-in-cr-review
#3712-End-Date-Change-Display-in-CR-Review
2 parents 9602027 + 871d066 commit feb9f84

1 file changed

Lines changed: 20 additions & 2 deletions

File tree

src/frontend/src/utils/diff-page.utils.ts

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,8 @@ export const getChangesForWorkPackage = (
259259
genChange(
260260
'Start Date',
261261
originalWorkPackage?.startDate.getTime() !== proposedChanges?.startDate.getTime(),
262-
originalWorkPackage?.startDate.toLocaleString() ?? '',
263-
proposedChanges?.startDate.toLocaleString() ?? ''
262+
datePipe(originalWorkPackage?.startDate),
263+
datePipe(proposedChanges?.startDate)
264264
)
265265
);
266266

@@ -273,6 +273,24 @@ export const getChangesForWorkPackage = (
273273
)
274274
);
275275

276+
let proposedChangesEndDate;
277+
278+
if (proposedChanges) {
279+
proposedChangesEndDate = new Date(proposedChanges.startDate);
280+
proposedChangesEndDate.setDate(proposedChangesEndDate.getDate() + proposedChanges.duration * 7);
281+
}
282+
283+
lines.push(
284+
genChange(
285+
'End Date',
286+
originalWorkPackage?.endDate && proposedChangesEndDate
287+
? datePipe(originalWorkPackage.endDate) !== datePipe(proposedChangesEndDate)
288+
: !!originalWorkPackage?.endDate !== !!proposedChangesEndDate,
289+
datePipe(originalWorkPackage?.endDate),
290+
datePipe(proposedChangesEndDate)
291+
)
292+
);
293+
276294
lines.push(
277295
genListChange(
278296
'Blocked By',

0 commit comments

Comments
 (0)