diff --git a/src/app/_layout/footer/footer.component.html b/src/app/_layout/footer/footer.component.html index 144fea6..7e3d083 100644 --- a/src/app/_layout/footer/footer.component.html +++ b/src/app/_layout/footer/footer.component.html @@ -13,7 +13,7 @@ href="https://allbestsistem.com/" target="_blank" style="background-color: #ffffff !important;" - >Smart Building Management Systems (V@2024-08-8.13) + >Smart Building Management Systems (V@2024-08-19.1)

diff --git a/src/app/content/hemat-app/monitoring/building/building.component.html b/src/app/content/hemat-app/monitoring/building/building.component.html index 2b97b6d..d31a401 100644 --- a/src/app/content/hemat-app/monitoring/building/building.component.html +++ b/src/app/content/hemat-app/monitoring/building/building.component.html @@ -132,7 +132,7 @@ 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 261b459..a5b2c25 100644 --- a/src/app/content/hemat-app/monitoring/building/building.component.ts +++ b/src/app/content/hemat-app/monitoring/building/building.component.ts @@ -96,7 +96,6 @@ export class BuildingComponent { this.deviceService.filterDashboard(buildingId, floorId).subscribe((res) => { this.filteredRows = res.data; this.typeData = this.filteredRows[0].type; - console.log(this.filteredRows[0].type); if (this.typeData === "building") { this.labelData = "Building"; } else if (this.typeData === "floor") { @@ -115,8 +114,10 @@ export class BuildingComponent { }, 3000); } - viewRow(row) { - this.router.navigate(["/monitoring/view-new-building", row.id]); + viewDetail(row) { + console.log(row); + + 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 9ef5c26..5107e16 100644 --- a/src/app/content/hemat-app/monitoring/detail/detail.component.ts +++ b/src/app/content/hemat-app/monitoring/detail/detail.component.ts @@ -85,8 +85,10 @@ export class DetailComponent { }); this.breadcrumbLink(); this.route.params.subscribe((params) => { - const buildingId = params["id"]; - this.paramsId = params["id"]; + const buildingId = params["buildingId"]; + console.log(buildingId); + + this.paramsId = params["buildingId"]; 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 8b23e88..e6964fc 100644 --- a/src/app/content/hemat-app/monitoring/monitoring.module.ts +++ b/src/app/content/hemat-app/monitoring/monitoring.module.ts @@ -90,9 +90,9 @@ import { ClipboardModule } from 'ngx-clipboard'; data: { mode: 'room' } }, { - path: 'view-new-building/:id', + path: 'view-detail/:buildingId', component: DetailComponent, - data: { mode: 'build' } + data: { mode: 'building' } }, { path: 'view-new-room/:id', diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html index 34540ab..7d70b4e 100644 --- a/src/app/login/login.component.html +++ b/src/app/login/login.component.html @@ -138,7 +138,7 @@

- (v@2024.08.8.13) + (v@2024.08.19.1)