diff --git a/src/app/shared/components/workshop-card/workshop-card.component.html b/src/app/shared/components/workshop-card/workshop-card.component.html index f792d6ea7..0a44ffa14 100644 --- a/src/app/shared/components/workshop-card/workshop-card.component.html +++ b/src/app/shared/components/workshop-card/workshop-card.component.html @@ -92,6 +92,9 @@

{{ workshop.providerTitle }}

+

+ account_balance Форма власності: {{ ownershipType }} +

person{{ workshop.minAge }} - {{ workshop.maxAge }} років

diff --git a/src/app/shared/components/workshop-card/workshop-card.component.ts b/src/app/shared/components/workshop-card/workshop-card.component.ts index 8f405aa17..cc4ffa9e0 100644 --- a/src/app/shared/components/workshop-card/workshop-card.component.ts +++ b/src/app/shared/components/workshop-card/workshop-card.component.ts @@ -14,6 +14,7 @@ import { Observable, Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { MatDialog } from '@angular/material/dialog'; import { CategoryIcons } from '../../enum/category-icons'; +import { OwnershipTypeUkr } from 'src/app/shared/enum/provider'; @Component({ selector: 'app-workshop-card', @@ -31,6 +32,7 @@ export class WorkshopCardComponent implements OnInit, OnDestroy { isFavorite: boolean; favoriteWorkshopId: Favorite; pendingApplicationAmount: number; + ownershipType: string; @Input() workshop: WorkshopCard; @Input() userRoleView: string; @@ -65,6 +67,7 @@ export class WorkshopCardComponent implements OnInit, OnDestroy { public dialog: MatDialog) { } ngOnInit(): void { + this.ownershipType = OwnershipTypeUkr[this.workshop.providerOwnership]; this.favoriteWorkshops$ .pipe(takeUntil(this.destroy$)) .subscribe((favorites: Favorite[]) => { diff --git a/src/app/shared/enum/provider.ts b/src/app/shared/enum/provider.ts index a66876ebe..eb8a359d8 100644 --- a/src/app/shared/enum/provider.ts +++ b/src/app/shared/enum/provider.ts @@ -23,9 +23,9 @@ export enum OwnershipType { } export enum OwnershipTypeUkr { - 'Державна', - 'Громадська організація', - 'Приватна', + State = 'Державна', + Common = 'Громадська організація', + Private = 'Приватна', } export enum WorkshopType { diff --git a/src/app/shared/models/provider.model.ts b/src/app/shared/models/provider.model.ts index 850c035a3..80aad25b8 100644 --- a/src/app/shared/models/provider.model.ts +++ b/src/app/shared/models/provider.model.ts @@ -17,7 +17,7 @@ export class Provider { directorDateOfBirth?: string | Date; phoneNumber?: string; founder?: string; - ownership?: number; + ownership?: string; type?: number; status?: boolean; legalAddress?: Address; diff --git a/src/app/shared/models/workshop.model.ts b/src/app/shared/models/workshop.model.ts index 6540dc8a6..7c2264628 100644 --- a/src/app/shared/models/workshop.model.ts +++ b/src/app/shared/models/workshop.model.ts @@ -83,6 +83,7 @@ export interface WorkshopCard { price: number; providerId: string; providerTitle: string; + providerOwnership: string; rating: number; title: string; workshopId: string; diff --git a/src/app/shell/personal-cabinet/provider/create-provider/create-info-form/create-info-form.component.html b/src/app/shell/personal-cabinet/provider/create-provider/create-info-form/create-info-form.component.html index 873de6f3b..4490e4e1b 100644 --- a/src/app/shell/personal-cabinet/provider/create-provider/create-info-form/create-info-form.component.html +++ b/src/app/shell/personal-cabinet/provider/create-provider/create-info-form/create-info-form.component.html @@ -6,7 +6,7 @@ - + {{ ownershipTypeUkr[type.key] }}