From 2aa7e53ef6fec9dea12e34fb8c8a3be9928fcfd6 Mon Sep 17 00:00:00 2001 From: Surendiran Date: Mon, 29 May 2023 15:49:30 +0530 Subject: [PATCH] Edit Business in setting page --- .../consultant-service/consultant.service.ts | 8 + .../consultant-setting.component.html | 142 +++++++- .../consultant-setting.component.scss | 27 ++ .../consultant-setting.component.ts | 312 ++++++++++++++++-- ng-seed/src/environments/environment.ts | 4 +- 5 files changed, 466 insertions(+), 27 deletions(-) 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 index 64bced2..89b57fb 100644 --- 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 @@ -42,6 +42,14 @@ export class ConsultantService { return this._http.post(this.apiUrl + "getPractitionerInfo",param) } + addFormDetails(addParams:any): Observable { + + return this._http.post(this.apiUrl + 'createBusinessDetails', 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-setting/consultant-setting.component.html b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.html index 40c2cb1..cd28aac 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 @@ -570,16 +570,148 @@ - + + - --> +
+ +
+ + - {{BusinessDetailsdata.busName}} + + Business Name + + Name is required + Limit exceed + +
+ +
+ + - {{BusinessDetailsdata.email}} + + Email + + + +
+
+ + - {{BusinessDetailsdata.contactNo}} + + Mobile No + + Contact No is required + Invalid Contact No + Contact No must be at least 10 characters + Limit exceed + +
+
+ + - {{BusinessDetailsdata.address}} + + Address + + Address is required + Limit exceed + +
+
+ + - {{BusinessDetailsdata.country}} + + Country + + Select Country + {{ country.flag }}   {{ country.name }} + Invalid option + + Country is required + +
+
+ + - {{BusinessDetailsdata.state}} + + State + + -- Select Your State -- + {{ state.name }} + Invalid option + + State is required + +
+
+ + - {{BusinessDetailsdata.city}} + + City + + -- Select Your City -- + {{ city.name }} + Invalid option + + City is required + +
+
+ + - {{BusinessDetailsdata.currency}} + + Type Of Currency + + currency is required + +
+
+
+ +
+
+ Upload Below 2MB
Supported File (jpg,jpeg and png) +
+
+ + + + + + +
+ + Appointment Booking Link @@ -590,15 +722,15 @@
-

Here's your personal booking page. share this link with customers so they can book your Services directly.

- Appointment booking URL +

Here's your personal booking page. Edit and share this link with customers so they can book your Services directly.

+ Appoinment booking domain
- + 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 e1686f6..4492d39 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 @@ -652,4 +652,31 @@ content: "\20B9"; } .tabIcon2{ color: red; +} +.scrollHVBusiness{ + height: calc(100vh - 230px) !important; +} + +.imgSizeValidation{ + color: red; + font-family: Didact Gothic, sans serif; +} + +.image{ + border: 7px solid #16c1a636; +} + +input[type=file]::file-selector-button { + margin-right: 20px; + border: none; + background: #084cdf; + padding: 10px 20px; + border-radius: 10px; + color: #fff; + cursor: pointer; + transition: background .2s ease-in-out; +} + +input[type=file]::file-selector-button:hover { + background: #0d45a5; } \ No newline at end of file diff --git a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.ts b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.ts index 326394f..8323209 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,6 +1,6 @@ import { LocationStrategy } from '@angular/common'; -import { Component, OnInit } from '@angular/core'; -import { AbstractControl, FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { Component, ElementRef, OnInit, VERSION, ViewChild } from '@angular/core'; +import { AbstractControl, FormArray, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { MatTableDataSource } from '@angular/material/table'; import { NotifierService } from 'angular-notifier'; @@ -13,6 +13,9 @@ import { ExtraWorkingHoursComponent } from '../extra-working-hours/extra-working import { UnavailabilityComponent } from '../unavailability/unavailability.component'; import { AddSkillsComponent } from '../add-skills/add-skills.component'; import { json } from 'd3'; +import { City, Country, State } from 'country-state-city'; +import { map } from 'rxjs/internal/operators/map'; +import { HttpClient } from '@angular/common/http'; @Component({ selector: 'app-consultant-setting', @@ -20,8 +23,29 @@ import { json } from 'd3'; styleUrls: ['./consultant-setting.component.scss'] }) export class ConsultantSettingComponent implements OnInit { + @ViewChild('country') country: ElementRef + @ViewChild('city') city: ElementRef + @ViewChild('state') state: ElementRef + name = 'Angular ' + VERSION.major; + countries = Country.getAllCountries(); + states = null; + cities = null; + + selectedCountry; + selectedState; + selectedCity; + businessDetails: FormGroup; + fileToUpload: any; + imageUrl: any; + action:string; + url: string | ArrayBuffer; + imageViewStatus: boolean = false; + formData: any=[]; + selectedFiles: any; + currentFileUpload: any; + countryevent:any=[]; assignService:any = [] - registerForm: FormGroup; + registerForm: FormGroup; submitted = false; selected = 'Assign New Services'; messages: Object[] = [{ @@ -34,6 +58,7 @@ export class ConsultantSettingComponent implements OnInit { }, ]; isEditable:any = false; + isEditableBusiness :any = false public usersList:any = new MatTableDataSource(); public servicesList:any = new MatTableDataSource(); practitionerdetails: any=[ @@ -82,11 +107,13 @@ export class ConsultantSettingComponent implements OnInit { consultants: any = []; frontDeskHidden: any = 0; frontDeskPractdetails: any = []; - constructor(private notifierService: NotifierService,private formBuilder: FormBuilder, public dialog: MatDialog, public _con:ConsultantService, private fb: FormBuilder, public _api:ConsultantService,private locationStrategy: LocationStrategy) { - + BusinessDetailsdata: any = []; + constructor(private http: HttpClient,private notifierService: NotifierService,private formBuilder: FormBuilder, public dialog: MatDialog, public _con:ConsultantService, private fb: FormBuilder, public _api:ConsultantService,private locationStrategy: LocationStrategy) { + this.formData= new FormData(); } - + + ngOnInit() { this.userRole = localStorage.getItem('user_role'); @@ -111,10 +138,41 @@ export class ConsultantSettingComponent implements OnInit { status: ['', Validators.required], information: ['', Validators.required], }); + + // let valData; + // if(this.action == 'Add'){ + // valData= [this.validateUsernameAvailability.bind(this)] + // }else{ + // valData = null + // } + let userrole = localStorage.getItem('user_role') + this.businessDetails = new FormGroup({ + logo: new FormControl('', null), + busName: new FormControl('', [Validators.required]), + address: new FormControl('', [Validators.required, Validators.maxLength(100)]), + city: new FormControl('', [Validators.required]), + currency: new FormControl('',[Validators.required]), + country: 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)]), + createdBy:new FormControl(userrole,[Validators.required]), + }); - + + + } +public myErrorBusiness = (controlName: string, errorName: string) =>{ + return this.businessDetails.controls[controlName].hasError(errorName); +} + +get f(){ + return this.businessDetails.controls; +} getCosultantList() { let param ={"busId": localStorage.getItem('busId')} console.log(param) @@ -181,6 +239,21 @@ edit_table(param){ // this.isEditable_month = tableArr.months; } } +edit_tableBusiness(param){ + + + + if (param == true) { + this.isEditableBusiness = false; + } else { + console.log('status', ); + this.isEditableBusiness = true + // localStorage.setItem('row_item',JSON.stringify(tableArr)) + console.log(this.isEditableBusiness); + // this.isEditable = status; + // this.isEditable_month = tableArr.months; + } +} workingDialog(action,obj) { obj.action = action; @@ -227,13 +300,64 @@ unavailability(action,obj) { this._con.getUsersListDetails(id).subscribe(res => { if (res.status == 200) { this.usersList = res.data[0]; - + //Start Edit Business Array + this.BusinessDetailsdata = this.usersList['BusinessDetails'][0] + console.log(this.BusinessDetailsdata) + // this.BusinessDetailsdata.country = JSON.parse(this.BusinessDetailsdata.country) + // this.BusinessDetailsdata.state = JSON.parse(this.BusinessDetailsdata.state) + // this.BusinessDetailsdata.city = JSON.parse(this.BusinessDetailsdata.city) + console.log(this.BusinessDetailsdata) + if(this.BusinessDetailsdata.hasOwnProperty('country')){ + if(this.BusinessDetailsdata.country instanceof Object){ + this.BusinessDetailsdata.country = this.BusinessDetailsdata.country + this.countryevent = this.BusinessDetailsdata.country + this.countryname(this.BusinessDetailsdata.country) + this.BusinessDetailsdata.country = this.BusinessDetailsdata.country.name + }else{ + this.BusinessDetailsdata.country = JSON.parse(this.BusinessDetailsdata.country) + this.countryevent = this.BusinessDetailsdata.country + this.countryname(this.BusinessDetailsdata.country) + this.BusinessDetailsdata.country = this.BusinessDetailsdata.country.name + } + } + if(this.BusinessDetailsdata.hasOwnProperty('state')){ + if(this.BusinessDetailsdata.state instanceof Object){ + this.BusinessDetailsdata.state = this.BusinessDetailsdata.state + this.selectedState = this.BusinessDetailsdata.state + this.statename(this.BusinessDetailsdata.state) + this.BusinessDetailsdata.state = this.BusinessDetailsdata.state.name + + }else{ + this.BusinessDetailsdata.state = JSON.parse(this.BusinessDetailsdata.state) + this.selectedState = this.BusinessDetailsdata.state + this.statename(this.BusinessDetailsdata.state) + this.BusinessDetailsdata.state = this.BusinessDetailsdata.state.name + + } + } + if(this.BusinessDetailsdata.hasOwnProperty('city')){ + if(this.BusinessDetailsdata.city instanceof Object){ + this.BusinessDetailsdata.city = this.BusinessDetailsdata.city + this.selectedCity = this.BusinessDetailsdata.city + this.BusinessDetailsdata.city = this.BusinessDetailsdata.city.name + }else{ + this.BusinessDetailsdata.city = JSON.parse(this.BusinessDetailsdata.city) + this.selectedCity = this.BusinessDetailsdata.city + this.BusinessDetailsdata.city = this.BusinessDetailsdata.city.name + } + } + console.log(this.BusinessDetailsdata) + this.businessDetails.patchValue(this.BusinessDetailsdata) + setTimeout(() => { + this.businessDetails.patchValue(this.BusinessDetailsdata) + }, 1500); + this.businessDetails.patchValue(this.BusinessDetailsdata) + // End Edit Business Array localStorage.setItem('practitioner',JSON.stringify(this.usersList)) console.log(this.usersList) if(this.usersList['practitionerInfos'].length==0){ this.usersList['practitionerInfos'] =[ - { - + { "exp":null, "qualification":null, "days": null, @@ -359,17 +483,15 @@ unavailability(action,obj) { // this.assignService = this.checkedArray } - get f() { - return this.registerForm.controls; - } + - onSubmit() { - this.submitted = true; - if (this.registerForm.invalid) { - return; - } - console.log(JSON.stringify(this.registerForm.value, null, 2)); - } + // onSubmit() { + // this.submitted = true; + // if (this.registerForm.invalid) { + // return; + // } + // console.log(JSON.stringify(this.registerForm.value, null, 2)); + // } openDialog(action,obj) { console.log(this.working_customize) @@ -567,4 +689,154 @@ unavailability(action,obj) { this.copiedKey = 0 }, 5000); } + +//Tab Function For Edit Business + + + validateUsernameAvailability(control: FormControl) { + return this.http.get(this.apiUrl + "businessDetailList") + .pipe( + map((response:any) => { + + console.log(response) + let response1 = response.data + let tmp=[]; + if(response1 instanceof Array){ + + response.data.forEach(element => { + tmp.push(element.email) + }); + console.log(tmp,`${control.value}`); + return !tmp.includes(`${control.value}`) ? null : { usernameTaken: true }; + }else{ + return null + } + }) + ); + } + + + submit(){ + let tmp = this.businessDetails.value + tmp.id = this.BusinessDetailsdata.id + console.log(tmp,this.businessDetails) + + if (!this.businessDetails.valid) { + console.log("check") + return; + } + // this.isSubmitting = true + // this.formData.append('image', this.currentFileUpload); + // console.log(this.formData.getAll('image')); + + this.formData.append('id', tmp.id); + this.formData.append('busId', this.BusinessDetailsdata.busId); + + + this.formData.append('country', JSON.stringify(this.countryevent) ); + this.formData.append('state', JSON.stringify(this.selectedState)); + this.formData.append('city', JSON.stringify(this.selectedCity)); + this.formData.append('email', tmp.email); + this.formData.append('contactNo', tmp.contactNo); + this.formData.append('busName', tmp.busName); + this.formData.append('address', tmp.address); + this.formData.append('currency',tmp.currency) + console.log(this.formData) + // this.dialogRef.close({event:this.action,data:this.formData,admincheck:tmp.admin_checked}); + // this.isSubmitting = false + // console.log(this.businessDetails.value); + // console.log(this.action,this.BusinessDetailsdata) + this._con.addFormDetails(this.formData).subscribe(res => { + if (res.status == 200) { + this.isEditableBusiness = false; + this.getUsersList() + this.notifierService.notify('success', 'Business Updated Successfully'); + } + else{ + console.log(res.message) + // this.notifierService.notify('success', 'You are awesome! I mean it!'); + this.notifierService.notify('warning', res.message); + } + }) + } + + + countryname(country){ + console.log(country) + + // console.log($event,$event.value) + this.countryevent = country + this.states = State.getStatesOfCountry(country.isoCode); + console.log(country) + this.businessDetails.controls['currency'].setValue(country.currency) + + this.selectedCountry = country; + this.cities = this.selectedState = this.selectedCity = null; + } + + statename(state){ + // console.log($event,$event.value) + this.cities = City.getCitiesOfState( this.countryevent.isoCode, state.isoCode) + console.log(this.cities) + this.selectedState = state; + // this.selectedCity = null; + } + + cityname(city){ + // console.log($event,$event.value) + this.selectedCity = city + + console.log(this.selectedCity) + } + + + + clear(type: string): void { + switch(type) { + case 'country': + this.selectedCountry = this.country.nativeElement.value = this.states = this.cities = this.selectedState = this.selectedCity = null; + break; + case 'state': + this.selectedState = this.state.nativeElement.value = this.cities = this.selectedCity = null; + break; + case 'city': + this.selectedCity = this.city.nativeElement.value = null; + break; + } + } + onSelectFile(event) { + console.log(event) + console.log(event.target.files[0]) + 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.businessDetails['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= new FormData(); + this.formData.append('image', file, file.name); + this.formData.append('logo', '1'); + 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); + } + } diff --git a/ng-seed/src/environments/environment.ts b/ng-seed/src/environments/environment.ts index 3179e14..8c7c544 100644 --- a/ng-seed/src/environments/environment.ts +++ b/ng-seed/src/environments/environment.ts @@ -7,8 +7,8 @@ export const environment = { production: false, environmentName: 'Testing Environment',//Localhost Environment. // apiEndpoint:'http://venbainfotech.com:5000/api/', - // apiEndpoint:'http://192.168.1.14:8080/api/', - apiEndpoint:'https://api.venbait.in/api/', + apiEndpoint:'http://192.168.1.23:8080/api/', + // apiEndpoint:'https://api.venbait.in/api/', //EndUser URL endUserUrl: window.location.origin+'/#/customer/',