changes from the meeting

bcgov · Jan 21, 2025 · 043c7d4 · 043c7d4
1 parent d74d98f
commit 043c7d4
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 19 deletions.
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/common-application.service.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/common-application.service.ts
@@ -37,6 +37,7 @@ import { AppRoutes } from '@app/app-routes';
 import { SPD_CONSTANTS } from '@app/core/constants/constants';
 import { BusinessLicenceApplicationRoutes } from '@app/modules/business-licence-application/business-license-application-routes';
 import { GuideDogServiceDogRoutes } from '@app/modules/guide-dog-service-dog/guide-dog-service-dog-routes';
+import { MetalDealersAndRecyclersRoutes } from '@app/modules/metal-dealers-and-recyclers/metal-dealers-and-recyclers-routes';
 import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { DialogComponent, DialogOptions } from '@app/shared/components/dialog.component';
 import { FormatDatePipe } from '@app/shared/pipes/format-date.pipe';
@@ -170,7 +171,9 @@ export class CommonApplicationService {
 			}
 		}
 
-		if (currentPath.includes(GuideDogServiceDogRoutes.MODULE_PATH)) {
+		if (currentPath.includes(MetalDealersAndRecyclersRoutes.MODULE_PATH)) {
+			this.router.navigateByUrl(MetalDealersAndRecyclersRoutes.path());
+		} else if (currentPath.includes(GuideDogServiceDogRoutes.MODULE_PATH)) {
 			this.router.navigateByUrl(GuideDogServiceDogRoutes.path());
 		} else {
 			this.router.navigateByUrl(AppRoutes.path(AppRoutes.LANDING));

diff --git a/...resentation.Licensing/ClientApp/src/app/core/services/metal-dealers-application.helper.ts b/...resentation.Licensing/ClientApp/src/app/core/services/metal-dealers-application.helper.ts
@@ -33,7 +33,7 @@ export abstract class MetalDealersApplicationHelper extends CommonApplicationHel
 		givenName: new FormControl(''),
 		middleName: new FormControl(''),
 		surname: new FormControl('', [FormControlValidators.required]),
-		attachments: new FormControl([]),
+		attachments: new FormControl([], [FormControlValidators.required]),
 	});
 
 	businessManagerFormGroup: FormGroup = this.formBuilder.group({

diff --git a/...pp/src/app/modules/metal-dealers-and-recyclers/components/metal-dealers-main.component.ts b/...pp/src/app/modules/metal-dealers-and-recyclers/components/metal-dealers-main.component.ts
@@ -119,9 +119,7 @@ export class MetalDealersMainComponent {
 			.pipe(
 				tap((_resp: any) => {
 					this.router.navigateByUrl(
-						MetalDealersAndRecyclersRoutes.pathMetalDealersAndRecyclers(
-							MetalDealersAndRecyclersRoutes.METAL_DEALERS_AND_RECYCLERS_REGISTER
-						)
+						MetalDealersAndRecyclersRoutes.path(MetalDealersAndRecyclersRoutes.METAL_DEALERS_AND_RECYCLERS_REGISTER)
 					);
 				}),
 				take(1)

diff --git a/.../src/app/modules/metal-dealers-and-recyclers/components/metal-dealers-wizard.component.ts b/.../src/app/modules/metal-dealers-and-recyclers/components/metal-dealers-wizard.component.ts
@@ -32,7 +32,6 @@ import { StepMetalDealersSummaryComponent } from './step-metal-dealers-summary.c
 
 				<app-wizard-footer
 					cancelLabel="Cancel"
-					(cancelStep)="onCancel()"
 					[isWideNext]="true"
 					(nextStepperStep)="onFormValidNextStep(STEP_REGISTRATION_INFORMATION)"
 				></app-wizard-footer>
@@ -45,7 +44,6 @@ import { StepMetalDealersSummaryComponent } from './step-metal-dealers-summary.c
 
 				<app-wizard-footer
 					cancelLabel="Cancel"
-					(cancelStep)="onCancel()"
 					(previousStepperStep)="onGoToPreviousStep()"
 					(nextStepperStep)="onFormValidNextStep(STEP_BUSINESS_OWNER)"
 				></app-wizard-footer>
@@ -58,7 +56,6 @@ import { StepMetalDealersSummaryComponent } from './step-metal-dealers-summary.c
 
 				<app-wizard-footer
 					cancelLabel="Cancel"
-					(cancelStep)="onCancel()"
 					(previousStepperStep)="onGoToPreviousStep()"
 					(nextStepperStep)="onFormValidNextStep(STEP_BUSINESS_MANAGER)"
 				></app-wizard-footer>
@@ -71,7 +68,6 @@ import { StepMetalDealersSummaryComponent } from './step-metal-dealers-summary.c
 
 				<app-wizard-footer
 					cancelLabel="Cancel"
-					(cancelStep)="onCancel()"
 					(previousStepperStep)="onGoToPreviousStep()"
 					(nextStepperStep)="onFormValidNextStep(STEP_BUSINESS_ADDRESSES)"
 				></app-wizard-footer>
@@ -84,7 +80,6 @@ import { StepMetalDealersSummaryComponent } from './step-metal-dealers-summary.c
 
 				<app-wizard-footer
 					cancelLabel="Cancel"
-					(cancelStep)="onCancel()"
 					(previousStepperStep)="onGoToPreviousStep()"
 					(nextStepperStep)="onFormValidNextStep(STEP_BRANCH_OFFICES)"
 				></app-wizard-footer>
@@ -97,7 +92,6 @@ import { StepMetalDealersSummaryComponent } from './step-metal-dealers-summary.c
 
 				<app-wizard-footer
 					cancelLabel="Cancel"
-					(cancelStep)="onCancel()"
 					(previousStepperStep)="onGoToPreviousStep()"
 					(nextStepperStep)="onFormValidNextStep(STEP_REVIEW)"
 				></app-wizard-footer>
@@ -110,7 +104,6 @@ import { StepMetalDealersSummaryComponent } from './step-metal-dealers-summary.c
 
 				<app-wizard-footer
 					cancelLabel="Cancel"
-					(cancelStep)="onCancel()"
 					(previousStepperStep)="onGoToPreviousStep()"
 					nextButtonLabel="Submit"
 					(nextStepperStep)="onSubmit()"
@@ -161,7 +154,7 @@ export class MetalDealersWizardComponent extends BaseWizardComponent implements
 
 	ngOnInit(): void {
 		if (!this.metalDealersApplicationService.initialized) {
-			this.router.navigateByUrl(MetalDealersAndRecyclersRoutes.pathMetalDealersAndRecyclers());
+			this.router.navigateByUrl(MetalDealersAndRecyclersRoutes.path());
 			return;
 		}
 
@@ -185,8 +178,6 @@ export class MetalDealersWizardComponent extends BaseWizardComponent implements
 		if (this.metalDealersModelValueChangedSubscription) this.metalDealersModelValueChangedSubscription.unsubscribe();
 	}
 
-	onCancel() {}
-
 	onGoToStep(step: number) {
 		this.stepper.selectedIndex = step;
 	}
@@ -218,7 +209,7 @@ export class MetalDealersWizardComponent extends BaseWizardComponent implements
 		if (!this.stepConsent.isFormValid()) return;
 
 		this.router.navigateByUrl(
-			MetalDealersAndRecyclersRoutes.pathMetalDealersAndRecyclers(
+			MetalDealersAndRecyclersRoutes.path(
 				MetalDealersAndRecyclersRoutes.METAL_DEALERS_AND_RECYCLERS_REGISTRATION_RECEIVED
 			)
 		);

diff --git a/...pp/modules/metal-dealers-and-recyclers/components/step-metal-dealers-consent.component.ts b/...pp/modules/metal-dealers-and-recyclers/components/step-metal-dealers-consent.component.ts
@@ -16,8 +16,14 @@ import { LicenceChildStepperStepComponent, UtilService } from '@app/core/service
 									I HEREBY CERTIFY THAT I have read and understand all portions of this application form. The
 									information set out by me in this application is true and correct to the best of my knowledge and
 									belief. I have read and understand the Metal Dealers and Recyclers Act and Regulations and I am aware
-									of and understand the terms and conditions of registration and the conditions that may be placed on me
-									as a registered business under the Act.
+									of and understand the
+									<a
+										aria-label="Terms and Conditions"
+										href="https://www.bclaws.gov.bc.ca/civix/document/id/complete/statreg/00_11022_01#section11"
+										target="_blank"
+										>terms and conditions</a
+									>
+									of registration and the conditions that may be placed on me as a registered business under the Act.
 								</mat-checkbox>
 								<mat-error
 									class="mat-option-error"

diff --git a/...ientApp/src/app/modules/metal-dealers-and-recyclers/metal-dealers-and-recyclers-routes.ts b/...ientApp/src/app/modules/metal-dealers-and-recyclers/metal-dealers-and-recyclers-routes.ts
@@ -5,7 +5,7 @@ export class MetalDealersAndRecyclersRoutes {
 	public static readonly METAL_DEALERS_AND_RECYCLERS_REGISTER = 'register';
 	public static readonly METAL_DEALERS_AND_RECYCLERS_REGISTRATION_RECEIVED = 'received';
 
-	public static pathMetalDealersAndRecyclers(route: string | null = null): string {
+	public static path(route: string | null = null): string {
 		return route
 			? `/${MetalDealersAndRecyclersRoutes.MODULE_PATH}/${route}`
 			: `/${MetalDealersAndRecyclersRoutes.MODULE_PATH}`;