diff --git a/src/app/content/hemat-app/cost-management/cost-management.component.ts b/src/app/content/hemat-app/cost-management/cost-management.component.ts
index 349a5c1..c72d750 100644
--- a/src/app/content/hemat-app/cost-management/cost-management.component.ts
+++ b/src/app/content/hemat-app/cost-management/cost-management.component.ts
@@ -132,7 +132,8 @@ export class CostManagementComponent implements OnInit {
 
   dataListBuilding() {
     this.monitoringApiService.getBuildingList().subscribe((data) => {
-      this.dataBuildingList = data.data.filter((item) => item.statusId === 2);
+      this.dataBuildingList = data.data.filter((item) => item.statusName.toLowerCase() === "aktif");
+      
     });
   }
 
diff --git a/src/app/content/hemat-app/device/device-control/device-control.component.ts b/src/app/content/hemat-app/device/device-control/device-control.component.ts
index e38805d..feed52a 100644
--- a/src/app/content/hemat-app/device/device-control/device-control.component.ts
+++ b/src/app/content/hemat-app/device/device-control/device-control.component.ts
@@ -99,7 +99,7 @@ export class DeviceControlComponent {
 
   dataListBuilding() {
     this.monitoringApiService.getBuildingList().subscribe((data) => {
-      this.dataBuildingList = data.data.filter((item) => item.statusId === 2);
+      this.dataBuildingList = data.data.filter((item) => item.statusName.toLowerCase() === "aktif");
     });
   }
 
diff --git a/src/app/content/hemat-app/device/device.component.ts b/src/app/content/hemat-app/device/device.component.ts
index 95b0fae..0b00886 100644
--- a/src/app/content/hemat-app/device/device.component.ts
+++ b/src/app/content/hemat-app/device/device.component.ts
@@ -169,7 +169,7 @@ export class DeviceComponent implements OnInit {
 
   dataListBuilding() {
     this.monitoringApiService.getBuildingList().subscribe((data) => {
-      this.dataBuildingList = data.data.filter((item) => item.statusId === 2);
+      this.dataBuildingList = data.data.filter((item) => item.statusName.toLowerCase() === "aktif");
     });
   }
 
diff --git a/src/app/content/hemat-app/monitoring/control-device-seemore/control-device-seemore.component.ts b/src/app/content/hemat-app/monitoring/control-device-seemore/control-device-seemore.component.ts
index eccfaeb..39f46af 100644
--- a/src/app/content/hemat-app/monitoring/control-device-seemore/control-device-seemore.component.ts
+++ b/src/app/content/hemat-app/monitoring/control-device-seemore/control-device-seemore.component.ts
@@ -111,7 +111,7 @@ export class ControlDeviceSeemoreComponent {
 
   dataListBuilding() {
     this.monitoringApiService.getBuildingList().subscribe((data) => {
-      this.dataBuildingList = data.data.filter((item) => item.statusId === 2);
+      this.dataBuildingList = data.data.filter((item) => item.statusName.toLowerCase() === "aktif");
     });
   }
 
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 86f698d..e99288d 100644
--- a/src/app/content/hemat-app/monitoring/detail/detail.component.ts
+++ b/src/app/content/hemat-app/monitoring/detail/detail.component.ts
@@ -258,6 +258,7 @@ export class DetailComponent {
         this.deviceCategory = res.data[0];
       });
   }
+
   dataEnergyChartKwhWater(buildingId) {
     this.energyMonitoringService
       .getDashboardChartKwhWater(buildingId)
@@ -276,6 +277,8 @@ export class DetailComponent {
 
         // Populate Appointment data at every multiple of 7
         let weekIndex = 0;
+        console.log(this.barChartData[0].data);
+        
         for (let i = 0; i < this.barChartData[0].data.length; i++) {
           if (i % 7 === 6 && weekIndex < weeklyKwh.length) {
             this.barChartData[2].data[i] = weeklyKwh[weekIndex++];