perbaikan profil, update password dan master

src/app/_layout/footer/footer.component.html

@@ -13,7 +13,7 @@
         href="https://allbestsistem.com/"
         target="_blank"
         style="background-color: #000000 !important;"
-        >Smart Building Management Systems (V@2024-07-11.02)
+        >Smart Building Management Systems (V@2024-07-11.03)
       </a></span
     >
   </p>

src/app/content/hemat-app/master/master-type/master-type.component.html

@@ -91,7 +91,7 @@
                           let-value="value"
                         >
                           <p style="color: #ffffff">
-                            {{ value === "2" ? "Aktif" : "Nonaktif" }}
+                            {{ value }}
                           </p>
                         </ng-template>
                       </ngx-datatable-column>

src/app/content/hemat-app/master/master-voltage/master-voltage.component.html

@@ -91,7 +91,7 @@
                           let-value="value"
                         >
                           <p style="color: #ffffff">
-                            {{ value === "2" ? "Aktif" : "Nonaktif" }}
+                            {{ value }}
                           </p>
                         </ng-template>
                       </ngx-datatable-column>

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

@@ -5,6 +5,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { Router } from '@angular/router';
 import { BuildingService } from '../../service/monitoring-api.service';
 import { LoginService } from '../../service/login.service';
+import { ToastrService } from 'ngx-toastr';
 
 @Component({
   selector: 'app-master-voltage',
@@ -24,7 +25,8 @@ export class MasterVoltageComponent {
     private modalService: NgbModal,
     private router: Router,
     private monitoringApiService: BuildingService,
-    private authService: LoginService
+    private authService: LoginService,
+    private toastr: ToastrService,
   ) {}
 
   ngOnInit() {
@@ -88,14 +90,20 @@ export class MasterVoltageComponent {
     modalRef.componentInstance.mode = "add";
     modalRef.result.then(
       (result) => {
-        console.log(result);
         if (result) {
-          this.monitoringApiService
+          if (this.filteredRows.some(value => value.name.toLowerCase() === result.name.toLowerCase())) {
+            this.toastr.error("Warning", "Data yang anda masukan double.", {
+              timeOut: 5000,
+              closeButton: true,
+            });
+          } else {
+            this.monitoringApiService
             .postHeaderDetailParam(result)
             .subscribe((res) => {
               console.log(res);
               this.fetchData();
             });
+          }
         }
       },
       (reason) => {
@@ -117,14 +125,14 @@ export class MasterVoltageComponent {
     modalRef.result.then(
       (result) => {
         console.log(result);
-        if (result) {
+        // if (result) {
-          this.monitoringApiService
+        //   this.monitoringApiService
-            .putHeaderDetailParam(result, row.id)
+        //     .putHeaderDetailParam(result, row.id)
-            .subscribe((res) => {
+        //     .subscribe((res) => {
-              console.log(res);
+        //       console.log(res);
-              this.fetchData();
+        //       this.fetchData();
-            });
+        //     });
-        }
+        // }
       },
       (reason) => {
         console.log(`Dismissed: ${reason}`);

src/app/content/hemat-app/user-profile/profil-information/profil-information.component.html

@@ -16,7 +16,6 @@
                   class="form-control"
                   formControlName="firstName"
                   maxlength="20"
-                  placeholder="John Vander"
                   [ngClass]="{'is-invalid': profilInfo.get('firstName').invalid && profilInfo.get('firstName').touched}"
                 />
                 <div *ngIf="profilInfo.get('firstName').invalid && profilInfo.get('firstName').touched" class="text-danger">
@@ -31,7 +30,6 @@
                   class="form-control"
                   formControlName="lastName"
                   maxlength="20"
-                  placeholder="John Vander"
                   [ngClass]="{'is-invalid': profilInfo.get('lastName').invalid && profilInfo.get('lastName').touched}"
                 />
                 <div *ngIf="profilInfo.get('firstName').invalid && profilInfo.get('firstName').touched" class="text-danger">
@@ -45,7 +43,6 @@
                   id="email"
                   class="form-control"
                   formControlName="email"
-                  placeholder="email@email.com"
                   maxlength="50"
                   [ngClass]="{'is-invalid': profilInfo.get('email').invalid && profilInfo.get('email').touched}"
                 />
@@ -61,7 +58,6 @@
                   class="form-control"
                   formControlName="phone"
                   maxlength="13"
-                  placeholder="08**************"
                   pattern="^[0-9]*$"
                   [ngClass]="{'is-invalid': profilInfo.get('phone').invalid && profilInfo.get('phone').touched}"
                 />

src/app/content/hemat-app/user-profile/profil-information/profil-information.component.ts

@@ -52,7 +52,7 @@ export class ProfilInformationComponent {
       lastName: ["", Validators.required],
       email: ["", [Validators.required, Validators.pattern(/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/)]],
       phone: ["", [Validators.required, Validators.pattern(/^[0-9]{10,15}$/)]],
-      image: [null],
+      image: [null, Validators.required],
     });
     this.dataProfil(this.storedData.sub);
     this.profilInfo.valueChanges.subscribe(() => {

src/app/content/hemat-app/user-profile/update-password/update-password.component.html

@@ -49,7 +49,9 @@
                       </button>
                     </div> -->
                     <div class="form-group">
-                      <label for="newPass" style="color: #ffffff">New Password</label>
+                      <label for="newPass" style="color: #ffffff"
+                        >New Password</label
+                      >
                       <div class="input-group">
                         <input
                           [type]="showNewPass ? 'text' : 'password'"
@@ -67,29 +69,38 @@
                             type="button"
                             class="btn btn-link"
                             (click)="toggleNewPassVisibility()"
-                            style="color: #c3f164 !important;"
+                            style="color: #c3f164 !important"
                           >
-                            <i [class]="showNewPass ? 'fa fa-eye-slash' : 'fa fa-eye'"></i>
+                            <i
+                              [class]="
+                                showNewPass ? 'fa fa-eye-slash' : 'fa fa-eye'
+                              "
+                            ></i>
                           </button>
                         </div>
+                        <small
+                          class="form-text text-muted danger"
+                          *ngIf="submitted && f.newPass.errors"
+                          class="invalid-feedback"
+                        >
+                          <div *ngIf="f.newPass.errors.required">
+                            New Password is required
+                          </div>
+                          <div *ngIf="f.newPass.errors.minlength">
+                            New Password must be at least 8 characters long
+                          </div>
+                          <div *ngIf="f.newPass.errors.pattern">
+                            New Password must contain at least one uppercase
+                            letter, one lowercase letter, and one number
+                          </div>
+                        </small>
                       </div>
-                      <small
-                        class="form-text text-muted danger"
-                        *ngIf="submitted && f.newPass.errors"
-                        class="invalid-feedback"
-                      >
-                        <div *ngIf="f.newPass.errors.required">New Password is required</div>
-                        <div *ngIf="f.newPass.errors.minlength">
-                          New Password must be at least 8 characters long
-                        </div>
-                        <div *ngIf="f.newPass.errors.pattern">
-                          New Password must contain at least one uppercase letter, one lowercase letter, and one number
-                        </div>
-                      </small>
                     </div>
 
                     <div class="form-group">
-                      <label for="confirmPass" style="color: #ffffff">Confirm Password</label>
+                      <label for="confirmPass" style="color: #ffffff"
+                        >Confirm Password</label
+                      >
                       <div class="input-group">
                         <input
                           [type]="showConfirmPass ? 'text' : 'password'"
@@ -107,22 +118,30 @@
                             type="button"
                             class="btn btn-link"
                             (click)="toggleConfirmPassVisibility()"
-                            style="color: #c3f164 !important;"
+                            style="color: #c3f164 !important"
                           >
-                            <i [class]="showConfirmPass ? 'fa fa-eye-slash' : 'fa fa-eye'"></i>
+                            <i
+                              [class]="
+                                showConfirmPass
+                                  ? 'fa fa-eye-slash'
+                                  : 'fa fa-eye'
+                              "
+                            ></i>
                           </button>
                         </div>
+                        <small
+                          class="form-text text-muted danger"
+                          *ngIf="submitted && f.confirmPass.errors"
+                          class="invalid-feedback"
+                        >
+                          <div *ngIf="f.confirmPass.errors.required">
+                            Confirm Password is required
+                          </div>
+                          <div *ngIf="f.confirmPass.errors.matchPassword">
+                            Confirm Password must match the New Password
+                          </div>
+                        </small>
                       </div>
-                      <small
-                        class="form-text text-muted danger"
-                        *ngIf="submitted && f.confirmPass.errors"
-                        class="invalid-feedback"
-                      >
-                        <div *ngIf="f.confirmPass.errors.required">Confirm Password is required</div>
-                        <div *ngIf="f.confirmPass.errors.matchPassword">
-                          Confirm Password must match the New Password
-                        </div>
-                      </small>
                     </div>
                   </div>
                 </div>

src/app/content/hemat-app/user-profile/update-password/update-password.component.ts

@@ -93,8 +93,6 @@ export class UpdatePasswordComponent {
     if (this.profilInfo.invalid) {
       return;
     }
-
-    // Handle form submission
   }
 
   cancel() {
@@ -114,6 +112,7 @@ export class UpdatePasswordComponent {
   }
 
   saveEdit() {
+    this.submitted = true;
     if (this.profilInfo.valid) {
       const dataPassword = {
         userid: this.profilInfo.value.userid,
@@ -135,6 +134,8 @@ export class UpdatePasswordComponent {
           });
         }
       );
+    } else {
+
     }
   }
 

src/app/login/login.component.html

@@ -138,7 +138,7 @@
                 <p
                   class="card-subtitle line-on-side text-muted text-center font-small-3 mx-2 my-1"
                 >
-                  <span>(v@2024.07.11.02)</span>
+                  <span>(v@2024.07.11.03)</span>
                 </p>
                 <!-- <div class="card-body">
                   <a