perbaikan master

src/app/content/hemat-app/master/master-building/add-edit-master-building/add-edit-master-building.component.html

@@ -1,6 +1,6 @@
 <div class="modal-header" style="background-color: #000000 !important">
   <h4 class="modal-title" style="color: #ffffff">Add New Row</h4>
-  <button type="button" class="close" aria-label="Close">
+  <button type="button" class="close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
     <span aria-hidden="true">&times;</span>
   </button>
 </div>
@@ -42,6 +42,7 @@
           class="form-control"
           id="phone"
           formControlName="phone"
+          pattern="^[0-9]*$"
           maxlength="13"
           [ngClass]="{'is-invalid': myForm.get('phone').invalid && myForm.get('phone').touched}"
         />
@@ -55,6 +56,7 @@
           type="text"
           class="form-control"
           id="owner"
+          maxlength="30"
           formControlName="owner"
           [ngClass]="{'is-invalid': myForm.get('owner').invalid && myForm.get('owner').touched}"
         />

src/app/content/hemat-app/master/master-building/add-edit-master-building/add-edit-master-building.component.ts

@@ -40,10 +40,10 @@ export class AddEditMasterBuildingComponent {
     this.myForm = this.fb.group({
       name: ["", Validators.required],
       statusId: ["", Validators.required],
-      email: ["", [Validators.required, Validators.email]],
+      email: ["", [Validators.required, Validators.pattern(/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/)]],
       owner: ["", Validators.required],
       address: ["", Validators.required],
-      phone: ["", [Validators.required, Validators.pattern("^[0-9]*$")]],
+      phone: ["", [Validators.required, Validators.pattern(/^[0-9]{10,15}$/)]],
       kwh: ["", Validators.required],
     });
   }
@@ -74,7 +74,7 @@ export class AddEditMasterBuildingComponent {
       console.log(this.dataStatus);
 
       this.filteredDataStatus = this.dataStatus.filter(
-        (item) => item.status === "2"
+        (item) => item.statusName.toLowerCase() === "aktif"
       );
     });
   }

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

@@ -96,6 +96,8 @@ export class MasterBuildingComponent {
   editRow(row) {
     const modalRef = this.modalService.open(AddEditMasterBuildingComponent, {
       size: "lg",
+      backdrop: 'static', 
+      keyboard: false 
     });
 
     modalRef.componentInstance.dataRow = row;