perbaikan master

2024-07-10 16:38:19 +07:00
parent 2194d2f720
commit 8d9840acec
23 changed files with 41 additions and 39 deletions
--- 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
@@ -76,7 +76,7 @@ export class AddEditMasterComponent implements OnInit {
      const dataCategory = data.data.find(
        (item) => item.name === "master_status"
      ).headerDetailParam;
-      this.dataMasterStatus = dataCategory.filter(item => item.status === "2");
+      this.dataMasterStatus = dataCategory.filter(item => item.statusName.toLowerCase() === "aktif");
    });
  }

--- 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,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}"
        />
--- 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
@@ -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"
      );
    });
  }
--- 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
@@ -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;
--- a/src/app/content/hemat-app/master/master-category/master-category.component.html
+++ b/src/app/content/hemat-app/master/master-category/master-category.component.html
@@ -94,7 +94,7 @@
                        </ng-template>
                      </ngx-datatable-column>
                      <ngx-datatable-column
-                        name="Status"
+                        name="StatusName"
                        [flexGrow]="1"
                        [minWidth]="90"
                      >
@@ -105,7 +105,7 @@
                          ngx-datatable-cell-template
                          let-value="value"
                        >
-                        <p style="color: #ffffff">{{ value === "2" ? "Aktif" : "Nonaktif" }}</p>
+                        <p style="color: #ffffff">{{ value}}</p>
                        </ng-template>
                      </ngx-datatable-column>
                      <ngx-datatable-column
--- a/src/app/content/hemat-app/master/master-category/master-category.component.ts
+++ b/src/app/content/hemat-app/master/master-category/master-category.component.ts
@@ -75,8 +75,6 @@ export class MasterCategoryComponent implements OnInit {
  }

  rowContainsSearchTerm(row: any): boolean {
-    console.log(row);
-    
    const searchTermLC = this.searchTerm.toLowerCase();
    console.log(searchTermLC);
    
--- a/src/app/content/hemat-app/master/master-duration-use/master-duration-use.component.html
+++ b/src/app/content/hemat-app/master/master-duration-use/master-duration-use.component.html
@@ -79,7 +79,7 @@
                        </ng-template>
                      </ngx-datatable-column>
                      <ngx-datatable-column
-                        name="Status"
+                        name="StatusName"
                        [flexGrow]="1"
                        [minWidth]="90"
                      >
@@ -90,7 +90,7 @@
                          ngx-datatable-cell-template
                          let-value="value"
                        >
-                        <p style="color: #ffffff">{{ value === "2" ? "Aktif" : "Nonaktif" }}</p>
+                        <p style="color: #ffffff">{{ value }}</p>
                        </ng-template>
                      </ngx-datatable-column>
                      <ngx-datatable-column
--- a/src/app/content/hemat-app/master/master-floor/master-floor.component.html
+++ b/src/app/content/hemat-app/master/master-floor/master-floor.component.html
@@ -74,7 +74,7 @@
                        </ng-template>
                      </ngx-datatable-column>
                      <ngx-datatable-column
-                        name="Status"
+                        name="StatusName"
                        [flexGrow]="1"
                        [minWidth]="90"
                      >
@@ -86,7 +86,7 @@
                          let-value="value"
                        >
                          <p style="color: #ffffff">
-                            {{ value === "2" ? "Aktif" : "Nonaktif" }}
+                            {{ value }}
                          </p>
                        </ng-template>
                      </ngx-datatable-column>
--- a/src/app/content/hemat-app/master/master-role/master-role.component.html
+++ b/src/app/content/hemat-app/master/master-role/master-role.component.html
@@ -83,7 +83,7 @@
                        </ng-template>
                      </ngx-datatable-column>
                      <ngx-datatable-column
-                        name="Status"
+                        name="StatusName"
                        [flexGrow]="1"
                        [minWidth]="90"
                      >
@@ -95,7 +95,7 @@
                          let-value="value"
                        >
                          <p style="color: #ffffff">
-                            {{ value === "2" ? "Aktif" : "Nonaktif" }}
+                            {{ value }}
                          </p>
                        </ng-template>
                      </ngx-datatable-column>
--- 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
@@ -72,7 +72,7 @@ export class AddEditMasterRoomComponent {
      );
      this.dataStatus = this.dataMasterStatus.headerDetailParam;
      this.filteredDataStatus = this.dataStatus.filter(
-        (item) => item.status === "2"
+        (item) => item.statusName.toLowerCase() === "aktif"
      );
    });
  }
--- a/src/app/content/hemat-app/master/master-status/master-status.component.html
+++ b/src/app/content/hemat-app/master/master-status/master-status.component.html
@@ -79,7 +79,7 @@
                        </ng-template>
                      </ngx-datatable-column>
                      <ngx-datatable-column
-                        name="Status"
+                        name="StatusName"
                        [flexGrow]="1"
                        [minWidth]="90"
                      >
@@ -91,7 +91,7 @@
                          let-value="value"
                        >
                          <p style="color: #ffffff">
-                            {{ value === "2" ? "Aktif" : "Nonaktif" }}
+                            {{ value }}
                          </p>
                        </ng-template>
                      </ngx-datatable-column>
--- a/src/app/content/hemat-app/master/master-type/master-type.component.html
+++ b/src/app/content/hemat-app/master/master-type/master-type.component.html
@@ -79,7 +79,7 @@
                        </ng-template>
                      </ngx-datatable-column>
                      <ngx-datatable-column
-                        name="Status"
+                        name="StatusName"
                        [flexGrow]="1"
                        [minWidth]="90"
                      >
--- a/src/app/content/hemat-app/master/master-voltage/master-voltage.component.html
+++ b/src/app/content/hemat-app/master/master-voltage/master-voltage.component.html
@@ -79,7 +79,7 @@
                        </ng-template>
                      </ngx-datatable-column>
                      <ngx-datatable-column
-                        name="Status"
+                        name="StatusName"
                        [flexGrow]="1"
                        [minWidth]="90"
                      >