#38 - Fix Solution form for 'Confiscare' stage

src/app/assets/components/edit-solution/edit-solution.component.html

@@ -159,6 +159,19 @@ <h3>Stare actuala bun: [ {{ getCurrentStage() }} ]</h3>
       </mat-form-field>
     </div>
 
+    <div class="column" *ngIf="solutionForm.controls.recoveryBeneficiaryId">
+      <mat-form-field>
+        <mat-select placeholder="Autoritatea catre care se fac despagubirile" name="recoveryBeneficiaryId"
+                    formControlName="recoveryBeneficiaryId"
+                    required
+        >
+          <mat-option *ngFor="let theBeneficiary of recoveryBeneficiaries" [value]="theBeneficiary.id">
+            {{ theBeneficiary.name }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+    </div>
+
     <div class="separator"></div>
 
     <mat-form-field>

src/app/assets/components/edit-solution/edit-solution.component.ts

@@ -4,6 +4,7 @@ import {
   Decision,
   Institution,
   PrecautionaryMeasure,
+  RecoveryBeneficiary,
   RecoveryDetails,
   Solution,
   SolutionDetails,
@@ -46,6 +47,7 @@ export class EditSolutionComponent implements OnInit {
   @Input() decisions: Decision[];
   @Input() stages: Stage[];
   @Input() precautionaryMeasures: PrecautionaryMeasure[];
+  @Input() recoveryBeneficiaries: RecoveryBeneficiary[];
   @Output() onUpdate: EventEmitter<Solution> = new EventEmitter<Solution>();
   @Output() onCancel: EventEmitter<Solution> = new EventEmitter<Solution>();
   @Output() onSave: EventEmitter<Solution> = new EventEmitter<Solution>();
@@ -156,6 +158,13 @@ export class EditSolutionComponent implements OnInit {
         }
         break;
       }
+
+      case 'confiscare': {
+        if (!this.solutionForm.contains('recoveryBeneficiaryId')) {
+          this.solutionForm.addControl('recoveryBeneficiaryId', new FormControl('', [Validators.required]));
+        }
+        break;
+      }
     }
   }
 

src/app/assets/containers/asset-detail/asset-detail.component.html

@@ -80,6 +80,7 @@ <h2>Adauga proprietati</h2>
         [decisions]="decisions$ | async"
         [stages]="stages$ | async"
         [precautionaryMeasures]="(precautionaryMeasures$ | async)"
+        [recoveryBeneficiaries]="(recoveryBeneficiaries$ | async)"
         (onUpdate)="onPropertyUpdate($event)"
         (onCancel)="onPropertyCancel($event)"
         (onSave)="onPropertySave($event)"

src/app/assets/containers/asset-detail/asset-detail.component.ts

@@ -12,6 +12,7 @@ import {
   Defendant,
   Institution,
   PrecautionaryMeasure,
+  RecoveryBeneficiary,
   Solution,
   Stage,
   StorageSpace
@@ -45,6 +46,7 @@ export class AssetDetailComponent implements OnInit {
   private decisions$: Observable<Decision[]>;
   private stages$: Observable<Stage[]>;
   private precautionaryMeasures$: Observable<PrecautionaryMeasure[]>;
+  private recoveryBeneficiaries$: Observable<RecoveryBeneficiary[]>;
   private assetProperty$: Observable<AssetProperty>;
 
   private categories$: Observable<Category[]> = this.store.pipe(select(fromStore.getAssetParentCategories));
@@ -79,6 +81,7 @@ export class AssetDetailComponent implements OnInit {
       this.decisions$ = this.store.pipe(select(fromStore.getAllDecisions));
       this.stages$ = this.store.pipe(select(fromStore.getAllStages));
       this.precautionaryMeasures$ = this.store.pipe(select(fromStore.getAllPrecautionaryMeasures));
+      this.recoveryBeneficiaries$ = this.store.pipe(select(fromStore.getAllRecoveryBeneficiaries));
     });
 
     this.asset$.pipe(take(1))

src/app/assets/guards/assets.guard.ts

@@ -38,7 +38,14 @@ export class AssetsGuard implements CanActivate {
       this.store.pipe(select(fromStore.getInstitutionsLoaded)),
       this.store.pipe(select(fromStore.getDecisionsLoaded)),
       this.store.pipe(select(fromStore.getPrecautionaryMeasuresLoaded)),
-      (aAssetsLoaded: boolean, aInstitutionsLoaded: boolean, aDecisionsLoaded: boolean, aMeasuresLoaded: boolean) => {
+      this.store.pipe(select(fromStore.getRecoveryBeneficiariesLoaded)),
+      (
+        aAssetsLoaded: boolean,
+        aInstitutionsLoaded: boolean,
+        aDecisionsLoaded: boolean,
+        aMeasuresLoaded: boolean,
+        aBeneficiariesLoaded: boolean
+      ) => {
         let allLoaded = true;
         if (!aAssetsLoaded) {
           this.store.dispatch(new fromStore.LoadAssets());
@@ -60,6 +67,11 @@ export class AssetsGuard implements CanActivate {
           allLoaded = false;
         }
 
+        if (!aBeneficiariesLoaded) {
+          this.store.dispatch(new fromStore.LoadRecoveryBeneficiaries());
+          allLoaded = false;
+        }
+
         return allLoaded;
       }
     ).pipe(