diff --git a/src/app/shared/components/person-card/person-card.component.html b/src/app/shared/components/person-card/person-card.component.html index 5b0cd514d3..c0bd259f45 100644 --- a/src/app/shared/components/person-card/person-card.component.html +++ b/src/app/shared/components/person-card/person-card.component.html @@ -46,10 +46,6 @@ - @@ -65,10 +61,7 @@ Відсутня - + diff --git a/src/app/shared/components/person-card/person-card.component.spec.ts b/src/app/shared/components/person-card/person-card.component.spec.ts index 1401476a56..1d30c49710 100644 --- a/src/app/shared/components/person-card/person-card.component.spec.ts +++ b/src/app/shared/components/person-card/person-card.component.spec.ts @@ -33,7 +33,6 @@ describe('PersonCardComponent', () => { ], declarations: [ PersonCardComponent, - MockValidationHintForInputComponent, PhoneTransformPipe ] }) @@ -57,18 +56,3 @@ describe('PersonCardComponent', () => { expect(component).toBeTruthy(); }); }); - -@Component({ - selector: 'app-validation-hint-for-input', - template: '' -}) - -class MockValidationHintForInputComponent { - @Input() type: string; - @Input() invalid: boolean; - @Input() isEmailCheck: boolean; - @Input() isEmptyCheck: boolean; - @Input() minLength: boolean; - @Input() minCharachters: number; - @Input() forbiddenCharacter: string; -} diff --git a/src/app/shared/components/validation-hint-for-input/validation-hint-for-input.component.html b/src/app/shared/components/validation-hint-for-input/validation-hint-for-input.component.html deleted file mode 100644 index dc53a92d7c..0000000000 --- a/src/app/shared/components/validation-hint-for-input/validation-hint-for-input.component.html +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - Це поле є обов'язковим - - - - - - Введіть коректний імейл - - - - - - Це поле має містити {{minCharachters}} цифр - - - - - - Введіть 10 цифр з ІПН.
У випадку внесення паспортних даних введіть 2 перші букви кирилиці та 6 цифр або 9 цифр -
-
- - - - Перевірте введені дані.
Використовуйте, будь ласка, тільки кирилицю та символи ( ' - ) -
-
- - - Перевірте введені дані.
Не використовуйте, будь ласка, спец. символи -
-
- - - - Перевірте введені данні.
Використовуйте дд.мм.рррр формат. Наприклад 20.10.2010 -
-
- - - - Перевірте введені данні.
Дата народження виходить за межі допустимих -
-
- - - - Перевірте введені дані.
Використовуйте, будь ласка, тільки кирилицю, цифри та символи ( ' - ) -
-
- - - - Перевірте введені дані.
Використовуйте, будь ласка, тільки кирилицю, цифри та символи ( ' - / , . ) -
-
- - - - Це поле має містити від {{ minCharachters }} до {{ maxCharachters }} символів - - - - - - Перевірте введені дані.
Використовуйте, будь ласка, тільки латиницю, кирилицю, цифри та символи ( ` ' - №) -
-
- diff --git a/src/app/shared/components/validation-hint-for-input/validation-hint-for-input.component.scss b/src/app/shared/components/validation-hint-for-input/validation-hint-for-input.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/app/shared/components/validation-hint-for-input/validation-hint-for-input.component.ts b/src/app/shared/components/validation-hint-for-input/validation-hint-for-input.component.ts deleted file mode 100644 index 3867586dc5..0000000000 --- a/src/app/shared/components/validation-hint-for-input/validation-hint-for-input.component.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Component, Input } from '@angular/core'; - -@Component({ - selector: 'app-validation-hint-for-input', - templateUrl: './validation-hint-for-input.component.html', - styleUrls: ['./validation-hint-for-input.component.scss'] -}) -export class ValidationHintForInputComponent { - @Input() type: string; - @Input() invalid: boolean; - @Input() isEmailCheck: boolean; - @Input() isEmptyCheck: boolean; - @Input() minLength: boolean; - @Input() maxLength: boolean; - @Input() minCharachters: number; - @Input() maxCharachters: number; - @Input() forbiddenCharacter: string; - @Input() minMaxDate: boolean; - - constructor() { - - } -} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index f798fec1ce..681122e66e 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -30,7 +30,6 @@ import { MapComponent } from './components/map/map.component'; import { ConfirmationModalWindowComponent } from './components/confirmation-modal-window/confirmation-modal-window.component'; import { PlaceholderFormDirective } from './directives/placeholder-styling.directive'; import { ValidationMessageStyling } from './directives/validation-message-styling.directive'; -import { ValidationHintForInputComponent } from './components/validation-hint-for-input/validation-hint-for-input.component'; import { NavigationBarComponent } from './components/navigation-bar/navigation-bar.component'; import { WorkshopCheckboxDropdownComponent } from './components/workshop-checkbox-dropdown/workshop-checkbox-dropdown.component'; import { NavigationMobileBarComponent } from './components/navigation-mobile-bar/navigation-mobile-bar.component'; @@ -93,7 +92,6 @@ import { WorkingHoursFormWrapperComponent } from './components/working-hours-for ConfirmationModalWindowComponent, PlaceholderFormDirective, ValidationMessageStyling, - ValidationHintForInputComponent, NavigationBarComponent, WorkshopCheckboxDropdownComponent, NavigationMobileBarComponent, @@ -164,7 +162,6 @@ import { WorkingHoursFormWrapperComponent } from './components/working-hours-for ConfirmationModalWindowComponent, PlaceholderFormDirective, ValidationMessageStyling, - ValidationHintForInputComponent, NavigationBarComponent, NavigationMobileBarComponent, WorkshopCheckboxDropdownComponent, diff --git a/src/app/shell/admin-tools/platform/directions/create-direction/add-class-form/add-class-form.component.spec.ts b/src/app/shell/admin-tools/platform/directions/create-direction/add-class-form/add-class-form.component.spec.ts index e10206cd05..41328c930e 100644 --- a/src/app/shell/admin-tools/platform/directions/create-direction/add-class-form/add-class-form.component.spec.ts +++ b/src/app/shell/admin-tools/platform/directions/create-direction/add-class-form/add-class-form.component.spec.ts @@ -36,7 +36,6 @@ describe('AddClassFormComponent', () => { schemas: [CUSTOM_ELEMENTS_SCHEMA], declarations: [ AddClassFormComponent, - MockValidationHintForInputComponent, ], providers: [ { provide: CdkStepper, } @@ -54,17 +53,4 @@ describe('AddClassFormComponent', () => { it('should create', () => { expect(component).toBeTruthy(); }); -}); -@Component({ - selector: 'app-validation-hint-for-input', - template: '' -}) - -class MockValidationHintForInputComponent { - @Input() type: string; - @Input() invalid: boolean; - @Input() minLength: boolean; - @Input() minCharachters: number; - @Input() forbiddenCharacter: string; - @Input() isEmptyCheck: boolean; -} +}); \ No newline at end of file diff --git a/src/app/shell/admin-tools/platform/directions/create-direction/add-class-form/classes-check-box-list/classes-check-box-list.component.spec.ts b/src/app/shell/admin-tools/platform/directions/create-direction/add-class-form/classes-check-box-list/classes-check-box-list.component.spec.ts index d57a999d2c..fd1e9efd0c 100644 --- a/src/app/shell/admin-tools/platform/directions/create-direction/add-class-form/classes-check-box-list/classes-check-box-list.component.spec.ts +++ b/src/app/shell/admin-tools/platform/directions/create-direction/add-class-form/classes-check-box-list/classes-check-box-list.component.spec.ts @@ -35,7 +35,6 @@ describe('ClassesCheckBoxListComponent', () => { schemas: [CUSTOM_ELEMENTS_SCHEMA], declarations: [ ClassesCheckBoxListComponent, - MockValidationHintForInputComponent, ] }) .compileComponents(); @@ -50,24 +49,4 @@ describe('ClassesCheckBoxListComponent', () => { it('should create', () => { expect(component).toBeTruthy(); }); - - @Component({ - selector: 'app-validation-hint-for-input', - template: '' - }) - - class MockValidationHintForInputComponent { - @Input() type: string; - @Input() invalid: boolean; - @Input() minLength: boolean; - @Input() minCharachters: number; - @Input() forbiddenCharacter: string; - @Input() isEmptyCheck: boolean; - @Input() direction: Direction; - @Input() department: Department; - @Input() directionFormGroup: FormGroup; - @Input() classFormGroup: FormGroup; - @Input() departmentFormGroup: FormGroup; - @Input() router: Router; - } }); diff --git a/src/app/shell/admin-tools/platform/directions/create-direction/add-class-form/new-class-form/new-class-form.component.spec.ts b/src/app/shell/admin-tools/platform/directions/create-direction/add-class-form/new-class-form/new-class-form.component.spec.ts index 4e483095db..67c1b93796 100644 --- a/src/app/shell/admin-tools/platform/directions/create-direction/add-class-form/new-class-form/new-class-form.component.spec.ts +++ b/src/app/shell/admin-tools/platform/directions/create-direction/add-class-form/new-class-form/new-class-form.component.spec.ts @@ -38,7 +38,6 @@ describe('NewClassFormComponent', () => { schemas: [CUSTOM_ELEMENTS_SCHEMA], declarations: [ NewClassFormComponent, - MockValidationHintForInputComponent, ] }) .compileComponents(); @@ -56,26 +55,4 @@ describe('NewClassFormComponent', () => { it('should create', () => { expect(Component).toBeTruthy(); }); - - @Component({ - selector: 'app-validation-hint-for-input', - template: '' - }) - - class MockValidationHintForInputComponent { - @Input() type: string; - @Input() invalid: boolean; - @Input() minLength: boolean; - @Input() minCharachters: number; - @Input() forbiddenCharacter: string; - @Input() isEmptyCheck: boolean; - @Input() direction: Direction; - @Input() department: Department; - @Input() directionFormGroup: FormGroup; - @Input() classFormGroup: FormGroup; - @Input() departmentFormGroup: FormGroup; - @Input() router: Router; - @Input() formIndex: number; - @Input() classAmount; - } }); diff --git a/src/app/shell/admin-tools/platform/directions/create-direction/add-department-form/add-department-form.component.spec.ts b/src/app/shell/admin-tools/platform/directions/create-direction/add-department-form/add-department-form.component.spec.ts index 314aeff3e0..834e8998c7 100644 --- a/src/app/shell/admin-tools/platform/directions/create-direction/add-department-form/add-department-form.component.spec.ts +++ b/src/app/shell/admin-tools/platform/directions/create-direction/add-department-form/add-department-form.component.spec.ts @@ -38,7 +38,6 @@ describe('AddClassFormComponent', () => { schemas: [CUSTOM_ELEMENTS_SCHEMA], declarations: [ AddDepartmentFormComponent, - MockValidationHintForInputComponent, ], providers: [ { provide: CdkStepper, } @@ -60,23 +59,3 @@ describe('AddClassFormComponent', () => { expect(component).toBeTruthy(); }); }); -@Component({ - selector: 'app-validation-hint-for-input', - template: '' -}) - -class MockValidationHintForInputComponent { - @Input() type: string; - @Input() invalid: boolean; - @Input() minLength: boolean; - @Input() minCharachters: number; - @Input() forbiddenCharacter: string; - @Input() isEmptyCheck: boolean; - @Input() direction: Direction; - @Input() department: Department; - @Input() directionFormGroup: FormGroup; - @Input() classFormGroup: FormGroup; - @Input() departmentFormGroup: FormGroup; - @Input() _stepper: CdkStepper; - @Input() router: Router; -} diff --git a/src/app/shell/admin-tools/platform/directions/create-direction/add-direction-form/add-direction-form.component.spec.ts b/src/app/shell/admin-tools/platform/directions/create-direction/add-direction-form/add-direction-form.component.spec.ts index 9334c8dec1..e9a185a6d7 100644 --- a/src/app/shell/admin-tools/platform/directions/create-direction/add-direction-form/add-direction-form.component.spec.ts +++ b/src/app/shell/admin-tools/platform/directions/create-direction/add-direction-form/add-direction-form.component.spec.ts @@ -38,7 +38,6 @@ describe('AddClassFormComponent', () => { schemas: [CUSTOM_ELEMENTS_SCHEMA], declarations: [ AddDirectionFormComponent, - MockValidationHintForInputComponent, ], providers: [ { provide: CdkStepper, } @@ -60,24 +59,5 @@ describe('AddClassFormComponent', () => { expect(component).toBeTruthy(); }); }); -@Component({ - selector: 'app-validation-hint-for-input', - template: '' -}) - -class MockValidationHintForInputComponent { - @Input() type: string; - @Input() invalid: boolean; - @Input() minLength: boolean; - @Input() minCharachters: number; - @Input() forbiddenCharacter: string; - @Input() isEmptyCheck: boolean; - @Input() direction: Direction; - @Input() department: Department; - @Input() directionFormGroup: FormGroup; - @Input() classFormGroup: FormGroup; - @Input() departmentFormGroup: FormGroup; - @Input() router: Router; -} diff --git a/src/app/shell/admin-tools/platform/directions/create-direction/create-direction.component.spec.ts b/src/app/shell/admin-tools/platform/directions/create-direction/create-direction.component.spec.ts index f564608cc0..68047e6e15 100644 --- a/src/app/shell/admin-tools/platform/directions/create-direction/create-direction.component.spec.ts +++ b/src/app/shell/admin-tools/platform/directions/create-direction/create-direction.component.spec.ts @@ -33,7 +33,6 @@ describe('CreateDirectionComponent', () => { schemas: [CUSTOM_ELEMENTS_SCHEMA], declarations: [ CreateDirectionComponent, - MockValidationHintForInputComponent, MockAddDepartmentFormComponent, MockAddDirectionFormComponent, MockAddClassFormComponent @@ -52,21 +51,6 @@ describe('CreateDirectionComponent', () => { expect(component).toBeTruthy(); }); }); -@Component({ - selector: 'app-validation-hint-for-input', - template: '' -}) - -class MockValidationHintForInputComponent { - @Input() type: string; - @Input() invalid: boolean; - @Input() isEmptyCheck: boolean; - @Input() forbiddenCharacter: string; - @Input() directionFormGroup: FormGroup; - @Input() classFormGroup: FormGroup; - @Input() departmentFormGroup: FormGroup; - @Input() router: Router; -} @Component({ selector: 'app-add-direction-form', template: '' diff --git a/src/app/shell/personal-cabinet/parent/create-application/create-application.component.html b/src/app/shell/personal-cabinet/parent/create-application/create-application.component.html index c624a9584b..631f8f69b6 100644 --- a/src/app/shell/personal-cabinet/parent/create-application/create-application.component.html +++ b/src/app/shell/personal-cabinet/parent/create-application/create-application.component.html @@ -17,9 +17,9 @@

ЗАЯВА НА ГУРТОК

- - + +
diff --git a/src/app/shell/personal-cabinet/parent/create-application/create-application.component.spec.ts b/src/app/shell/personal-cabinet/parent/create-application/create-application.component.spec.ts index e67783c676..f33f84815f 100644 --- a/src/app/shell/personal-cabinet/parent/create-application/create-application.component.spec.ts +++ b/src/app/shell/personal-cabinet/parent/create-application/create-application.component.spec.ts @@ -6,7 +6,7 @@ import { MatSelectModule } from '@angular/material/select'; import { MatOptionModule } from '@angular/material/core'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { MatIconModule } from '@angular/material/icon'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { FormsModule, ReactiveFormsModule, FormControl } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { MatInputModule } from '@angular/material/input'; import { Component, Input } from '@angular/core'; @@ -72,18 +72,12 @@ class MockPersonCardComponent { } @Component({ - selector: 'app-validation-hint-for-input', + selector: 'app-validation-hint', template: '' }) class MockValidationHintForInputComponent { - @Input() type: string; - @Input() invalid: boolean; - @Input() isEmailCheck: boolean; - @Input() isEmptyCheck: boolean; - @Input() minLength: boolean; - @Input() minCharachters: number; - @Input() forbiddenCharacter: string; + @Input() validationFormControl: FormControl; } @Component({