Skip to content

Commit ff9e4cd

Browse files
AbradatAbradat
committed
Merge branch 'develop' into feature/ALCS-1871
2 parents 6723a51 + eacade6 commit ff9e4cd

File tree

149 files changed

+3263
-5223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+3263
-5223
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -196,18 +196,18 @@ export class DecisionConditionTypesDialogComponent {
196196
hasAnyDates(
197197
conditions: Partial<ApplicationDecisionConditionDto>[] | Partial<NoticeOfIntentDecisionConditionDto>[],
198198
): boolean {
199-
return conditions.some((condition) => condition.dates && condition.dates.length > 0);
199+
return conditions.filter((c) => c.decision !== null).some((condition) => condition.dates && condition.dates.length > 0);
200200
}
201201

202202
hasAdminFee(
203203
conditions: Partial<ApplicationDecisionConditionDto>[] | Partial<NoticeOfIntentDecisionConditionDto>[],
204204
): boolean {
205-
return conditions.map((c) => c.administrativeFee).filter((f) => f !== null && f !== undefined && f > 0).length > 0;
205+
return conditions.filter((c) => c.decision !== null).map((c) => c.administrativeFee).filter((f) => f !== null && f !== undefined && f > 0).length > 0;
206206
}
207207

208208
hasSecurityAmount(
209209
conditions: Partial<ApplicationDecisionConditionDto>[] | Partial<NoticeOfIntentDecisionConditionDto>[],
210210
): boolean {
211-
return conditions.map((c) => c.securityAmount).filter((f) => f !== null && f !== undefined && f > 0).length > 0;
211+
return conditions.filter((c) => c.decision !== null).map((c) => c.securityAmount).filter((f) => f !== null && f !== undefined && f > 0).length > 0;
212212
}
213213
}

‎alcs-frontend/src/app/features/application/application.module.ts

-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { appChildRoutes, ApplicationComponent } from './application.component';
1515
import { BoundaryAmendmentComponent } from './boundary-amendment/boundary-amendment.component';
1616
import { EditBoundaryAmendmentDialogComponent } from './boundary-amendment/edit-boundary-amendment-dialog/edit-boundary-amendment-dialog.component';
1717
import { DecisionModule } from './decision/decision.module';
18-
import { DocumentUploadDialogComponent } from './documents/document-upload-dialog/document-upload-dialog.component';
1918
import { DocumentsComponent } from './documents/documents.component';
2019
import { InfoRequestsComponent } from './info-requests/info-requests.component';
2120
import { InfoRequestDialogComponent } from './info-requests/info-request-dialog/info-request-dialog.component';
@@ -73,7 +72,6 @@ const routes: Routes = [
7372
ApplicantInfoComponent,
7473
LfngInfoComponent,
7574
DocumentsComponent,
76-
DocumentUploadDialogComponent,
7775
ProposalComponent,
7876
NfuProposalComponent,
7977
SubdProposalComponent,

‎alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html

+16-16
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ <h4 *ngIf="condition.type">{{ condition.type.label }}</h4>
7878
</div>
7979
</div>
8080

81-
<div class="dates-container" *ngIf="condition.dates !== undefined && condition.type?.isDateChecked">
81+
<div class="dates-container" *ngIf="dates !== undefined && condition.type?.isDateChecked">
8282
<ng-container *ngIf="showSingleDateField; else showMultipleDateTable">
8383
<ng-container *ngIf="singleDateLabel === 'Due Date'; else showEndDateContainer">
8484
<div class="single-table">
@@ -99,20 +99,20 @@ <h4 *ngIf="condition.type">{{ condition.type.label }}</h4>
9999
<div class="single-table-row">
100100
<div class="single-column single-due">
101101
<app-inline-datepicker
102-
[value]="condition.dates[0].date ?? undefined"
103-
(save)="updateDate(condition.dates[0].uuid!, 'date', $event)"
102+
[value]="dates[0].date ?? undefined"
103+
(save)="updateDate(dates[0].uuid, 'date', $event)"
104104
></app-inline-datepicker>
105105
</div>
106106
<div class="single-column single-completed">
107107
<app-inline-datepicker
108-
[value]="condition.dates[0].completedDate ?? undefined"
109-
(save)="updateDate(condition.dates[0].uuid!, 'completedDate', $event)"
108+
[value]="dates[0].completedDate ?? undefined"
109+
(save)="updateDate(dates[0].uuid, 'completedDate', $event)"
110110
></app-inline-datepicker>
111111
</div>
112112
<div class="single-column single-comment">
113113
<app-inline-textarea
114-
[value]="condition.dates[0].comment ?? undefined"
115-
(save)="updateDate(condition.dates[0].uuid!, 'comment', $event)"
114+
[value]="dates[0].comment ?? undefined"
115+
(save)="updateDate(dates[0].uuid, 'comment', $event)"
116116
></app-inline-textarea>
117117
</div>
118118
</div>
@@ -132,8 +132,8 @@ <h4 *ngIf="condition.type">{{ condition.type.label }}</h4>
132132
<div class="single-table-row">
133133
<div class="single-column single-end">
134134
<app-inline-datepicker
135-
[value]="condition.dates[0].date ?? undefined"
136-
(save)="updateDate(condition.dates[0].uuid!, 'date', $event)"
135+
[value]="dates[0].date ?? undefined"
136+
(save)="updateDate(dates[0].uuid, 'date', $event)"
137137
></app-inline-datepicker>
138138
</div>
139139
</div>
@@ -153,8 +153,8 @@ <h4 *ngIf="condition.type">{{ condition.type.label }}</h4>
153153
<th mat-header-cell *matHeaderCellDef class="multiple-due">Due</th>
154154
<td mat-cell *matCellDef="let element">
155155
<app-inline-datepicker
156-
[value]="condition.dates[element.index - 1].date ?? undefined"
157-
(save)="updateDate(condition.dates[element.index - 1].uuid!, 'date', $event)"
156+
[value]="dates[element.index - 1].date ?? undefined"
157+
(save)="updateDate(dates[element.index - 1].uuid, 'date', $event)"
158158
></app-inline-datepicker>
159159
</td>
160160
</ng-container>
@@ -163,8 +163,8 @@ <h4 *ngIf="condition.type">{{ condition.type.label }}</h4>
163163
<th mat-header-cell *matHeaderCellDef class="multiple-completed">Completed</th>
164164
<td mat-cell *matCellDef="let element">
165165
<app-inline-datepicker
166-
[value]="condition.dates[element.index - 1].completedDate ?? undefined"
167-
(save)="updateDate(condition.dates[element.index - 1].uuid!, 'completedDate', $event)"
166+
[value]="dates[element.index - 1].completedDate ?? undefined"
167+
(save)="updateDate(dates[element.index - 1].uuid, 'completedDate', $event)"
168168
></app-inline-datepicker>
169169
</td>
170170
</ng-container>
@@ -173,8 +173,8 @@ <h4 *ngIf="condition.type">{{ condition.type.label }}</h4>
173173
<th mat-header-cell *matHeaderCellDef class="multiple-comment">Comment</th>
174174
<td mat-cell *matCellDef="let element" class="wrap-text">
175175
<app-inline-textarea
176-
[value]="condition.dates[element.index - 1].comment ?? undefined"
177-
(save)="updateDate(condition.dates[element.index - 1].uuid!, 'comment', $event)"
176+
[value]="dates[element.index - 1].comment ?? undefined"
177+
(save)="updateDate(dates[element.index - 1].uuid, 'comment', $event)"
178178
></app-inline-textarea>
179179
</td>
180180
</ng-container>
@@ -200,7 +200,7 @@ <h4 *ngIf="condition.type">{{ condition.type.label }}</h4>
200200

201201
<div
202202
class="full-width"
203-
[ngClass]="{ 'description-no-date-container': !(condition.dates !== undefined && condition.type?.isDateChecked) }"
203+
[ngClass]="{ 'description-no-date-container': !(dates !== undefined && condition.type !== null && condition.type !== undefined && condition.type.isDateChecked) }"
204204
>
205205
<div class="subheading2">Description</div>
206206
<span

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,14 @@ export class ConditionComponent implements OnInit, AfterViewInit {
274274
}
275275

276276
async updateDate(
277-
dateUuid: string,
277+
dateUuid: string | undefined,
278278
fieldName: keyof ApplicationDecisionConditionDateDto,
279279
newValue: number | string | null,
280280
) {
281+
if (dateUuid === undefined) {
282+
return;
283+
}
284+
281285
const index = this.dates.findIndex((dto) => dto.uuid === dateUuid);
282286

283287
if (index !== -1) {

‎alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { ApplicationDecisionV2Service } from '../../../../../services/applicatio
88
import { ApplicationDecisionDocumentDto } from '../../../../../services/application/decision/application-decision-v2/application-decision.dto';
99
import { ToastService } from '../../../../../services/toast/toast.service';
1010
import { ConfirmationDialogService } from '../../../../../shared/confirmation-dialog/confirmation-dialog.service';
11-
import { DecisionDocumentUploadDialogComponent } from '../decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component';
11+
import { DocumentUploadDialogComponent } from '../../../../../shared/document-upload-dialog/document-upload-dialog.component';
1212
import { FILE_NAME_TRUNCATE_LENGTH } from '../../../../../shared/constants';
1313

1414
@Component({
@@ -102,14 +102,16 @@ export class DecisionDocumentsComponent implements OnInit, OnDestroy {
102102
private openFileDialog(existingDocument?: ApplicationDecisionDocumentDto) {
103103
if (this.decision) {
104104
this.dialog
105-
.open(DecisionDocumentUploadDialogComponent, {
105+
.open(DocumentUploadDialogComponent, {
106106
minWidth: '600px',
107107
maxWidth: '800px',
108108
width: '70%',
109109
data: {
110110
fileId: this.fileId,
111111
decisionUuid: this.decision?.uuid,
112112
existingDocument: existingDocument,
113+
decisionService: this.decisionService,
114+
allowedVisibilityFlags: ['A', 'C', 'G', 'P'],
113115
},
114116
})
115117
.beforeClosed()

‎alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.html

-111
This file was deleted.

‎alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.scss

-82
This file was deleted.

0 commit comments

Comments
 (0)