Skip to content

Commit

Permalink
EMBCESSMOD-5627 - Task Start/End Date/Time validated against support …
Browse files Browse the repository at this point in the history 
…interval (#2380)
  • Loading branch information
@TimaQT
TimaQT authored Jul 12, 2024
1 parent 4cc3719 commit 5c352c5
Show file tree
Hide file tree
Showing 2 changed files with 136 additions and 11 deletions.
34 changes: 32 additions & 2 deletions ...ature-components/wizard/support-components/support-details/support-details.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,14 @@
) {
<mat-error> Please enter a valid date</mat-error>
}

@if (
supportDetailsFormControl.fromDate.invalid &&
supportDetailsFormControl.fromDate.hasError('invalidTaskDateTime')
) {
<mat-error
>The date and time must be within the Task's Start and End Date and Time</mat-error
>
}
@if (
supportDetailsFormControl.fromDate.invalid &&
supportDetailsFormControl.fromDate.hasError('required')
Expand All @@ -262,6 +269,14 @@
) {
<mat-error> From Time is required</mat-error>
}
@if (
supportDetailsFormControl.fromTime.invalid &&
supportDetailsFormControl.fromTime.hasError('invalidTaskDateTime')
) {
<mat-error
>The date and time must be within the Task's Start and End Date and Time</mat-error
>
}
</mat-form-field>
</div>
</div>
Expand Down Expand Up @@ -308,7 +323,14 @@
) {
<mat-error> Please enter a valid date</mat-error>
}

@if (
supportDetailsFormControl.toDate.invalid &&
supportDetailsFormControl.toDate.hasError('invalidTaskDateTime')
) {
<mat-error
>The date and time must be within the Task's Start and End Date and Time</mat-error
>
}
@if (
supportDetailsFormControl.toDate.invalid &&
supportDetailsFormControl.toDate.hasError('required')
Expand All @@ -333,6 +355,14 @@
) {
<mat-error> To Time Required</mat-error>
}
@if (
supportDetailsFormControl.toTime.invalid &&
supportDetailsFormControl.toTime.hasError('invalidTaskDateTime')
) {
<mat-error
>The date and time must be within the Task's Start and End Date and Time</mat-error
>
}
</mat-form-field>
</div>
</div>
Expand Down
113 changes: 104 additions & 9 deletions ...feature-components/wizard/support-components/support-details/support-details.component.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DatePipe, NgStyle, UpperCasePipe, TitleCasePipe } from '@angular/common';
import { Component, OnDestroy, OnInit } from '@angular/core';
import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
import {
AbstractControl,
UntypedFormArray,
Expand All @@ -8,7 +8,9 @@ import {
UntypedFormGroup,
Validators,
FormsModule,
ReactiveFormsModule
ReactiveFormsModule,
ValidatorFn,
ValidationErrors
} from '@angular/forms';
import { Router } from '@angular/router';
import { CustomValidationService } from 'src/app/core/services/customValidation.service';
Expand Down Expand Up @@ -58,6 +60,7 @@ import { MatCard, MatCardContent } from '@angular/material/card';
templateUrl: './support-details.component.html',
styleUrls: ['./support-details.component.scss'],
standalone: true,
changeDetection: ChangeDetectionStrategy.OnPush,
imports: [
MatCard,
MatCardContent,
Expand Down Expand Up @@ -139,6 +142,65 @@ export class SupportDetailsComponent implements OnInit, OnDestroy {
this.currentTime = this.datePipe.transform(Date.now(), 'HH:mm');
}

compareTaskDateTimeValidator({ controlType, other }: { controlType: 'date' | 'time'; other: string }): ValidatorFn {
return (control: AbstractControl): ValidationErrors | null => {
let isValid = false;
const error = { invalidTaskDateTime: true };
const otherControl = this.supportDetailsForm?.get(other);
// no need to validate if one of the controls does not have a value
if (
control?.value === null ||
control?.value === '' ||
control?.value === undefined ||
otherControl?.value === null ||
otherControl?.value === '' ||
otherControl?.value === undefined
) {
isValid = true;
} else {
let controlDate;
if (controlType === 'date') {
controlDate = this.dateConversionService.createDateTimeString(control.value, otherControl.value);
} else if (controlType === 'time') {
controlDate = this.dateConversionService.createDateTimeString(otherControl.value, control.value);
}

if (this.evacueeSessionService?.evacFile?.task?.from && this.evacueeSessionService?.evacFile?.task?.to) {
const from = moment(this.evacueeSessionService?.evacFile?.task?.from);
const to = moment(this.evacueeSessionService?.evacFile?.task?.to);

isValid = moment(controlDate).isBetween(from, to, 'm', '[]');
} else isValid = true;
}
if (!isValid) {
otherControl?.setErrors(error);
control?.setErrors(error);
} else {
if (control.errors) {
const errors = { ...control.errors }; // Copy the errors object
delete errors['invalidTaskDateTime']; // Remove the specific error

if (Object.keys(errors).length === 0) {
control.setErrors(null); // No errors left, set to null
} else {
control.setErrors(errors); // Set the modified errors object
}
if (otherControl.errors) {
const errors = { ...otherControl.errors }; // Copy the errors object
delete errors['invalidTaskDateTime']; // Remove the specific error

if (Object.keys(errors).length === 0) {
otherControl.setErrors(null); // No errors left, set to null
} else {
otherControl.setErrors(errors); // Set the modified errors object
}
}
}
}
return null;
};
}

validDateFilter = (d: Date | null): boolean => {
const date = d || new Date();
return moment(date).isBetween(
Expand Down Expand Up @@ -568,7 +630,7 @@ export class SupportDetailsComponent implements OnInit, OnDestroy {
SupportCategory[this.stepSupportsService.supportTypeToAdd.value] ||
this.mapSubCategoryToCategory(SupportSubCategory[this.stepSupportsService.supportTypeToAdd.value]);

const largestTo = existingSupports
let largestTo = existingSupports
.filter((support) => support.category === category)
.reduce(
(maxTo, support) => {
Expand All @@ -577,6 +639,11 @@ export class SupportDetailsComponent implements OnInit, OnDestroy {
},
new Date(this.dateConversionService.convertStringToDate(this.datePipe.transform(Date.now(), 'dd-MMM-yyyy')))
);
const taskTo = moment(this.evacueeSessionService?.evacFile?.task?.to);

if (moment(largestTo).isAfter(taskTo)) {
largestTo = taskTo.toDate();
}

return largestTo;
}
Expand All @@ -600,9 +667,14 @@ export class SupportDetailsComponent implements OnInit, OnDestroy {
currentDateTime.setSeconds(0);

// Compare and get the later time between maxToDatePlusOneMinute and currentTime
const finalTime = maxToDatePlusOneMinute > currentDateTime ? maxToDatePlusOneMinute : currentDateTime;
const largestToTime = finalTime.toTimeString().split(' ')[0];
let finalTime = maxToDatePlusOneMinute > currentDateTime ? maxToDatePlusOneMinute : currentDateTime;
const taskTo = moment(this.evacueeSessionService?.evacFile?.task?.to);
if (moment(finalTime).isAfter(taskTo)) {
finalTime = taskTo.toDate();
finalTime.setSeconds(0);
}

const largestToTime = finalTime.toTimeString().split(' ')[0];
return largestToTime;
}

Expand All @@ -621,17 +693,40 @@ export class SupportDetailsComponent implements OnInit, OnDestroy {
*/
private createSupportDetailsForm(): void {
this.supportDetailsForm = this.formBuilder.group({
fromDate: [this.setFromDate(), [this.customValidation.validDateValidator(), Validators.required]],
fromTime: [this.setFromTime(), [Validators.required]],
fromDate: [
this.setFromDate(),
[
this.customValidation.validDateValidator(),
Validators.required,
this.compareTaskDateTimeValidator({
controlType: 'date',
other: 'fromTime'
})
]
],
fromTime: [
this.setFromTime(),
[Validators.required, this.compareTaskDateTimeValidator({ controlType: 'time', other: 'fromDate' })]
],
noOfDays: [
this.stepSupportsService?.supportDetails?.noOfDays ? this.stepSupportsService?.supportDetails?.noOfDays : '',
[Validators.required]
],
toDate: [
this.stepSupportsService?.supportDetails?.toDate ? this.stepSupportsService?.supportDetails?.toDate : '',
[this.customValidation.validDateValidator(), Validators.required]
[
this.customValidation.validDateValidator(),
Validators.required,
this.compareTaskDateTimeValidator({
controlType: 'date',
other: 'toTime'
})
]
],
toTime: [
this.setToTime(),
[Validators.required, this.compareTaskDateTimeValidator({ controlType: 'time', other: 'toDate' })]
],
toTime: [this.setToTime(), [Validators.required]],
members: this.formBuilder.array([], [this.customValidation.memberCheckboxValidator()]),
referral: this.supportDetailsService.generateDynamicForm(this.stepSupportsService?.supportTypeToAdd?.value),
paperSupportNumber: [
Expand Down

0 comments on commit 5c352c5

Please sign in to comment.