Add educational institution status#363/zubkov

src/app/shared/constants/constants.ts

@@ -39,6 +39,7 @@ export class Constants {
   static WorkingDaysValues: any;
 
   static readonly SOCIAL_GROUP_ID_ABSENT_VALUE = 0;
+  static readonly INSTITUTION_STATUS_ID_ABSENT_VALUE = 0;
 
 }
 

src/app/shared/models/institutionStatus.model.ts

@@ -0,0 +1,5 @@
+export interface InstitutionStatus {
+    id: string;
+    name: number;
+  }
+

src/app/shared/models/provider.model.ts

@@ -24,8 +24,9 @@ export class Provider {
   actualAddress?: Address;
   workshop?: Workshop;
   image?: File[];
+  institutionStatusId?: number | null;
 
-  constructor(info, legalAddress: Address, actualAddress: Address, photo, user: User, provider?: Provider) {
+  constructor(info, legalAddress: Address, actualAddress: Address, description, user: User, provider?: Provider) {
     this.shortTitle = info.shortTitle;
     this.ownership = info.ownership;
     this.type = info.type;
@@ -41,7 +42,8 @@ export class Provider {
     this.founder = info.founder;
     this.legalAddress = legalAddress;
     this.actualAddress = actualAddress;
-    this.description = photo.description;
+    this.description = description.description;
+    this.institutionStatusId = description.institutionStatusId || null;
     this.userId = user.id;
     if (provider?.id) {
       this.id = provider.id;

src/app/shared/services/provider/provider.service.ts

@@ -1,6 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
+import { InstitutionStatus } from '../../models/institutionStatus.model';
 import { Provider } from '../../models/provider.model';
 
 @Injectable({
@@ -40,4 +41,11 @@ export class ProviderService {
   updateProvider(provider: Provider): Observable<object> {
     return this.http.put('/api/v1/Provider/Update', provider);
   }
+
+  /**
+ * This method get all institution statuses
+ */
+  getInstitutionStatus(): Observable<InstitutionStatus[]> {
+    return this.http.get<InstitutionStatus[]>('/api/v1/InstitutionStatus/Get');
+  }
 }

src/app/shared/store/meta-data.actions.ts

@@ -22,6 +22,10 @@ export class GetSocialGroup {
   static readonly type = '[meta-data] Get GetSocialGroup';
   constructor() { }
 }
+export class GetInstitutionStatus{
+  static readonly type = '[meta-data] Get GetInstitutionStatus';
+  constructor() { }
+}
 export class ClearClasses {
   static readonly type = '[meta-data] clear classes state';
 }

src/app/shared/store/meta-data.state.ts

@@ -24,9 +24,12 @@ import {
   GetTopDirections,
   ClearDepartments,
   ClearClasses,
+  GetInstitutionStatus,
   ClearRatings
 } from './meta-data.actions';
 import { Observable } from 'rxjs';
+import { InstitutionStatus } from '../models/institutionStatus.model';
+import { ProviderService } from '../services/provider/provider.service';
 
 export interface MetaDataStateModel {
   directions: Direction[];
@@ -35,6 +38,7 @@ export interface MetaDataStateModel {
   classes: IClass[];
   cities: City[];
   socialGroups: SocialGroup[];
+  institutionStatuses: InstitutionStatus[];
   isCity: boolean;
   filteredDirections: Direction[];
   filteredDepartments: Department[];
@@ -51,6 +55,7 @@ export interface MetaDataStateModel {
     classes: [],
     cities: null,
     socialGroups: [],
+    institutionStatuses: [],
     isCity: false,
     filteredDirections: [],
     filteredDepartments: [],
@@ -78,6 +83,9 @@ export class MetaDataState {
   @Selector()
   static socialGroups(state: MetaDataStateModel): SocialGroup[] { return state.socialGroups; }
 
+  @Selector()
+  static institutionStatuses(state: MetaDataStateModel): InstitutionStatus[] { return state.institutionStatuses; }
+
   @Selector()
   static cities(state: MetaDataStateModel): City[] { return state.cities; }
 
@@ -102,9 +110,10 @@ export class MetaDataState {
   constructor(
     private categoriesService: CategoriesService,
     private childrenService: ChildrenService,
+    private providerService: ProviderService,
     private cityService: CityService,
     private ratingService: RatingService) { }
-
+    
   @Action(GetDirections)
   getDirections({ patchState }: StateContext<MetaDataStateModel>, { }: GetDirections): Observable<Direction[]> {
     patchState({ isLoading: true })
@@ -151,6 +160,16 @@ export class MetaDataState {
         tap((socialGroups: SocialGroup[]) => patchState({ socialGroups: socialGroups })
         ))
   }
+
+  @Action(GetInstitutionStatus)
+  getInstitutionStatus({ patchState }: StateContext<MetaDataStateModel>, { }: GetInstitutionStatus): Observable<InstitutionStatus[]> {
+    return this.providerService
+      .getInstitutionStatus()
+      .pipe(
+        tap((institutionStatuses: InstitutionStatus[]) => patchState({ institutionStatuses: institutionStatuses })
+        ))
+  }
+
   @Action(ClearClasses)
   clearClasses({ patchState }: StateContext<MetaDataStateModel>, { }: ClearClasses): void {
     patchState({ classes: undefined });

src/app/shared/store/user.state.ts

@@ -430,7 +430,7 @@ export class UserState {
   onUpdateProviderSuccess({ dispatch }: StateContext<UserStateModel>, { payload }: OnUpdateProviderSuccess): void {
     dispatch(new MarkFormDirty(false));
     console.log('Provider is updated', payload);
-    dispatch(new ShowMessageBar({ message: 'Організація успішно відредагована', type: 'success' }));
+    dispatch([new ShowMessageBar({ message: 'Організація успішно відредагована', type: 'success' }), new GetProfile()]);
     dispatch(new GetProfile()).subscribe(() => this.router.navigate(['/personal-cabinet/provider/info']));
   }
 

src/app/shell/personal-cabinet/provider/create-provider/create-photo-form/create-photo-form.component.html

@@ -1,6 +1,17 @@
 <form [formGroup]="PhotoFormGroup" fxLayout='column' fxLayoutAlign='center space-between' class="step">
   <!-- <app-image-form-control [imgMaxAmount]="4" [label]="'Фото'" formControlName="image">
   </app-image-form-control> TODO: Second release -->
+
+  <label class="step-label">Статус</label>
+  <mat-form-field floatLabel="never" appearance="none">
+    <mat-select disableOptionCentering panelClass="dropdown-panel" class="step-input" formControlName="institutionStatusId">
+      <mat-option [value]="0" class="dropdown-option"> Відсутній </mat-option>
+      <mat-option *ngFor="let status of (institutionStatuses$ | async)" [value]="status.id" class="dropdown-option">
+        {{status.name}}
+      </mat-option>
+    </mat-select>
+  </mat-form-field> 
+
   <label class="step-label"> Опис <span class="step-required">*</span></label>
   <mat-form-field appPlaceholderStyling floatLabel="never" appearance="none">
     <textarea matInput class="step-textarea" placeholder="Максимум {{constants.MAX_DESCRIPTION_LENGTH}} символів"

src/app/shell/personal-cabinet/provider/create-provider/create-photo-form/create-photo-form.component.spec.ts

@@ -9,6 +9,8 @@ import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { MatGridListModule } from '@angular/material/grid-list';
 import { Component, Input } from '@angular/core';
+import { MatOptionModule } from '@angular/material/core';
+import { MatSelectModule } from '@angular/material/select';
 
 describe('CreatePhotoFormComponent', () => {
   let component: CreatePhotoFormComponent;
@@ -24,6 +26,8 @@ describe('CreatePhotoFormComponent', () => {
         BrowserAnimationsModule,
         NgxsModule.forRoot([]),
         MatIconModule,
+        MatOptionModule,
+        MatSelectModule,
         MatGridListModule
       ],
       declarations: [
@@ -41,6 +45,7 @@ describe('CreatePhotoFormComponent', () => {
     component.PhotoFormGroup = new FormGroup({
       image: new FormControl('', Validators.required),
       description: new FormControl('', Validators.required),
+      institutionStatusId: new FormControl('')
     });
     fixture.detectChanges();
   });

src/app/shell/personal-cabinet/provider/create-provider/create-photo-form/create-photo-form.component.ts

@@ -1,7 +1,13 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { Select, Store } from '@ngxs/store';
+import { Observable, Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
 import { Constants } from 'src/app/shared/constants/constants';
+import { InstitutionStatus } from 'src/app/shared/models/institutionStatus.model';
 import { Provider } from 'src/app/shared/models/provider.model';
+import { GetInstitutionStatus } from 'src/app/shared/store/meta-data.actions';
+import { MetaDataState } from 'src/app/shared/store/meta-data.state';
 
 @Component({
   selector: 'app-create-photo-form',
@@ -12,20 +18,47 @@ export class CreatePhotoFormComponent implements OnInit {
 
   readonly constants: typeof Constants = Constants;
 
+
+  @Select(MetaDataState.institutionStatuses)
+  institutionStatuses$: Observable<InstitutionStatus[]>;
+  destroy$: Subject<boolean> = new Subject<boolean>();
+
   PhotoFormGroup: FormGroup;
 
   @Input() provider: Provider;
+  @Input() editMode: boolean;
+
   @Output() passPhotoFormGroup = new EventEmitter();
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: FormBuilder, private store: Store) {
     this.PhotoFormGroup = this.formBuilder.group({
       image: new FormControl(''),
       description: new FormControl('', Validators.required),
+      institutionStatusId: new FormControl(Constants.INSTITUTION_STATUS_ID_ABSENT_VALUE),
     });
   }
 
   ngOnInit(): void {
+    this.store.dispatch(new GetInstitutionStatus());
+    if (this.provider?.institutionStatusId === null) {
+      this.provider.institutionStatusId = 0
+    }
     this.provider && this.PhotoFormGroup.patchValue(this.provider, { emitEvent: false });
     this.passPhotoFormGroup.emit(this.PhotoFormGroup);
+
+    this.institutionStatuses$
+    .pipe(
+      takeUntil(this.destroy$),
+    ).subscribe(() => {
+      if (this.editMode) {
+        this.provider.institutionStatusId = this.provider.institutionStatusId || Constants.SOCIAL_GROUP_ID_ABSENT_VALUE;
+        this.PhotoFormGroup.patchValue(this.provider, { emitEvent: false });
+      }
+    });
+  }
+
+  ngOnDestroy(): void {
+    this.destroy$.next(true);
+    this.destroy$.unsubscribe();
   }
 }

src/app/shell/personal-cabinet/provider/provider-org-info/provider-org-info.component.html

@@ -58,6 +58,9 @@ <h5>Будинок</h5>
           <mat-tab label="Опис">
             <h5>Опис</h5>
             <p class="description">{{provider.description}}</p>
+            <h5>Статус</h5>
+            <p class="description">{{this.currentStatus}}</p>
+
           </mat-tab>
 
         </mat-tab-group>

src/app/shell/personal-cabinet/provider/provider-org-info/provider-org-info.component.ts

@@ -1,11 +1,17 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { MatTabChangeEvent } from '@angular/material/tabs';
-import { Select, Store } from '@ngxs/store';
-import { Observable } from 'rxjs';
+import { Actions, ofAction, ofActionSuccessful, Select, Store } from '@ngxs/store';
+import { Observable, Subject } from 'rxjs';
+import { distinctUntilChanged, filter, takeUntil } from 'rxjs/operators';
 import { createProviderSteps, OwnershipType, OwnershipTypeUkr, ProviderType, ProviderTypeUkr } from 'src/app/shared/enum/provider';
+import { InstitutionStatus } from 'src/app/shared/models/institutionStatus.model';
 import { Provider } from 'src/app/shared/models/provider.model';
-import { ActivateEditMode } from 'src/app/shared/store/app.actions';
+import { ActivateEditMode, ShowMessageBar } from 'src/app/shared/store/app.actions';
+import { GetInstitutionStatus } from 'src/app/shared/store/meta-data.actions';
+import { MetaDataState } from 'src/app/shared/store/meta-data.state';
+import { GetProfile } from 'src/app/shared/store/registration.actions';
 import { RegistrationState } from 'src/app/shared/store/registration.state';
+import { OnUpdateProviderSuccess } from 'src/app/shared/store/user.actions';
 
 @Component({
   selector: 'app-provider-org-info',
@@ -22,11 +28,30 @@ export class ProviderOrgInfoComponent implements OnInit {
 
   editLink: string = createProviderSteps[0];
 
-  @Select(RegistrationState.provider) provider$: Observable<Provider>;
+  @Select(RegistrationState.provider) 
+  provider$: Observable<Provider>;
+  @Select(MetaDataState.institutionStatuses)
+  institutionStatuses$: Observable<InstitutionStatus[]>;
+  destroy$: Subject<boolean> = new Subject<boolean>();
 
+  currentStatus: string;
   constructor(private store: Store) { }
 
-  ngOnInit(): void { }
+  ngOnDestroy(): void {
+    this.destroy$.next(true);
+    this.destroy$.unsubscribe();
+  }
+
+  ngOnInit(): void { 
+    this.store.dispatch(new GetInstitutionStatus());
+    this.institutionStatuses$.pipe(
+      filter(institutionStatuses => !!institutionStatuses.length),
+      takeUntil(this.destroy$),
+    ).subscribe((institutionStatuses) => {
+      const provider = this.store.selectSnapshot(RegistrationState.provider);
+      this.currentStatus = institutionStatuses.find((item) => +item.id === provider.institutionStatusId)?.name.toString() ?? 'Відсутній'
+    }); 
+  } 
 
   ActivateEditMode(): void {
     this.store.dispatch(new ActivateEditMode(true));