From bd082f2fde88be64c28fc6eb6f5f196eb80c11ce Mon Sep 17 00:00:00 2001 From: "surendar.m@watermelon.us" Date: Thu, 30 Mar 2023 12:09:30 +0530 Subject: [PATCH] service assigned Fix --- .../consultant-setting.component.html | 48 +++++++++++------- .../consultant-setting.component.scss | 7 +++ .../consultant-setting.component.ts | 25 ++------- .../edit-working-hours.component.html | 13 ++--- .../edit-working-hours.component.ts | 8 ++- ng-seed/src/assets/images/service.png | Bin 0 -> 17034 bytes 6 files changed, 52 insertions(+), 49 deletions(-) create mode 100644 ng-seed/src/assets/images/service.png 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 a45b4a4..2b8044b 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 @@ -343,23 +343,37 @@ - -
-
- -
-
-
{{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}}
-
+ Customize the price and duration of a service.
-
-
- Active -
-
- - -
+
+ + +
+
+ +
+
+
{{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}}
+
+ Customize the price and duration of a service.
+
+
+ Active +
+
+
+
+
+
+
+
+
+
+
+
+
+

No Service Assigned

+
+
+
diff --git a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.scss b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.scss index 4c49255..d24b468 100644 --- a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.scss +++ b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.scss @@ -408,3 +408,10 @@ margin-bottom: 10rem; display: contents !important; } } + +.noAssignedService{ + font-size: large; + color: #847a7a; + margin: 0; + text-align: center; +} \ No newline at end of file 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 877c73a..ff09903 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 @@ -118,6 +118,7 @@ workingDialog(action,obj) { } } ); } + getAssignedList(busId) { this._api.getAssignedDetails(busId).subscribe(res => { console.log(res) @@ -141,11 +142,10 @@ workingDialog(action,obj) { this.assignService.push(e.servicesName) }); }); - console.log(this.servicesList_array) - - this.getAssignedList(this.usersList.busId) + console.log(this.servicesList_array) } - } ); + this.getAssignedList(this.usersList.busId) + }); // this.assignService = this.checkedArray } @@ -178,22 +178,7 @@ workingDialog(action,obj) { // }); } - workingDialog(action,obj) { - obj.action = action; - const dialogRef = this.dialog.open(ExtraWorkingHoursComponent, { - width: '48%', - height: '100%', - // maxWidth: '38vw', - position: { right: '0' }, - data:obj - }); - // dialogRef.afterClosed().subscribe(result => { - // if(result != undefined){ - // console.log(result) - // this.formAddUpdateAndDelete(result,result.data) - // } - // }); - } + asignService(param,index){ console.log(param) diff --git a/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.html b/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.html index 85f6709..b30a605 100644 --- a/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.html +++ b/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.html @@ -3,8 +3,7 @@