+
-
-
- {{details.servicesName}}
- {{details.duration}} Minutes
-
+
+
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 08e59bd..4c49255 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
@@ -343,21 +343,28 @@ margin-bottom: 10rem;
margin-left: 1rem;
}
.service-info{
- line-height: 3rem!important;
+ // line-height: 3rem!important;
font-size: 14px!important;
font-weight: 500!important;
+ color: #2f2c2c;
+}
+.service-info2{
+ // line-height: 3rem!important;
+ font-size: 12px!important;
+ font-weight: 500!important;
color: #5F5F5F;
}
.info{
font-size: 12px!important;
font-weight: 500;
color: rgba(2,71,91,.6);
- padding: 0 0 10px;
+ // padding: 0 0 10px;
max-height: 38px;
display: -webkit-box;
overflow: hidden;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
+ cursor: pointer;
}
::ng-deep .mat-card .mat-card-title:nth-child(2) {
margin-top: -33px!important;
@@ -382,3 +389,22 @@ margin-bottom: 10rem;
// color: #4C4C4C;
// text-align: center;
// }
+.assignService{
+ .scrollHV {
+ height: calc(100vh - 461px) !important;
+ }
+}
+::ng-deep .mat-select-panel .mat-option{
+ height: 5em !important;
+}
+// css example
+.indianSymbol {
+ content: "\20B9";
+}
+
+.p-1{
+ padding: 1rem !important;
+ .flexCard{
+ display: contents !important;
+ }
+}
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 91f3c65..7ca2a97 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
@@ -5,6 +5,7 @@ import { MatDialog } from '@angular/material/dialog';
import { MatTableDataSource } from '@angular/material/table';
import { ApiServiceService } from 'app/appoinment/service-list-details/service-api-services/api-service.service';
import { environment } from 'environments/environment';
+import { AssignServiceComponent } from '../assign-service/assign-service.component';
import { ConsultantService } from '../consultant-service/consultant.service';
import { EditWorkingHoursComponent } from '../edit-working-hours/edit-working-hours.component';
import { ExtraWorkingHoursComponent } from '../extra-working-hours/extra-working-hours.component';
@@ -15,6 +16,7 @@ import { ExtraWorkingHoursComponent } from '../extra-working-hours/extra-working
styleUrls: ['./consultant-setting.component.scss']
})
export class ConsultantSettingComponent implements OnInit {
+ assignService:any = []
registerForm: FormGroup;
submitted = false;
selected = 'Assign New Services';
@@ -33,6 +35,9 @@ export class ConsultantSettingComponent implements OnInit {
practitionerdetails: any;
servicesList_array: any = [];
apiUrl:any;
+ serviceCheckedData: number;
+ checkedArray: any[];
+ servicesList_data: any=[];
constructor(private formBuilder: FormBuilder, public dialog: MatDialog, public _con:ConsultantService, private fb: FormBuilder, public _api:ConsultantService,private locationStrategy: LocationStrategy) {}
@@ -53,110 +58,178 @@ export class ConsultantSettingComponent implements OnInit {
}
-getUsersList() {
- //this._pd.getTabStatusPdDetails(this.tabStatus)
- let id = localStorage.getItem('user_id')
- console.log(id)
- this._con.getUsersListDetails(id).subscribe(res => {
- if (res.status == 200) {
- this.usersList = res.data[0];
- console.log(this.usersList)
- this.practitionerdetails = this.usersList['practitionerInfos'][0]
- console.log(this.practitionerdetails)
- this.apiUrl = 'http://localhost:4200/customer/business/'+this.usersList.randStr
- this.getServicesList(this.usersList.id,this.usersList.busId)
- // this.dataSource = res.data.length;
- // console.log(this.dataSource)
- // this.dataSource.data = this.usersList;
- // console.log(this.dataSource.data)
- // this.recordStatus=false;
- }
- else{
- // this.usersList=[];
- // this.dataSource = null;
- // this.recordStatus=true;
- }
- }
- ,error => {
- // this.errorMessage.push(error);
- // this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (error.error_type == 2 ? error.error_status + ' ( ' + error.error_text + ' ) ' : ' ( ' + error.error_text + ' ) ') +'\" Error Occur.!');
- // alert(error.html_format);
- });
-}
-getServicesList(id,busId) {
- //this._pd.getTabStatusPdDetails(this.tabStatus)
- this._api.getServicesListDetails(id,busId).subscribe(res => {
- if (res.status == 200) {
- this.servicesList = res.data;
- res['data'].forEach(element => {
- // tmp.push(element.service)
- element.service.forEach(e => {
- this.servicesList_array.push(e)
- });
- });
- console.log(this.servicesList_array)
- // console.log(this.servicesList)
- // this.dataSource = res.data.length;
- // console.log(this.dataSource)
- // this.dataSource.data = this.servicesList;
- // console.log(this.dataSource.data)
- // this.recordStatus=false;
- }
- else{
- // this.servicesList=[];
- // this.dataSource = null;
- // this.recordStatus=true;
- }
- }
- ,error => {
- // this.errorMessage.push(error);
- // this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (error.error_type == 2 ? error.error_status + ' ( ' + error.error_text + ' ) ' : ' ( ' + error.error_text + ' ) ') +'\" Error Occur.!');
- // alert(error.html_format);
- });
-}
-get f() {
- return this.registerForm.controls;
-}
-onSubmit() {
- this.submitted = true;
- if (this.registerForm.invalid) {
- return;
+ public myError = (controlName: string, errorName: string) =>{
+ return this.registerForm.controls[controlName].hasError(errorName);
+ }
+
+ tabClick(tab) {
+ console.log(tab.index);
+ if(tab.index == '2'){
+ this.getServicesList(this.usersList.id,this.usersList.busId)
+ // this.getAssignedList(this.usersList.busId)
+ }
+
}
- console.log(JSON.stringify(this.registerForm.value, null, 2));
-}
-openDialog(action,obj) {
- obj.action = action;
- const dialogRef = this.dialog.open(EditWorkingHoursComponent, {
- 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)
- // }
- // });
-}
-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)
- // }
- // });
-}
+ getUsersList() {
+ //this._pd.getTabStatusPdDetails(this.tabStatus)
+ let id = localStorage.getItem('user_id')
+ console.log(id)
+ this._con.getUsersListDetails(id).subscribe(res => {
+ if (res.status == 200) {
+ this.usersList = res.data[0];
+ console.log(this.usersList)
+ this.practitionerdetails = this.usersList['practitionerInfos'][0]
+ console.log(this.practitionerdetails)
+ this.apiUrl = 'http://localhost:4200/customer/business/'+this.usersList.randStr
+
+ }
+ } );
+ }
+ getAssignedList(busId) {
+ this._api.getAssignedDetails(busId).subscribe(res => {
+ console.log(res)
+ if (res.status == 200) {
+ this.servicesList = res.data;
+ }
+ } );
+ }
+
+ getServicesList(id,busId) {
+ this.servicesList_array = []
+ //this._pd.getTabStatusPdDetails(this.tabStatus)
+ this._api.getServicesListDetails(id,busId).subscribe(res => {
+ if (res.status == 200) {
+ this.servicesList_data = res.data;
+ res['data'].forEach(element => {
+ // tmp.push(element.service)
+ element.service.forEach(e => {
+ console.log(e)
+ this.servicesList_array.push(e)
+ this.assignService.push(e.servicesName)
+ });
+ });
+ console.log(this.servicesList_array)
+
+ this.getAssignedList(this.usersList.busId)
+ }
+ } );
+ // this.assignService = this.checkedArray
+ }
+
+ get f() {
+ return this.registerForm.controls;
+ }
+
+ onSubmit() {
+ this.submitted = true;
+ if (this.registerForm.invalid) {
+ return;
+ }
+ console.log(JSON.stringify(this.registerForm.value, null, 2));
+ }
+
+ openDialog(action,obj) {
+ obj.action = action;
+ const dialogRef = this.dialog.open(EditWorkingHoursComponent, {
+ 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)
+ // }
+ // });
+ }
+
+ 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)
+ console.log(index,this.servicesList_data)
+ if(this.servicesList_data[index].duration.length>0){
+ param = this.servicesList_data[index].duration[0]
+ }
+ const dialogRef = this.dialog.open(AssignServiceComponent, {
+ width: '30%',
+ height: '100%',
+ // maxWidth: '38vw',
+ position: { right: '0' },
+ data:param
+ });
+ dialogRef.afterClosed().subscribe(result => {
+ console.log(result)
+ if(result instanceof Object){
+ this.createDurationFees(result)
+ }
+ });
+ }
+
+ createDurationFees(param){
+ this._api.createDurationFeesDetails(param).subscribe(res => {
+ if (res.status == 200) {
+ console.log(res)
+ // this.checkedList = res.data;
+ }
+ } );
+ }
+
+ getValues(event: {
+ isUserInput: any;
+ source: { value: any; selected: any };
+ },details) {
+ console.log(event,details,this.assignService)
+ if (event.isUserInput) {
+ if (event.source.selected === true) {
+ console.log('1',event.source.value)
+ this.serviceCheckedData = 1
+ this.getCheckedService(details)
+ } else {
+ console.log('2',event.source.value)
+ this.serviceCheckedData = 0
+ this.getCheckedService(details)
+ }
+ }
+
+ }
+
+ // AlterServicesMap
+ // methoad post
+ // param = {serviceId:"",userId:"",busId:"",active:1}
+ getCheckedService(params){
+ console.log(params)
+ let userid = localStorage.getItem('user_id')
+ let data = {serviceId:params.serviceId,userId:userid,busId:params.busId,active:this.serviceCheckedData}
+ console.log(data)
+ this._api.getServiceCheckedDetails(data).subscribe(res => {
+ if (res.status == 200) {
+ console.log(res)
+ // this.checkedList = res.data;
+ this.getServicesList(this.usersList.id,this.usersList.busId)
+ }
+ } );
+ }
+
+
}
diff --git a/ng-seed/src/app/appoinment/service-list-details/service-api-services/api-service.service.ts b/ng-seed/src/app/appoinment/service-list-details/service-api-services/api-service.service.ts
index 7a43b7b..2f27a68 100644
--- a/ng-seed/src/app/appoinment/service-list-details/service-api-services/api-service.service.ts
+++ b/ng-seed/src/app/appoinment/service-list-details/service-api-services/api-service.service.ts
@@ -14,7 +14,7 @@ export class ApiServiceService {
getServicesListDetails(): Observable {
console.log('IN')
- return this._http.get(this.apiUrl + "getServicesDetails ")
+ return this._http.post(this.apiUrl + "getServicesDetails",{})
// .pipe(
// catchError(this.handleError('role', []))
// )
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 c2653ec..a57da35 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
@@ -31,7 +31,7 @@
Duration
- {{element.duration}}
+ {{element.duration}} Mins
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 05f58c3..771838e 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
@@ -44,29 +44,12 @@ export class ServiceListComponent implements OnInit {
this.getServicesList()
}
- getServicesList() {
- //this._pd.getTabStatusPdDetails(this.tabStatus)
+ getServicesList() {
this._api.getServicesListDetails().subscribe(res => {
if (res.status == 200) {
- this.servicesList = res.data;
- // console.log(this.servicesList)
- // this.dataSource = res.data.length;
- // console.log(this.dataSource)
- // this.dataSource.data = this.servicesList;
- // console.log(this.dataSource.data)
- // this.recordStatus=false;
- }
- else{
- // this.servicesList=[];
- // this.dataSource = null;
- // this.recordStatus=true;
- }
- }
- ,error => {
- // this.errorMessage.push(error);
- // this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (error.error_type == 2 ? error.error_status + ' ( ' + error.error_text + ' ) ' : ' ( ' + error.error_text + ' ) ') +'\" Error Occur.!');
- // alert(error.html_format);
- });
+ this.servicesList = res.data;
+ }
+ } );
}
confirmBox(event,element){
diff --git a/ng-seed/src/app/end-user/end-user.service.ts b/ng-seed/src/app/end-user/end-user.service.ts
index 770cb59..abe3293 100644
--- a/ng-seed/src/app/end-user/end-user.service.ts
+++ b/ng-seed/src/app/end-user/end-user.service.ts
@@ -15,7 +15,7 @@ private apiUrl = environment.apiEndpoint;
getServicesListDetails(): Observable {
console.log('IN')
- return this._http.get(this.apiUrl + "getServicesDetails ")
+ return this._http.get(this.apiUrl + "getServicesDetails",{})
// .pipe(
// catchError(this.handleError('role', []))
// )
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 e582b71..00db1e7 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
@@ -16,7 +16,7 @@
-
Define Your Services
-
+
+
+
- role is required
- -->
+
+
-
+
+
+
+ 
+
+
+
+
+ {{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}}
+ +