diff --git a/src/app/shared/constants/regex-constants.ts b/src/app/shared/constants/regex-constants.ts index 5e45d8946e..71a369a3ab 100644 --- a/src/app/shared/constants/regex-constants.ts +++ b/src/app/shared/constants/regex-constants.ts @@ -6,7 +6,7 @@ export const TEXT_REGEX: RegExp = /^\S[А-Яа-яЇїІіЄєЁёҐґ'’`\s-]*$/; // Regex for lastName, firstName, middleName, fullName -export const NAME_REGEX: RegExp = /^[А-Яа-яЇїІіЄєЁёҐґ'’`\s-]*[А-Яа-яЇїІіЄєЁёҐґ]$/; +export const NAME_REGEX: RegExp = /^[А-Яа-яЇїІіЄєЁёҐґ'’`-]*[А-Яа-яЇїІіЄєЁёҐґ]$/; // Regex for email export const EMAIL_REGEX: RegExp = /^[\w.-]+@([\w.-]+\.)+[\w.-]{2,6}$/; diff --git a/src/app/shared/enum/enumUA/localization.ts b/src/app/shared/enum/enumUA/localization.ts new file mode 100644 index 0000000000..0100c9a262 --- /dev/null +++ b/src/app/shared/enum/enumUA/localization.ts @@ -0,0 +1,4 @@ +export enum Localization { + uk, + en +} diff --git a/src/app/shared/pipes/translate-cases.pipe.ts b/src/app/shared/pipes/translate-cases.pipe.ts index 724aa22448..a6498a1353 100644 --- a/src/app/shared/pipes/translate-cases.pipe.ts +++ b/src/app/shared/pipes/translate-cases.pipe.ts @@ -17,7 +17,7 @@ export class TranslateCasesPipe implements PipeTransform { transform(count: number, enumTranslate: any): string { const countLastStr = count?.toString().slice(-1); - let countNum = count?.toString(); + let countNum = count?.toString() || '0'; if (count === 0 || (count >= 11 && count <= 14)) { this.translateKey = enumTranslate[2]; diff --git a/src/app/shared/store/meta-data.actions.ts b/src/app/shared/store/meta-data.actions.ts index fcac6418c2..c39f1845b3 100644 --- a/src/app/shared/store/meta-data.actions.ts +++ b/src/app/shared/store/meta-data.actions.ts @@ -8,7 +8,7 @@ export class GetDirections { export class GetSocialGroup { static readonly type = '[meta-data] Get get social groups'; - constructor() {} + constructor(public locale?: string) {} } export class GetInstitutionStatuses { @@ -37,7 +37,7 @@ export class GetFeaturesList { export class GetAllInstitutions { static readonly type = '[meta-data] Get All Institutions'; - constructor(public filterNonGovernment: boolean) {} + constructor(public filterNonGovernment: boolean, public locale?: string) {} } export class GetAllInstitutionsHierarchy { diff --git a/src/app/shared/store/meta-data.state.ts b/src/app/shared/store/meta-data.state.ts index 5d83a0fe5f..32589dae70 100644 --- a/src/app/shared/store/meta-data.state.ts +++ b/src/app/shared/store/meta-data.state.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import { Action, Selector, State, StateContext } from '@ngxs/store'; import { Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; +import { Util } from 'shared/utils/utils'; import { Constants, EMPTY_RESULT } from '../constants/constants'; import { AchievementType } from '../models/achievement.model'; @@ -175,10 +176,10 @@ export class MetaDataState { } @Action(GetSocialGroup) - getSocialGroup({ patchState }: StateContext, {}: GetSocialGroup): Observable { + getSocialGroup({ patchState }: StateContext, { locale }: GetSocialGroup): Observable { patchState({ isLoading: true }); return this.childrenService - .getSocialGroup({ uk: 0, en: 1 }[localStorage.getItem('ui-culture') || 'uk']) + .getSocialGroup(Util.getCurrentLocalization(locale)) .pipe(tap((socialGroups: DataItem[]) => patchState({ socialGroups, isLoading: false }))); } diff --git a/src/app/shared/styles/cabinet.scss b/src/app/shared/styles/cabinet.scss index c2044e6e30..37dc6c6127 100644 --- a/src/app/shared/styles/cabinet.scss +++ b/src/app/shared/styles/cabinet.scss @@ -1,22 +1,25 @@ .container { background: #ffffff; - box-shadow: 0px 6px 16px rgba(0, 0, 0, 0.08); + box-shadow: 0 6px 16px rgba(0, 0, 0, 0.08); margin-bottom: 20px; padding: 1.5rem 1.5rem 0 1.5rem; border-radius: 5px; .nav { border-bottom: none; + a { font-size: 13px; opacity: 1; - min-width: 0px !important; + min-width: 0 !important; height: inherit !important; - padding: 0 24px 8px 24px !important; + padding: 4px 24px 4px 24px !important; } + a:first-child { - padding: 0 24px 8px 0px !important; + padding: 4px 12px 4px 12px !important; } + .active { color: #3849f9; border-bottom: 2px solid #3849f9; @@ -27,12 +30,13 @@ margin-top: 40px; } } -.title, -.nav a { + +.title, .nav a { font-weight: 700; font-family: 'Innerspace'; color: #444444; } + .title { font-size: 18px; line-height: inherit; diff --git a/src/app/shared/utils/utils.ts b/src/app/shared/utils/utils.ts index ec76ed9227..08bc426998 100644 --- a/src/app/shared/utils/utils.ts +++ b/src/app/shared/utils/utils.ts @@ -1,3 +1,4 @@ +import { Localization } from 'shared/enum/enumUA/localization'; import { BaseAdmin } from 'shared/models/admin.model'; import { AreaAdmin } from 'shared/models/areaAdmin.model'; import { CodeMessageErrors } from '../enum/enumUA/errors'; @@ -19,6 +20,20 @@ import { EmailConfirmationStatuses } from './../enum/statuses'; * Utility class that providers methods for shared data manipulations */ export class Util { + /** + * This method returns current localization as a number for backend requests + *
+ * Locale string can be passed as param or by default it is taken from local storage, + * but it is required to provide locale if calling from a language change event + * because storage gives the previous locale + *
+ * Ukrainian locale is 0 and English is 1 + * @param locale Locale string (uk, en) + */ + public static getCurrentLocalization(locale: string = localStorage.getItem('ui-culture') || 'uk'): number { + return Localization[locale]; + } + /** * This method returns child age * @param child Child @@ -66,9 +81,7 @@ export class Util { } public static getTodayBirthDate(): Date { - const today = new Date(); - - return today; + return new Date(); } /** diff --git a/src/app/shell/admin-tools/data/admins/create-admin/create-admin.component.html b/src/app/shell/admin-tools/data/admins/create-admin/create-admin.component.html index f1c3204880..9b134ed689 100644 --- a/src/app/shell/admin-tools/data/admins/create-admin/create-admin.component.html +++ b/src/app/shell/admin-tools/data/admins/create-admin/create-admin.component.html @@ -12,65 +12,59 @@

{{ formTitle | translate | uppercase }}

- + - + - +
{{ phonePrefix }} - +
- + - + - + {{ institution.title }} @@ -80,13 +74,12 @@

{{ formTitle | translate | uppercase }}

- + {{ region.fullName }} @@ -99,13 +92,12 @@

{{ formTitle | translate | uppercase }}

- + {{ codeficator.territorialCommunity }} @@ -116,13 +108,12 @@

{{ formTitle | translate | uppercase }}

 - + @@ -130,14 +121,18 @@

{{ formTitle | translate | uppercase }}

+ + {{ 'AGREEMENTS.PLATFORM_RULES' | translate }} + + {{ 'AGREEMENTS.PERSONAL_DATA_USE' | translate }} +
- - + - + +
diff --git a/src/app/shell/admin-tools/platform/platform-info/info-edit/info-edit.component.html b/src/app/shell/admin-tools/platform/platform-info/info-edit/info-edit.component.html index 1df247d18b..57e8b612b1 100644 --- a/src/app/shell/admin-tools/platform/platform-info/info-edit/info-edit.component.html +++ b/src/app/shell/admin-tools/platform/platform-info/info-edit/info-edit.component.html @@ -9,40 +9,45 @@

+ {{ 'FORMS.HEADERS.SUBHEADER_TITLE' | translate }} + * + - +
- + -
- - +
diff --git a/src/app/shell/details/details-tabs/achievements/achievement-card/achievement-card.component.html b/src/app/shell/details/details-tabs/achievements/achievement-card/achievement-card.component.html index a96a71b215..e8f1fdf652 100644 --- a/src/app/shell/details/details-tabs/achievements/achievement-card/achievement-card.component.html +++ b/src/app/shell/details/details-tabs/achievements/achievement-card/achievement-card.component.html @@ -3,13 +3,12 @@
-

+

{{ achievementsTypes[achievement.achievementTypeId - 1].title }}

{{ 'FORMS.LABELS.DATE' | translate }}

@@ -26,22 +25,25 @@

{{ 'FORMS.LABELS.TEACHERS' | translate }}

{{ teacher.title }}

-

{{ 'FORMS.LABELS.DESCRIPTION' | translate }}

+

{{ 'FORMS.LABELS.ACHIEVEMENT_DESCRIPTION' | translate }}

- {{ showMore ? achievement.title : (achievement.title | slice : 0 : 150) }} - {{ (!showMore ? 'MORE' : 'LESS') | translate }} + {{ showMore + ? achievement.title + : (achievement.title | slice : 0 : 150) }} + + {{ (!showMore + ? 'MORE' + : 'LESS') | translate }}

-
+
edit
diff --git a/src/app/shell/details/details-tabs/achievements/achievement-card/achievement-card.component.ts b/src/app/shell/details/details-tabs/achievements/achievement-card/achievement-card.component.ts index 3538c9a432..26f58db0a0 100644 --- a/src/app/shell/details/details-tabs/achievements/achievement-card/achievement-card.component.ts +++ b/src/app/shell/details/details-tabs/achievements/achievement-card/achievement-card.component.ts @@ -1,7 +1,8 @@ -import { Component, Input, Output, EventEmitter } from '@angular/core'; -import { Constants } from '../../../../../shared/constants/constants'; -import { Achievement, AchievementType } from '../../../../../shared/models/achievement.model'; -import { Workshop } from '../../../../../shared/models/workshop.model'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; + +import { Constants } from 'shared/constants/constants'; +import { Achievement, AchievementType } from 'shared/models/achievement.model'; +import { Workshop } from 'shared/models/workshop.model'; @Component({ selector: 'app-achievement-card', diff --git a/src/app/shell/details/details-tabs/achievements/achievements.component.html b/src/app/shell/details/details-tabs/achievements/achievements.component.html index c335e5c4d0..6ddf769c18 100644 --- a/src/app/shell/details/details-tabs/achievements/achievements.component.html +++ b/src/app/shell/details/details-tabs/achievements/achievements.component.html @@ -7,25 +7,21 @@
- +
- + diff --git a/src/app/shell/personal-cabinet/parent/create-child/child-form/child-form.component.spec.ts b/src/app/shell/personal-cabinet/parent/create-child/child-form/child-form.component.spec.ts index cb79f15474..29febb62b0 100644 --- a/src/app/shell/personal-cabinet/parent/create-child/child-form/child-form.component.spec.ts +++ b/src/app/shell/personal-cabinet/parent/create-child/child-form/child-form.component.spec.ts @@ -1,18 +1,20 @@ -import { MatChipsModule } from '@angular/material/chips'; -import { MatIconModule } from '@angular/material/icon'; +import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ChildFormComponent } from './child-form.component'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatDatepickerModule } from '@angular/material/datepicker'; -import { MatRadioModule } from '@angular/material/radio'; -import { MatNativeDateModule, MatOptionModule } from '@angular/material/core'; import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatChipsModule } from '@angular/material/chips'; +import { MatNativeDateModule, MatOptionModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { MatRadioModule } from '@angular/material/radio'; import { MatSelectModule } from '@angular/material/select'; -import { Component, Input } from '@angular/core'; -import { KeyFilterDirective } from '../../../../../shared/directives/key-filter.directive'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { TranslateModule } from '@ngx-translate/core'; +import { NgxsModule } from '@ngxs/store'; + +import { KeyFilterDirective } from 'shared/directives/key-filter.directive'; +import { ChildFormComponent } from './child-form.component'; describe('ChildFormComponent', () => { let component: ChildFormComponent; @@ -33,6 +35,7 @@ describe('ChildFormComponent', () => { MatSelectModule, MatIconModule, MatChipsModule, + NgxsModule.forRoot([]), TranslateModule.forRoot() ], declarations: [ChildFormComponent, MockValidationHintForInputComponent, KeyFilterDirective] diff --git a/src/app/shell/personal-cabinet/parent/create-child/child-form/child-form.component.ts b/src/app/shell/personal-cabinet/parent/create-child/child-form/child-form.component.ts index a3eeb10c4a..abb744c111 100644 --- a/src/app/shell/personal-cabinet/parent/create-child/child-form/child-form.component.ts +++ b/src/app/shell/personal-cabinet/parent/create-child/child-form/child-form.component.ts @@ -1,46 +1,74 @@ -import { Component, EventEmitter, Input, Output, OnInit, ViewChild } from '@angular/core'; +import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; -import { MatSelect } from '@angular/material/select'; +import { MatChipList } from '@angular/material/chips'; import { MatOption } from '@angular/material/core'; +import { MatSelect } from '@angular/material/select'; +import { LangChangeEvent, TranslateService } from '@ngx-translate/core'; +import { Store } from '@ngxs/store'; +import { Subject } from 'rxjs'; +import { takeUntil } from 'rxjs/operators'; + import { DATE_REGEX } from 'shared/constants/regex-constants'; import { ValidationConstants } from 'shared/constants/validation'; -import { Util } from 'shared/utils/utils'; import { DataItem } from 'shared/models/item.model'; +import { GetSocialGroup } from 'shared/store/meta-data.actions'; +import { Util } from 'shared/utils/utils'; @Component({ selector: 'app-child-form', templateUrl: './child-form.component.html', styleUrls: ['./child-form.component.scss'] }) -export class ChildFormComponent implements OnInit { - readonly validationConstants = ValidationConstants; - +export class ChildFormComponent implements OnInit, OnDestroy { + public readonly validationConstants = ValidationConstants; private readonly NONE_SOCIAL_GROUP_ID = 6; - @Input() ChildFormGroup: FormGroup; - @Input() index: number; - @Input() childrenAmount: number; - @Input() socialGroups: DataItem[]; + @Input() + public ChildFormGroup: FormGroup; + @Input() + public index: number; + @Input() + public childrenAmount: number; + @Input() + public socialGroups: DataItem[]; - @Output() deleteForm = new EventEmitter(); + @Output() + public deleteForm = new EventEmitter(); - @ViewChild('select') select: MatSelect; + @ViewChild('select') + private select: MatSelect; + @ViewChild('chipList') + private chipList: MatChipList; - socialGroupControl: FormControl = new FormControl([]); - dateFilter: RegExp = DATE_REGEX; + public socialGroupControl: FormControl = new FormControl([]); + public dateFilter: RegExp = DATE_REGEX; // TODO: Check the maximum allowable date in this case - maxDate: Date = Util.getTodayBirthDate(); - minDate: Date = Util.getMinBirthDate(ValidationConstants.BIRTH_AGE_MAX); + public maxDate: Date = Util.getTodayBirthDate(); + public minDate: Date = Util.getMinBirthDate(ValidationConstants.BIRTH_AGE_MAX); - ngOnInit(): void { + public destroy$: Subject = new Subject(); + + constructor(private translateService: TranslateService, private store: Store) {} + + public ngOnInit(): void { this.socialGroupControl = this.ChildFormGroup.get('socialGroups') as FormControl; + + this.translateService.onLangChange.pipe(takeUntil(this.destroy$)).subscribe(({ lang }: LangChangeEvent) => { + this.store.dispatch(new GetSocialGroup(lang)); + this.chipList.chips.forEach((chip) => chip.remove()); + }); + } + + public ngOnDestroy(): void { + this.destroy$.next(true); + this.destroy$.unsubscribe(); } /** * This method remove selected option from formControl * @param group SocialGroup */ - onRemoveItem(group: DataItem): void { + public onRemoveItem(group: DataItem): void { this.socialGroupControl.value.splice(this.socialGroupControl.value.indexOf(group), 1); this.select.options.find((option: MatOption) => option.value.id === group.id).deselect(); } @@ -49,7 +77,7 @@ export class ChildFormComponent implements OnInit { * This method disabled option if there is selected value in social group form control and this value is None * @param option SocialGroup */ - checkDisabled(option: DataItem): boolean { + public checkDisabled(option: DataItem): boolean { if (!this.socialGroupControl.value.length) { return false; } else { @@ -58,11 +86,11 @@ export class ChildFormComponent implements OnInit { } } - compareSocialGroups(group: DataItem, group2: DataItem): boolean { + public compareSocialGroups(group: DataItem, group2: DataItem): boolean { return group.id === group2.id; } - onDelete(): void { + public onDelete(): void { this.deleteForm.emit(this.index); } } diff --git a/src/app/shell/personal-cabinet/parent/create-child/create-child.component.html b/src/app/shell/personal-cabinet/parent/create-child/create-child.component.html index 8dcb192923..c8e320dc9e 100644 --- a/src/app/shell/personal-cabinet/parent/create-child/create-child.component.html +++ b/src/app/shell/personal-cabinet/parent/create-child/create-child.component.html @@ -1,32 +1,34 @@
-

{{ (editMode ? 'FORMS.HEADERS.EDIT_CHILD' : 'FORMS.HEADERS.NEW_CHILD') | translate | uppercase }}

+

+ {{ (editMode + ? 'FORMS.HEADERS.EDIT_CHILD' + : 'FORMS.HEADERS.NEW_CHILD') | translate | uppercase }} +

{{ 'FORMS.HEADERS.CREATE_CHILD_SUBTITLE' | translate }}

-
-

@@ -37,25 +39,27 @@

{{ (editMode ? 'FORMS.HEADERS.EDIT_CHILD' : 'FORMS.HEA

- +

{{ 'FORMS.CONTROL_VALUES.CHILD_AGREEMENT_WITH_TERMS_OF_USE_START' | translate }} - {{ - 'FORMS.CONTROL_VALUES.TERMS_OF_USE' | translate - }} + + {{ 'FORMS.CONTROL_VALUES.TERMS_OF_USE' | translate }} + {{ 'FORMS.CONTROL_VALUES.AGREEMENT_WITH_TERMS_OF_USE_END' | translate }}

- - +
diff --git a/src/app/shell/personal-cabinet/provider/create-achievement/create-achievement.component.html b/src/app/shell/personal-cabinet/provider/create-achievement/create-achievement.component.html index 54d01655a6..0aa893dc5e 100644 --- a/src/app/shell/personal-cabinet/provider/create-achievement/create-achievement.component.html +++ b/src/app/shell/personal-cabinet/provider/create-achievement/create-achievement.component.html @@ -3,51 +3,47 @@

{{ 'FORMS.HEADERS.ADD_ACHIEVEMENT' | translate }}

- +
- + - - + + {{ achievement.title }} - - + + - + - + {{ child | getFullName }} cancel @@ -58,16 +54,16 @@

{{ 'FORMS.HEADERS.ADD_ACHIEVEMENT' | translate }}

 - + {{ 'BANNERS.ADD_ACHIEVEMENT_PARTICIPANTS' | translate }} - +
@@ -80,19 +76,17 @@

{{ 'FORMS.HEADERS.ADD_ACHIEVEMENT' | translate }}

- + - + {{ teacher | getFullName }} cancel @@ -111,23 +105,22 @@

{{ 'FORMS.HEADERS.ADD_ACHIEVEMENT' | translate }}

{{ 'BANNERS.ADD_ACHIEVEMENT_TEACHERS' | translate }} - + - +
- + @@ -135,16 +128,19 @@

{{ 'FORMS.HEADERS.ADD_ACHIEVEMENT' | translate }}

- +
-
diff --git a/src/app/shell/personal-cabinet/provider/create-achievement/create-achievement.component.ts b/src/app/shell/personal-cabinet/provider/create-achievement/create-achievement.component.ts index c5d5a7134a..06d7820bbf 100644 --- a/src/app/shell/personal-cabinet/provider/create-achievement/create-achievement.component.ts +++ b/src/app/shell/personal-cabinet/provider/create-achievement/create-achievement.component.ts @@ -57,9 +57,11 @@ export class CreateAchievementComponent extends CreateFormComponent implements O get teachersFormControl(): FormControl { return this.AchievementFormGroup.get('teachers') as FormControl; } + get childrenFormControl(): FormControl { return this.AchievementFormGroup.get('children') as FormControl; } + get achievementTypeIdFormControl(): FormControl { return this.AchievementFormGroup.get('achievementTypeId') as FormControl; } @@ -86,7 +88,6 @@ export class CreateAchievementComponent extends CreateFormComponent implements O teachers: new FormControl('', Validators.required), children: new FormControl('', Validators.required) }); - this.subscribeOnDirtyForm(this.AchievementFormGroup); } @@ -95,7 +96,7 @@ export class CreateAchievementComponent extends CreateFormComponent implements O } determineEditMode(): void { - this.achievementId = this.route.snapshot.paramMap.get('achievementId'); + this.achievementId = this.route.snapshot.queryParamMap.get('achievementId'); this.editMode = !!this.achievementId; if (this.editMode) { this.setEditMode(); diff --git a/src/app/shell/personal-cabinet/provider/create-provider-admin/create-provider-admin.component.html b/src/app/shell/personal-cabinet/provider/create-provider-admin/create-provider-admin.component.html index b0541b01d2..18c4f912ee 100644 --- a/src/app/shell/personal-cabinet/provider/create-provider-admin/create-provider-admin.component.html +++ b/src/app/shell/personal-cabinet/provider/create-provider-admin/create-provider-admin.component.html @@ -53,15 +53,14 @@

{{ phonePrefix }} - +
- diff --git a/src/app/shell/personal-cabinet/provider/create-provider/create-provider.component.html b/src/app/shell/personal-cabinet/provider/create-provider/create-provider.component.html index f7b67c7a65..285e6fd313 100644 --- a/src/app/shell/personal-cabinet/provider/create-provider/create-provider.component.html +++ b/src/app/shell/personal-cabinet/provider/create-provider/create-provider.component.html @@ -2,7 +2,9 @@

- {{ (isEditMode ? 'FORMS.HEADERS.EDIT_PROVIDER' : 'FORMS.HEADERS.NEW_PROVIDER') | translate }} + {{ (isEditMode + ? 'FORMS.HEADERS.EDIT_PROVIDER' + : 'FORMS.HEADERS.NEW_PROVIDER') | translate }}

{{ 'FORMS.HEADERS.NEW_PROVIDER_SUBHEADER' | translate }}

@@ -12,16 +14,18 @@

{{ 'TITLES.ABOUT_THE_PROVIDER_INFO' | translate }}

 - +
-
@@ -31,22 +35,20 @@

{{ 'TITLES.CONTACTS' | translate }}

 - +
-
@@ -56,31 +58,38 @@

{{ 'TITLES.DESCRIPTION' | translate }}

 - +
- {{ 'AGREEMENTS.I_AGREE_FOR_DATA_USE' | translate }} + + {{ 'AGREEMENTS.I_AGREE_FOR_DATA_USE' | translate }} - {{ 'AGREEMENTS.I_AM_NOT_ROBOT' | translate }} + + {{ 'AGREEMENTS.I_AM_NOT_ROBOT' | translate }}
- + -
diff --git a/src/app/shell/personal-cabinet/provider/create-workshop/create-workshop.component.html b/src/app/shell/personal-cabinet/provider/create-workshop/create-workshop.component.html index 78fde48f2f..461239948c 100644 --- a/src/app/shell/personal-cabinet/provider/create-workshop/create-workshop.component.html +++ b/src/app/shell/personal-cabinet/provider/create-workshop/create-workshop.component.html @@ -3,10 +3,14 @@

- {{ (editMode ? 'FORMS.HEADERS.EDIT_WORKSHOP' : 'FORMS.HEADERS.NEW_WORKSHOP') | translate }} + {{ (editMode + ? 'FORMS.HEADERS.EDIT_WORKSHOP' + : 'FORMS.HEADERS.NEW_WORKSHOP') | translate }}

- {{ (editMode ? 'FORMS.HEADERS.EDIT_WORKSHOP_DESCRIPTION_PATH' : 'FORMS.HEADERS.NEW_WORKSHOP_DESCRIPTION_PATH') | translate }} + {{ (editMode + ? 'FORMS.HEADERS.EDIT_WORKSHOP_DESCRIPTION_PATH' + : 'FORMS.HEADERS.NEW_WORKSHOP_DESCRIPTION_PATH') | translate }} {{ 'FORMS.HEADERS.WORKSHOP_FORM_DESCRIPTION' | translate }}

@@ -16,13 +20,12 @@

{{ 'TITLES.ABOUT_THE_WORKSHOP_SHORT' | translate }}

 - +
- +

{{ 'TITLES.DESCRIPTION' | translate }}

 - +
- +

{{ 'TITLES.CONTACTS' | translate }}

 - +
- +

{{ 'TITLES.TEACHERS' | translate }}

 - +
@@ -99,12 +100,19 @@

-

diff --git a/src/app/shell/personal-cabinet/shared-cabinet/user-config/user-config-edit/user-config-edit.component.html b/src/app/shell/personal-cabinet/shared-cabinet/user-config/user-config-edit/user-config-edit.component.html index 74be54f68a..446262c9c7 100644 --- a/src/app/shell/personal-cabinet/shared-cabinet/user-config/user-config-edit/user-config-edit.component.html +++ b/src/app/shell/personal-cabinet/shared-cabinet/user-config/user-config-edit/user-config-edit.component.html @@ -10,10 +10,9 @@

{{ 'FORMS.HEADERS.EDIT_PERSONAL_INFORMATION' | transla - +

-
diff --git a/src/assets/i18n/uk.json b/src/assets/i18n/uk.json index 4741571799..d32a9779a8 100644 --- a/src/assets/i18n/uk.json +++ b/src/assets/i18n/uk.json @@ -387,7 +387,7 @@ "SEARCH_PROVIDER_CHILD_WORKSHOP": "Пошук за закладом, дитиною чи назвою гуртка", "SEARCH_NAME_EMAIL_PHONE_CITY_STATUS": "Пошук за ПІБ, електронною поштою, телефоном, містом чи статусом", "SEARCH_PROVIDER_EDRPO_MAIL_PHONE": "Пошук за закладом, ЄДРПО, електронною поштою, телефоном", - "SEARCH_NAME_EMAIL_CITY_TYPE_CHANGE": "Пошук за ПІБ, емейлом, містом, типом чи зміною", + "SEARCH_NAME_EMAIL_CITY_TYPE_CHANGE": "Пошук за ПІБ, імейлом, містом, типом чи зміною", "ENTER_DATE_RANGE": "Введіть діапазон дат", "ALL_FILTERS": "Усі фільтри", "SELECT_SUBORDINATION": "Оберіть підпорядкування",