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.01)
+        >Smart Building Management Systems (V@2024-07-10.04)
       </a></span
     >
   </p>

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

@@ -57,9 +57,9 @@ export class AddEditMasterBuildingComponent {
       id: this.dataRow.id,
       name: [this.dataRow.name, Validators.required],
       statusId: [this.dataRow.status_id, Validators.required],
-      email: [this.dataRow.email, [Validators.required, Validators.pattern(/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/)]],
+      email: [this.dataRow.email, [Validators.required, Validators.email]],
       owner: [this.dataRow.owner, Validators.required],
-      address: [this.dataRow.address, [Validators.required, Validators.pattern(/^[0-9]{10,15}$/)]],
+      address: [this.dataRow.address, Validators.required],
       phone: [
         this.dataRow.phone,
         [Validators.required, Validators.pattern("^[0-9]*$")],

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

@@ -17,11 +17,19 @@
                   formControlName="firstName"
                   maxlength="20"
                   placeholder="John Vander"
-                  [ngClass]="{'is-invalid': profilInfo.get('firstName').invalid && profilInfo.get('firstName').touched}"
+                  [ngClass]="{
+                    'is-invalid': submitted && f.firstName.errors
+                  }"
                 />
-                <div *ngIf="profilInfo.get('firstName').invalid && profilInfo.get('firstName').touched" class="text-danger">
+                <small
-                  First name is required.
+                  class="form-text text-muted danger"
-                </div>
+                  *ngIf="submitted && f.firstName.errors"
+                  class="invalid-feedback"
+                >
+                  <div *ngIf="f.firstName.errors.required">
+                    Full First Name is required
+                  </div>
+                </small>
               </div>
               <div class="form-group">
                 <label for="lastName" style="color: #ffffff">Last Name</label>
@@ -32,11 +40,19 @@
                   formControlName="lastName"
                   maxlength="20"
                   placeholder="John Vander"
-                  [ngClass]="{'is-invalid': profilInfo.get('lastName').invalid && profilInfo.get('lastName').touched}"
+                  [ngClass]="{
+                    'is-invalid': submitted && f.lastName.errors
+                  }"
                 />
-                <div *ngIf="profilInfo.get('firstName').invalid && profilInfo.get('firstName').touched" class="text-danger">
+                <small
-                  Last name is required.
+                  class="form-text text-muted danger"
-                </div>
+                  *ngIf="submitted && f.lastName.errors"
+                  class="invalid-feedback"
+                >
+                  <div *ngIf="f.lastName.errors.required">
+                    Full lastName is required
+                  </div>
+                </small>
               </div>
               <div class="form-group">
                 <label for="email" style="color: #ffffff">Email</label>
@@ -47,11 +63,17 @@
                   formControlName="email"
                   placeholder="email@email.com"
                   maxlength="50"
-                  [ngClass]="{'is-invalid': profilInfo.get('email').invalid && profilInfo.get('email').touched}"
+                  [ngClass]="{
+                    'is-invalid': submitted && f.email.errors
+                  }"
                 />
-                <div *ngIf="profilInfo.get('email').invalid && profilInfo.get('email').touched" class="text-danger">
+                <small
-                  Please enter a valid email.
+                  class="form-text text-muted danger"
-                </div>
+                  *ngIf="submitted && f.email.errors"
+                  class="invalid-feedback"
+                >
+                  <div *ngIf="f.email.errors.required">Email is required</div>
+                </small>
               </div>
               <div class="form-group">
                 <label for="phone" style="color: #ffffff">Phone</label>
@@ -63,11 +85,17 @@
                   maxlength="13"
                   placeholder="08**************"
                   pattern="^[0-9]*$"
-                  [ngClass]="{'is-invalid': profilInfo.get('phone').invalid && profilInfo.get('phone').touched}"
+                  [ngClass]="{
+                    'is-invalid': submitted && f.phone.errors
+                  }"
                 />
-                <div *ngIf="profilInfo.get('phone').invalid && profilInfo.get('phone').touched" class="text-danger">
+                <small
-                  Please enter a valid phone number.
+                  class="form-text text-muted danger"
-                </div>
+                  *ngIf="submitted && f.phone.errors"
+                  class="invalid-feedback"
+                >
+                  <div *ngIf="f.phone.errors.required">Phone is required</div>
+                </small>
               </div>
             </div>
             <div class="col-md-4 d-flex justify-content-center align-items-center">

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.05)</span>
+                  <span>(v@2024.07.10.04)</span>
                 </p>
                 <!-- <div class="card-body">
                   <a