diff --git a/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.html b/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.html index 54990b4..9fe4215 100644 --- a/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.html +++ b/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.html @@ -1,7 +1,7 @@

Appointment Details

Filter - +
@@ -16,31 +16,36 @@
- - - + + + + + + + + + + + + + - - + + - - - - - - - - - + + + + + - + @@ -72,11 +77,17 @@
BusId {{element.busId}} Profile
Client Name
{{element.customer[0].cusName || null }}
Appointment Date
{{element.appoinmentDate | date:'dd-MMM-YYYY' }}
+ 		Time
{{element.appoinmentDate | date:'mediumDate'}}

{{element.appoinmentTime}} 		Appointment Time
{{element.appoinmentSlots }}
 Slots
{{element.appoinmentSlots}} 		Booking ID
{{element.booking}} 		Status
{{element.status}}
{{element.status == 0 ? 'Booked':'Cancelled'}} 		Action
+
+ - +
diff --git a/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.ts b/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.ts index efc1481..2c87f65 100644 --- a/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.ts +++ b/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.ts @@ -41,16 +41,17 @@ const ELEMENT_DATA: UsersData[] = [ export class AppoinmentsListComponent implements OnInit { push: any; - displayedColumns: string[] = ['busId', 'time', 'slots', 'action']; + displayedColumns: string[] = ['Profile', 'ClientName','date','time','status', 'action']; // dataSource: any; public appoinmentsList:any = new MatTableDataSource(); // dataSource: any = new MatTableDataSource(ELEMENT_DATA); @ViewChild(MatTable,{static:true}) table: MatTable; - @ViewChild(MatPaginator) paginator: MatPaginator; + // @ViewChild(MatPaginator) paginator: MatPaginator; recordStatus: boolean; addFormData: any; - - + @ViewChild('paginator') paginator: MatPaginator; + @ViewChild('paginatorPageSize') paginatorPageSize: MatPaginator; + pageSizes = [3, 5, 7]; constructor(public dialog: MatDialog, public _app:AppointmentsService) { } ngOnInit(): void { @@ -62,28 +63,33 @@ export class AppoinmentsListComponent implements OnInit { this._app.getAppoinmentsListDetails().subscribe(res => { if (res.status == 200) { this.appoinmentsList = res.data; - // console.log(this.appoinmentsList) - // this.dataSource = res.data.length; - // console.log(this.dataSource) - // this.dataSource.data = this.appoinmentsList; - // console.log(this.dataSource.data) - // this.recordStatus=false; + console.log(this.appoinmentsList) + } else{ - // this.appoinmentsList=[]; - // 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); - }); + }) + // let param ={'userId':"5" + // } + // this._app.getServicesMapDetails(param).subscribe(res => { + // if (res.status == 200) { + // console.log(res) + // this.appoinmentsList = res.data; + // console.log(this.appoinmentsList) + + // } + // else{ + + // } + // }) + } ngAfterViewInit() { this.appoinmentsList.paginator = this.paginator; + this.appoinmentsList.paginator = this.paginatorPageSize; + } applyFilter(event: Event) { const filterValue = (event.target as HTMLInputElement).value; diff --git a/ng-seed/src/app/appoinment/appoinments/appointments-service/appointments.service.ts b/ng-seed/src/app/appoinment/appoinments/appointments-service/appointments.service.ts index a05dcb4..f947001 100644 --- a/ng-seed/src/app/appoinment/appoinments/appointments-service/appointments.service.ts +++ b/ng-seed/src/app/appoinment/appoinments/appointments-service/appointments.service.ts @@ -26,7 +26,14 @@ export class AppointmentsService { // catchError(this.handleError('role', [])) // ) } - + + getServicesMapDetails(addParams): Observable { + return this._http.post(this.apiUrl + 'getServicesMapDetails', addParams) + // .pipe( + // catchError(this.handleError('role', [])) + // ) + } + handleError(arg0: string, arg1: undefined[]): (err: any, caught: Observable) => import("rxjs").ObservableInput { throw new Error('Method not implemented.'); diff --git a/ng-seed/src/app/appoinment/consultant-setting/consultant-service/consultant.service.spec.ts b/ng-seed/src/app/appoinment/consultant-setting/consultant-service/consultant.service.spec.ts new file mode 100644 index 0000000..1f4a0ea --- /dev/null +++ b/ng-seed/src/app/appoinment/consultant-setting/consultant-service/consultant.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { ConsultantService } from './consultant.service'; + +describe('ConsultantService', () => { + let service: ConsultantService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(ConsultantService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/ng-seed/src/app/appoinment/consultant-setting/consultant-service/consultant.service.ts b/ng-seed/src/app/appoinment/consultant-setting/consultant-service/consultant.service.ts new file mode 100644 index 0000000..d14ce17 --- /dev/null +++ b/ng-seed/src/app/appoinment/consultant-setting/consultant-service/consultant.service.ts @@ -0,0 +1,33 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { environment } from 'environments/environment'; +import { Observable } from 'rxjs'; +import { catchError } from 'rxjs/operators'; + +@Injectable({ + providedIn: 'root' +}) +export class ConsultantService { + + private apiUrl = environment.apiEndpoint; + constructor(private _http: HttpClient) { } + + getUsersListDetails(id): Observable { + console.log('IN') + return this._http.post(this.apiUrl + 'getPractitionerInfo', {id:id}) + // .pipe( + // catchError(this.handleError('role', [])) + // ) + } + getServicesListDetails(userId,busId): Observable { + console.log('IN') + return this._http.post(this.apiUrl + 'getServicesMapDetails', {busId:busId, userId:userId}) + // .pipe( + // catchError(this.handleError('role', [])) + // ) + } + + handleError(arg0: string, arg1: undefined[]): (err: any, caught: Observable) => import("rxjs").ObservableInput { + throw new Error('Method not implemented.'); + } +} diff --git a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting.module.ts b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting.module.ts index 35c105d..66e4dd7 100644 --- a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting.module.ts +++ b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting.module.ts @@ -6,12 +6,14 @@ import { ConsultantSettingComponent } from './consultant-setting/consultant-sett import { DemoMaterialModule } from 'app/shared/demo.module'; import { NgScrollbarModule } from 'ngx-scrollbar'; import { EditWorkingHoursComponent } from './edit-working-hours/edit-working-hours.component'; +import { ExtraWorkingHoursComponent } from './extra-working-hours/extra-working-hours.component'; @NgModule({ declarations: [ ConsultantSettingComponent, - EditWorkingHoursComponent + EditWorkingHoursComponent, + ExtraWorkingHoursComponent ], imports: [ CommonModule, 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 9066ae0..b1472d9 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 @@ -12,12 +12,12 @@ - - Staff Information + + My Profile
- Set Up Staff Profile + Profile
@@ -25,75 +25,81 @@
- -
-
Name is required
-
+ {{usersList.userName}}
- -
-
Email is required
-
Email must be a valid email address
-
+ {{usersList.email}}
+ + {{usersList.role}} +
+
+ + {{usersList.password}} +
+
+ + {{practitionerdetails.gender}} +
+
+ + {{practitionerdetails.dob}} +
+
+ + {{practitionerdetails.languages}} +
+
+ + {{practitionerdetails.qualification}} +
+
+ + {{practitionerdetails.designtion}} +
+
+ + {{practitionerdetails.exp}} +
+
+ + {{practitionerdetails.fees}} +
+ + + + + + @@ -104,7 +110,7 @@ - + Working Hours
@@ -118,11 +124,12 @@
- Working Hours + + Working Hours
-
+
@@ -130,32 +137,112 @@
-
- 10:00 am +
+ 09:00am
- -
- 01:00 pm +
+ 06:00pm
-
+
Monday
-
- 10:00 am -
- - -
- 01:00 pm -
-
-
+
+ 09:00am +
+ - +
+ 06:00pm +
+
+
+
+ + Tuesday + +
+
+
+ 09:00am +
+ - +
+ 06:00pm +
+
+
+
+
+ + Wednesday + +
+
+
+ 09:00am +
+ - +
+ 06:00pm +
+
+
+
+
+ + Thursday + +
+
+
+ 09:00am +
+ - +
+ 06:00pm +
+
+
+
+
+ + Friday + +
+
+
+ 09:00am +
+ - +
+ 06:00pm +
+
+
+
+
+ + Saturday + +
+
+
+ 09:00am +
+ - +
+ 06:00pm +
+
+
+
Special Working Hours - +

Workings on weekends or compensating for time off? Add them here to let customers know when you're available.

Unavailability - +

Workings on weekends or compensating for time off? Add them here to let customers know when you're available.

@@ -187,43 +274,35 @@ - Assigned Services + Assigned Services
Define Your Services - - - - None - Option 1 - Option 2 - Option 3 - - -
-
- - - -

{{message.name}}

-

{{message.time}} | ₹ {{message.amount}}

-

+ Customize the price of a service.

- - -
- {{message.username}} -
-
- {{message.status}} -
+
+ + + + {{details.servicesName}} + {{details.duration}} Minutes + + - Staff Booking URL + Staff Booking URL
@@ -239,7 +318,7 @@
- + @@ -251,4 +330,5 @@ + \ No newline at end of file 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 5793d5d..08e59bd 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 @@ -26,6 +26,9 @@ margin-left: 2rem; // margin-top: -9rem; } + // :host ::ng-deep .mat-tab-body.mat-tab-body-active { + // position: absolute !important; + // } mat-tab-body { flex-grow: 1; @@ -36,12 +39,23 @@ :host ::ng-deep mat-ink-bar { display: none; } - + .icons-info{ + margin-left: -4rem; + margin-right: 1rem; + } + .icons{ + margin-left: -1rem; + margin-right: 1rem; + } + .icons-Hours{ + margin-left: -2rem; + margin-right: 1rem; + } :host ::ng-deep.mat-tab-label.mat-tab-label-active { background-color: transparent; - // color: red; - // background-color: #eee; - // border-right: 2px solid red; + color: #666; + background-color: #eee; + border-right: 2px solid #666; } :host ::ng-deep.mat-tab-label { @@ -118,7 +132,8 @@ label{ line-height: 21px; } .underline-title{ - color: #666!important; + // color: #666!important; + color: #111; font-size: 16px; margin-top: 1px; border-bottom: 1px solid #EFEFEF; @@ -324,7 +339,29 @@ margin-bottom: 10rem; } - +.checkbox{ + margin-left: 1rem; +} +.service-info{ + line-height: 3rem!important; + font-size: 14px!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; + max-height: 38px; + display: -webkit-box; + overflow: hidden; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; +} +::ng-deep .mat-card .mat-card-title:nth-child(2) { + margin-top: -33px!important; +} // .user-pro-wrap{ // background-color: #fff; // // height: 100%; 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 0b397b8..91f3c65 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 @@ -1,7 +1,13 @@ +import { LocationStrategy } from '@angular/common'; import { Component, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms'; 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 { 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'; @Component({ selector: 'app-consultant-setting', @@ -21,7 +27,13 @@ export class ConsultantSettingComponent implements OnInit { status: 'Active', }, ]; - constructor(private formBuilder: FormBuilder, public dialog: MatDialog) {} + + public usersList:any = new MatTableDataSource(); + public servicesList:any = new MatTableDataSource(); + practitionerdetails: any; + servicesList_array: any = []; + apiUrl:any; + constructor(private formBuilder: FormBuilder, public dialog: MatDialog, public _con:ConsultantService, private fb: FormBuilder, public _api:ConsultantService,private locationStrategy: LocationStrategy) {} ngOnInit() { @@ -37,8 +49,71 @@ export class ConsultantSettingComponent implements OnInit { status: ['', Validators.required], information: ['', Validators.required], }); + this.getUsersList() + } +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; } @@ -66,5 +141,22 @@ openDialog(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) + // } + // }); +} + } 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 a2b9f0b..6a77c47 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 @@ -1,271 +1,657 @@
- -
-
- Edit Working Hours - -
-
- -
-
- - - - + +
+
+ Edit Working Hours + +
+
+ +
+
+
+
+
+ + + + +
+ + + + {{ filterType }} + + + + + + + {{ apiType }} + + + + + + + add + + + delete + +
+
+
+ + +
+ +
+
+
+
+
+
+ + + + +
+ + + + {{ filterType }} + + + + + + + {{ apiType }} + + + + + add + + + delete + +
+
-
-
-
- -
-
-
- + + + +
+ + + + {{ filterType }} + + + + + + + {{ apiType }} + + + + + add + + + delete + +
+
+
+ +
+ +
+
+
+
+
+
+ + + + +
+ + + + {{ filterType }} + + + + + + + {{ apiType }} + + + + + add + + + delete + +
+
+
+
+
+
+
+
+
+
+
+ + + + +
+ + + + {{ filterType }} + + + + + + + {{ apiType }} + + + + + add + + + delete + +
+
+
+
+
+
+
+
+
+
+
+ + + + +
+ + + + {{ filterType }} + + + + + + + {{ apiType }} + + + + + add + + + delete + +
+
+
+
+
+
+
+
+
+
+
+ + + + +
+ + + + {{ filterType }} + + + + + + + {{ apiType }} + + + + + add + + + delete + +
+
+
+
+
+ -
- Cancel - Save -
-
- - - +
--> + +
+ Cancel + Save +
+
\ No newline at end of file diff --git a/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.scss b/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.scss index 4d76379..d922a38 100644 --- a/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.scss +++ b/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.scss @@ -12,22 +12,22 @@ float: right; } .label-container { - display: flex; + // display: flex; width: 100%; border-bottom: 1px solid #F5F6F8; box-sizing: border-box; min-height: 40px; - padding: 13px 0; + padding: 5px 0; } .label-name{ color: #666; - position: relative; + // position: absolute; text-transform: capitalize; width: 100px; flex: none; - margin-right: 15px; + margin-right: 0rem!important; align-self: flex-start; - padding-top: 13px; + padding-top: 25px; box-sizing: border-box; line-height: 15px; } @@ -37,8 +37,14 @@ // padding: 10px 10px 10px 10px; width: 150px; } + .dis-flexs { + display: flex !important; + } .dis-flex { - display: flex!important; + display: flex !important; + margin-left: 3rem; + margin-bottom: 10px; + margin-top: -0.5rem; } .width-10px { width: 10px!important; @@ -48,12 +54,36 @@ height: 40px; background-color: #FFF; font-size: 13px; - color: #111; + color: #685f5f; border-radius: 4px; - border-color: #666; + border-color: #999; } .addbreak{ - margin-top: 0.5rem; + margin-right: 0.5rem; + color: #FFF; + margin-left: 25px; + height: 40px; + margin-top: 1rem; + cursor: pointer; + // &:hover { + // cursor: pointer; + // color: #111; + // } + } + .deleteRow{ + margin-right: 0.5rem; + margin-left: 1rem; + margin-top: 1.5rem; + // color: #FFF; + color: #111; + cursor: pointer; + // &:hover { + // cursor: pointer; + // color: #111; + // } + } + .applyToAll{ + margin-top: -0.5rem; margin-right: 2rem; color: #FFF; &:hover { @@ -64,7 +94,6 @@ // .scrollHV { // height: calc(100vh - 190px); // } - .popup-button { margin-top: 2rem; width: 100%; @@ -73,13 +102,14 @@ background: #F5F5F5; color: #111; float: left; + cursor: pointer; } .buttons { width: 50%; background: #FFF; color: #111; - font-size: 13px; - font-family: zohopuvi-medium; + font-size: 15px; + // font-family: zohopuvi-medium; text-align: center; border-top: 1px solid #E2E2E2; padding: 20px; @@ -88,9 +118,19 @@ transition: all .2s ease-in; } .add { - background: #52518F; + background-color: #4caf50; color: #FFF; - border-top: 1px solid #52518F; + border-top: 1px solid #4caf50; float: left; + cursor: pointer; + } + .margin-lft{ + margin-left: 2rem; } } +::ng-deep .mat-dialog-container { + overflow-x: hidden!important; +} +::ng-deep .mat-form-field { + width: 20%; +} 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 5a3a0b1..a4256d1 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 @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup } from '@angular/forms'; +import { FormArray, FormBuilder, FormGroup } from '@angular/forms'; import { MatDialogRef } from '@angular/material/dialog'; @Component({ @@ -9,30 +9,116 @@ import { MatDialogRef } from '@angular/material/dialog'; }) export class EditWorkingHoursComponent implements OnInit { + filterTypes = [ + '09:00am','09:30am','10:00am','10:30am','11:00am','11:30am','12:00am','12:30am','01:00pm','01:00pm','01:30pm', '02:00pm', '02:30pm', '03:00pm', '03:30pm', '04:00pm', '04:30pm', '05:00pm', '05:30pm', '06:00pm', '06:30pm', '07:00pm', '07:30pm', '08:00pm','08:30pm', '09:00pm', + ]; + apiTypes = [ + '09:00am','09:30am','10:00am','10:30am','11:00am','11:30am','12:00am','12:30am','01:00pm','01:00pm','01:30pm', '02:00pm', '02:30pm', '03:00pm', '03:30pm', '04:00pm', '04:30pm', '05:00pm', '05:30pm', '06:00pm', '06:30pm', '07:00pm', '07:30pm', '08:00pm','08:30pm', '09:00pm', + ]; + days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; + seedData = [ + { day: 'Sunday', filterType: '09:00am', apiType: '09:30am' }, + + ]; + + dynamicForm: FormGroup; + // rows = [{noQuestion : 0}]; datainputForm: FormGroup; - timing: any[] = ['09:00am','09:30am','10:00am','10:30am','11:00am','11:30am','12:00am','12:30am','01:00pm','01:00pm','01:30pm', '02:00pm', '02:30pm', '03:00pm', '03:30pm', '04:00pm', '04:30pm', '05:00pm', '05:30pm', '06:00pm', '06:30pm', '07:00pm', '07:30pm', '08:00pm','08:30pm', '09:00pm',] + // timing: any[] = ['09:00am','09:30am','10:00am','10:30am','11:00am','11:30am','12:00am','12:30am','01:00pm','01:00pm','01:30pm', '02:00pm', '02:30pm', '03:00pm', '03:30pm', '04:00pm', '04:30pm', '05:00pm', '05:30pm', '06:00pm', '06:30pm', '07:00pm', '07:30pm', '08:00pm','08:30pm', '09:00pm',] constructor(public dialogRef: MatDialogRef, private fb: FormBuilder) { } - close() { this.dialogRef.close(); } +// addNewRow() { +// this.rows.push({noQuestion : 0}); +// } + +// deleteRow(i){ +// this.rows.splice(i, 1 ); +// } + ngOnInit(): void { this.datainputForm = this.fb.group({ - dropDownTest: '09:00am', + dropDownTest: '09:00am', + dropDownTests: '09:30am', dropDownTest1:'' }) -} -onSelectChange(){ - console.log(this.datainputForm.get('dropDownTest').value); - if( this.datainputForm.get('dropDownTest').value === 'vmnic3'){ - this.datainputForm.get('dropDownTest1').disable(); - }else{ - this.datainputForm.get('dropDownTest1').enable(); - } - } - + this.dynamicForm = this.fb.group({ + filters: this.fb.array([]) + }); + this.seedFiltersFormArray(); +} + + +seedFiltersFormArray() { + this.seedData.forEach(seedDatum => { + const formGroup = this.createFilterGroup(); + if (seedDatum.apiType) { + formGroup.addControl('value', this.getFormControl()); + } + formGroup.patchValue(seedDatum); + this.filtersFormArray.push(formGroup); + }); +} + +createFilterGroup() { + return this.fb.group({ + filterType: [], + apiType: [], + day: [] + }); +} + +addFilterToFiltersFormArray() { + this.filtersFormArray.push(this.createFilterGroup()); +} + +removeFilterFromFiltersFormArray(index) { + this.filtersFormArray.removeAt(index); +} + +selectedAPIChanged(i) { + this.getFilterGroupAtIndex(i).addControl('value', this.getFormControl()); +} + +getFormControl() { + return this.fb.control(null); +} + +save() { + console.log(this.dynamicForm.value); +} + +get filtersFormArray() { + return (this.dynamicForm.get('filters')); +} + +getFilterGroupAtIndex(index) { + return (this.filtersFormArray.at(index)); +} + +// onSelectChange(){ +// console.log(this.datainputForm.get('dropDownTest').value); +// if( this.datainputForm.get('dropDownTest').value === 'vmnic3'){ + +// this.datainputForm.get('dropDownTest1').disable(); +// }else{ +// this.datainputForm.get('dropDownTest1').enable(); +// } + +// console.log(this.datainputForm.get('dropDownTests').value); +// if( this.datainputForm.get('dropDownTests').value === 'vmnic3'){ + +// this.datainputForm.get('dropDownTest1').disable(); +// }else{ +// this.datainputForm.get('dropDownTest1').enable(); +// } +// } + onSubmit() { + console.log(this.datainputForm.value); + } } diff --git a/ng-seed/src/app/appoinment/consultant-setting/extra-working-hours/extra-working-hours.component.html b/ng-seed/src/app/appoinment/consultant-setting/extra-working-hours/extra-working-hours.component.html new file mode 100644 index 0000000..00aa878 --- /dev/null +++ b/ng-seed/src/app/appoinment/consultant-setting/extra-working-hours/extra-working-hours.component.html @@ -0,0 +1,66 @@ +
+
+
+ Add Additional Availability - Staff + +
+
+
+
+
+
+
+ + + + +
+
+ + +
+
+ + + + + + + + + + + +
+
+ + + + + + + + + + + +
+
+ + + + +
+
+
+
+ +
+
+ Cancel + Save +
+
diff --git a/ng-seed/src/app/appoinment/consultant-setting/extra-working-hours/extra-working-hours.component.scss b/ng-seed/src/app/appoinment/consultant-setting/extra-working-hours/extra-working-hours.component.scss new file mode 100644 index 0000000..0d734d1 --- /dev/null +++ b/ng-seed/src/app/appoinment/consultant-setting/extra-working-hours/extra-working-hours.component.scss @@ -0,0 +1,106 @@ +.extra-working{ + .popup-header { + background: #FFF; + // padding: 5px 5px 5px 5px; + margin-top: -1.5rem; + border-bottom: 1px solid #F5F6F8; + } + .button{ + // float: right; + margin-bottom: 1rem; + background-color: #ffff; + margin-top: -1rem; + margin-left: 14rem; + } + // h5{ + // margin-bottom: 1.5rem; + // } + .availability{ + margin-bottom: 7.5rem; + } + .label-container{ + margin-right: 8rem; + margin-left: 1.5rem; + } + // .outline{ + // width: 18%; + // } + .mate{ + width: 16% !important; + } + .date-marge{ + margin-left: 4.5rem; + } + .label{ + margin-right: 9rem; + margin-left: 1.5rem; + } + .mr-8{ + margin-right: 7rem; + margin-left: 1.5rem; + } + .mr2{ + margin-right: 3rem; + margin-left: 1.5rem; + } + .cancel { + background: #F5F5F5; + color: #111; + float: left; + cursor: pointer; + } + .buttons { + width: 50%; + background: #FFF; + color: #111; + font-size: 15px; + // font-family: zohopuvi-medium; + text-align: center; + border-top: 1px solid #E2E2E2; + padding: 20px; + -webkit-transition: all .2s ease-in; + -moz-transition: all .2s ease-in; + transition: all .2s ease-in; + } + .add { + background-color: #4caf50; + color: #FFF; + border-top: 1px solid #4caf50; + float: left; + cursor: pointer; + } + h1 { + color: #4caf50; + font-weight: 300; + text-align: center; + } + + toggle-button { + margin: 0 auto; + } + .example-h2 { + margin: 10px; + } + + .example-section { + display: flex; + align-content: center; + align-items: center; + height: 60px; + } + + .example-margin { + margin: 10px; + } + +} +::ng-deep .mat-form-field-outline { + width: 145%; +} +::ng-deep .mat-icon-button { + margin-right: -3rem; +} +::ng-deep .mat-slide-toggle-bar { + width: 50px; + height: 20px; +} \ No newline at end of file diff --git a/ng-seed/src/app/appoinment/consultant-setting/extra-working-hours/extra-working-hours.component.spec.ts b/ng-seed/src/app/appoinment/consultant-setting/extra-working-hours/extra-working-hours.component.spec.ts new file mode 100644 index 0000000..cff4b0d --- /dev/null +++ b/ng-seed/src/app/appoinment/consultant-setting/extra-working-hours/extra-working-hours.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ExtraWorkingHoursComponent } from './extra-working-hours.component'; + +describe('ExtraWorkingHoursComponent', () => { + let component: ExtraWorkingHoursComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ExtraWorkingHoursComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ExtraWorkingHoursComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng-seed/src/app/appoinment/consultant-setting/extra-working-hours/extra-working-hours.component.ts b/ng-seed/src/app/appoinment/consultant-setting/extra-working-hours/extra-working-hours.component.ts new file mode 100644 index 0000000..ba3dd28 --- /dev/null +++ b/ng-seed/src/app/appoinment/consultant-setting/extra-working-hours/extra-working-hours.component.ts @@ -0,0 +1,31 @@ +import { Component, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { MatDialogRef } from '@angular/material/dialog'; +export interface UsersData { + name: string; + id: number; +} +@Component({ + selector: 'app-extra-working-hours', + templateUrl: './extra-working-hours.component.html', + styleUrls: ['./extra-working-hours.component.scss'] +}) +export class ExtraWorkingHoursComponent implements OnInit { + form: FormGroup; + checked = false; + disabled = false; + constructor(public dialogRef: MatDialogRef) { } + + close() { + this.dialogRef.close(); +} + ngOnInit(): void { + this.form = new FormGroup({ + name: new FormControl('', [Validators.required]), + }); + } + submit(){ + console.log(this.form.value); + } + +} diff --git a/ng-seed/src/app/end-user/consultants/consultants-list.component.html b/ng-seed/src/app/end-user/consultants/consultants-list.component.html index fad3655..74feec9 100644 --- a/ng-seed/src/app/end-user/consultants/consultants-list.component.html +++ b/ng-seed/src/app/end-user/consultants/consultants-list.component.html @@ -33,15 +33,16 @@
{{consultant.userName}}
- {{consultant.specialist || "ENT" }}
- {{consultant.year || "1 YRS EXP"}}
- {{consultant.qualification || "MBBS"}}
- Starts at ₹ {{consultant.payment || 100}}
+ {{consultant.practitionerInfos[0].designtion + || "ENT" }}
+ {{consultant.practitionerInfos[0].exp || null}}
+ {{consultant.practitionerInfos[0].qualification || null}}
+ Starts at ₹ {{consultant.practitionerInfos[0].fees || 100}}
transcribe - {{consultant.language || "English"}} + {{consultant.practitionerInfos[0].languages || ""}} location_on @@ -55,7 +56,7 @@ -
diff --git a/ng-seed/src/app/end-user/consultants/consultants-list.component.ts b/ng-seed/src/app/end-user/consultants/consultants-list.component.ts index 31f33e8..4d1e038 100644 --- a/ng-seed/src/app/end-user/consultants/consultants-list.component.ts +++ b/ng-seed/src/app/end-user/consultants/consultants-list.component.ts @@ -27,10 +27,21 @@ export class ConsultantsListComponent implements OnInit { }); }); - - let filter = arr_val.filter(arr=>{return arr.role == "PRACTITIONER" && arr.busId =="abc123"}) + let service = localStorage.getItem("servicedetails") + let serviceDetails = JSON.parse(service) + console.log(serviceDetails) + let filter = arr_val.filter(arr=>{return arr.role == "PRACTITIONER" && arr.busId ==serviceDetails.busId}) console.log(arr_val,filter) - this.consultants = filter; + + + let result = filter.filter((obj, index, self) => + index === self.findIndex((t) => ( + t.id === obj.id + + + )) + ); + this.consultants = result; // this.consultants = [{ // name: 'Dr. Suganya', // specialist: 'ENT', @@ -103,9 +114,14 @@ export class ConsultantsListComponent implements OnInit { } - goToSlotBooking(){ + goToSlotBooking(param){ let URL = this.router.url; - console.log(URL) + console.log(URL,param) + let service = localStorage.getItem("servicedetails") + let serviceDetails = JSON.parse(service) + serviceDetails.userId = ""+param.id+"" + + localStorage.setItem("servicedetails",JSON.stringify(serviceDetails)) // console.log(URL+"/"+data.randStr+"/practitioner") this.router.navigate([URL+"/slot"]) 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 0eab10c..2feb9d0 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 @@ -53,9 +53,10 @@ export class CustomerInfoComponent implements OnInit { this._cus.addCusDetails(addFormData).subscribe(res => { if (res.status == 200) { console.log(res) + let URL = this.router.url; console.log(URL) - this.router.navigate([URL+"/pt"]) + this.router.navigate([URL+"/"+res['data'].id+"/pt"]) } }); diff --git a/ng-seed/src/app/end-user/end-user-routing.module.ts b/ng-seed/src/app/end-user/end-user-routing.module.ts index 3b17276..13eb8e3 100644 --- a/ng-seed/src/app/end-user/end-user-routing.module.ts +++ b/ng-seed/src/app/end-user/end-user-routing.module.ts @@ -40,27 +40,27 @@ const routes: Routes = [ component: ConsultantsListComponent }, { - path: 'busniness/:randstr', + path: 'business/:randstr', component: ServiceListComponent }, { - path: 'busniness/:randstr/:randstrs/practitioner', + path: 'business/:randstr/:randstrs/practitioner', component: ConsultantsListComponent }, { - path: 'busniness/:randstr/:randstrs/practitioner/slot', + path: 'business/:randstr/:randstrs/practitioner/slot', component: SlotBookingDetailsComponent }, { - path: 'busniness/:randstr/:randstrs/practitioner/slot/cus', + path: 'business/:randstr/:randstrs/practitioner/slot/cus', component: CustomerInfoComponent }, { - path: 'busniness/:randstr/:randstrs/practitioner/slot/cus/pt', + path: 'business/:randstr/:randstrs/practitioner/slot/cus/:cusId/pt', component: PaymentComponent }, { - path: 'busniness/:randstr/:randstrs/practitioner/slot/cus/pt/bts', + path: 'business/:randstr/:randstrs/practitioner/slot/cus/pt/bts', component: BookingSummaryComponent }, 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 4785160..770cb59 100644 --- a/ng-seed/src/app/end-user/end-user.service.ts +++ b/ng-seed/src/app/end-user/end-user.service.ts @@ -50,7 +50,20 @@ private apiUrl = environment.apiEndpoint; // catchError(this.handleError('role', [])) // ) } - + CreateAppoinmentsCus(addParams): Observable { + return this._http.post(this.apiUrl + 'CreateAppoinmentsCus', addParams) + // .pipe( + // catchError(this.handleError('role', [])) + // ) + } + CreatecusServicesMapDetails(addParams): Observable { + return this._http.post(this.apiUrl + 'CreatecusServicesMapDetails', addParams) + // .pipe( + // catchError(this.handleError('role', [])) + // ) + } + + handleError(arg0: string, arg1: undefined[]): (err: any, caught: Observable) => import("rxjs").ObservableInput { throw new Error('Method not implemented.'); } 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 4497246..f172c2a 100644 --- a/ng-seed/src/app/end-user/payment/payment.component.ts +++ b/ng-seed/src/app/end-user/payment/payment.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router'; +import { EndUserService } from '../end-user.service'; @Component({ selector: 'app-payment', @@ -9,7 +10,7 @@ import { Router } from '@angular/router'; }) export class PaymentComponent implements OnInit { form: FormGroup; - constructor(private router:Router) { } + constructor(private router:Router,public enduser:EndUserService, ) { } ngOnInit(): void { this.form = new FormGroup({ @@ -26,10 +27,49 @@ export class PaymentComponent implements OnInit { submit(){ console.log(this.form.value) + let slot_array = JSON.parse(localStorage.getItem("slotData")) + let service = localStorage.getItem("servicedetails") + let serviceDetails = JSON.parse(service) + console.log(serviceDetails) + let URL = this.router.url; - console.log(URL) - this.router.navigate([URL+"/bts"]) + console.log(URL,slot_array) + let URL_AS_LIST = URL.split('/'); + console.log(URL_AS_LIST); + let paramsmap= { + "serviceId": ""+serviceDetails.serviceId+"", + "userId": serviceDetails.userId, + "busId": serviceDetails.busId +} + this.enduser.CreatecusServicesMapDetails(paramsmap).subscribe(res => { + if (res.status == 200) { + console.log(res) + let serviceMap = res['data'].id + let time = new Date().toLocaleTimeString() + let params= { + "busId": serviceDetails.busId, + "cusId": URL_AS_LIST[8], + "appoinmentDate": slot_array[0].date, + "appoinmentTime": time, + "serviceMap": serviceMap, + "appoinmentSlots": slot_array[0].slots, + } + console.log(params) + this.enduser.CreateAppoinmentsCus(params).subscribe(res => { + if (res.status == 200) { + console.log(res) + this.router.navigate([URL+"/bts"]) + } + }) + + + + } + }) + + + } } diff --git a/ng-seed/src/app/end-user/service-list-details/service-list.component.html b/ng-seed/src/app/end-user/service-list-details/service-list.component.html index 0c037c3..df5d186 100644 --- a/ng-seed/src/app/end-user/service-list-details/service-list.component.html +++ b/ng-seed/src/app/end-user/service-list-details/service-list.component.html @@ -41,10 +41,11 @@
+

- © 2021 Venba Information Technology Pvt Ltd. All Rights Reserved + © 2023 Venba Information Technology Pvt Ltd. All Rights Reserved

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 ebfe868..9e45d1f 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 @@ -212,6 +212,7 @@ let updatevalue = { serviceId: row_obj.serviceId, goto(data){ let URL = this.router.url; console.log(URL,data) + localStorage.setItem("servicedetails",JSON.stringify(data)) console.log(URL+"/"+data.randStr+"/practitioner") this.router.navigate([URL+"/"+data.randStr+"/practitioner"]) 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 00db1e7..e582b71 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 @@
- +
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 1494404..12310c4 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 @@ -36,7 +36,13 @@ export class SlotBookingDetailsComponent implements OnInit { workspace: new FormControl('', [Validators.required]), }); -console.log(this.local_data, this.selects) + + + let service = localStorage.getItem("servicedetails") + let serviceDetails = JSON.parse(service) + console.log(serviceDetails) + + // this.form.controls['note'].setValue('Sample') this.form.patchValue(this.local_data) } @@ -54,13 +60,14 @@ console.log(this.local_data, this.selects) } var target = event.currentTarget; target.style.backgroundColor = "#0c8f00"; - console.log(param) - this.slot_array.push(param) + console.log(this.date,param) + this.slot_array.push({date:this.date,slots:param}) } submit(){ 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"]) diff --git a/ng-seed/src/app/session/login/login.component.ts b/ng-seed/src/app/session/login/login.component.ts index 0575d29..85f3bb9 100644 --- a/ng-seed/src/app/session/login/login.component.ts +++ b/ng-seed/src/app/session/login/login.component.ts @@ -47,6 +47,7 @@ export class LoginComponent { localStorage.setItem('user_token',res.token); localStorage.setItem('user_role',res.role); localStorage.setItem('email',JSON.stringify(auth)) + localStorage.setItem('user_id',res.roleId) this.router.navigate(['/home']) } } diff --git a/ng-seed/src/assets/images/profile.jpg b/ng-seed/src/assets/images/profile.jpg new file mode 100644 index 0000000..38f833a Binary files /dev/null and b/ng-seed/src/assets/images/profile.jpg differ