saldo

default.conf

@@ -1,10 +1,9 @@
 server {
-	listen 80;
-	server_name hv-ui;
-	
-	location / {
-		location /usr/share/nginx/html;
-		try_files $uri $uri/ /index.html;
-	}
+  listen 80;
+  server_name hv-ui;
+  location / {
+    root /usr/share/nginx/html;
+    try_files $uri $uri/ /index.html;
+  }
 }
 

hv-ui/src/app/config.ts

@@ -1 +1 @@
-export const serviceBaseUrl = "http://172.16.3.32:5000";
+export const serviceBaseUrl = "http://172.16.10.29:5000";

hv-ui/src/app/mieter.ts

@@ -13,4 +13,5 @@ export interface Mieter {
     telefon: string;
     einzug: string;
     auszug: string;
+    saldo: number;
 }

hv-ui/src/app/mieters/mieters.component.html

@@ -3,7 +3,7 @@
 <ul>
     <li *ngFor="let mieter of mieters"
         routerLink="/mieter/{{mieter.id}}">
-        <span>{{mieter.vorname}} {{mieter.nachname}}</span>
+        <span>{{mieter.nachname}}, {{mieter.vorname}} ({{mieter.saldo}})</span>
     </li>
 </ul>
 </section>

hv-ui/src/app/mieters/mieters.component.ts

@@ -3,6 +3,9 @@ import { Component, OnInit } from '@angular/core';
 import { Mieter } from '../mieter';
 import { MieterService } from '../mieter.service';
 import { MessageService } from '../message.service';
+import { ZahlungForderungService} from '../zahlung-forderung.service'
+
+import { Saldo } from '../zahlung-forderung'
 
 
 @Component({
@@ -12,21 +15,38 @@ import { MessageService } from '../message.service';
 })
 export class MietersComponent implements OnInit {
 
-  mieters: Mieter[];
+  mieters: Mieter[]
+  year: string
+  selectedMieter : Mieter
 
-  selectedMieter : Mieter;
-
-  constructor(private mieterService: MieterService, private messageService: MessageService) { }
+  constructor(
+    private mieterService: MieterService, 
+    private zahlungForderungService: ZahlungForderungService,
+    private messageService: MessageService) {      
+  }
 
   async getMieters() {
     try {
-      this.mieters = await this.mieterService.getMieters();
+      this.mieters = await this.mieterService.getMieters();      
+    } catch (err) {
+      this.messageService.add(JSON.stringify(err, undefined, 4))
+    }
+  }
+
+  async loadSaldos() {
+    try {
+      this.mieters.forEach(async (m:Mieter) => {
+        let saldo: Saldo = await this.zahlungForderungService.getSaldoByMieterAndYear(m.id, +this.year)
+        m.saldo = saldo.saldo
+      })
     } catch (err) {
       this.messageService.add(JSON.stringify(err, undefined, 4))
     }
   }
 
   ngOnInit(): void {
+    this.year = new Date().getFullYear().toString()
     this.getMieters();
+    this.loadSaldos();
   }
 }