Skip to content

Commit 5c0f3f6

Browse files
authored
Merge pull request #2012 from bcgov/feature/ALCS-2313-QA-1
2312 QA 1
2 parents 6bc43e4 + 3360061 commit 5c0f3f6

File tree

5 files changed

+19
-22
lines changed

5 files changed

+19
-22
lines changed

alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ <h4>{{ isEdit ? 'Edit' : 'Create' }} Decision Condition Type</h4>
9797
class="condition-date-types"
9898
>
9999
<mat-radio-button [value]="DateType.SINGLE">Single - Select date label </mat-radio-button>
100-
<div class="condition-fields-container" *ngIf="conditionTypeForm.value.dateType === 'single'">
100+
<div class="condition-fields-container" *ngIf="conditionTypeForm.value.dateType === DateType.SINGLE">
101101
<mat-button-toggle-group
102102
id="singleDateLabelId"
103103
formControlName="singleDateLabel"

alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ export class DecisionConditionTypesDialogComponent {
146146
return (control: AbstractControl): Observable<{ [key: string]: any } | null> => {
147147
return of(control.value).pipe(
148148
debounceTime(300),
149-
switchMap((isDateChecked) => {
149+
switchMap(() => {
150150
if (!this.conditionService) {
151151
throw Error('Condition service not found');
152152
}
@@ -155,9 +155,7 @@ export class DecisionConditionTypesDialogComponent {
155155
map((conditions) =>
156156
!control.value && conditions && this.hasAnyDates(conditions) ? { hasConditions: true } : null,
157157
),
158-
catchError((e) => {
159-
return of({ hasConditions: true });
160-
}),
158+
catchError((e) => of({ hasConditions: true })),
161159
);
162160
};
163161
}

alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts

-3
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,6 @@ export class DecisionConditionComponent implements OnInit, OnChanges {
213213
})
214214
.beforeClosed()
215215
.subscribe(async (dates: DueDate[]) => {
216-
if (!this.uuid) {
217-
return;
218-
}
219216
this.dates = dates.map((date) => ({
220217
uuid: date.uuid,
221218
date: date.date?.toDate().getTime(),

services/apps/alcs/src/providers/typeorm/migrations/1733163698882-add_date_and_admin_fee.ts

-14
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { MigrationInterface, QueryRunner } from 'typeorm';
2+
3+
export class AddDateAndAdminFee1733774036308 implements MigrationInterface {
4+
public async up(queryRunner: QueryRunner): Promise<void> {
5+
await queryRunner.query(
6+
`UPDATE "alcs"."application_decision_condition_type" SET "is_administrative_fee_amount_checked" = true, "date_type" = 'Single', "single_date_label" = 'Due Date' WHERE "code" NOT IN ('SRPT', 'UEND')`,
7+
);
8+
await queryRunner.query(
9+
`UPDATE "alcs"."notice_of_intent_decision_condition_type" SET "is_administrative_fee_amount_checked" = true, "date_type" = 'Single', "single_date_label" = 'Due Date' WHERE "code" NOT IN ('SRPT', 'UEND')`,
10+
);
11+
}
12+
13+
public async down(queryRunner: QueryRunner): Promise<void> {
14+
// N/A
15+
}
16+
}

0 commit comments

Comments
 (0)