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 d726b5a..05340c4 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 @@ -167,6 +167,8 @@ unavailability(action,obj) { }] } this.practitionerdetails = this.usersList['practitionerInfos'][0] + this.practitionerdetails.skills = JSON.parse(this.practitionerdetails.skills) + console.log( this.practitionerdetails) this._con.getPractitionerInfo.next( this.usersList['practitionerInfos']); console.log(this.practitionerdetails) this.id=this.practitionerdetails.id 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 5d66f11..f244959 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 @@ -71,7 +71,7 @@ Practitioner
- : {{serviceMapDetails.user[0].userName}} + : Dr.{{serviceMapDetails.user[0].userName}}
@@ -79,7 +79,7 @@ Date & Time
- : {{bookingSummary.appoinmentDate | date:'fullDate'}}({{bookingSummary.appoinmentSlots | date:'shortTime'}}) + : {{bookingSummary.appoinmentDate | date:'fullDate'}}({{bookingSummary.appoinmentSlots[0] | date:'shortTime'}})
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 3669b6f..dfedad0 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 @@ -33,6 +33,7 @@ export class BookingSummaryComponent implements OnInit { this.end_user.summmarylist_observable$.subscribe((res) => { console.log('booked2', res); this.bookingSummary = res[0] + this.bookingSummary.appoinmentSlots =JSON.parse( this.bookingSummary.appoinmentSlots) // this.end_user.getcusServicesMapDetails() let param ={id:this.bookingSummary.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 f7fb0e1..c7f09ba 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 @@ -30,7 +30,7 @@
- + Contact No is required Invalid Contact No Contact No must be at least 10 characters @@ -40,7 +40,7 @@
- +
verified @@ -53,12 +53,12 @@
- +
- - + +
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 bcd82eb..4d8f6c0 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 @@ -45,11 +45,11 @@ export class CustomerInfoComponent implements OnInit { '[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+.[a-zA-Z]{2,63}$', ),]), phoneNo: new FormControl('', [Validators.required, Validators.minLength(10),Validators.maxLength(10), Validators.pattern('^[0-9]{10}$')]), - address_1: new FormControl('', [Validators.maxLength(50)]), - city: new FormControl('', [Validators.maxLength(10)]), - state: new FormControl('', [Validators.maxLength(10)]), - otp: new FormControl('', [Validators.maxLength(10)]), - pincode: new FormControl('',[Validators.maxLength(6)]), + address_1: new FormControl('', [ Validators.maxLength(50)]), + city: new FormControl('', [ Validators.maxLength(10)]), + state: new FormControl('', [ Validators.maxLength(10)]), + otp: new FormControl('', [ Validators.maxLength(10)]), + pincode: new FormControl('',[ Validators.maxLength(6)]), }); } @@ -60,17 +60,21 @@ export class CustomerInfoComponent implements OnInit { submit(){ console.log(this.form.value) console.log('add') + if(!this.form.valid){ + return + } let row_obj = this.form.value console.log(row_obj) let addFormData = { cusName: row_obj.cusName, email: row_obj.email, address_1: row_obj.address_1, - phoneNo: row_obj.phoneNo, + phoneNo: this.phoneNumber.substring(3) , pincode: row_obj.pincode, state: row_obj.state, city: row_obj.city, }; + console.log(addFormData) this._cus.addCusDetails(addFormData).subscribe(res => { if (res.status == 200) { diff --git a/ng-seed/src/app/end-user/payment/payment.component.ts b/ng-seed/src/app/end-user/payment/payment.component.ts index 6a5f5bf..6a59e38 100644 --- a/ng-seed/src/app/end-user/payment/payment.component.ts +++ b/ng-seed/src/app/end-user/payment/payment.component.ts @@ -68,7 +68,7 @@ export class PaymentComponent implements OnInit { let time = new Date().toLocaleTimeString() let params= { "busId": serviceDetails.busId, - "cusId": URL_AS_LIST[8], + "cusId": URL_AS_LIST[9], "appoinmentDate": slot_array[0].date, "appoinmentTime": time, "serviceMap": serviceMap, 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 ebbe0bc..b0ad617 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 @@ -51,7 +51,7 @@
- +

Slot Availability

@@ -74,21 +74,30 @@

Avatar Service

{{servicesName.servicesName}} ({{servicesName.duration }} Mins) -

+ +

AvatarDate :

+ {{date | date:'longDate'}} +

AvatarTime :

+ {{slotTime | date:'shortTime'}} +

AvatarAmount :

+ ₹ {{user.practitionerInfos[0].days}}
-
+
-
{{check(days) | date:'longDate'}}
+
{{check(days) | date:'fullDate'}}
+ +
+ +
@@ -184,10 +193,8 @@
-->
-
- -
- + +
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 87ef4a7..bc543cd 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 @@ -414,4 +414,9 @@ footer { float:left; } + .scrollHV { + height: calc(100vh - 150px); + // zoom: 90%; + } + \ No newline at end of file diff --git a/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.ts b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.ts index 3e6e43a..2b3e958 100644 --- a/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.ts +++ b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.ts @@ -190,6 +190,7 @@ export class SlotBookingDetailsComponent implements OnInit { toggleActive(event:any,param:any,i:any){ console.log(event,param,i) + this.slot_array =[]; // debugger; // event.preventDefault(); this.slotIndex = i @@ -224,7 +225,7 @@ export class SlotBookingDetailsComponent implements OnInit { } }); - this.slot_array.push({date:this.date,slots:param}) + this.slot_array.push({date:this.date,slots:filteredTimes}) } @@ -232,8 +233,8 @@ export class SlotBookingDetailsComponent implements OnInit { console.log( this.slot_array) localStorage.setItem("slotData",JSON.stringify(this.slot_array)) let URL = this.router.url; - //console.log(URL) - this.router.navigate([URL+"/cus"]) + console.log( JSON.parse(localStorage.getItem("slotData"))) + this.router.navigate([URL+"/cus"]) } checkBooked(param){ // console.log(param, this.bookedAppointment) diff --git a/ng-seed/src/environments/environment.ts b/ng-seed/src/environments/environment.ts index 7870972..13643e6 100644 --- a/ng-seed/src/environments/environment.ts +++ b/ng-seed/src/environments/environment.ts @@ -10,7 +10,7 @@ export const environment = { // apiEndpoint:'http://192.168.1.20:8080/api/', // apiEndpoint:'https://api.venbait.in/api/', // apiEndpoint:'http://venbainfotech.com:5000/api/', - apiEndpoint:'http://192.168.1.17:8080/api/', + apiEndpoint:'http://192.168.1.3:8080/api/', // apiEndpoint:'https://api.venbait.in/api/', //EndUser URL