Update ownership type (#821)

* type from number to string * fix drop-down * feat: add providerOwnership field to the card (#822) * feat: add providerOwnership field * add and display variable ownershipType
ita-social-projects · Jan 29, 2022 · b68f306 · b68f306
1 parent a9332e3
commit b68f306
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git 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 @@
     <p class="card_text_label" [matTooltip]="workshop.providerTitle" showTooltipIfTruncated matTooltipClass="tooltip"
       [matTooltipPosition]="below">{{ workshop.providerTitle }}</p>
   </div>
+  <p class="card_text" *ngIf="ownershipType">
+    <mat-icon class="card_icon">account_balance</mat-icon> Форма власності: {{ ownershipType }}
+  </p>
   <p class="card_text" [ngClass]="isCreateApplicationView ? 'hide': ''">
     <mat-icon class="card_icon">person</mat-icon>{{ workshop.minAge }} - {{ workshop.maxAge }} років
   </p>

diff --git 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
@@ -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
@@ -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
@@ -83,6 +83,7 @@ export interface WorkshopCard {
   price: number;
   providerId: string;
   providerTitle: string;
+  providerOwnership: string;
   rating: number;
   title: string;
   workshopId: string;

diff --git a/...ersonal-cabinet/provider/create-provider/create-info-form/create-info-form.component.html b/...ersonal-cabinet/provider/create-provider/create-info-form/create-info-form.component.html
@@ -6,7 +6,7 @@
     <mat-select disableOptionCentering panelClass="dropdown-panel" class="step-input" formControlName="ownership"
       name="ownership" placeholder="Оберіть форму властності">
       <ng-container *ngFor="let type of ownershipType | keyvalue">
-        <mat-option *ngIf="ownershipTypeUkr[type.key]" [value]="+type.key" class="dropdown-option">
+        <mat-option *ngIf="ownershipTypeUkr[type.key]" [value]="type.key" class="dropdown-option">
           {{ ownershipTypeUkr[type.key] }}
         </mat-option>
       </ng-container>