From e7d02c7e354188af87255c4f2e819c544ca9c844 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Mon, 17 Apr 2023 13:07:42 +0530 Subject: [PATCH 1/3] api changes and working hrs --- .../appoinments-list.component.ts | 5 ++- .../appointment-addcustomer.component.scss | 3 +- .../appointments.service.ts | 4 +- .../dialog-box/dialog-box.component.ts | 3 +- .../consultant-setting.component.html | 34 ++++++++--------- .../consultant-setting.component.ts | 37 ++++++++++++++++--- .../edit-working-hours.component.html | 29 ++++++++------- .../edit-working-hours.component.ts | 26 ++++++++----- .../customers-list.component.ts | 19 ++++++++-- .../add-service/add-service.component.html | 5 +++ .../add-service/add-service.component.ts | 3 +- .../api-service.service.ts | 10 ++++- .../service-list/service-list.component.html | 6 ++- .../service-list/service-list.component.ts | 13 +++++-- .../user/add-user/add-user.component.html | 2 +- .../user/add-user/add-user.component.ts | 8 ++-- .../user/user-list/user-list.component.html | 12 +++--- .../user/user-list/user-list.component.ts | 5 ++- .../search-category.component.ts | 2 +- .../src/app/layouts/role-menu-items.pipe.ts | 2 +- .../src/app/session/login/login.component.ts | 6 ++- ng-seed/src/environments/environment.ts | 2 +- 22 files changed, 158 insertions(+), 78 deletions(-) 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 3663409..37b0755 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 @@ -78,7 +78,9 @@ export class AppoinmentsListComponent implements OnInit { getAppoinmentsList() { let user_role = localStorage.getItem('user_role'); //this._pd.getTabStatusPdDetails(this.tabStatus) - this._app.getAppoinmentsListDetails().subscribe(res => { + let param ={"busId": localStorage.getItem('busId')} + console.log(param) + this._app.getAppoinmentsListDetails(param).subscribe(res => { if (res.status == 200) { this.isLoading = false @@ -130,6 +132,7 @@ export class AppoinmentsListComponent implements OnInit { this.recordStatus=false; } else{ + this.isLoading = false this.appoinmentsList=[]; this.appointmentListLength= null; this.recordStatus=true; diff --git a/ng-seed/src/app/appoinment/appoinments/appointment-addcustomer/appointment-addcustomer.component.scss b/ng-seed/src/app/appoinment/appoinments/appointment-addcustomer/appointment-addcustomer.component.scss index 2853f60..55ece68 100644 --- a/ng-seed/src/app/appoinment/appoinments/appointment-addcustomer/appointment-addcustomer.component.scss +++ b/ng-seed/src/app/appoinment/appoinments/appointment-addcustomer/appointment-addcustomer.component.scss @@ -205,7 +205,7 @@ $tem-color : #217e69; .cardDesign2{ border: 1px dashed #227f6e; width: 75%; - height: 348px; + height: 337px; margin-left: 3rem; background-color: #fcfcfc; margin-bottom: 2rem; @@ -239,6 +239,7 @@ $tem-color : #217e69; -webkit-transition: all .2s ease-in; -moz-transition: all .2s ease-in; transition: all .2s ease-in; + border: 0; } .add { background-color: #4caf50; 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 b8a658a..ce705ea 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 @@ -14,9 +14,9 @@ public customerlist_observable$ = this.customerlist.asObservable(); private apiUrl = environment.apiEndpoint; constructor(private _http: HttpClient) { } - getAppoinmentsListDetails(): Observable { + getAppoinmentsListDetails(param): Observable { console.log('IN') - return this._http.get(this.apiUrl + "getAppoinmentsDetails") + return this._http.post(this.apiUrl + "getAppoinmentsDetails",param) // .pipe( // catchError(this.handleError('role', [])) // ) diff --git a/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.ts b/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.ts index 9afd42d..585ec04 100644 --- a/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.ts +++ b/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.ts @@ -336,7 +336,8 @@ export class DialogBoxComponent implements OnInit { } getApiData(){ - this._app.getAppoinmentsListDetails().subscribe(res => { + let param ={"busId": localStorage.getItem('busId')} + this._app.getAppoinmentsListDetails(param).subscribe(res => { if (res.status == 200) { let appoinmentsList = res.data; let id = localStorage.getItem('user_id') 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 fd68ce0..5b4f94e 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 @@ -70,7 +70,7 @@ -
+
{{practitionerdetails.languages}} @@ -78,7 +78,7 @@
-
+
{{practitionerdetails.qualification}} @@ -86,7 +86,7 @@
-
+
{{practitionerdetails.designtion}} @@ -94,7 +94,7 @@
-
+
{{practitionerdetails.exp}} @@ -102,7 +102,7 @@
-
+
{{practitionerdetails.skills}} @@ -112,7 +112,7 @@
-
+
{{practitionerdetails.caption}} @@ -120,7 +120,7 @@
-
+
{{practitionerdetails.description}} @@ -178,7 +178,7 @@ - + Working Hours @@ -200,8 +200,8 @@ -
-
+
+
@@ -223,7 +223,7 @@
-
+
@@ -248,7 +248,7 @@
-
+
@@ -271,7 +271,7 @@
-
+
@@ -294,7 +294,7 @@
-
+
@@ -317,7 +317,7 @@
-
+
@@ -340,7 +340,7 @@
-
+
@@ -393,7 +393,7 @@
- + Assigned Services 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 e5bf8f6..c3ec73c 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 @@ -34,7 +34,23 @@ export class ConsultantSettingComponent implements OnInit { isEditable:any = false; public usersList:any = new MatTableDataSource(); public servicesList:any = new MatTableDataSource(); - practitionerdetails: any; + practitionerdetails: any=[ + { + + "exp":null, + "qualification":null, + "days": null, + "languages": null, + "workingHours": JSON.stringify([{"sunday":{"hours":[{"startTime":"09:30 am","endTime":"06:00 pm","day":"sunday","value":null}],"breaks":[]}},{"monday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"monday","value":null}],"breaks":[]}},{"tuesday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"tuesday","value":null}],"breaks":[]}},{"wednesday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"wednesday","value":null}],"breaks":[]}},{"thursday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"thursday","value":null}],"breaks":[]}},{"friday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"friday","value":null}],"breaks":[]}},{"saturday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"saturday","value":null}],"breaks":[]}}]), + "dob": null, + "designtion": null, + "gender": null, + "description":null, + "skills": null, + "caption": null, + "isActive": "1", + + }] servicesList_array: any = []; serviceCheckedData: number; checkedArray: any[]; @@ -55,12 +71,15 @@ export class ConsultantSettingComponent implements OnInit { id: any; public end_User_Url = environment.endUserUrl; endUserURL: any; + userRole:any=[]; genderOption:any = [{'name':'Male'},{'name':'Female'}] skillsOption:any = [{'name':'Assisting with walking from bed to wheelchair'},{'name':'Bathing, dressing and grooming assistance'},{'name':'Medication reminders'},{'name':'Safety and fall prevention'},{'name':'Status reporting to family'},{'name':'Assisting with walking from bed to wheelchair'},{'name':'Bathing, dressing and grooming assistance'},{'name':'Medication reminders'},{'name':'Safety and fall prevention'},{'name':'Status reporting to family'}] constructor(private notifierService: NotifierService,private formBuilder: FormBuilder, public dialog: MatDialog, public _con:ConsultantService, private fb: FormBuilder, public _api:ConsultantService,private locationStrategy: LocationStrategy) {} ngOnInit() { + this.userRole = localStorage.getItem('user_role'); + console.log( this.userRole ) // this.openDialog('action','obj') this.registerForm = this.formBuilder.group({ name: ['', Validators.required], @@ -148,6 +167,8 @@ unavailability(action,obj) { this._con.getUsersListDetails(id).subscribe(res => { if (res.status == 200) { this.usersList = res.data[0]; + + localStorage.setItem('practitioner',JSON.stringify( this.usersList)) console.log(this.usersList) if(this.usersList['practitionerInfos'].length==0){ this.usersList['practitionerInfos'] =[ @@ -157,7 +178,7 @@ unavailability(action,obj) { "qualification":null, "days": null, "languages": null, - "workingHours": "[{\"sunday\":{\"hours\":[{\"startTime\":\"09:30 am\",\"endTime\":\"09:30 pm\",\"day\":\"sunday\",\"value\":null}],\"breaks\":[]}},{\"monday\":{\"hours\":[{\"startTime\":\"09:00 am\",\"endTime\":\"09:30 pm\",\"day\":\"monday\",\"value\":null}],\"breaks\":[]}},{\"tuesday\":{\"hours\":[{\"startTime\":\"09:00 am\",\"endTime\":\"12:00 am\",\"day\":\"tuesday\",\"value\":null},{\"startTime\":\"01:00 pm\",\"endTime\":\"04:00 pm\",\"day\":null},{\"startTime\":\"05:00 pm\",\"endTime\":\"09:00 pm\",\"day\":null}],\"breaks\":[]}},{\"wednesday\":{\"hours\":[{\"startTime\":\"09:00 am\",\"endTime\":\"09:30 am\",\"day\":\"wednesday\",\"value\":null}],\"breaks\":[]}},{\"thursday\":{\"hours\":[{\"startTime\":\"09:00 am\",\"endTime\":\"09:30 am\",\"day\":\"thursday\",\"value\":null}],\"breaks\":[]}},{\"friday\":{\"hours\":[{\"startTime\":\"09:00 am\",\"endTime\":\"09:30 am\",\"day\":\"friday\",\"value\":null}],\"breaks\":[]}},{\"saturday\":{\"hours\":[{\"startTime\":\"09:00 am\",\"endTime\":\"09:30 am\",\"day\":\"saturday\",\"value\":null}],\"breaks\":[]}}]", + "workingHours": JSON.stringify([{"sunday":{"hours":[{"startTime":"09:30 am","endTime":"06:00 pm","day":"sunday","value":null}],"breaks":[]}},{"monday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"monday","value":null}],"breaks":[]}},{"tuesday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"tuesday","value":null}],"breaks":[]}},{"wednesday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"wednesday","value":null}],"breaks":[]}},{"thursday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"thursday","value":null}],"breaks":[]}},{"friday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"friday","value":null}],"breaks":[]}},{"saturday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"saturday","value":null}],"breaks":[]}}]), "dob": null, "designtion": null, "gender": null, @@ -173,11 +194,14 @@ unavailability(action,obj) { console.log( this.practitionerdetails) this._con.getPractitionerInfo.next( this.usersList['practitionerInfos']); console.log(this.practitionerdetails) + this.endUserURL = this.end_User_Url+this.usersList['BusinessDetails'][0].randStr + this.workinghours = JSON.parse(this.practitionerdetails.workingHours) + this.skills= JSON.parse(this.practitionerdetails.skills) this.id=this.practitionerdetails.id this.userName = this.usersList.userName this.gender=this.practitionerdetails.gender this.description=this.practitionerdetails.description - this.skills= JSON.parse(this.practitionerdetails.skills) + this.caption = this.practitionerdetails.caption this.dob=this.practitionerdetails.dob this.exp=this.practitionerdetails.exp @@ -185,10 +209,10 @@ unavailability(action,obj) { this.qualification=this.practitionerdetails.qualification this.designtion=this.practitionerdetails.designtion console.log(this.gender) - this.workinghours = JSON.parse(this.practitionerdetails.workingHours) + // this.workinghours = this.practitionerdetails.workingHours console.log(this.workinghours) - this.endUserURL = this.end_User_Url+this.usersList['BusinessDetails'][0].randStr + console.log(this.endUserURL) } @@ -340,11 +364,12 @@ unavailability(action,obj) { "dob": this.dob, "designtion": this.qualification, "gender": this.gender, + "workingHours": JSON.stringify([{"sunday":{"hours":[{"startTime":"09:30 am","endTime":"06:00 pm","day":"sunday","value":null}],"breaks":[]}},{"monday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"monday","value":null}],"breaks":[]}},{"tuesday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"tuesday","value":null}],"breaks":[]}},{"wednesday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"wednesday","value":null}],"breaks":[]}},{"thursday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"thursday","value":null}],"breaks":[]}},{"friday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"friday","value":null}],"breaks":[]}},{"saturday":{"hours":[{"startTime":"09:00 am","endTime":"06:00 pm","day":"saturday","value":null}],"breaks":[]}}]), "description": this.description, "skills": this.skills, "caption": this.caption, "userName": this.userName, - "userId":userid + "practitionerId":userid } if(this.usersList['practitionerInfos'].length>0) { param.id = this.id 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 b479dd9..5a203de 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 @@ -9,6 +9,7 @@
+
@@ -27,7 +28,7 @@ + formControlName="startTime" [disabled]="Select1 !=true"> @@ -40,7 +41,7 @@ (selectionChange)="selectedAPIChanged(i)" placeholder="Select Time" #apiField - formControlName="endTime"> + formControlName="endTime" [disabled]="Select1 !=true"> @@ -100,7 +101,7 @@ + formControlName="startTime" [disabled]="Select2 !=true"> @@ -113,7 +114,7 @@ (selectionChange)="selectedAPIChanged(i)" placeholder="Select Time" #apiField - formControlName="endTime"> + formControlName="endTime" [disabled]="Select2 !=true"> @@ -173,7 +174,7 @@ + formControlName="startTime" [disabled]="Select3 !=true"> @@ -186,7 +187,7 @@ (selectionChange)="selectedAPIChanged(i)" placeholder="Select Time" #apiField - formControlName="endTime"> + formControlName="endTime" [disabled]="Select3 !=true"> @@ -246,7 +247,7 @@ + formControlName="startTime" [disabled]="Select4 !=true"> @@ -259,7 +260,7 @@ (selectionChange)="selectedAPIChanged(i)" placeholder="Select Time" #apiField - formControlName="endTime"> + formControlName="endTime" [disabled]="Select4 !=true"> @@ -319,7 +320,7 @@ + formControlName="startTime" [disabled]="Select5 !=true"> @@ -332,7 +333,7 @@ (selectionChange)="selectedAPIChanged(i)" placeholder="Select Time" #apiField - formControlName="endTime"> + formControlName="endTime" [disabled]="Select5 !=true"> @@ -392,7 +393,7 @@ + formControlName="startTime" [disabled]="Select6 !=true"> @@ -405,7 +406,7 @@ (selectionChange)="selectedAPIChanged(i)" placeholder="Select Time" #apiField - formControlName="endTime"> + formControlName="endTime" [disabled]="Select6 !=true"> @@ -465,7 +466,7 @@ + formControlName="startTime" [disabled]="Select7 !=true"> @@ -478,7 +479,7 @@ (selectionChange)="selectedAPIChanged(i)" placeholder="Select Time" #apiField - formControlName="endTime"> + formControlName="endTime" [disabled]="Select7 !=true"> 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 f9eaf4a..0a9ada9 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 @@ -18,8 +18,8 @@ export class EditWorkingHoursComponent implements OnInit { "10:30 am", "11:00 am", "11:30 am", - "12:00 am", - "12:30 am", + "12:00 pm", + "12:30 pm", "01:00 pm", "01:00 pm", "01:30 pm", @@ -46,8 +46,8 @@ export class EditWorkingHoursComponent implements OnInit { "10:30 am", "11:00 am", "11:30 am", - "12:00 am", - "12:30 am", + "12:00 pm", + "12:30 pm", "01:00 pm", "01:00 pm", "01:30 pm", @@ -98,7 +98,7 @@ export class EditWorkingHoursComponent implements OnInit { Answer: any = []; practitioner:any =[]; // 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',] - + doctor:any=[]; constructor(private notifierService: NotifierService, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data, @@ -106,6 +106,7 @@ export class EditWorkingHoursComponent implements OnInit { ) { var date = new Date('9:00 am'); console.log(this.data,date) + this._api.getPractitionerInfo_observable$.subscribe((res) => { console.log('nav list 3', res); @@ -129,7 +130,9 @@ export class EditWorkingHoursComponent implements OnInit { // this.rows.splice(i, 1 ); // } - ngOnInit(): void { + ngOnInit() { + this.doctor = JSON.parse(localStorage.getItem('practitioner')) + console.log (this.doctor) this.datainputForm = this.fb.group({ dropDownTest: "09:00am", dropDownTests: "09:30am", @@ -164,7 +167,7 @@ export class EditWorkingHoursComponent implements OnInit { this.seedFiltersFormArray5(); this.seedFiltersFormArray6(); this.seedFiltersFormArray7(); - // setTimeout(() => { + setTimeout(() => { let sunday ={filters :this.data[0].sunday.hours } if(this.data[0].sunday.hours.length>1){ @@ -209,7 +212,7 @@ export class EditWorkingHoursComponent implements OnInit { this.dynamicForm7.patchValue(saturday) - //}, 1000); + }, 2000); } @@ -462,7 +465,12 @@ export class EditWorkingHoursComponent implements OnInit { console.log(this.Answer); let param; if( this.practitioner.length>0){ - param ={id:this.practitioner[0].id,workingHours:JSON.stringify(this.Answer)} + if(this.practitioner[0].hasOwnProperty('id')){ + param ={id:this.practitioner[0].id,workingHours:JSON.stringify(this.Answer)} + }else{ + param ={practitionerId: this.doctor.id,workingHours:JSON.stringify(this.Answer)} + } + } this._api.createPractitionerInfo(param).subscribe(res => { 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 7c856ba..80b4331 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 @@ -80,11 +80,14 @@ export class CustomersListComponent implements OnInit { getCustomersList() { console.log('in') //this._pd.getTabStatusPdDetails(this.tabStatus) + this.recordStatus=false; let user_role = localStorage.getItem('user_role'); - if(user_role == 'PRACTITIONER'){ - this._app.getAppoinmentsListDetails().subscribe(res => { + if(user_role == 'PRACTITIONER' || user_role == 'BADMIN'){ + let param ={"busId": localStorage.getItem('busId')} + this._app.getAppoinmentsListDetails(param).subscribe(res => { if (res.status == 200) { this.appoinmentsList = res.data; + this.recordStatus=true; let id = localStorage.getItem('user_id') console.log(id) console.log(this.appoinmentsList) @@ -94,14 +97,21 @@ export class CustomersListComponent implements OnInit { filter.forEach(element => { this.appoinmentsIds.push( element.customer[0].id) }); - this.getCustomerDetails() - } + if(this.appoinmentsList.length>0){ + this.getCustomerDetails() + } + + } else{ + this.isLoading = false + this.recordStatus=true; + } }) } // this.getCustomerDetails() } getCustomerDetails(){ + this._cus.getCustomersListDetails().subscribe(res => { if (res.status == 200) { this.isLoading = false @@ -135,6 +145,7 @@ export class CustomersListComponent implements OnInit { } else{ + this.isLoading = false this.customersList=[]; this.customersListLength= null; this.recordStatus=true; diff --git a/ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.html b/ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.html index 55ab0c9..70d4502 100644 --- a/ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.html +++ b/ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.html @@ -23,6 +23,11 @@ Duration is required + + + Fees is required + + Sure to delete {{local_data.servicesName}}? 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 ee350de..6fc765b 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 @@ -40,7 +40,8 @@ ngOnInit() { this.form = new FormGroup({ servicesName: new FormControl('', [Validators.required, Validators.maxLength(20)]), duration: new FormControl('',[Validators.required]), - description: new FormControl('',[Validators.required]) + description: new FormControl('',[Validators.required]), + fees:new FormControl('',[Validators.required]) }); this.form.patchValue(this.local_data) } 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 2f27a68..6c956bc 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 @@ -12,14 +12,20 @@ export class ApiServiceService { private apiUrl = environment.apiEndpoint; constructor(private _http: HttpClient) { } - getServicesListDetails(): Observable { + getServicesListDetails(param): Observable { + console.log('IN') + return this._http.post(this.apiUrl + "getServicesDetails",param) + // .pipe( + // catchError(this.handleError('role', [])) + // ) + } + getServicesListDetails2(): Observable { console.log('IN') return this._http.post(this.apiUrl + "getServicesDetails",{}) // .pipe( // catchError(this.handleError('role', [])) // ) } - addFormDetails(addParams): Observable { return this._http.post(this.apiUrl + 'CreateService', addParams) // .pipe( 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 9d95509..dcb60be 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 @@ -34,12 +34,16 @@ Duration {{row.duration}} - + + Fees + {{row.fees}} + Description {{row.description}} + 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 c585533..4ad9104 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 @@ -18,7 +18,7 @@ export class ServiceListComponent implements OnInit { addFormData: any; push: any; id: number; - displayedColumns: string[] = ['serviceId','servicesName','duration','description','action']; + displayedColumns: string[] = ['serviceId','servicesName','duration','fees','description','action']; serviceId: number; public servicesListLength: number; @@ -59,7 +59,9 @@ export class ServiceListComponent implements OnInit { getServicesList() { - this._api.getServicesListDetails().subscribe(res => { + let param ={"busId": localStorage.getItem('busId')} + console.log(param) + this._api.getServicesListDetails(param).subscribe(res => { if (res.status == 200) { this.isLoading = false; this.servicesList = res.data; @@ -74,6 +76,7 @@ export class ServiceListComponent implements OnInit { this.recordStatus=false; } else{ + this.isLoading = false; this.servicesList=[]; this.servicesListLength= null; this.recordStatus=true; @@ -137,10 +140,11 @@ export class ServiceListComponent implements OnInit { if(result.event == 'Add'){ console.log('add') let addFormData = { - // busId: 'abc123', - // id: row_obj.id, + busId: localStorage.getItem('busId'), + id: row_obj.id, description:row_obj.description, duration: parseInt(row_obj.duration), + fees: parseInt(row_obj.fees), serviceId: row_obj.serviceId, servicesName: row_obj.servicesName }; @@ -151,6 +155,7 @@ export class ServiceListComponent implements OnInit { let updatevalue = { description:row_obj.description, serviceId: row_obj.serviceId, + fees: parseInt(row_obj.fees), duration: parseInt(row_obj.duration), servicesName: row_obj.servicesName } diff --git a/ng-seed/src/app/appoinment/user/add-user/add-user.component.html b/ng-seed/src/app/appoinment/user/add-user/add-user.component.html index 7f115d7..007f2b6 100644 --- a/ng-seed/src/app/appoinment/user/add-user/add-user.component.html +++ b/ng-seed/src/app/appoinment/user/add-user/add-user.component.html @@ -14,7 +14,7 @@ --> Business - + -- {{business.busName}} diff --git a/ng-seed/src/app/appoinment/user/add-user/add-user.component.ts b/ng-seed/src/app/appoinment/user/add-user/add-user.component.ts index 5caf5f6..fd16b1e 100644 --- a/ng-seed/src/app/appoinment/user/add-user/add-user.component.ts +++ b/ng-seed/src/app/appoinment/user/add-user/add-user.component.ts @@ -31,6 +31,7 @@ export class AddUserComponent implements OnInit { formData:any=[]; private apiUrl = environment.apiEndpoint; busId: any; + disableBus: any=1; constructor(private notifierService: NotifierService,private router: Router,private formBuilder: FormBuilder, public dialogRef: MatDialogRef, @Optional() @Inject(MAT_DIALOG_DATA) public data: UsersData,public _bus:BusinessService) { @@ -45,6 +46,7 @@ export class AddUserComponent implements OnInit { ngOnInit() { + this.disableBus = localStorage.getItem('go_admin') let userrole = localStorage.getItem('user_role') this.form = new FormGroup({ businessselect: new FormControl('',[Validators.required]), @@ -107,10 +109,10 @@ export class AddUserComponent implements OnInit { console.log(this.form['value'].businessselect) // this.local_data.businessselect = this.local_data.busId console.log(localStorage.getItem('busNameID'), localStorage.getItem('go_admin')) - if( localStorage.getItem('go_admin') =='0'){ + // if( localStorage.getItem('go_admin') =='0'){ this.local_data.businessselect = localStorage.getItem('busNameID') this.form.controls['businessselect'].setValue(localStorage.getItem('busNameID')) - } + // } //localStorage.setItem('busNameID',getData.busId) if(this.action == 'Update'){ @@ -154,7 +156,7 @@ export class AddUserComponent implements OnInit { } if(this.action == 'Update'){ this.formData.append('id', tmp.id); - this.formData.append('busId', this.busId); + } this.formData.append('busId', this.busId); this.formData.append('userName', tmp.userName); diff --git a/ng-seed/src/app/appoinment/user/user-list/user-list.component.html b/ng-seed/src/app/appoinment/user/user-list/user-list.component.html index f74ed2a..f61abb0 100644 --- a/ng-seed/src/app/appoinment/user/user-list/user-list.component.html +++ b/ng-seed/src/app/appoinment/user/user-list/user-list.component.html @@ -4,7 +4,7 @@ Filter - + Role - All - SADMIN - PRACTITIONER - BADMIN + All + SADMIN + PRACTITIONER + BADMIN diff --git a/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts b/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts index 62ccc29..63c227c 100644 --- a/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts +++ b/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts @@ -169,7 +169,8 @@ export class UserListComponent implements OnInit { } openDialog(action,obj) { - // localStorage.setItem('busNameID',null) + localStorage.setItem('busNameID',obj.busId + ) obj.action = action; const dialogRef = this.dialog.open(AddUserComponent, { // width: '30%', @@ -179,6 +180,8 @@ export class UserListComponent implements OnInit { data:obj }); dialogRef.afterClosed().subscribe(result => { + localStorage.setItem('go_admin','1') + localStorage.setItem('busNameID',null) if(result != undefined){ console.log(result) this.formAddUpdateAndDelete(result,result.data) diff --git a/ng-seed/src/app/end-user/search-category/search-category.component.ts b/ng-seed/src/app/end-user/search-category/search-category.component.ts index 44ded6e..5221884 100644 --- a/ng-seed/src/app/end-user/search-category/search-category.component.ts +++ b/ng-seed/src/app/end-user/search-category/search-category.component.ts @@ -110,7 +110,7 @@ export class SearchCategoryComponent implements OnInit { console.log(this.eventData) if(this.eventData == 'services'){ //this._pd.getTabStatusPdDetails(this.tabStatus) - this._api.getServicesListDetails().subscribe(res => { + this._api.getServicesListDetails2().subscribe(res => { if (res.status == 200) { this.servicesList = res.data; } diff --git a/ng-seed/src/app/layouts/role-menu-items.pipe.ts b/ng-seed/src/app/layouts/role-menu-items.pipe.ts index 90281c2..0bad9ad 100644 --- a/ng-seed/src/app/layouts/role-menu-items.pipe.ts +++ b/ng-seed/src/app/layouts/role-menu-items.pipe.ts @@ -11,7 +11,7 @@ export class RoleMenuItemsPipe implements PipeTransform { // if(type=="1"){ switch(localStorage.getItem('user_role')){ case 'SADMIN': return value.filter(val=>val.state!="appoinments" && val.state!="customers" && val.state != "consultant-setting" && val.state!="consultants" && val.state!="services"); - case 'BADMIN': return value.filter(val=>val.state !="business" && val.state != "consultant-setting" && val.state!="users" && val.state!="consultants"); + case 'BADMIN': return value.filter(val=>val.state !="business" && val.state!="users" && val.state!="consultants"); case 'PRACTITIONER': return value.filter(val=>val.state !="business" && val.state!="consultants" && val.state!="users" && val.state!="services"); // case 'PRACTITIONER': // case '3': return value.filter(val=>val.state!="settings"); diff --git a/ng-seed/src/app/session/login/login.component.ts b/ng-seed/src/app/session/login/login.component.ts index e66a289..a002a46 100644 --- a/ng-seed/src/app/session/login/login.component.ts +++ b/ng-seed/src/app/session/login/login.component.ts @@ -47,7 +47,11 @@ 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) + localStorage.setItem('user_id',res.roleId + ); + + localStorage.setItem('busId',res.busId) + this.router.navigate(['/home']) } }else{ diff --git a/ng-seed/src/environments/environment.ts b/ng-seed/src/environments/environment.ts index 13643e6..75d19cb 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.3:8080/api/', + apiEndpoint:'http://192.168.1.4:8080/api/', // apiEndpoint:'https://api.venbait.in/api/', //EndUser URL From 898b45a41161502df9adf1e815adaa81c8ce592e Mon Sep 17 00:00:00 2001 From: "surendar.m@watermelon.us" Date: Mon, 17 Apr 2023 13:13:07 +0530 Subject: [PATCH 2/3] business and user image validation --- .../dialog-box/dialog-box.component.scss | 2 +- .../add-business/add-business.component.html | 4 +- .../add-business/add-business.component.ts | 55 +++++++++++-------- .../user/add-user/add-user.component.html | 4 +- .../user/add-user/add-user.component.ts | 10 +++- .../customer-info.component.html | 3 +- ng-seed/src/environments/environment.ts | 2 +- 7 files changed, 47 insertions(+), 33 deletions(-) diff --git a/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.scss b/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.scss index 254055f..e615dde 100644 --- a/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.scss +++ b/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.scss @@ -165,7 +165,7 @@ $tem-color : #217e69; border: 1px solid #e8edef; width: 89%; background-color: #227f6e21; - box-shadow: 0 2px 0 rgb(0 0 0 / 3%) + box-shadow: 0 2px 0 #00000008 } .hoverButton{ background: $white; diff --git a/ng-seed/src/app/appoinment/business/add-business/add-business.component.html b/ng-seed/src/app/appoinment/business/add-business/add-business.component.html index 24b4c91..fcf431f 100644 --- a/ng-seed/src/app/appoinment/business/add-business/add-business.component.html +++ b/ng-seed/src/app/appoinment/business/add-business/add-business.component.html @@ -23,7 +23,7 @@ - + Contact No is required Invalid Contact No Contact No must be at least 10 characters @@ -54,7 +54,7 @@

- Upload Below 2MB + Upload Below 2MB
Supported File (jpg,jpeg anf png)
Add Admin diff --git a/ng-seed/src/app/appoinment/business/add-business/add-business.component.ts b/ng-seed/src/app/appoinment/business/add-business/add-business.component.ts index 9f9ba0c..19cd671 100644 --- a/ng-seed/src/app/appoinment/business/add-business/add-business.component.ts +++ b/ng-seed/src/app/appoinment/business/add-business/add-business.component.ts @@ -51,26 +51,33 @@ export class AddBusinessComponent implements OnInit { onSelectFile(event) { console.log(event) console.log(event.target.files[0]) - if(event.target.files[0].size > 2097152){ - this.notifierService.notify('warning', 'Image size is too Larger'); - }else { - const file = event.target.files[0]; - if(event != null){ - this.imageViewStatus = true - } - this.form['value'].logo = [event.target.files[0]] - if (event.target.files && event.target.files[0]) { - var reader = new FileReader(); - reader.readAsDataURL(event.target.files[0]); - reader.onload = (event) => { - this.url = event.target.result; - console.log(this.url) + let fileType = event.target.files[0] + if(fileType.type == 'image/png' || fileType.type == 'image/jpg' || fileType.type == 'image/jpeg'){ + if(event.target.files[0].size > 2097152){ + this.notifierService.notify('warning', 'Image size is too Larger'); + }else { + const file = event.target.files[0]; + if(event != null){ + this.imageViewStatus = true + } + this.form['value'].logo = [event.target.files[0]] + if (event.target.files && event.target.files[0]) { + var reader = new FileReader(); + reader.readAsDataURL(event.target.files[0]); + reader.onload = (event) => { + this.url = event.target.result; + console.log(this.url) + } } + // this.formData=[]; + this.formData.append('image', file, file.name); + console.log(this.currentFileUpload) } - // this.formData=[]; - this.formData.append('image', file, file.name); - console.log(this.currentFileUpload) - } + } else { + this.notifierService.notify('warning', 'Invalid File)'); + this.notifierService.notify('warning', 'Upload Supported File Like (png,jpg and jpeg)'); + } + // this.formData.append('file', file, file.name); } @@ -83,14 +90,14 @@ export class AddBusinessComponent implements OnInit { admin_checked: new FormControl('',null), logo: new FormControl('', null), - busName: new FormControl('', [Validators.required, Validators.maxLength(20)]), - address: new FormControl('', [Validators.required, Validators.maxLength(50)]), - city: new FormControl('', [Validators.required, Validators.maxLength(10)]), - state: new FormControl('', [Validators.required, Validators.maxLength(10)]), + busName: new FormControl('', [Validators.required]), + address: new FormControl('', [Validators.required, Validators.maxLength(100)]), + city: new FormControl('', [Validators.required]), + state: new FormControl('', [Validators.required]), email: new FormControl('', [Validators.required, Validators.email,Validators.pattern( '[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+.[a-zA-Z]{2,63}$', ),]), - contactNo: new FormControl('', [Validators.required, Validators.minLength(10),Validators.maxLength(10), Validators.pattern('^[0-9]{10}$')]), + contactNo: new FormControl('', [Validators.required, Validators.minLength(10),Validators.maxLength(10),Validators.pattern('^[0-9]{10}$')]), createdBy:new FormControl(userrole,[Validators.required]), }); @@ -100,7 +107,7 @@ export class AddBusinessComponent implements OnInit { public myError = (controlName: string, errorName: string) =>{ return this.form.controls[controlName].hasError(errorName); } - + submit(){ let tmp = this.form.value tmp.id = this.local_data.id diff --git a/ng-seed/src/app/appoinment/user/add-user/add-user.component.html b/ng-seed/src/app/appoinment/user/add-user/add-user.component.html index 7f115d7..88b6e17 100644 --- a/ng-seed/src/app/appoinment/user/add-user/add-user.component.html +++ b/ng-seed/src/app/appoinment/user/add-user/add-user.component.html @@ -52,7 +52,7 @@ Phone No - + Contact No is required Invalid Contact No Contact No must be at least 10 characters @@ -68,7 +68,7 @@

- Upload Below 2MB + Upload Below 2MB
Supported File (jpg,jpeg anf png)