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 9fe4215..fe3be01 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 @@ -37,7 +37,7 @@ Appointment Time -
{{element.appoinmentSlots }}
+
{{element.appoinmentSlots }}
 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 2c87f65..51c5666 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 @@ -63,8 +63,18 @@ export class AppoinmentsListComponent implements OnInit { this._app.getAppoinmentsListDetails().subscribe(res => { if (res.status == 200) { this.appoinmentsList = res.data; + let user_role = localStorage.getItem('user_role'); + if(user_role == 'PRACTITIONER'){ + let id = localStorage.getItem('user_id') + console.log(id) + this.appoinmentsList console.log(this.appoinmentsList) - + + let filter = this.appoinmentsList.filter(arr=>{return arr["ServicesMapDetail.userId"] + == id}) + console.log(filter) + this.appoinmentsList = filter + } } else{ diff --git a/ng-seed/src/app/appoinment/business/business-list/business-list.component.ts b/ng-seed/src/app/appoinment/business/business-list/business-list.component.ts index a2bb14f..8b93e29 100644 --- a/ng-seed/src/app/appoinment/business/business-list/business-list.component.ts +++ b/ng-seed/src/app/appoinment/business/business-list/business-list.component.ts @@ -160,7 +160,19 @@ export class BusinessListComponent implements OnInit { // var d = this.customersList.length+1 console.log(formValue[0]) - this._bus.addFormDetails(formValue[0]).subscribe(res => { + + const formData:FormData = new FormData(); + formData.append('image', formValue[0].logo); + // formData.append('busId', JSON.stringify(formValue[0].busName)); + // formData.append('busName', JSON.stringify(formValue[0].busName)); + + // formData.append('address', JSON.stringify(formValue[0].address)); + // formData.append('state', JSON.stringify(formValue[0].state)); + // formData.append('city', JSON.stringify(formValue[0].city)); + // formData.append('email', JSON.stringify(formValue[0].email)); + // formData.append('contactNo', JSON.stringify(formValue[0].contactNo)); +console.log(formData) + this._bus.addFormDetails(formData).subscribe(res => { if (res.status == 200) { // this.customersList = res.data; this.getBusinessList() diff --git a/ng-seed/src/app/appoinment/business/business-service/business.service.ts b/ng-seed/src/app/appoinment/business/business-service/business.service.ts index 77d638f..03a2154 100644 --- a/ng-seed/src/app/appoinment/business/business-service/business.service.ts +++ b/ng-seed/src/app/appoinment/business/business-service/business.service.ts @@ -19,7 +19,7 @@ export class BusinessService { ) } - addFormDetails(addParams): Observable { + addFormDetails(addParams:any): Observable { return this._http.post(this.apiUrl + 'createBusinessDetails', addParams) // .pipe( // catchError(this.handleError('role', [])) 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 b1472d9..ac28e01 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 @@ -19,6 +19,10 @@ Profile + + + +
@@ -26,6 +30,7 @@
{{usersList.userName}} +
@@ -41,32 +46,67 @@
- {{practitionerdetails.gender}} + {{practitionerdetails.gender}} + + Gender + + +
- {{practitionerdetails.dob}} + {{practitionerdetails.dob}} + + Date of Birth + + +
- {{practitionerdetails.languages}} + {{practitionerdetails.languages}} + + Languages + + +
- {{practitionerdetails.qualification}} + {{practitionerdetails.qualification}} + + Qualification + + +
- {{practitionerdetails.designtion}} + {{practitionerdetails.designtion}} + + Designation + + +
- {{practitionerdetails.exp}} + {{practitionerdetails.exp}} + + Experience + + +
-
+
-
-
-
-
-
-
- - - - -
- - - - {{ filterType }} - - - - - - - {{ apiType }} - - - - - add - - - delete - -
-
-
-
-
-
-
-
-
-
-
- - - - -
- - - - {{ filterType }} - - - - - - - {{ apiType }} - - - - - add - - - delete - -
-
-
- -
-
-
-
-
-
-
-
- - - - -
- - - - {{ filterType }} - - - - - - - {{ apiType }} - - - - - add - - - delete - -
-
-
-
-
-
-
-
-
-
-
- - - - -
- - - - {{ filterType }} - - - - - - - {{ apiType }} - - - - - add - - - delete - -
-
-
-
-
-
-
-
-
-
-
- - - - -
- - - - {{ filterType }} - - - - - - - {{ apiType }} - - - - - add - - - delete - -
-
-
-
-
-
-
-
-
-
-
- - - - -
- - - - {{ filterType }} - - - - - - - {{ apiType }} - - - - - add - - - delete - -
-
-
-
-
- + + add + + + delete +
- + - - -
Apply To All
- - -
-
- - - - -
-
-
-
-
-
-
-
-
- -
-
- -
-
-
-
-
-
- + -
-
Apply To All
-
-
-
-
- - - -
-
-
-
-
-
-
-
-
- -
-
- -
-
-
-
+ + +
+ +
+
+
+
+
+
+ + + +
-
- + - + + + + {{ filterType }} + + + + + + + {{ apiType }} + + + + + + + add + + + delete + +
-
Apply To All
-
-
-
-
- - - -
-
-
-
-
- -
-
-
- -
-
- -
-
-
- + + +
+ +
+
+
+
+
+
+ + + +
-
- + - + + + + {{ filterType }} + + + + + + + {{ apiType }} + + + + + + + add + + + delete + +
-
Apply To All
-
-
-
-
- - - -
-
-
-
-
- -
-
-
- -
-
- -
-
-
- + + +
+ +
+
+
+
+
+
+ + + +
-
- + - + + + + {{ filterType }} + + + + + + + {{ apiType }} + + + + + + + add + + + delete + +
-
Apply To All
-
-
-
-
- - - -
-
-
-
-
- -
-
-
- -
-
- -
-
-
- + + +
+ +
+
+
+
+
+
+ + + +
-
- + - + + + + {{ filterType }} + + + + + + + {{ apiType }} + + + + + + + add + + + delete + +
-
Apply To All
-
-
-
-
- - - -
-
-
-
-
- -
-
-
- -
-
- -
-
-
- + + +
+ +
+
+
+
+
+
+ + + +
-
- + - + + + + {{ filterType }} + + + + + + + {{ apiType }} + + + + + + + add + + + delete + +
-
Apply To All
-
-
--> - +
+ + +
+ +
Cancel Save 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 a4256d1..8e5fb2c 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 @@ -22,6 +22,12 @@ export class EditWorkingHoursComponent implements OnInit { ]; dynamicForm: FormGroup; + dynamicForm2: FormGroup; + dynamicForm3: FormGroup; + dynamicForm4: FormGroup; + dynamicForm5: FormGroup; + dynamicForm6: FormGroup; + dynamicForm7: 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',] @@ -50,20 +56,129 @@ ngOnInit(): void { this.dynamicForm = this.fb.group({ filters: this.fb.array([]) }); + this.dynamicForm2 = this.fb.group({ + filters2: this.fb.array([]) + }); + this.dynamicForm3 = this.fb.group({ + filters3: this.fb.array([]) + }); + this.dynamicForm4 = this.fb.group({ + filters4: this.fb.array([]) + }); + this.dynamicForm5 = this.fb.group({ + filters5: this.fb.array([]) + }); + this.dynamicForm6 = this.fb.group({ + filters6: this.fb.array([]) + }); + this.dynamicForm7 = this.fb.group({ + filters7: this.fb.array([]) + }); this.seedFiltersFormArray(); + this.seedFiltersFormArray2(); + this.seedFiltersFormArray3(); + this.seedFiltersFormArray4(); + this.seedFiltersFormArray5(); + this.seedFiltersFormArray6(); + this.seedFiltersFormArray7(); + } seedFiltersFormArray() { this.seedData.forEach(seedDatum => { + console.log(seedDatum) const formGroup = this.createFilterGroup(); if (seedDatum.apiType) { formGroup.addControl('value', this.getFormControl()); } + seedDatum.day = 'sunday' + formGroup.patchValue(seedDatum); this.filtersFormArray.push(formGroup); + + }); } +seedFiltersFormArray2() { + this.seedData.forEach(seedDatum => { + const formGroup = this.createFilterGroup(); + if (seedDatum.apiType) { + formGroup.addControl('value', this.getFormControl()); + } + seedDatum.day = 'monday' + formGroup.patchValue(seedDatum); + this.filtersFormArray2.push(formGroup); + + + }); +} +seedFiltersFormArray3() { + this.seedData.forEach(seedDatum => { + const formGroup = this.createFilterGroup(); + if (seedDatum.apiType) { + formGroup.addControl('value', this.getFormControl()); + } + seedDatum.day = 'tuesday' + formGroup.patchValue(seedDatum); + this.filtersFormArray3.push(formGroup); + + + }); +} +seedFiltersFormArray4() { + this.seedData.forEach(seedDatum => { + const formGroup = this.createFilterGroup(); + if (seedDatum.apiType) { + formGroup.addControl('value', this.getFormControl()); + } + seedDatum.day = 'wednesday' + formGroup.patchValue(seedDatum); + this.filtersFormArray4.push(formGroup); + + + }); +} +seedFiltersFormArray5() { + this.seedData.forEach(seedDatum => { + const formGroup = this.createFilterGroup(); + if (seedDatum.apiType) { + formGroup.addControl('value', this.getFormControl()); + } + seedDatum.day = 'thursday' + formGroup.patchValue(seedDatum); + this.filtersFormArray5.push(formGroup); + + + }); +} +seedFiltersFormArray6() { + this.seedData.forEach(seedDatum => { + const formGroup = this.createFilterGroup(); + if (seedDatum.apiType) { + formGroup.addControl('value', this.getFormControl()); + } + seedDatum.day = 'friday' + formGroup.patchValue(seedDatum); + this.filtersFormArray6.push(formGroup); + + + }); +} +seedFiltersFormArray7() { + this.seedData.forEach(seedDatum => { + const formGroup = this.createFilterGroup(); + if (seedDatum.apiType) { + formGroup.addControl('value', this.getFormControl()); + } + seedDatum.day = 'saturday' + formGroup.patchValue(seedDatum); + this.filtersFormArray7.push(formGroup); + + + }); +} + createFilterGroup() { return this.fb.group({ @@ -72,15 +187,58 @@ createFilterGroup() { day: [] }); } +createFilterGroup2() { + return this.fb.group({ + filterType: [], + apiType: [], + day: [] + }); +} addFilterToFiltersFormArray() { this.filtersFormArray.push(this.createFilterGroup()); } +addFilterToFiltersFormArray2() { + this.filtersFormArray2.push(this.createFilterGroup2()); +} +addFilterToFiltersFormArray3() { + this.filtersFormArray3.push(this.createFilterGroup()); +} +addFilterToFiltersFormArray4() { + this.filtersFormArray4.push(this.createFilterGroup()); +} +addFilterToFiltersFormArray5() { + this.filtersFormArray5.push(this.createFilterGroup()); +} +addFilterToFiltersFormArray6() { + this.filtersFormArray6.push(this.createFilterGroup()); +} +addFilterToFiltersFormArray7() { + this.filtersFormArray7.push(this.createFilterGroup()); +} removeFilterFromFiltersFormArray(index) { this.filtersFormArray.removeAt(index); } - +removeFilterFromFiltersFormArray2(index) { + this.filtersFormArray2.removeAt(index); +} +removeFilterFromFiltersFormArray3(index) { + this.filtersFormArray3.removeAt(index); +} +removeFilterFromFiltersFormArray4(index) { + this.filtersFormArray4.removeAt(index); +} +removeFilterFromFiltersFormArray5(index) { + this.filtersFormArray5.removeAt(index); +} +removeFilterFromFiltersFormArray6(index) { + this.filtersFormArray6.removeAt(index); +} +removeFilterFromFiltersFormArray7(index) { + this.filtersFormArray7.removeAt(index); +} + selectedAPIChanged(i) { this.getFilterGroupAtIndex(i).addControl('value', this.getFormControl()); } @@ -90,12 +248,34 @@ getFormControl() { } save() { - console.log(this.dynamicForm.value); + + let tmp = [this.dynamicForm.value,this.dynamicForm2.value,this.dynamicForm3.value,this.dynamicForm4.value,this.dynamicForm5.value,this.dynamicForm6.value,this.dynamicForm7.value] + console.log(tmp); + + } get filtersFormArray() { return (this.dynamicForm.get('filters')); } +get filtersFormArray2() { + return (this.dynamicForm2.get('filters2')); +} +get filtersFormArray3() { + return (this.dynamicForm3.get('filters3')); +} +get filtersFormArray4() { + return (this.dynamicForm4.get('filters4')); +} +get filtersFormArray5() { + return (this.dynamicForm5.get('filters5')); +} +get filtersFormArray6() { + return (this.dynamicForm6.get('filters6')); +} +get filtersFormArray7() { + return (this.dynamicForm7.get('filters7')); +} getFilterGroupAtIndex(index) { return (this.filtersFormArray.at(index)); @@ -121,4 +301,6 @@ getFilterGroupAtIndex(index) { onSubmit() { console.log(this.datainputForm.value); } + showOptions(event:any): void { + console.log(event.checked);} } diff --git a/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.ts b/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.ts index 9d34fc5..93d3661 100644 --- a/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.ts +++ b/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { MatPaginator, PageEvent } from '@angular/material/paginator'; import { MatTable, MatTableDataSource } from '@angular/material/table'; +import { AppointmentsService } from 'app/appoinment/appoinments/appointments-service/appointments.service'; import Swal from 'sweetalert2'; import { AddCustomersComponent } from '../add-customers/add-customers.component'; import { CustomersService } from '../customers-service/customers.service'; @@ -50,8 +51,9 @@ export class CustomersListComponent implements OnInit { // pageSize = 10; // pageEvent: PageEvent; addFormData: any; - - constructor(public dialog: MatDialog,public _cus:CustomersService) { } + appoinmentsList:any =[]; + appoinmentsIds:any = []; + constructor(public dialog: MatDialog,public _cus:CustomersService,public _app:AppointmentsService) { } ngOnInit(): void { // console.log('IN') @@ -61,10 +63,47 @@ export class CustomersListComponent implements OnInit { getCustomersList() { //this._pd.getTabStatusPdDetails(this.tabStatus) + let user_role = localStorage.getItem('user_role'); + if(user_role == 'PRACTITIONER'){ + this._app.getAppoinmentsListDetails().subscribe(res => { + if (res.status == 200) { + this.appoinmentsList = res.data; + let id = localStorage.getItem('user_id') + console.log(id) + + console.log(this.appoinmentsList) + + let filter = this.appoinmentsList.filter(arr=>{return arr["ServicesMapDetail.userId"] + == id}) + console.log(filter) + filter.forEach(element => { + this.appoinmentsIds.push( element.customer[0].id) + + + }); + + } + else{ + + } + }) + } this._cus.getCustomersListDetails().subscribe(res => { if (res.status == 200) { this.customersList = res.data; - // console.log(this.customersList) + console.log(this.customersList,this.appoinmentsIds) + let user_role = localStorage.getItem('user_role'); + if(user_role == 'PRACTITIONER'){ + + + const activeIds = this.appoinmentsIds + const serviceList = this.customersList + + const result = serviceList.filter(({id}) => activeIds.includes(id)); + console.log(result) + this.customersList = result + } + // this.dataSource = res.data.length; // console.log(this.dataSource) // this.dataSource.data = this.customersList;