changes for details

ui/hv2-ui/src/app/my-flats/my-flats.component.ts

@@ -1,31 +1,59 @@
 import { Component, OnInit } from '@angular/core';
 import { MessageService } from '../message.service';
-import { FlatService } from '../data-object-service';
-import { Flat } from '../data-objects';
+import { FlatService, PremiseService } from '../data-object-service';
+import { Flat, Premise } from '../data-objects';
 import { MatTableDataSource } from '@angular/material/table'
 
+interface DN_Flat {
+  flat: Flat
+  premise: Premise
+}
+
 @Component({
   selector: 'app-my-flats',
   templateUrl: './my-flats.component.html',
   styleUrls: ['./my-flats.component.css']
 })
 export class MyFlatsComponent implements OnInit {
-
   flats: Flat[]
-  dataSource: MatTableDataSource<Flat>
+  premises: Premise[]
+  dnFlats: DN_Flat[]
+
+  dataSource: MatTableDataSource<DN_Flat>
   displayedColumns: string[] = ["description", "premise", "area", "flat_no"]
 
-  constructor(private flatService: FlatService, private messageService: MessageService) { }
+  constructor(
+    private flatService: FlatService, 
+    private premiseService: PremiseService,
+    private messageService: MessageService
+  ) { }
 
   async getFlats(): Promise<void> {
     try {
       this.messageService.add("Trying to load flats")
       this.flats = await this.flatService.getFlats()
-      this.messageService.add("Flats loaded")
+      this.messageService.add(`Flats loaded: ${ JSON.stringify(this.flats, undefined, 4) }`)
+      this.messageService.add("Trying to load premises")
+      this.premises = await this.premiseService.getPremises()
+      this.messageService.add(`Premises loaded: ${ JSON.stringify(this.premises, undefined, 4) }`)
 
-      this.dataSource = new MatTableDataSource<Flat>(this.flats)
+      const premisesDict = new Map<number, Premise>()
+      for (let p of this.premises) {
+        this.messageService.add(`p2pd: ${p.id}`)
+        premisesDict.set(p.id, p)
+      }
+      this.messageService.add(`premisesDict: ${ JSON.stringify(premisesDict, undefined, 4) }`)
+      for (let f of this.flats) {
+        this.dnFlats.push({
+          flat: f,
+          premise: premisesDict.get(f.premise)
+        })
+      }
+      this.messageService.add(`dnFlats: { JSON.stringify(this.dnFlats, undefined, 4) }`)
+
+      this.dataSource = new MatTableDataSource<DN_Flat>(this.dnFlats)
     } catch (err) {
-      this.messageService.add(JSON.stringify(err, undefined, 4))
+      this.messageService.add(`Error in getFlats: ${ JSON.stringify(err, undefined, 4) }`)
     }
   }