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 0eccf3f..4ad03e6 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 @@ -14,8 +14,11 @@ export class AssignServiceComponent implements OnInit { constructor(public dialogRef: MatDialogRef,@Optional() @Inject(MAT_DIALOG_DATA) public data) { console.log(data) this.local_data = data - this.local_data.duration = this.local_data.durationNew + if(this.local_data.hasOwnProperty('durationNew')){ + this.local_data.duration = this.local_data.durationNew + } + } ngOnInit(): void { 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 5b4f94e..9ef133e 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 @@ -433,7 +433,7 @@
{{details.servicesName}}
-
{{servicesList_data[i].duration.length>0 ? servicesList_data[i].duration[0].durationNew : details.duration}} Mins | {{servicesList_data[i].duration.length>0 ? servicesList_data[i].duration[0].fees : 0}}
+
{{servicesList_data[i].duration.length>0 ? servicesList_data[i].duration[0].durationNew : details.duration}} Mins | {{servicesList_data[i].duration.length>0 ? servicesList_data[i].duration[0].fees : details.fees}}
+ Customize the price and duration of a service.
diff --git a/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.ts b/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.ts index 723928e..8c1488e 100644 --- a/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.ts +++ b/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.ts @@ -173,12 +173,13 @@ export class EditWorkingHoursComponent implements OnInit { let sunday ={filters :this.data[0].sunday.hours } for(let i=0;i<=this.data[0].sunday.hours.length-2;i++){ this.addFilterToFiltersFormArray() + this.dynamicForm.patchValue(sunday) } // if(this.data[0].sunday.hours.length>1){ // } - this.dynamicForm.patchValue(sunday) + // this.data[1].monday.hours.forEach(element => { // element.value = null diff --git a/ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.ts b/ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.ts index 6fc765b..64e81c3 100644 --- a/ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.ts +++ b/ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.ts @@ -43,6 +43,7 @@ ngOnInit() { description: new FormControl('',[Validators.required]), fees:new FormControl('',[Validators.required]) }); + this.local_data.duration = JSON.stringify(this.local_data.duration) this.form.patchValue(this.local_data) } diff --git a/ng-seed/src/app/appoinment/user/user-service/user.service.ts b/ng-seed/src/app/appoinment/user/user-service/user.service.ts index 6df9ad4..cfbea3f 100644 --- a/ng-seed/src/app/appoinment/user/user-service/user.service.ts +++ b/ng-seed/src/app/appoinment/user/user-service/user.service.ts @@ -14,7 +14,8 @@ export class UserService { getUsersListDetails(): Observable { console.log('IN') - return this._http.get(this.apiUrl + "getusers") + //return this._http.post(this.apiUrl + "getusers") + return this._http.post(this.apiUrl + 'getusers', {}) // .pipe( // catchError(this.handleError('role', [])) // ) diff --git a/ng-seed/src/app/end-user/service-list-details/service-list.component.ts b/ng-seed/src/app/end-user/service-list-details/service-list.component.ts index 26ef11d..2b20c09 100644 --- a/ng-seed/src/app/end-user/service-list-details/service-list.component.ts +++ b/ng-seed/src/app/end-user/service-list-details/service-list.component.ts @@ -223,6 +223,10 @@ let updatevalue = { serviceId: row_obj.serviceId, console.log(URL+"/"+data.randStr+"/practitioner") this.router.navigate([URL+"/"+data.randStr+"/practitioner"]) }else{ + let filter = this.full_data.filter(arr=>{return arr.serviceId == data.serviceId && arr.busId ==data.busId}) + console.log(filter) + localStorage.setItem('cusServiceData',JSON.stringify(filter)) + localStorage.setItem("servicedetails",JSON.stringify(data)) this.router.navigate([URL+"/slots/list"]) } 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 0f8e68f..ad49105 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 @@ -69,7 +69,7 @@

Avatar Practitioner

Dr. {{doctor}}

Avatar Service

- {{servicesName.servicesName}} ({{servicesName.duration + {{servicesName.servicesName}} ({{serviceMapdetails[0].duration.length>0 ? serviceMapdetails[0].duration[0].durationNew:serviceMapdetails[0].service[0].duration }} Mins) diff --git a/ng-seed/src/environments/environment.ts b/ng-seed/src/environments/environment.ts index 75d19cb..3587fea 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.4:8080/api/', + apiEndpoint:'http://192.168.1.8:8080/api/', // apiEndpoint:'https://api.venbait.in/api/', //EndUser URL