diff --git a/src/app/content/hemat-app/cost-management/cost-management.component.ts b/src/app/content/hemat-app/cost-management/cost-management.component.ts index 9b7b3b9..083ed44 100644 --- a/src/app/content/hemat-app/cost-management/cost-management.component.ts +++ b/src/app/content/hemat-app/cost-management/cost-management.component.ts @@ -328,6 +328,8 @@ export class CostManagementComponent implements OnInit { this.spinnerActive = true; this.costService.getSyncCost(dataDate).subscribe((data) => { console.log(data); + this.dataCompPrevMonthCost(this.storedData.buildingId); + this.dataCompActEstCost(this.storedData.buildingId); }); setTimeout(() => { this.spinnerActive = false; diff --git a/src/app/content/hemat-app/user-profile/profil-information/profil-information.component.html b/src/app/content/hemat-app/user-profile/profil-information/profil-information.component.html index f730f02..16c9a0c 100644 --- a/src/app/content/hemat-app/user-profile/profil-information/profil-information.component.html +++ b/src/app/content/hemat-app/user-profile/profil-information/profil-information.component.html @@ -84,6 +84,7 @@ formControlName="phone" maxlength="13" placeholder="08**************" + pattern="^[0-9]*$" [ngClass]="{ 'is-invalid': submitted && f.phone.errors }" diff --git a/src/app/content/hemat-app/user-profile/profil-information/profil-information.component.ts b/src/app/content/hemat-app/user-profile/profil-information/profil-information.component.ts index 98e5316..bf31e16 100644 --- a/src/app/content/hemat-app/user-profile/profil-information/profil-information.component.ts +++ b/src/app/content/hemat-app/user-profile/profil-information/profil-information.component.ts @@ -50,7 +50,7 @@ export class ProfilInformationComponent { this.profilInfo = this.formBuilder.group({ firstName: ["", Validators.required], lastName: ["", Validators.required], - email: ["", [Validators.required, Validators.email]], + 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], });