hv2/hv2-all-in-one
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2021-09-10 12:40:48 +02:00
parent 2da6b667bc
commit 2a23d88dd9
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ui/hv2-ui/src/app/fee-list/fee-list.component.html
View File

@ -16,7 +16,7 @@
</ng-container> </ng-container>
<ng-container matColumnDef="amount"> <ng-container matColumnDef="amount">
<th mat-header-cell *matHeaderCellDef>Betrag</th> <th mat-header-cell *matHeaderCellDef>Betrag</th>
<td mat-cell *matCellDef="let element">{{element.amount}} €</td> <td mat-cell *matCellDef="let element">{{element.amount | number:'1.2-2'}} €</td>
</ng-container> </ng-container>
<ng-container matColumnDef="fee_type"> <ng-container matColumnDef="fee_type">
<th mat-header-cell *matHeaderCellDef>Typ</th> <th mat-header-cell *matHeaderCellDef>Typ</th>
@ -24,11 +24,11 @@
</ng-container> </ng-container>
<ng-container matColumnDef="startdate"> <ng-container matColumnDef="startdate">
<th mat-header-cell *matHeaderCellDef>Beginn</th> <th mat-header-cell *matHeaderCellDef>Beginn</th>
<td mat-cell *matCellDef="let element">{{element.startdate}}</td> <td mat-cell *matCellDef="let element">{{element.startdate | date}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="enddate"> <ng-container matColumnDef="enddate">
<th mat-header-cell *matHeaderCellDef>Ende</th> <th mat-header-cell *matHeaderCellDef>Ende</th>
<td mat-cell *matCellDef="let element">{{element.enddate}}</td> <td mat-cell *matCellDef="let element">{{element.enddate | date}}</td>
</ng-container> </ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;" [routerLink]="['/fee/', row.id]"></tr> <tr mat-row *matRowDef="let row; columns: displayedColumns;" [routerLink]="['/fee/', row.id]"></tr>

7
ui/hv2-ui/src/app/flat-details/flat-details.component.ts
View File

@ -44,11 +44,17 @@ export class FlatDetailsComponent implements OnInit {
async getFlat(): Promise<void> { async getFlat(): Promise<void> {
try { try {
const id = +this.route.snapshot.paramMap.get('id') const id = +this.route.snapshot.paramMap.get('id')
this.messageService.add(`getFlat ${id}`)
if (id != 0) { if (id != 0) {
this.flat = await this.flatService.getFlat(id) this.flat = await this.flatService.getFlat(id)
this.premise = await this.premiseService.getPremise(this.flat.premise) this.premise = await this.premiseService.getPremise(this.flat.premise)
this.mappedOverheadAdvances = await this.extApiService.getOverheadAdvancesByFlat(this.flat.id) this.mappedOverheadAdvances = await this.extApiService.getOverheadAdvancesByFlat(this.flat.id)
this.dataSource = new MatTableDataSource<OverheadAdvance>(this.mappedOverheadAdvances) this.dataSource = new MatTableDataSource<OverheadAdvance>(this.mappedOverheadAdvances)
} else {
this.flat = NULL_Flat
this.premise = NULL_Premise
this.mappedOverheadAdvances = undefined
this.dataSource = undefined
} }
} catch (err) { } catch (err) {
throw err throw err
@ -116,6 +122,7 @@ export class FlatDetailsComponent implements OnInit {
} }
ngOnInit(): void { ngOnInit(): void {
this.messageService.add("FlatDetailsComponent.ngOnInit")
this.getPremises() this.getPremises()
this.getOverheadAdvances() this.getOverheadAdvances()
this.getFlat() this.getFlat()

6
ui/hv2-ui/src/app/overhead-advance-list/overhead-advance-list.component.html
View File

@ -16,15 +16,15 @@
</ng-container> </ng-container>
<ng-container matColumnDef="amount"> <ng-container matColumnDef="amount">
<th mat-header-cell *matHeaderCellDef>Betrag</th> <th mat-header-cell *matHeaderCellDef>Betrag</th>
<td mat-cell *matCellDef="let element">{{element.amount}} €</td> <td mat-cell *matCellDef="let element">{{element.amount | number:'1.2-2'}} €</td>
</ng-container> </ng-container>
<ng-container matColumnDef="startdate"> <ng-container matColumnDef="startdate">
<th mat-header-cell *matHeaderCellDef>Beginn</th> <th mat-header-cell *matHeaderCellDef>Beginn</th>
<td mat-cell *matCellDef="let element">{{element.startdate}}</td> <td mat-cell *matCellDef="let element">{{element.startdate | date}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="enddate"> <ng-container matColumnDef="enddate">
<th mat-header-cell *matHeaderCellDef>Ende</th> <th mat-header-cell *matHeaderCellDef>Ende</th>
<td mat-cell *matCellDef="let element">{{element.enddate}}</td> <td mat-cell *matCellDef="let element">{{element.enddate | date}}</td>
</ng-container> </ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> <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;" [routerLink]="['/overheadadvance/', row.id]"></tr>