+
Training Start Date must be on or before the Training End Date
@@ -94,29 +90,28 @@ import moment from 'moment';
-
Training Start Date
-
-
+
+ Date format YYYY-MM-DD
This is required
-
- Invalid date of birth
-
-
- This must be on or before {{ maxDate | formatDate }}
-
+ This date is invalid
+ This date cannot be in the future
@@ -124,21 +119,21 @@ import moment from 'moment';
Training End Date
-
-
+
+ Date format YYYY-MM-DD
This is required
-
- Invalid date of birth
-
-
- This must be on or before {{ maxDate | formatDate }}
-
+ This date is invalid
+ This date cannot be in the future
@@ -250,10 +245,11 @@ import moment from 'moment';
export class StepTeamSchoolTrainingsComponent implements LicenceChildStepperStepComponent {
form: FormGroup = this.gdsdTeamApplicationService.schoolTrainingHistoryFormGroup;
+ invalidDateRange = false;
+
booleanTypeCodes = BooleanTypeCode;
matcher = new FormErrorStateMatcher();
- maxDate = moment();
- minDate = this.utilService.getDateMin();
+ dateMask = SPD_CONSTANTS.date.dateMask;
phoneMask = SPD_CONSTANTS.phone.displayMask;
@ViewChild(FileUploadComponent) fileUploadComponent!: FileUploadComponent;
@@ -264,6 +260,46 @@ export class StepTeamSchoolTrainingsComponent implements LicenceChildStepperStep
private gdsdTeamApplicationService: GdsdTeamApplicationService
) {}
+ onValidateStartDate(index: number): void {
+ const schoolTrainingsArray = this.form.get('schoolTrainings') as FormArray;
+ const form = schoolTrainingsArray.at(index);
+
+ const dateFormControl = form.get('trainingStartDate');
+ const errorKey = this.utilService.getIsInputValidDate(dateFormControl?.value);
+ if (errorKey) {
+ dateFormControl?.setErrors({ [errorKey]: true });
+ return;
+ }
+
+ const dateEndFormControl = form.get('trainingEndDate');
+ if (dateFormControl?.value && dateEndFormControl?.value) {
+ this.invalidDateRange = !this.utilService.getIsInputValidDateRange(
+ dateFormControl?.value,
+ dateEndFormControl?.value
+ );
+ }
+ }
+
+ onValidateEndDate(index: number): void {
+ const schoolTrainingsArray = this.form.get('schoolTrainings') as FormArray;
+ const form = schoolTrainingsArray.at(index);
+
+ const dateFormControl = form.get('trainingEndDate');
+ const errorKey = this.utilService.getIsInputValidDate(dateFormControl?.value);
+ if (errorKey) {
+ dateFormControl?.setErrors({ [errorKey]: true });
+ return;
+ }
+
+ const dateStartFormControl = form.get('trainingStartDate');
+ if (dateStartFormControl?.value && dateFormControl?.value) {
+ this.invalidDateRange = !this.utilService.getIsInputValidDateRange(
+ dateStartFormControl?.value,
+ dateFormControl?.value
+ );
+ }
+ }
+
onRemoveSchoolTrainingRow(index: number) {
const data: DialogOptions = {
icon: 'warning',
@@ -316,7 +352,7 @@ export class StepTeamSchoolTrainingsComponent implements LicenceChildStepperStep
get schoolTrainingsArray(): FormArray {
return this.form.get('schoolTrainings');
}
- public get attachments(): FormControl {
+ get attachments(): FormControl {
return this.form.get('attachments') as FormControl;
}
}
diff --git a/src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/gdsd-team/step-team-training-history.component.ts b/src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/gdsd-team/step-team-training-history.component.ts
index 7c385a515f..8512d0ee9c 100644
--- a/src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/gdsd-team/step-team-training-history.component.ts
+++ b/src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/gdsd-team/step-team-training-history.component.ts
@@ -68,15 +68,13 @@ export class StepTeamTrainingHistoryComponent implements LicenceChildStepperStep
this.logattachments.setValue([]);
}
- public get schoolattachments(): FormControl {
+ get schoolattachments(): FormControl {
return this.gdsdTeamApplicationService.schoolTrainingHistoryFormGroup.get('attachments') as FormControl;
}
-
- public get otherattachments(): FormControl {
+ get otherattachments(): FormControl {
return this.gdsdTeamApplicationService.otherTrainingHistoryFormGroup.get('attachments') as FormControl;
}
-
- public get logattachments(): FormControl {
+ get logattachments(): FormControl {
return this.gdsdTeamApplicationService.otherTrainingHistoryFormGroup.get('practiceLogAttachments') as FormControl;
}
}
diff --git a/src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/retired-dog/step-rd-dog-living-info.component.ts b/src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/retired-dog/step-rd-dog-living-info.component.ts
index 3a0fc886fa..2ea814053b 100644
--- a/src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/retired-dog/step-rd-dog-living-info.component.ts
+++ b/src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/retired-dog/step-rd-dog-living-info.component.ts
@@ -3,8 +3,7 @@ import { FormGroup } from '@angular/forms';
import { ApplicationTypeCode } from '@app/api/models';
import { BooleanTypeCode } from '@app/core/code-types/model-desc.models';
import { RetiredDogApplicationService } from '@app/core/services/retired-dog-application.service';
-import { LicenceChildStepperStepComponent, UtilService } from '@app/core/services/util.service';
-import { FormErrorStateMatcher } from '@app/shared/directives/form-error-state-matcher.directive';
+import { LicenceChildStepperStepComponent } from '@app/core/services/util.service';
@Component({
selector: 'app-step-rd-dog-living-info',
@@ -40,19 +39,11 @@ import { FormErrorStateMatcher } from '@app/shared/directives/form-error-state-m
export class StepRdDogLivingInfoComponent implements LicenceChildStepperStepComponent {
booleanTypeCodes = BooleanTypeCode;
- matcher = new FormErrorStateMatcher();
-
form: FormGroup = this.retiredDogApplicationService.dogLivingForm;
- maxToday = this.utilService.getToday();
- minDate = this.utilService.getDogDateMin();
-
@Input() applicationTypeCode!: ApplicationTypeCode;
- constructor(
- private utilService: UtilService,
- private retiredDogApplicationService: RetiredDogApplicationService
- ) {}
+ constructor(private retiredDogApplicationService: RetiredDogApplicationService) {}
isFormValid(): boolean {
this.form.markAllAsTouched();
diff --git a/src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/retired-dog/step-rd-dog-retired-info.component.ts b/src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/retired-dog/step-rd-dog-retired-info.component.ts
index 74b59955e7..356261336e 100644
--- a/src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/retired-dog/step-rd-dog-retired-info.component.ts
+++ b/src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/retired-dog/step-rd-dog-retired-info.component.ts
@@ -2,6 +2,7 @@ import { Component, Input } from '@angular/core';
import { FormControl, FormGroup } from '@angular/forms';
import { ApplicationTypeCode } from '@app/api/models';
import { BooleanTypeCode } from '@app/core/code-types/model-desc.models';
+import { SPD_CONSTANTS } from '@app/core/constants/constants';
import { RetiredDogApplicationService } from '@app/core/services/retired-dog-application.service';
import { LicenceChildStepperStepComponent, UtilService } from '@app/core/services/util.service';
import { FormErrorStateMatcher } from '@app/shared/directives/form-error-state-matcher.directive';
@@ -17,24 +18,20 @@ import { FormErrorStateMatcher } from '@app/shared/directives/form-error-state-m
Date of Retirement
-
-
Date format YYYY-MM-DD
Date format YYYY-MM-DD
This is required
- Invalid date of retirement
-
- This must be on or before {{ maxToday | formatDate }}
-
+ This date is invalid
+ This date cannot be in the future
@@ -58,8 +55,7 @@ export class StepRdDogRetiredInfoComponent implements LicenceChildStepperStepCom
form: FormGroup = this.retiredDogApplicationService.dogRetiredForm;
- maxToday = this.utilService.getToday();
- minDate = this.utilService.getDogDateMin();
+ dateMask = SPD_CONSTANTS.date.dateMask;
@Input() applicationTypeCode!: ApplicationTypeCode;
@@ -68,6 +64,13 @@ export class StepRdDogRetiredInfoComponent implements LicenceChildStepperStepCom
private retiredDogApplicationService: RetiredDogApplicationService
) {}
+ onValidateDate(): void {
+ const errorKey = this.utilService.getIsInputValidDate(this.dogRetiredDate.value);
+ if (errorKey) {
+ this.dogRetiredDate.setErrors({ [errorKey]: true });
+ }
+ }
+
isFormValid(): boolean {
this.form.markAllAsTouched();
return this.form.valid;
@@ -79,7 +82,7 @@ export class StepRdDogRetiredInfoComponent implements LicenceChildStepperStepCom
get showHintError(): boolean {
return (this.dogRetiredDate?.dirty || this.dogRetiredDate?.touched) && this.dogRetiredDate?.invalid;
}
- public get dogRetiredDate(): FormControl {
+ get dogRetiredDate(): FormControl {
return this.form.get('dogRetiredDate') as FormControl;
}
}
diff --git a/src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/shared/form-gdsd-accredited-school.component.ts b/src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/shared/form-gdsd-accredited-school.component.ts
index 88aa7a0cff..97db70e2a6 100644
--- a/src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/shared/form-gdsd-accredited-school.component.ts
+++ b/src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/shared/form-gdsd-accredited-school.component.ts
@@ -1,42 +1,35 @@
import { Component, Input, OnInit } from '@angular/core';
import { FormControl } from '@angular/forms';
-import { MatSelectChange } from '@angular/material/select';
import { ApplicationTypeCode } from '@app/api/models';
import { SPD_CONSTANTS } from '@app/core/constants/constants';
import { ConfigService, DogSchoolResponseExt } from '@app/core/services/config.service';
import { FormErrorStateMatcher } from '@app/shared/directives/form-error-state-matcher.directive';
+import { map, Observable, startWith } from 'rxjs';
@Component({
selector: 'app-form-gdsd-accredited-school',
template: `