From dab98cd79c68ab8531fcf4d67d9674d5278ec7a1 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Sat, 27 May 2023 17:30:15 +0530 Subject: [PATCH] consult error and customer validation added --- .../consultant-setting.component.html | 6 +-- .../consultant-setting.component.ts | 6 +-- .../service-list/service-list.component.html | 34 ++++++++++------- .../service-list/service-list.component.ts | 23 +++++++++--- .../user/user-list/user-list.component.ts | 4 +- .../booking-summary.component.ts | 3 ++ .../customer-info.component.html | 37 +++++++++++++------ .../customer-info.component.scss | 7 ++++ .../customer-info/customer-info.component.ts | 29 ++++++++++++--- .../doctor-profile.component.ts | 8 +++- .../layouts/admin/admin-layout.component.html | 2 +- .../menu-items/horizontal-menu-items.ts | 2 +- .../src/app/shared/menu-items/menu-items.ts | 2 +- ng-seed/src/environments/environment.ts | 4 +- 14 files changed, 118 insertions(+), 49 deletions(-) diff --git a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.html b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.html index 7f42d4b..6657fbb 100644 --- a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.html +++ b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.html @@ -585,15 +585,15 @@
-

Here's your personal booking page. Edit and share this link with customers so they can book your Services directly.

- Appoinment booking domain +

Here's your personal booking page. share this link with customers so they can book your Services directly.

+ Appointment booking URL
- + 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 f5de1be..326394f 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 @@ -43,7 +43,7 @@ export class ConsultantSettingComponent implements OnInit { "qualification":null, "days": null, "languages": null, - "workingHours": JSON.stringify([{"sunday":{"hours":[{"startTime":"09:30 am","endTime":"06:00 pm","day":"sunday","value":null}],"breaks":[]}},{"monday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"monday","value":null}],"breaks":[]}},{"tuesday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"tuesday","value":null}],"breaks":[]}},{"wednesday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"wednesday","value":null}],"breaks":[]}},{"thursday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"thursday","value":null}],"breaks":[]}},{"friday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"friday","value":null}],"breaks":[]}},{"saturday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"saturday","value":null}],"breaks":[]}}]), + "workingHours": JSON.stringify([{"sunday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"sunday","value":null}],"breaks":[]}},{"monday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"monday","value":null}],"breaks":[]}},{"tuesday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"tuesday","value":null}],"breaks":[]}},{"wednesday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"wednesday","value":null}],"breaks":[]}},{"thursday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"thursday","value":null}],"breaks":[]}},{"friday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"friday","value":null}],"breaks":[]}},{"saturday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"saturday","value":null}],"breaks":[]}}]), // "dob": null, // "designtion": null, "gender": null, @@ -238,7 +238,7 @@ unavailability(action,obj) { "qualification":null, "days": null, "languages": null, - "workingHours": JSON.stringify( [{"sunday":{"hours":[],"breaks":[]}},{"monday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"monday","value":null}],"breaks":[]}},{"tuesday":{"hours":[],"breaks":[]}},{"wednesday":{"hours":[],"breaks":[]}},{"thursday":{"hours":[],"breaks":[]}},{"friday":{"hours":[],"breaks":[]}},{"saturday":{"hours":[],"breaks":[]}}]), + "workingHours": JSON.stringify( [{"sunday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"sunday","value":null}],"breaks":[]}},{"monday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"monday","value":null}],"breaks":[]}},{"tuesday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"tuesday","value":null}],"breaks":[]}},{"wednesday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"wednesday","value":null}],"breaks":[]}},{"thursday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"thursday","value":null}],"breaks":[]}},{"friday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"friday","value":null}],"breaks":[]}},{"saturday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"saturday","value":null}],"breaks":[]}}]), // "dob": null, // "designtion": null, "gender": null, @@ -249,7 +249,7 @@ unavailability(action,obj) { }] let param; - let tmp = [{"sunday":{"hours":[],"breaks":[]}},{"monday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"monday","value":null}],"breaks":[]}},{"tuesday":{"hours":[],"breaks":[]}},{"wednesday":{"hours":[],"breaks":[]}},{"thursday":{"hours":[],"breaks":[]}},{"friday":{"hours":[],"breaks":[]}},{"saturday":{"hours":[],"breaks":[]}}] + let tmp = [{"sunday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"sunday","value":null}],"breaks":[]}},{"monday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"monday","value":null}],"breaks":[]}},{"tuesday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"tuesday","value":null}],"breaks":[]}},{"wednesday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"wednesday","value":null}],"breaks":[]}},{"thursday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"thursday","value":null}],"breaks":[]}},{"friday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"friday","value":null}],"breaks":[]}},{"saturday":{"hours":[{"startTime":"09:00 am","endTime":"09:00 pm","day":"saturday","value":null}],"breaks":[]}}] param ={practitionerId: this.usersList.id,workingHours:JSON.stringify(tmp),days:7} this._api.createPractitionerInfo(param).subscribe(res => { diff --git a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.html b/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.html index 62693a1..5cef235 100644 --- a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.html +++ b/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.html @@ -1,17 +1,25 @@

Services Details

- - Filter - - - - Practitioner - - All - - {{details.userName}} - - - +
+
+ + Filter + + +
+
+ + Practitioner + + All + + {{details.userName}} + + + +
+
+ + diff --git a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts b/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts index 96ec8e9..195b013 100644 --- a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts +++ b/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts @@ -71,6 +71,18 @@ export class ServiceListComponent implements OnInit { if (res.status == 200) { console.log(res.data) this.consultants = res.data; + let tmp =[] + res.data.forEach(element => { + + if(element.role == "PRACTITIONER"){ + tmp.push(element) + } + + }); + + this.consultants = tmp; + + } else{ this.consultants=[]; @@ -104,16 +116,17 @@ export class ServiceListComponent implements OnInit { this.servicesList.sort((a: any, b: any) => { return b.serviceId - a.serviceId; }); - this.servicesList.forEach((element, index) => { - element.index = index - - - }); + let result = this.servicesList.filter((obj, index, self) => index === self.findIndex((t) => ( t.serviceId === obj.serviceId )) ); + result.forEach((element, index) => { + element.index = index + + + }); this.servicesList = result this.servicesListSource['data'] = this.servicesList; this.servicesListLength = this.servicesList.length diff --git a/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts b/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts index cfa9204..ee1c8ca 100644 --- a/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts +++ b/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts @@ -357,7 +357,7 @@ export class UserListComponent implements OnInit { } let loginUser = localStorage.getItem('user_role') - if(loginUser == 'FRONTDESK'){ + if(loginUser == "BIZADMIN"){ if(result.role == 'PRACTITIONER'){ console.log('PRACTITIONER') if(action == 'Update'){ @@ -368,7 +368,7 @@ export class UserListComponent implements OnInit { this.openAssignService(res['data'].id,'',res['data'].userName) } } - } + } } else{ diff --git a/ng-seed/src/app/end-user/booking-summary/booking-summary.component.ts b/ng-seed/src/app/end-user/booking-summary/booking-summary.component.ts index bd628cb..2e178d2 100644 --- a/ng-seed/src/app/end-user/booking-summary/booking-summary.component.ts +++ b/ng-seed/src/app/end-user/booking-summary/booking-summary.component.ts @@ -85,6 +85,9 @@ export class BookingSummaryComponent implements OnInit { "appoinmentDate": slot_array[0].date, "appoinmentTime": time, "serviceMap": serviceMap, + "paymentStatus": 1, + "paymentMode":"online", + "createdBy":"customer", "appoinmentSlots": JSON.stringify(slot_array[0].slots) //"servicemap" :this.bookedAppointment_servicemap } 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 c7ac76d..7fa3dc4 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 @@ -114,35 +114,50 @@
- + Name is required + Limit exceed
- + + Please enter a valid email address + + + + Email is required +
- - + + + Contact No is required + Invalid Contact No + Contact No must be at least 10 characters + Limit exceed +
+ +
+ verified
- +
- + Address is required
- + @@ -193,21 +208,21 @@
- + state is required
- + City is required
- + Pincode is required
@@ -263,7 +278,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 7befee1..72ec69e 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 @@ -159,4 +159,11 @@ footer { width: 100%; position: absolute; bottom: 0; +} + +.mat-green:disabled { + /* Styles for the button when it's disabled */ + background-color: gray !important; /* Change the background color to gray */ + color: white !important; /* Change the text color to white */ + /* Add any other styling as desired */ } \ 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 02b8ca8..ab1d0e5 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 @@ -71,9 +71,11 @@ export class CustomerInfoComponent implements OnInit { hash:new FormControl('', []), amount: new FormControl('', []), name: new FormControl('', [Validators.required]), - email: new FormControl('', [Validators.required]), + email: new FormControl('', [Validators.required, Validators.email,Validators.pattern( + '[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+.[a-zA-Z]{2,63}$', + ),]), phone: new FormControl('', [Validators.required, Validators.minLength(10),Validators.maxLength(10)]), - address_line_1: new FormControl('', [Validators.required]), + address_line_1: new FormControl('', [Validators.required,Validators.maxLength(100)]), address_line_2:new FormControl('', []), order_id: new FormControl('', []), description: new FormControl('', []), @@ -81,9 +83,9 @@ export class CustomerInfoComponent implements OnInit { return_url: new FormControl('', []), currency: new FormControl('', []), country: new FormControl('', []), - zip_code: new FormControl('', []), - state: new FormControl('', []), - city: new FormControl('', []), + zip_code: new FormControl('', [Validators.required]), + state: new FormControl('', [Validators.required]), + city: new FormControl('', [Validators.required]), udf1: new FormControl('', []), udf2: new FormControl('', []), udf3: new FormControl('', []), @@ -279,7 +281,7 @@ export class CustomerInfoComponent implements OnInit { getOTP(event) { - this.phoneNumber = this.form.value.phoneNo + this.phoneNumber = this.form.value.phone if( this.phoneNumber.length!=10){ alert("invalid Phone No...!") }else{ @@ -341,6 +343,8 @@ export class CustomerInfoComponent implements OnInit { onclickfun(){ + + console.log("worked") let row_obj = this.form.value function generateRandomString() { @@ -348,6 +352,15 @@ export class CustomerInfoComponent implements OnInit { const randomNum = (Math.random() + 1).toString(36).substring(7); return prefix + randomNum; } + if(this.verifyOTP == 0){ + this.getOTP(1) + } + + if(!this.form.valid ){ + + return + }else { + if(this.verifyOTP == 1){ let payment = { api_key: "4cb964d4-9ef4-4a25-8f85-a2a13f43cbba", hash: '', @@ -427,5 +440,9 @@ this.paymentform = payment; ) // } +} + +} + } 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 ee4e421..083b048 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 @@ -48,7 +48,6 @@ export class DoctorProfileComponent implements OnInit { console.log('booked', res); if(res.length>0){ - localStorage.setItem('busId',res[0].business[0].busId) localStorage.setItem('busName',res[0].business[0].busName) localStorage.setItem('logo',res[0].business[0].logo) this.bookedAppointment = res[0].user[0] @@ -58,6 +57,10 @@ export class DoctorProfileComponent implements OnInit { this.profileDetails = this.bookedAppointment.practitionerInfos[0] console.log(this.profileDetails) this.skillsDetails = JSON.parse(this.profileDetails.skills) + + this.busName = res[0].business[0].busName + this.currency = localStorage.getItem('currency') + this.logo = res[0].business[0].logo // this.skillsDetails = JSON.parse(this.skillsDetails) }else{ @@ -147,6 +150,9 @@ export class DoctorProfileComponent implements OnInit { // console.log(filter) localStorage.setItem('workingHrs',this.consultants[0].practitionerInfos [0].workingHours) + + localStorage.setItem('busName',this.ServicesMapDetailsList[0].business[0].busName) + localStorage.setItem('logo',this.ServicesMapDetailsList[0].business[0].logo) this.end_user.appointmentBooked.next(this.ServicesMapDetailsList) this.bookedAppointment = this.ServicesMapDetailsList[0].user[0] diff --git a/ng-seed/src/app/layouts/admin/admin-layout.component.html b/ng-seed/src/app/layouts/admin/admin-layout.component.html index d139319..e200ee7 100644 --- a/ng-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng-seed/src/app/layouts/admin/admin-layout.component.html @@ -30,7 +30,7 @@
{{getUserData.userName}}
-
- {{roleName}}
+
{{roleName}}