From d93f5e5d904f62865f7f82997e1707c353efe22d Mon Sep 17 00:00:00 2001 From: Surendiran Date: Mon, 15 May 2023 14:52:51 +0530 Subject: [PATCH] end user mobile-forgot mail --- .../assign-service.component.ts | 8 ++++++- .../consultant-setting.component.ts | 1 + .../booking-summary.component.html | 10 +++++---- .../booking-summary.component.scss | 6 ++++- .../customer-info.component.html | 20 ++++++++--------- .../customer-info.component.scss | 5 ++++- .../customer-info/customer-info.component.ts | 2 +- .../doctor-profile.component.ts | 6 +++-- .../slot-booking-details.component.html | 10 ++++----- .../slot-booking-details.component.scss | 7 +++--- .../app/session-services/session.service.ts | 2 ++ .../forgot-password.component.ts | 9 +++++++- .../src/app/session/login/login.component.ts | 4 ++++ .../reset-password.component.html | 22 ++++++++++++++----- .../reset-password.component.ts | 15 +++++++++---- 15 files changed, 87 insertions(+), 40 deletions(-) diff --git a/ng-seed/src/app/appoinment/consultant-setting/assign-service/assign-service.component.ts b/ng-seed/src/app/appoinment/consultant-setting/assign-service/assign-service.component.ts index 88f90e5..94bb1a2 100644 --- a/ng-seed/src/app/appoinment/consultant-setting/assign-service/assign-service.component.ts +++ b/ng-seed/src/app/appoinment/consultant-setting/assign-service/assign-service.component.ts @@ -42,7 +42,13 @@ export class AssignServiceComponent implements OnInit { submit(){ console.log(this.form.value) - let user_id = localStorage.getItem('user_id') + // let user_role = localStorage.getItem('user_role'); + // let user_id + // if(user_role == 'FRONTDESK'){ + // user_id = + // }else{ + let user_id = localStorage.getItem('user_id') + // } let details:any = { durationNew: this.form.value.duration, fees:this.form.value.fees, diff --git a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.ts b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.ts index 3f19dce..012d499 100644 --- a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.ts +++ b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.ts @@ -142,6 +142,7 @@ backRoute(param){ redirectToSetting(practitiionerDetails){ console.log(practitiionerDetails) + localStorage.setItem('user_id',practitiionerDetails.id) this.frontDeskPractdetails = practitiionerDetails this.frontDeskHidden = 0 this.getUsersList() diff --git a/ng-seed/src/app/end-user/booking-summary/booking-summary.component.html b/ng-seed/src/app/end-user/booking-summary/booking-summary.component.html index 680b2bb..62ec58a 100644 --- a/ng-seed/src/app/end-user/booking-summary/booking-summary.component.html +++ b/ng-seed/src/app/end-user/booking-summary/booking-summary.component.html @@ -14,7 +14,7 @@
-
+
@@ -51,10 +51,11 @@
+
-
+
+ -
{{busName}}
@@ -137,8 +138,9 @@
- +
+
\ No newline at end of file diff --git a/ng-seed/src/app/end-user/booking-summary/booking-summary.component.scss b/ng-seed/src/app/end-user/booking-summary/booking-summary.component.scss index eaa2d3e..c083a12 100644 --- a/ng-seed/src/app/end-user/booking-summary/booking-summary.component.scss +++ b/ng-seed/src/app/end-user/booking-summary/booking-summary.component.scss @@ -50,4 +50,8 @@ mat-toolbar{ } .mat-toolbar-single-row { display: block !important; -} \ No newline at end of file +} + +.scrollHV { + height: calc(100vh - 110px); + } \ No newline at end of file diff --git a/ng-seed/src/app/end-user/customer-info/customer-info.component.html b/ng-seed/src/app/end-user/customer-info/customer-info.component.html index 2ec172f..dde0c75 100644 --- a/ng-seed/src/app/end-user/customer-info/customer-info.component.html +++ b/ng-seed/src/app/end-user/customer-info/customer-info.component.html @@ -22,14 +22,14 @@
-
+
Name is required Limit exceed
-
+
@@ -41,10 +41,10 @@
-
+
-
+
Contact No is required @@ -53,7 +53,7 @@ Limit exceed
-
+
@@ -80,28 +80,28 @@
-->
-
+
Address is required Limit exceed
-
+
State is required Limit exceed
-
+
City is required Limit exceed
-
+
City is required @@ -111,7 +111,7 @@
-
+
diff --git a/ng-seed/src/app/end-user/customer-info/customer-info.component.scss b/ng-seed/src/app/end-user/customer-info/customer-info.component.scss index ec66307..acdbf22 100644 --- a/ng-seed/src/app/end-user/customer-info/customer-info.component.scss +++ b/ng-seed/src/app/end-user/customer-info/customer-info.component.scss @@ -106,7 +106,7 @@ mat-toolbar{ font-size: 16px; } .mt-1 { - margin-top: 4rem !important; + margin-top: 2rem !important; } .base-border:after { content: ''; @@ -141,4 +141,7 @@ mat-toolbar{ font-weight: 500; margin-left: 2.8rem; color: #7a7a7a; +} +.scrollHV { + height: calc(100vh - 110px); } \ No newline at end of file diff --git a/ng-seed/src/app/end-user/customer-info/customer-info.component.ts b/ng-seed/src/app/end-user/customer-info/customer-info.component.ts index d58fffc..5d5263b 100644 --- a/ng-seed/src/app/end-user/customer-info/customer-info.component.ts +++ b/ng-seed/src/app/end-user/customer-info/customer-info.component.ts @@ -143,7 +143,7 @@ export class CustomerInfoComponent implements OnInit { openOtp(event) { const dialogRef = this.dialog.open(OptVerifyComponent, { - width: '30%', + width: '40%', // height: '100%', // maxWidth: '38vw', // position: { right: '0' }, diff --git a/ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.ts b/ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.ts index 5a27f9c..59e9800 100644 --- a/ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.ts +++ b/ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.ts @@ -29,8 +29,10 @@ export class DoctorProfileComponent implements OnInit { console.log(URL_AS_LIST); this.backRouting = URL_AS_LIST[4] console.log(this.backRouting) - - this.getpractitionerList() + console.log(URL_AS_LIST[2]) + if(URL_AS_LIST[2] != 'business'){ + this.getpractitionerList() + } } ngOnInit(): void { diff --git a/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.html b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.html index 50257dc..5837961 100644 --- a/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.html +++ b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.html @@ -60,10 +60,10 @@
- +
-
+

Pick Appointment Time For {{check(days) | date:'longDate'}}

@@ -87,8 +87,7 @@
- - + @@ -193,7 +192,7 @@
-->
-
+
@@ -224,6 +223,7 @@
+
diff --git a/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.scss b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.scss index c428950..114b954 100644 --- a/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.scss +++ b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.scss @@ -293,9 +293,8 @@ footer { float:left; } - // .scrollHV { - // //height: calc(100vh - 150px); - // // zoom: 90%; - // } + .scrollHV2 { + height: calc(100vh - 140px); + } \ No newline at end of file diff --git a/ng-seed/src/app/session-services/session.service.ts b/ng-seed/src/app/session-services/session.service.ts index 83ec5b7..7411383 100644 --- a/ng-seed/src/app/session-services/session.service.ts +++ b/ng-seed/src/app/session-services/session.service.ts @@ -10,6 +10,8 @@ import { catchError } from 'rxjs/operators'; export class SessionService { private apiUrl = environment.apiEndpoint; private nameSource = new BehaviorSubject(''); + public forgotEmail:BehaviorSubject = new BehaviorSubject([]); + public forgotEmail_observable$ = this.forgotEmail.asObservable(); name = this.nameSource.asObservable() constructor(private _http: HttpClient) { } diff --git a/ng-seed/src/app/session/forgot-password/forgot-password.component.ts b/ng-seed/src/app/session/forgot-password/forgot-password.component.ts index 2fd140d..4e2738b 100644 --- a/ng-seed/src/app/session/forgot-password/forgot-password.component.ts +++ b/ng-seed/src/app/session/forgot-password/forgot-password.component.ts @@ -15,13 +15,20 @@ export class ForgotPasswordComponent { password: string; form: FormGroup; forgotTokenEmail: any; + forgotMailDara: any; - constructor(private router: Router,public _ser:SessionService) { } + constructor(private router: Router,public _ser:SessionService) { + this._ser.forgotEmail_observable$.subscribe((res) => { + console.log('email', res); + this.forgotMailDara = res + }) + } ngOnInit() { this.form = new FormGroup({ email: new FormControl('',[Validators.required,Validators.email,Validators.pattern('[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+.[a-zA-Z]{2,63}$')]), }); + this.form.controls['email'].setValue(this.forgotMailDara) } submit(){ diff --git a/ng-seed/src/app/session/login/login.component.ts b/ng-seed/src/app/session/login/login.component.ts index 488d4f2..ed58255 100644 --- a/ng-seed/src/app/session/login/login.component.ts +++ b/ng-seed/src/app/session/login/login.component.ts @@ -113,6 +113,10 @@ export class LoginComponent { } openForgot() { + console.log(this.loginForm.value.email) + let forgotMail = this.loginForm.value.email + console.log(this.loginForm.value.email) + this._ser.forgotEmail.next(forgotMail) this.router.navigate(['authentication/forgot-password']) // this.router.navigate(['/home']) } diff --git a/ng-seed/src/app/session/reset-password/reset-password.component.html b/ng-seed/src/app/session/reset-password/reset-password.component.html index 53b6361..84ee937 100644 --- a/ng-seed/src/app/session/reset-password/reset-password.component.html +++ b/ng-seed/src/app/session/reset-password/reset-password.component.html @@ -11,14 +11,24 @@
- - Name is required - Limit exceed + + {{hide ? 'visibility_off' : 'visibility'}} + + Password length must be greater than or equal to 8 and password must contain one or more uppercase , lowercase , numeric and special characters + + + Password is required + - - Name is required - Limit exceed + + {{hide2 ? 'visibility_off' : 'visibility'}} + + Password length must be greater than or equal to 8 and password must contain one or more uppercase , lowercase , numeric and special characters + + + Password is required +

Forgot password?

diff --git a/ng-seed/src/app/session/reset-password/reset-password.component.ts b/ng-seed/src/app/session/reset-password/reset-password.component.ts index e8973fd..1405752 100644 --- a/ng-seed/src/app/session/reset-password/reset-password.component.ts +++ b/ng-seed/src/app/session/reset-password/reset-password.component.ts @@ -12,18 +12,25 @@ import { SessionService } from 'app/session-services/session.service'; export class ResetPasswordComponent implements OnInit { form: FormGroup; forgotApiDetails: string; - + hide: boolean; + hide2:boolean; constructor(private router: Router,public _ser:SessionService) { } ngOnInit(): void { + this.hide = true; + this.hide2 =true this._ser.name.subscribe(data=>{ this.forgotApiDetails = data; console.log(this.forgotApiDetails) }); - this.form = new FormGroup({ - password: new FormControl('',[Validators.required,Validators.maxLength(10)]), - password2: new FormControl('',[Validators.required,Validators.maxLength(10)]), + this.form = new FormGroup({ + password: new FormControl('', [Validators.required,Validators.pattern( + '^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*_=+-]).{8,12}$' + )]), + password2: new FormControl('', [Validators.required,Validators.pattern( + '^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*_=+-]).{8,12}$' + )]), }); } public myError = (controlName: string, errorName: string) =>{