From b5cf71d00859231e05054085c5509c0c54d18a42 Mon Sep 17 00:00:00 2001 From: Fuzi_fauzia Date: Mon, 19 Aug 2024 10:06:37 +0700 Subject: [PATCH] penambahan route floor dan room --- .../monitoring/building/building.component.ts | 12 ++++++++++-- .../hemat-app/monitoring/detail/detail.component.ts | 4 ++-- .../hemat-app/monitoring/monitoring.module.ts | 13 ++++++++++++- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/app/content/hemat-app/monitoring/building/building.component.ts b/src/app/content/hemat-app/monitoring/building/building.component.ts index a5b2c25..5345aa5 100644 --- a/src/app/content/hemat-app/monitoring/building/building.component.ts +++ b/src/app/content/hemat-app/monitoring/building/building.component.ts @@ -115,9 +115,17 @@ export class BuildingComponent { } viewDetail(row) { - console.log(row); + if (row.building_id !== undefined && row.floor_id === undefined) { + this.router.navigate(["/monitoring/view-detail-floor", row.id]); + } else if (row.building_id !== undefined && row.floor_id !== undefined) { + this.router.navigate(["/monitoring/view-detail-room", row.id]); + } else { + this.router.navigate(["/monitoring/view-detail-building", row.id]); + } + console.log(row.floor_id); + console.log(row.building_id); - this.router.navigate(["/monitoring/view-detail", row.id]); + // this.router.navigate(["/monitoring/view-detail", row.id]); } editRow(row) { diff --git a/src/app/content/hemat-app/monitoring/detail/detail.component.ts b/src/app/content/hemat-app/monitoring/detail/detail.component.ts index 5107e16..e6657e8 100644 --- a/src/app/content/hemat-app/monitoring/detail/detail.component.ts +++ b/src/app/content/hemat-app/monitoring/detail/detail.component.ts @@ -85,10 +85,10 @@ export class DetailComponent { }); this.breadcrumbLink(); this.route.params.subscribe((params) => { - const buildingId = params["buildingId"]; + const buildingId = params["id"]; console.log(buildingId); - this.paramsId = params["buildingId"]; + this.paramsId = params["id"]; if (buildingId) { this.dataEnergyMonitoringTopCard(buildingId); this.dataEnergyMonitoringSummary(buildingId); diff --git a/src/app/content/hemat-app/monitoring/monitoring.module.ts b/src/app/content/hemat-app/monitoring/monitoring.module.ts index e6964fc..34fa782 100644 --- a/src/app/content/hemat-app/monitoring/monitoring.module.ts +++ b/src/app/content/hemat-app/monitoring/monitoring.module.ts @@ -90,10 +90,21 @@ import { ClipboardModule } from 'ngx-clipboard'; data: { mode: 'room' } }, { - path: 'view-detail/:buildingId', + path: 'view-detail-building/:id', component: DetailComponent, data: { mode: 'building' } }, + { + path: 'view-detail-floor/:id', + component: DetailComponent, + data: { mode: 'floor' } + }, + { + path: 'view-detail-room/:id', + component: DetailComponent, + data: { mode: 'room' } + }, + { path: 'view-new-room/:id', component: DetailComponent,