From 3ef7dab91fd6ead3b3a52f55a8ea8b5760c34131 Mon Sep 17 00:00:00 2001
From: Fuzi_fauzia <fuzi.fauzia@allbestsistem.com>
Date: Wed, 10 Jul 2024 18:05:07 +0700
Subject: [PATCH] perbaikan master building

---
 .../add-edit-master.component.ts              |  4 +++-
 .../add-edit-master-building.component.html   |  4 ++--
 .../add-edit-master-building.component.ts     | 10 ++++++---
 .../master-building.component.html            |  4 ++--
 .../master-building.component.ts              |  2 ++
 .../add-edit-master-room.component.ts         |  6 ++---
 .../master-room/master-room.component.ts      | 22 +++++++++++++++++--
 .../service/monitoring-api.service.ts         |  1 +
 8 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/src/app/content/hemat-app/master/add-edit-master/add-edit-master.component.ts b/src/app/content/hemat-app/master/add-edit-master/add-edit-master.component.ts
index 83e556e..9719184 100644
--- a/src/app/content/hemat-app/master/add-edit-master/add-edit-master.component.ts
+++ b/src/app/content/hemat-app/master/add-edit-master/add-edit-master.component.ts
@@ -56,11 +56,13 @@ export class AddEditMasterComponent implements OnInit {
   }
 
   editForm() {
+    console.log(this.dataRow);
+    
     const formControls = {
       id: this.dataRow.id,
       name: [this.dataRow.name, Validators.required],
       status: [this.dataRow.status, Validators.required],
-      headerId: this.dataRow.headerId,
+      headerId: this.dataRow.header_id,
     };
 
     if (this.category) {
diff --git a/src/app/content/hemat-app/master/master-building/add-edit-master-building/add-edit-master-building.component.html b/src/app/content/hemat-app/master/master-building/add-edit-master-building/add-edit-master-building.component.html
index ec03242..405b432 100644
--- a/src/app/content/hemat-app/master/master-building/add-edit-master-building/add-edit-master-building.component.html
+++ b/src/app/content/hemat-app/master/master-building/add-edit-master-building/add-edit-master-building.component.html
@@ -1,5 +1,5 @@
 <div class="modal-header" style="background-color: #000000 !important">
-  <h4 class="modal-title" style="color: #ffffff">Add New Row</h4>
+  <h4 class="modal-title" style="color: #ffffff">{{labelModal}}</h4>
   <button type="button" class="close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
     <span aria-hidden="true">&times;</span>
   </button>
@@ -95,7 +95,7 @@
       <div class="form-group col-md-6">
         <label for="statusId" style="color: #ffffff">Status:</label>
         <select
-          id="projectinput5"
+          id="statusId"
           class="form-control"
           formControlName="statusId"
           [ngClass]="{'is-invalid': myForm.get('statusId').invalid && myForm.get('statusId').touched}"
diff --git a/src/app/content/hemat-app/master/master-building/add-edit-master-building/add-edit-master-building.component.ts b/src/app/content/hemat-app/master/master-building/add-edit-master-building/add-edit-master-building.component.ts
index ead1c6e..f34c0e2 100644
--- a/src/app/content/hemat-app/master/master-building/add-edit-master-building/add-edit-master-building.component.ts
+++ b/src/app/content/hemat-app/master/master-building/add-edit-master-building/add-edit-master-building.component.ts
@@ -18,7 +18,7 @@ export class AddEditMasterBuildingComponent {
   dataStatus: any[];
   filteredDataStatus: any[];
   dataMasterStatus: any;
-
+  labelModal: any;
   constructor(
     public activeModal: NgbActiveModal,
     private fb: FormBuilder,
@@ -30,7 +30,11 @@ export class AddEditMasterBuildingComponent {
     this.authService.checkTokenAndRedirect();
     this.createForm();
     this.listDataStatus();
-
+    if (this.mode === "add") {
+      this.labelModal = "Add Row"
+    } else {
+      this.labelModal = "Edit Row"
+    }
     if (this.dataRow) {
       this.editForm();
     }
@@ -52,7 +56,7 @@ export class AddEditMasterBuildingComponent {
     this.myForm = this.fb.group({
       id: this.dataRow.id,
       name: [this.dataRow.name, Validators.required],
-      statusId: [this.dataRow.statusId, Validators.required],
+      statusId: [this.dataRow.status_id, Validators.required],
       email: [this.dataRow.email, [Validators.required, Validators.email]],
       owner: [this.dataRow.owner, Validators.required],
       address: [this.dataRow.address, Validators.required],
diff --git a/src/app/content/hemat-app/master/master-building/master-building.component.html b/src/app/content/hemat-app/master/master-building/master-building.component.html
index baba52d..0f23282 100644
--- a/src/app/content/hemat-app/master/master-building/master-building.component.html
+++ b/src/app/content/hemat-app/master/master-building/master-building.component.html
@@ -139,7 +139,7 @@
                         </ng-template>
                       </ngx-datatable-column>
                       <ngx-datatable-column
-                        name="statusId"
+                        name="StatusName"
                         [flexGrow]="1"
                         [minWidth]="90"
                       >
@@ -151,7 +151,7 @@
                           let-value="value"
                         >
                           <p style="color: #ffffff">
-                            {{ value === 2 ? "Aktif" : "Nonaktif" }}
+                            {{ value }}
                           </p>
                         </ng-template>
                       </ngx-datatable-column>
diff --git a/src/app/content/hemat-app/master/master-building/master-building.component.ts b/src/app/content/hemat-app/master/master-building/master-building.component.ts
index d9d6d6c..c0475da 100644
--- a/src/app/content/hemat-app/master/master-building/master-building.component.ts
+++ b/src/app/content/hemat-app/master/master-building/master-building.component.ts
@@ -74,6 +74,8 @@ export class MasterBuildingComponent {
   openAddMasterModal() {
     const modalRef = this.modalService.open(AddEditMasterBuildingComponent, {
       size: "lg",
+      backdrop: 'static', 
+      keyboard: false 
     });
 
     modalRef.componentInstance.mode = "add";
diff --git a/src/app/content/hemat-app/master/master-room/add-edit-master-room/add-edit-master-room.component.ts b/src/app/content/hemat-app/master/master-room/add-edit-master-room/add-edit-master-room.component.ts
index 10584ce..36f1124 100644
--- a/src/app/content/hemat-app/master/master-room/add-edit-master-room/add-edit-master-room.component.ts
+++ b/src/app/content/hemat-app/master/master-room/add-edit-master-room/add-edit-master-room.component.ts
@@ -55,6 +55,8 @@ export class AddEditMasterRoomComponent {
   }
 
   editForm() {
+    console.log(this.dataRow);
+    
     this.myForm = this.fb.group({
       id: this.dataRow.id,
       name: [this.dataRow.roomEntity.name, Validators.required],
@@ -80,9 +82,7 @@ export class AddEditMasterRoomComponent {
   listDataBuilding() {
     this.monitoringApiService.getMasterBuildingData().subscribe((res) => {
       this.dataBuilding = res.results.data;
-      this.filteredDataBuilding = this.dataBuilding.filter(
-        (item) => item.statusId === 2
-      );
+      this.filteredDataBuilding = this.dataBuilding
     });
   }
 
diff --git a/src/app/content/hemat-app/master/master-room/master-room.component.ts b/src/app/content/hemat-app/master/master-room/master-room.component.ts
index a6e3ef6..7f8054d 100644
--- a/src/app/content/hemat-app/master/master-room/master-room.component.ts
+++ b/src/app/content/hemat-app/master/master-room/master-room.component.ts
@@ -109,6 +109,8 @@ export class MasterRoomComponent {
   }
 
   editRow(row) {
+    console.log(row);
+    
     const modalRef = this.modalService.open(AddEditMasterRoomComponent, {
       size: "lg",
       backdrop: "static", // Add this line
@@ -120,10 +122,26 @@ export class MasterRoomComponent {
     modalRef.result.then(
       (result) => {
         if (result) {
+          console.log(result);
+          const filteredData = {
+            id: result.id,
+            name: result.name,
+            description: result.description,
+          };
           this.monitoringApiService
-            .putMasterRoomParam(result, row.id)
+            .putMasterRoomParam(filteredData, row.id)
             .subscribe((res) => {
-              this.fetchData();
+              console.log(res);
+              const transformedData = {
+                buildingId: result.buildingId,
+                roomId: res.data.id,
+                statusId: result.statusId,
+              };
+              this.monitoringApiService
+                .puttBuildingRoom(transformedData, row.id)
+                .subscribe((res) => {
+                  this.fetchData();
+                });
             });
         }
       },
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 90f84eb..33427f9 100644
--- a/src/app/content/hemat-app/service/monitoring-api.service.ts
+++ b/src/app/content/hemat-app/service/monitoring-api.service.ts
@@ -180,6 +180,7 @@ export class BuildingService {
     });
     return this.http.post<any>(url, data, { headers });
   }
+  
   putMasterRoomParam(data: any, id: any): Observable<any> {
     const url = `https://kapi.absys.ninja/hemat/room/${id}`;
     const headers = new HttpHeaders({