some changes about fee and tenancy mapping

This commit is contained in:
2021-09-09 11:36:01 +02:00
parent 3dfb7e2bf2
commit b394a16d7e
9 changed files with 332 additions and 136 deletions

View File

@ -5,7 +5,7 @@ import { MatTableDataSource } from '@angular/material/table';
import { ActivatedRoute, Router } from '@angular/router';
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 { ExtApiService } from '../ext-data-object-service';
import { MessageService } from '../message.service';
@Component({
@ -45,7 +45,7 @@ export class FlatDetailsComponent implements OnInit {
constructor(
private flatService: FlatService,
private premiseService: PremiseService,
private extOverheadAdvanceService: ExtOverheadAdvanceService,
private extApiService: ExtApiService,
private overheadAdvanceService: OverheadAdvanceService,
private overheadAdvanceFlatMappingService: OverheadAdvanceFlatMappingService,
private messageService: MessageService,
@ -59,7 +59,7 @@ 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.mappedOverheadAdvances = await this.extOverheadAdvanceService.getOverheadAdvancesByFlat(this.flat.id)
this.mappedOverheadAdvances = await this.extApiService.getOverheadAdvancesByFlat(this.flat.id)
this.dataSource = new MatTableDataSource<OverheadAdvance>(this.mappedOverheadAdvances)
}
} catch (err) {