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 e0596a3..13f7074 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 @@ -161,7 +161,7 @@ export class AppoinmentsListComponent implements OnInit { openDialog(action,obj) { obj.action = action; const dialogRef = this.dialog.open(DialogBoxComponent, { - width: '55%', + width: '40%', height: '100%', // maxWidth: '38vw', position: { right: '0' }, diff --git a/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.html b/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.html index 5c37321..11c18ec 100644 --- a/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.html +++ b/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.html @@ -1,225 +1,144 @@ - -
- {{action}} Appoinment + +
{{action}} Appoinment -
- -
+ >close
+ +
-
- - - - -- - - {{business.busname}} - - - Please choose an Business - Please choose any other - -
+ + Business + + + {{business.busname}} + + + Please choose an Business + Please choose any other + -
- - - - -- - - {{business.service}} - - - Please choose an Service - Please choose any other - -
+ + Service + + -- + + {{business.service}} + + + Please choose an Service + Please choose any other + -
- - - - -- - - {{business.practitioner}} - - - Please choose an Practitioner - Please choose any other - -
+ + Practitioner + + -- + + {{business.practitioner}} + + + Please choose an Practitioner + Please choose any other + -
- - - - - - - - - - - - -
-
- Wed, 12 Apr 2023 -
-
-
+ + Choose a date + + + + + + Choose a Time + + -
-
- MORNING -
-
- - - -
+ +
+ 12 thursday 2023
-
-
- AFTERNOON -
-
- - -
+
+ + + + + + + + + + + +
+ + + + Customer + + + + New Customer + + {{business.customer}} + + + Please choose an Customer + Please choose any other + + + +
+
+ New Customer
+ + Name + + + + + Email + + + + + Phone + + +
-
-
- EVENING -
-
- - -
+
+ Cancel + Save
-
-
- NIGHT -
-
- -
-
-
-
-
-
+ - - -
- - - - - Add customer - - {{business.customer}} - - - Please choose an Customer - Please choose any other - -
- - - -
- - -
+ + Customer + Description + +
- - - - - - - - -
- - - Sure to delete {{local_data.name}}? - -
-
- - -
- \ No newline at end of file + + + + Sure to delete {{local_data.cusName}}? + +
+ +
+ + +
+ \ No newline at end of file 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 07a69a4..254055f 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 @@ -1,8 +1,13 @@ -// ::ng-deep .cdk-overlay-pane{ -// width: 60%!important; -// } +$color_red_orange_approx: #107c14; +$white: #fff; +$black_10: rgba(0, 0, 0, 0.1); +$black_30: rgba(0, 0, 0, 0.3); +$icon-size: 3rem; +$icon-color: #D8D8D8; +$main-color: #f44336; +$tem-color : #217e69; .mat-pane{ - width: 20rem; + width: 27rem; } .button{ margin-bottom: 1rem; @@ -72,7 +77,7 @@ // width: 175%!important; // } .mate{ - width: 22% !important; + width: 43% !important; } .date-marge{ margin-left: 1.5rem; @@ -138,4 +143,110 @@ padding: 5px; font-size: 12px; color: #666; -} \ No newline at end of file +} + +.navStyle{ + width: 100%; + height: 3rem; + background-color: #227f6e; + color: #fff; +} +.innerdivs{ + width:100%; + // float:left; +} +.innerdivs2{ + width:100%; + // float:left; + text-align: center; + margin-bottom: 1rem !important; +} +.cardDesign{ + border: 1px solid #e8edef; + width: 89%; + background-color: #227f6e21; + box-shadow: 0 2px 0 rgb(0 0 0 / 3%) +} +.hoverButton{ + background: $white; + // box-shadow: 0 2px 6px $tem-color; + transition: all 0.1s ease-in-out 0s; + &:hover { + box-shadow: 0 0 8px $tem-color; + + transform: scale(1.05); + } +} +.primary{ + background-color: #00866e00; + color: brown; + width: auto; + border: 1px solid brown; + cursor: pointer; +} +.clickedSlot{ + color: white !important; + background-color: brown !important; + cursor: pointer !important; + width: auto; +} +.bookedSlot{ + background-color: darkgrey; + color: white; + width: 6rem; + cursor: no-drop !important; +} +.newCustomer{ + color: #227f6e; + text-align: center; + border: 1px solid #e8edef; +} + +.cardDesign2{ + border: 1px dashed #227f6e; + width: 75%; + height: 348px; + margin-left: 3rem; + background-color: #fcfcfc; + margin-bottom: 2rem; +} +.card-mat-pane{ + width: 20rem; +} +.new{ + color: #227f6e; + margin-top: 0px !important; +} +.popup-button { + // margin-top: 2rem; + width: 100%; + } + .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: 10px; + -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; +} +.pad{ + padding: 20px !important; +} \ No newline at end of file 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 46d3426..1ae66a5 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 @@ -92,7 +92,8 @@ export class DialogBoxComponent implements OnInit { {appoinmentSlots: '07PM - 07.30PM'}, ]; - + clicks:any = 0; + customerCard: any; constructor(private router: Router,private formBuilder: FormBuilder, public dialogRef: MatDialogRef, @Optional() @Inject(MAT_DIALOG_DATA) public data: UsersData) { @@ -127,41 +128,65 @@ export class DialogBoxComponent implements OnInit { this.dialogRef.close(); } -toggle() { - this.show = !this.show; + toggle() { + this.show = !this.show; + // Change the name of the button. + if(this.show) + this.buttonName = "Hide"; + else + this.buttonName = "Show"; + } - // Change the name of the button. - if(this.show) - this.buttonName = "Hide"; - else - this.buttonName = "Show"; -} - - - ngOnInit() { - this.form = new FormGroup({ - busname: new FormControl('', [Validators.required]), - service: new FormControl('', [Validators.required]), - practitioner: new FormControl('', [Validators.required]), - appoinmentDate: new FormControl('', [Validators.required]), - appoinmentTime: new FormControl('', [Validators.required]), - customer: new FormControl('', [Validators.required]), - note: new FormControl('', [Validators.required]), - - workspace: new FormControl('', [Validators.required]), - staff: new FormControl('', [Validators.required]), - slot: new FormControl('', [Validators.required]), - appoinmentSlots: new FormControl('', [Validators.required]), - - }); -console.log(this.local_data, this.selects) -// this.form.controls['note'].setValue('Sample') - this.form.patchValue(this.local_data) -} - public myError = (controlName: string, errorName: string) =>{ - return this.form.controls[controlName].hasError(errorName); - } - submit(){ - console.log(this.form.value); - } + + ngOnInit() { + this.form = new FormGroup({ + busname: new FormControl('', [Validators.required]), + service: new FormControl('', [Validators.required]), + practitioner: new FormControl('', [Validators.required]), + appoinmentDate: new FormControl('', [Validators.required]), + appoinmentTime: new FormControl('', [Validators.required]), + customer: new FormControl('', [Validators.required]), + note: new FormControl('', [Validators.required]), + + workspace: new FormControl('', [Validators.required]), + staff: new FormControl('', [Validators.required]), + slot: new FormControl('', [Validators.required]), + appoinmentSlots: new FormControl('', [Validators.required]), + + }); + console.log(this.local_data, this.selects) + // this.form.controls['note'].setValue('Sample') + this.form.patchValue(this.local_data) + } + public myError = (controlName: string, errorName: string) =>{ + return this.form.controls[controlName].hasError(errorName); + } + submit(){ + console.log(this.form.value); + } + + + goToSlotBooking(){ + // this.days[] + if(this.clicks <5){ + this.clicks += 1; + } + } + goToSlotBooking2(){ + // this.days[] + if( this.clicks >0){ + this.clicks -= 1; + } + console.log( this.clicks) + } + check(param){ + return param[this.clicks]; + } + + addCustomerList(param){ + this.customerCard = param + } + save(){ + + } } 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 129ed75..51fa978 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 @@ -115,7 +115,7 @@
{{practitionerdetails.description}} - + Description 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 629349f..451a0c5 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 @@ -384,7 +384,7 @@ box-sizing: border-box; line-height: 15px; } .scrollHV { -height: calc(100vh - 190px); +height: calc(100vh - 200px); } ::ng-deep .mat-form-field-infix { height: 50px!important; @@ -405,9 +405,9 @@ margin-left: 1rem; ::ng-deep .mat-card .mat-card-title:nth-child(2) { margin-top: -33px!important; } -::ng-deep .mat-select-panel .mat-option{ -height: 5em !important; -} +// ::ng-deep .mat-select-panel .mat-option{ +// height: 5em !important; +// } // css example .indianSymbol { content: "\20B9"; 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 05340c4..2eade3a 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 @@ -242,7 +242,7 @@ unavailability(action,obj) { //if(this.working_customize == false){ // obj.action = action; const dialogRef = this.dialog.open(EditWorkingHoursComponent, { - width: '48%', + width: '45%', height: '100%', // maxWidth: '38vw', position: { right: '0' }, 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 dc8fe95..b479dd9 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,13 +1,14 @@
-
+
Edit Working Hours
+
@@ -521,7 +522,7 @@ -->
- +
Cancel Save 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 b6cf06c..9781bf7 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 @@ -1,4 +1,4 @@ -.edit-working{ +.edit-working{ .popup-header { background: #FFF; padding: 5px 5px 5px 5px; @@ -91,12 +91,12 @@ color: #111; } } - // .scrollHV { - // height: calc(100vh - 190px); - // } + .scrollHV { + height: calc(100vh - 152px); + } .popup-button { margin-top: 2rem; - width: 100%; + width: 100%; } .cancel { background: #F5F5F5; @@ -137,3 +137,9 @@ mat-checkbox{ margin-right: 10px; } +.mar{ + margin: 0px !important; +} +.mat-dialog-container{ + padding: 24px 0px 0px 0px !important; +} 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 c65bd42..8cedd68 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 @@ -1,10 +1,11 @@ -
+ Appointment

{{busName}}
+
@@ -84,12 +85,13 @@
+

© 2023 Venba Information Technology Pvt Ltd. All Rights Reserved

-
+
@@ -98,7 +100,7 @@
-

No Service

+

No Doctor

diff --git a/ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.html b/ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.html index 7c0e2d6..41cf114 100644 --- a/ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.html +++ b/ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.html @@ -42,6 +42,7 @@
--> + Appointment

{{busName}}

@@ -208,8 +209,22 @@
-