Skip to content

Commit 5bfc745

Browse files
authored
Merge pull request #2073 from bcgov/feature/ALCS-1871-4
QA Fixes #2: 1871
2 parents da77acd + c7a735c commit 5bfc745

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

alcs-frontend/src/app/features/board/dialogs/application-decision-condition-dialog/application-decision-condition-dialog.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ <h3 class="card-title">
156156
</ng-template>
157157
</ng-container>
158158
<ng-template #multipleDateColumn>
159-
<span class="date-label">Due Date:</span>
159+
<span class="date-label">Due Date: </span>
160160
</ng-template>
161161
<ng-container *ngIf="getDate(element.condition); else noDate">
162162
{{ getDate(element.condition) }}

alcs-frontend/src/app/features/board/dialogs/application-decision-condition-dialog/application-decision-condition-dialog.component.ts

+14-6
Original file line numberDiff line numberDiff line change
@@ -155,18 +155,26 @@ export class ApplicationDecisionConditionDialogComponent extends CardDialogCompo
155155
if (condition.dates && condition.dates.length > 0) {
156156
let minDueDate: ApplicationDecisionConditionDateDto | null = null;
157157
let maxDueDate: ApplicationDecisionConditionDateDto | null = null;
158+
let allDatesNull = true;
158159

159160
for (const date of condition.dates) {
160-
if (!maxDueDate || date.date! > maxDueDate.date!) {
161-
maxDueDate = date;
162-
}
163-
if (!date.completedDate) {
164-
if (!minDueDate || date.date! < minDueDate.date!) {
165-
minDueDate = date;
161+
if (date.date !== null) {
162+
allDatesNull = false;
163+
if (!maxDueDate || date.date! > maxDueDate.date!) {
164+
maxDueDate = date;
165+
}
166+
if (!date.completedDate) {
167+
if (!minDueDate || date.date! < minDueDate.date!) {
168+
minDueDate = date;
169+
}
166170
}
167171
}
168172
}
169173

174+
if (allDatesNull) {
175+
return null;
176+
}
177+
170178
const selectedDate = minDueDate || maxDueDate;
171179
return selectedDate ? this.formatTimestamp(selectedDate.date!) : null;
172180
}

0 commit comments

Comments
 (0)