overhead advance mapping

ui/hv2-ui/src/app/flat-details/flat-details.component.css

@@ -6,3 +6,6 @@ table {
     flex: 1 1 auto;
 }
 
+#addoverheadfield {
+    margin-right: 15px;
+}

ui/hv2-ui/src/app/flat-details/flat-details.component.html

@@ -63,9 +63,21 @@
                         <td mat-cell *matCellDef="let element">{{element.enddate}}</td>
                     </ng-container>
                     <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-                    <tr mat-row *matRowDef="let row; columns: displayedColumns;" [routerLink]="['/overheadadvance/', row.id]"></tr>
+                    <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
                 </table>
             </div>
+            <div>
+                <form (ngSubmit)="addOverheadAdvance()">
+                    <mat-form-field appearance="standard" id="addoverheadfield">
+                        <mat-label>Betriebskostensatz</mat-label>
+                        <mat-select #mapSelect [(ngModel)]="selectedOverheadAdvance" name="overheadadvance">
+                            <mat-option *ngFor="let p of allOverheadAdvances" [value]="p.id">{{p.description}} {{p.startdate}}</mat-option>
+                        </mat-select>
+                    </mat-form-field>
+                    <button #mapButton type="submit" mat-raised-button color="primary">Zuordnen</button>
+                </form>
+
+            </div>
 
         </mat-card-content>
     </mat-card>

ui/hv2-ui/src/app/flat-details/flat-details.component.ts

@@ -1,8 +1,9 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { MatButton } from '@angular/material/button';
+import { MatSelect } from '@angular/material/select';
 import { MatTableDataSource } from '@angular/material/table';
 import { ActivatedRoute, Router } from '@angular/router';
-import { FlatService, OverheadAdvanceFlatMappingService, PremiseService } from '../data-object-service';
+import { FlatService, OverheadAdvanceFlatMappingService, OverheadAdvanceService, PremiseService } from '../data-object-service';
 import { Flat, OverheadAdvance, OverheadAdvanceFlatMapping, Premise } from '../data-objects';
 import { ExtOverheadAdvanceService } from '../ext-data-object-service';
 import { MessageService } from '../message.service';
@@ -31,16 +32,22 @@ export class FlatDetailsComponent implements OnInit {
   }
 
   premises: Premise[]
-  overheadAdvances: OverheadAdvance[]
+  mappedOverheadAdvances: OverheadAdvance[]
+  allOverheadAdvances: OverheadAdvance[]
+  selectedOverheadAdvance: number
   dataSource: MatTableDataSource<OverheadAdvance>
   displayedColumns: string[] = [ "description", "amount", "startdate", "enddate" ]
 
   @ViewChild('submitButton') submitButton: MatButton
+  @ViewChild('mapButton') mapButton: MatButton
+  @ViewChild('mapSelect') mapSelect: MatSelect
 
   constructor(
     private flatService: FlatService,
     private premiseService: PremiseService,
     private extOverheadAdvanceService: ExtOverheadAdvanceService,
+    private overheadAdvanceService: OverheadAdvanceService,
+    private overheadAdvanceFlatMappingService: OverheadAdvanceFlatMappingService,
     private messageService: MessageService,
     private route: ActivatedRoute,
     private router: Router
@@ -52,8 +59,8 @@ export class FlatDetailsComponent implements OnInit {
       if (id != 0) {
         this.flat = await this.flatService.getFlat(id)
         this.premise = await this.premiseService.getPremise(this.flat.premise)
-        this.overheadAdvances = await this.extOverheadAdvanceService.getOverheadAdvancesByFlat(this.flat.id)
+        this.mappedOverheadAdvances = await this.extOverheadAdvanceService.getOverheadAdvancesByFlat(this.flat.id)
-        this.dataSource = new MatTableDataSource<OverheadAdvance>(this.overheadAdvances)
+        this.dataSource = new MatTableDataSource<OverheadAdvance>(this.mappedOverheadAdvances)
       }
     } catch (err) {
       throw err
@@ -71,6 +78,16 @@ export class FlatDetailsComponent implements OnInit {
     }
   }
 
+  async getOverheadAdvances(): Promise<void> {
+    try {
+      this.messageService.add("Trying to load overheadadvances")
+      this.allOverheadAdvances = await this.overheadAdvanceService.getOverheadAdvances()
+      this.messageService.add("overheadadvances loaded")
+    } catch (err) {
+      this.messageService.add(JSON.stringify(err, undefined, 4))
+    }
+  }
+
 
 
   async saveFlat() {
@@ -92,8 +109,27 @@ export class FlatDetailsComponent implements OnInit {
     }
   }
 
+  async addOverheadAdvance() {
+    try {
+      this.mapButton.disabled = true
+      this.messageService.add(`addOverheadAdvance: ${ JSON.stringify(this.selectedOverheadAdvance, undefined, 4) }`)
+      let newMapping: OverheadAdvanceFlatMapping = {
+        'flat': this.flat.id,
+        'overhead_advance': this.selectedOverheadAdvance,
+        'id': 0
+      }
+      newMapping = await this.overheadAdvanceFlatMappingService.postOverheadAdvanceFlatMapping(newMapping)
+      this.messageService.add(`New overheadadvance flat mapping created: ${newMapping.id}`)
+      this.selectedOverheadAdvance = undefined
+      this.getFlat()
+    } finally {
+      this.mapButton.disabled = false
+    }
+  }
+
   ngOnInit(): void {
     this.getPremises()
+    this.getOverheadAdvances()
     this.getFlat()
   }