integrasi table device dan table master category

src/app/content/hemat-app/monitoring/building/building.component.html

@@ -43,7 +43,7 @@
                       class="text-muted mb-0"
                       style="font-family: Montserrat, sans-serif"
                     >
-                      {{ data.build_name }}
+                      {{ data.build_name ? data.build_name : data.name}}
                     </h3>
                   </div>
                 </div>

src/app/content/hemat-app/monitoring/building/building.component.ts

@@ -48,10 +48,25 @@ export class BuildingComponent {
       },
     };
     this.fetchData();
-    this.buildingData();
+    // this.buildingData();
   }
 
   fetchData() {
+    // this.monitoringApiService.getBuildingData().subscribe((res) => {
+    //   this.data = res;
+    //   this.filteredRows = res.data;
+    //   console.log(this.filteredRows);
+      
+    //   this.dataTop = [];
+    //   for (let i = 0; i < res.length; i++) {
+    //     if (res[i].topUse.label[i]) {
+    //       this.dataTop.push({
+    //         label: res[i].topUse.label ? res[i].topUse.label : '',
+    //         value: res[i].topUse.value ? res[i].topUse.value : 0,
+    //       });
+    //     }
+    //   }
+    // });
     this.monitoringService.getMonitoringBuildingData().subscribe((res) => {
       this.data = res;
       this.filteredRows = res;