From 04e8abc487086416fa0c022665ad2c4b5b3eca5f Mon Sep 17 00:00:00 2001 From: Fuzi_fauzia Date: Mon, 1 Jul 2024 10:58:22 +0700 Subject: [PATCH] filter device --- src/app/_layout/footer/footer.component.html | 2 +- .../device-control.component.html | 2 +- .../device-control.component.ts | 45 +++---- .../monitoring/detail/detail.component.html | 2 +- .../monitoring/detail/detail.component.ts | 2 + .../service/monitoring-api.service.ts | 122 ++++++++++-------- src/app/login/login.component.html | 2 +- 7 files changed, 93 insertions(+), 84 deletions(-) diff --git a/src/app/_layout/footer/footer.component.html b/src/app/_layout/footer/footer.component.html index c76e469..99b9904 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: #000000 !important;" - >Smart Building Management Systems (V@2024-06-28.02) + >Smart Building Management Systems (V@2024-06-1.01)

diff --git a/src/app/content/hemat-app/device/device-control/device-control.component.html b/src/app/content/hemat-app/device/device-control/device-control.component.html index 623ecc7..77ff717 100644 --- a/src/app/content/hemat-app/device/device-control/device-control.component.html +++ b/src/app/content/hemat-app/device/device-control/device-control.component.html @@ -111,7 +111,7 @@ -
+
{ this.data = res; this.filteredRows = this.data.results.data; - console.log(this.filteredRows); + this.filteredDeviceRows = this.filterDevices(this.filteredRows); }); } + filterDevices(devices: any[]): any[] { + return devices.filter((device) => + device.mapping.some( + (map) => map.name.startsWith("switch") && map.type === "Boolean" + ) + ); + } + dataListMaster() { this.monitoringApiService.getMasterListData().subscribe((data) => { const dataCategory = data.data.find( @@ -152,15 +148,16 @@ export class DeviceControlComponent { switchChanged(ev, data) { console.log(ev); console.log(data); - const requestData = { - device_id: data.device_id, - switch: data.mapping[0].switch, - value: ev, - command_type: "on_off", - }; - this.deviceService.deviceSwitch(requestData).subscribe((res) => { - console.log(res); - }); + + // const requestData = { + // device_id: data.device_id, + // switch: data.mapping[0].switch, + // value: ev, + // command_type: "on_off", + // }; + // this.deviceService.deviceSwitch(requestData).subscribe((res) => { + // console.log(res); + // }); } addFieldValue() {} diff --git a/src/app/content/hemat-app/monitoring/detail/detail.component.html b/src/app/content/hemat-app/monitoring/detail/detail.component.html index bd4b76d..fac29d5 100644 --- a/src/app/content/hemat-app/monitoring/detail/detail.component.html +++ b/src/app/content/hemat-app/monitoring/detail/detail.component.html @@ -13,7 +13,7 @@
Kwh Consumption

- {{ topCard?.kwh_consumption.toFixed(1) }} Kwh + {{ topCard?.kwh_consumption ? topCard?.kwh_consumption.toFixed(1) : 0 }} Kwh

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 a19e4f1..fe038ee 100644 --- a/src/app/content/hemat-app/monitoring/detail/detail.component.ts +++ b/src/app/content/hemat-app/monitoring/detail/detail.component.ts @@ -195,6 +195,8 @@ export class DetailComponent { .getDashboardTopCard(buildingId) .subscribe((res) => { this.topCard = res.data; + console.log(this.topCard); + }); } dataEnergyMonitoringSummary(buildingId) { diff --git a/src/app/content/hemat-app/service/monitoring-api.service.ts b/src/app/content/hemat-app/service/monitoring-api.service.ts index d3f8f00..ac45db3 100644 --- a/src/app/content/hemat-app/service/monitoring-api.service.ts +++ b/src/app/content/hemat-app/service/monitoring-api.service.ts @@ -1,5 +1,5 @@ import { Injectable } from "@angular/core"; -import { HttpClient, HttpHeaders } from "@angular/common/http"; +import { HttpClient, HttpHeaders } from "@angular/common/http"; import { Observable } from "rxjs"; @Injectable({ @@ -11,8 +11,8 @@ export class BuildingService { postLogin(data: any): Observable { const url = `https://kapi.absys.ninja/hemat/users/login`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.post(url, data, { headers }); } @@ -20,8 +20,8 @@ export class BuildingService { listBuilding(): Observable { const url = `https://kapi.absys.ninja/hemat/building/dashboard/list`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.get(url, { headers }); } @@ -30,8 +30,8 @@ export class BuildingService { const url = `https://kapi.absys.ninja/hemat/building?page=${page}&limit=${limit}`; // const headers = new HttpHeaders().set('Content-Type', 'application/json'); const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.get(url, { headers }); } @@ -39,8 +39,8 @@ export class BuildingService { getRoomByBuildingId(buildingId: any): Observable { const url = `https://kapi.absys.ninja/hemat/room-building/list/byIds?buildingId=${buildingId}`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.get(url, { headers }); } @@ -48,8 +48,8 @@ export class BuildingService { getDeviceById(deviceId: any): Observable { const url = `https://kapi.absys.ninja/hemat/devices/${deviceId}`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.get(url, { headers }); } @@ -57,8 +57,8 @@ export class BuildingService { getMasterListData(): Observable { const url = `https://kapi.absys.ninja/hemat/header-param/list`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.get(url, { headers }); } @@ -66,17 +66,20 @@ export class BuildingService { getMasterData(page: number = 1, limit: number = 100): Observable { const url = `https://kapi.absys.ninja/hemat/header-param?page=${page}&limit=${limit}`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.get(url, { headers }); } - getMasterBuildingData(page: number = 1, limit: number = 100): Observable { + getMasterBuildingData( + page: number = 1, + limit: number = 100 + ): Observable { const url = `https://kapi.absys.ninja/hemat/building?page=${page}&limit=${limit}`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.get(url, { headers }); } @@ -84,8 +87,8 @@ export class BuildingService { getBuildingList(): Observable { const url = `https://kapi.absys.ninja/hemat/building/list`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.get(url, { headers }); } @@ -93,8 +96,8 @@ export class BuildingService { getListRoomData(): Observable { const url = `https://kapi.absys.ninja/hemat/room/list`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.get(url, { headers }); } @@ -102,17 +105,17 @@ export class BuildingService { getMasterRoomData(page: number = 1, limit: number = 100): Observable { const url = `https://kapi.absys.ninja/hemat/room?page=${page}&limit=${limit}`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.get(url, { headers }); } - getCostManagement(page: number = 1, limit: number = 100, ): Observable { + getCostManagement(page: number = 1, limit: number = 100): Observable { const url = `https://kapi.absys.ninja/hemat/cost_management?page=${page}&limit=${limit}&building_id=4&periode=2024-06`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.get(url, { headers }); } @@ -120,25 +123,25 @@ export class BuildingService { postHeaderDetailParam(data: any): Observable { const url = `https://kapi.absys.ninja/hemat/header-detail-param`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.post(url, data, { headers }); } putHeaderDetailParam(data: any, id: any): Observable { const url = `https://kapi.absys.ninja/hemat/header-detail-param/${id}`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.put(url, data, { headers }); } - + deleteHeaderDetailParam(id: any): Observable { const url = `https://kapi.absys.ninja/hemat/header-detail-param/${id}`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.delete(url, { headers }); } @@ -146,16 +149,16 @@ export class BuildingService { postMasterBuildingParam(data: any): Observable { const url = `https://kapi.absys.ninja/hemat/building`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.post(url, data, { headers }); } putMasterBuildingParam(data: any, id: any): Observable { const url = `https://kapi.absys.ninja/hemat/building/${id}`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.put(url, data, { headers }); } @@ -163,8 +166,8 @@ export class BuildingService { deleteMasterBuildingParam(id: any): Observable { const url = `https://kapi.absys.ninja/hemat/building/${id}`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.delete(url, { headers }); } @@ -172,16 +175,16 @@ export class BuildingService { postMasterRoomParam(data: any): Observable { const url = `https://kapi.absys.ninja/hemat/room`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.post(url, data, { headers }); } putMasterRoomParam(data: any, id: any): Observable { const url = `https://kapi.absys.ninja/hemat/room/${id}`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.put(url, data, { headers }); } @@ -189,8 +192,8 @@ export class BuildingService { postBatchBuilding(data: any): Observable { const url = `https://kapi.absys.ninja/hemat/room-building/post-batch/room`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.post(url, data, { headers }); } @@ -198,8 +201,8 @@ export class BuildingService { getBuildingRoomList(page: number = 1, limit: number = 100): Observable { const url = `https://kapi.absys.ninja/hemat/room-building?page=${page}&limit=${limit}`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.get(url, { headers }); } @@ -207,8 +210,8 @@ export class BuildingService { puttBuildingRoom(data: any, id: any): Observable { const url = `https://kapi.absys.ninja/hemat/room-building/${id}`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.put(url, data, { headers }); } @@ -216,8 +219,8 @@ export class BuildingService { putDevice(data: any, id: any): Observable { const url = `https://kapi.absys.ninja/hemat/devices/${id}`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.put(url, data, { headers }); } @@ -225,8 +228,8 @@ export class BuildingService { getRoomBuildingById(roomBuildingId: any): Observable { const url = `https://kapi.absys.ninja/hemat/room-building/${roomBuildingId}`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.get(url, { headers }); } @@ -234,9 +237,16 @@ export class BuildingService { deleteRoomBuilding(id: any): Observable { const url = `https://kapi.absys.ninja/hemat/room-building/${id}`; const headers = new HttpHeaders({ - 'Content-Type': 'application/json', - 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + "Content-Type": "application/json", + "x-api-key": "j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT", }); return this.http.delete(url, { headers }); } + + getDevicesWithSwitchMapping(devices: any[]): any[] { + return devices.filter((device) => + device.mapping.some((map: any) => map.name.includes('switch')) + // device.mapping.some((map: any) => console.log(map)) + ); + } } diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html index ccb6ed1..89ee29f 100644 --- a/src/app/login/login.component.html +++ b/src/app/login/login.component.html @@ -138,7 +138,7 @@

- (v@2024.06.28.02) + (v@2024.06.1.01)