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 e4b85f6..7068e28 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,57 +1,76 @@

Appoinment Details

- Filter - + Filter +
- +
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
S.NO {{element.id}} Service {{element.serviceselect}} Customer {{element.customerselect}} Date & Time {{element.picker}} Action - edit - delete -
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Time {{element.time}} Booking ID {{element.booking}} Workspace {{element.workspace}} Service {{element.service}} Staff {{element.staff}} Customer {{element.customer}} Payment {{element.payment}} Status {{element.status}} Action + edit + delete +
- - - -
-
-
- - + + + +
+
+
+ \ No newline at end of file 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 e1f06ed..25e4555 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 @@ -5,22 +5,30 @@ import { MatTable, MatTableDataSource } from '@angular/material/table'; import Swal from 'sweetalert2'; import { DialogBoxComponent } from '../dialog-box/dialog-box.component'; export interface UsersData { - id: number; - serviceselect: string; - customerselect: string; - picker: string; + // id: number; + time: string; + booking: string; + workspace: string; + service: string; + staff: string; + customer: string; + payment: string; + status: string; + date: string; } const ELEMENT_DATA: UsersData[] = [ - {id: 1, serviceselect: 'school management system ', customerselect: 'A', picker: '2023-02-26T11:26:30.882Z' }, - {id: 2, serviceselect: 'Sample', customerselect: 'B', picker: '2023-02-26T11:26:30.882Z' }, - {id: 3, serviceselect: 'Test', customerselect: 'C', picker: '2023-02-26T11:26:30.882Z' }, - {id: 4, serviceselect: 'Sample', customerselect: 'A', picker: '2023-02-26T11:26:30.882Z' }, - {id: 5, serviceselect: 'Test', customerselect: 'B', picker: '2023-02-26T11:26:30.882Z' }, - {id: 6, serviceselect: 'Sample', customerselect: 'C', picker: '2023-02-26T11:26:30.882Z'}, - {id: 7, serviceselect: 'Test', customerselect: 'A', picker: '2023-02-26T11:26:30.882Z'}, - {id: 8, serviceselect: 'Sample', customerselect: 'B', picker: '2023-02-26T11:26:30.882Z'}, - {id: 9, serviceselect: 'Test', customerselect: 'C', picker: '2023-02-26T11:26:30.882Z'}, - {id: 10, serviceselect: 'Sample', customerselect: 'A', picker: '2023-02-26T11:26:30.882Z'}, + {time: '12:00 pm - 12:30 pm', booking: '#SA-00001', workspace: 'sample ', service: 'test', staff: 'Kumar.S', customer:'A', payment:'Free', status: 'Pending', date:'01 Mar 2023'}, + {time: '01:00 pm - 01:30 pm', booking: '#SA-00002', workspace: 'test ', service: 'sample', staff: 'Kumar.S', customer:'B', payment:'Paid', status: 'Completed', date:'01 Mar 2023'}, + {time: '02:00 pm - 02:30 pm', booking: '#SA-00003', workspace: 'sample ', service: 'test', staff: 'Kumar.S', customer:'C', payment:'Free', status: 'Pending', date:'01 Mar 2023'}, + {time: '03:00 pm - 03:30 pm', booking: '#SA-00004', workspace: 'test ', service: 'sample', staff: 'Kumar.S', customer:'A', payment:'Paid', status: 'Completed', date:'01 Mar 2023'}, + {time: '04:00 pm - 04:30 pm', booking: '#SA-00005', workspace: 'sample ', service: 'test', staff: 'Kumar.S', customer:'B', payment:'Free', status: 'Pending', date:'01 Mar 2023'}, + {time: '05:00 pm - 05:30 pm', booking: '#SA-00006', workspace: 'test ', service: 'sample', staff: 'Kumar.S', customer:'C', payment:'Paid', status: 'Completed', date:'01 Mar 2023'}, + {time: '09:00 am - 09:30 am', booking: '#SA-00007', workspace: 'sample ', service: 'test', staff: 'Kumar.S', customer:'A', payment:'Free', status: 'Pending', date:'01 Mar 2023'}, + {time: '10:00 am - 10:30 am', booking: '#SA-00008', workspace: 'test ', service: 'sample', staff: 'Kumar.S', customer:'B', payment:'Paid', status: 'Completed', date:'01 Mar 2023'}, + {time: '11:00 am - 11:30 am', booking: '#SA-00009', workspace: 'sample ', service: 'test', staff: 'Kumar.S', customer:'C', payment:'Free', status: 'Pending', date:'01 Mar 2023'}, + {time: '12:00 am - 12:30 am', booking: '#SA-000010', workspace: 'test ', service: 'sample', staff: 'Kumar.S', customer:'A', payment:'Paid', status: 'Completed', date:'01 Mar 2023'}, + {time: '01:00 pm - 01:30 pm', booking: '#SA-000011', workspace: 'sample ', service: 'test', staff: 'Kumar.S', customer:'B', payment:'Free', status: 'Pending', date:'01 Mar 2023'}, + ]; @Component({ selector: 'app-appoinments-list', @@ -30,7 +38,7 @@ const ELEMENT_DATA: UsersData[] = [ export class AppoinmentsListComponent implements OnInit { push: any; - displayedColumns: string[] = ['id', 'serviceselect', 'customerselect','picker', 'action']; + displayedColumns: string[] = [ 'time', 'booking', 'workspace', 'service', 'staff', 'customer', 'payment', 'status','action']; dataSource: any; // dataSource: any = new MatTableDataSource(ELEMENT_DATA); @ViewChild(MatTable,{static:true}) table: MatTable; @@ -78,7 +86,7 @@ export class AppoinmentsListComponent implements OnInit { openDialog(action,obj) { obj.action = action; const dialogRef = this.dialog.open(DialogBoxComponent, { - // width: '30%', + width: '45%', height: '100%', // maxWidth: '38vw', position: { right: '0' }, @@ -98,12 +106,19 @@ export class AppoinmentsListComponent implements OnInit { addRowData(row_obj){ var d = this.dataSource.data.length+1 console.log(this.dataSource) + console.log(row_obj) this.dataSource.data.push ({ id: d, - serviceselect: row_obj.serviceselect, - customerselect: row_obj.customerselect, - picker: row_obj.picker + time: row_obj.time, + booking: row_obj.booking, + workspace: row_obj.workspace, + service: row_obj.service, + staff: row_obj.staff, + customer: row_obj.customer, + payment: row_obj.payment, + status: row_obj.status, + date: row_obj.date, }); this.table.renderRows(); @@ -112,9 +127,15 @@ export class AppoinmentsListComponent implements OnInit { console.log(row_obj) this.dataSource = this.dataSource.data.filter((value,key)=>{ if(value.id == row_obj.id){ - value.serviceselect = row_obj.serviceselect; - value.customerselect = row_obj.customerselect; - value.picker = row_obj.picker; + value.time = row_obj.time; + value.booking = row_obj.booking; + value.workspace = row_obj.workspace; + value.service = row_obj.service; + value.staff = row_obj.staff; + value.customer = row_obj.customer; + value.payment = row_obj.payment; + value.status = row_obj.status; + value.date = row_obj.date; } return true; }); 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 0a8e402..d4cba9b 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,76 +1,98 @@ -
{{action}} New Appoinment -
- -
-
- - - - -- - - {{business.name}} - - - Please choose an animal - Please choose any other - - +
+ New Appoinment + +
+
+ +
+ - + -- - - {{business.name}} + + {{business.workspace}} - - Please choose an animal - Please choose any other - - - - - - - - - - - - - - - - - -
- - - Sure to delete {{local_data.name}}? -
-
- - -
- - - \ No newline at end of file +
+
+ + + + -- + + {{business.service}} + + + Please choose an Service + Please choose any other + +
+
+ + + + -- + + {{business.staff}} + + + Please choose an Staff + Please choose any other + +
+
+ + + + + + + + + +
+
+ + + + -- + + {{business.customer}} + + + Please choose an Customer + Please choose any other + +
+
+ + +
+ +
+ + Sure to delete {{local_data.name}}? + +
+
+ + +
+ \ 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 0bad49d..bba6576 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,15 +1,15 @@ // ::ng-deep .cdk-overlay-pane{ // width: 60%!important; // } -.mat-pane{ - width: 20rem; -} +// .mat-pane{ +// width: 20rem; +// } .button{ - // float: right; margin-bottom: 1rem; - background-color: #ffff; + background-color: #ffff!important; margin-top: -1rem; - margin-left: 6rem; + position: absolute; + right: 20px; } ::ng-deep .mat-card.settings-panel { position: inherit; @@ -46,3 +46,36 @@ width: 90%!important; } } + +//25/02/2023 + +.field{ + display: flex; +} +.label-container{ + flex: 1; + color: #666; + position: relative; + text-transform: capitalize; + width: 100px; + flex: none; + margin-right: 20px; + align-self: flex-start; + padding-top: 20px; + box-sizing: border-box; + line-height: 15px; + font-size: 14px; +} +::ng-deep .mat-form-field-appearance-outline .mat-form-field-wrapper { + margin: 0.25em 0; + width: 175%!important; +} +.mate{ + width: 27%!important; +} +.date-marge{ + margin-left: 6rem; +} +.field-inline{ + display: inline-flex; +} 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 5ead7c6..863e14f 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 @@ -3,8 +3,16 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Router } from '@angular/router'; export interface UsersData { - name: string; - id: number; + // id: number; + time: string; + booking: string; + workspace: string; + service: string; + staff: string; + customer: string; + payment: string; + status: string; + date: Date; } @Component({ selector: 'app-dialog-box', @@ -13,27 +21,38 @@ export interface UsersData { }) export class DialogBoxComponent implements OnInit { form: FormGroup; - fileToUpload: any; - imageUrl: any; + // fileToUpload: any; + // imageUrl: any; action:string; local_data:any; url: string | ArrayBuffer; - serviceselect = new FormControl('', [Validators.required]); + workspace = new FormControl('', [Validators.required]); selects = [ - {name: 'school management system'}, - {name: 'Sample'}, - {name: 'Test'}, + {workspace: 'school management system'}, + {workspace: 'Sample'}, + {workspace: 'Test'}, ]; - - customerselect = new FormControl('', [Validators.required]); + service = new FormControl('', [Validators.required]); select = [ - {name: 'A'}, - {name: 'B'}, - {name: 'C'}, - {name: 'D'}, + {service: 'Hospital'}, + {service: 'School'}, + {service: 'Sports'}, + ]; + staff = new FormControl('', [Validators.required]); + staffs = [ + {staff: 'A'}, + {staff: 'B'}, + {staff: 'C'}, + {staff: 'D'}, + ]; + customer = new FormControl('', [Validators.required]); + customers = [ + {customer: 'Sample'}, + {customer: 'Test'}, + {customer: 'CSample'}, + {customer: 'TestD'}, ]; - constructor(private router: Router,private formBuilder: FormBuilder, public dialogRef: MatDialogRef, @Optional() @Inject(MAT_DIALOG_DATA) public data: UsersData) { @@ -64,22 +83,20 @@ export class DialogBoxComponent implements OnInit { } } close() { + // console.log(this.form.value); this.dialogRef.close(); } + ngOnInit() { this.form = new FormGroup({ - serviceselect: new FormControl('', [Validators.required]), - customerselect: new FormControl('', [Validators.required]), - picker: new FormControl('', [Validators.required]), - // image: new FormControl('', null), - // name: 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)]), - // email: new FormControl('', [Validators.required, Validators.email,Validators.pattern( - // '[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+.[a-zA-Z]{2,63}$', - // ),]), - // contact_no: new FormControl('', [Validators.required, Validators.maxLength(10)]), + + workspace: new FormControl('', [Validators.required]), + service: new FormControl('', [Validators.required]), + staff: new FormControl('', [Validators.required]), + date: new FormControl('', [Validators.required]), + time: new FormControl('', [Validators.required]), + customer: new FormControl('', [Validators.required]), + note: new FormControl('', [Validators.required]), }); this.form.patchValue(this.local_data) } diff --git a/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.html b/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.html index 4fa1713..02ddbfb 100644 --- a/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.html +++ b/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.html @@ -1,9 +1,27 @@ + +

- --> +

diff --git a/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.scss b/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.scss index cab77df..c6a108c 100644 --- a/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.scss +++ b/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.scss @@ -7,4 +7,13 @@ } mat-card { margin: 8px; - } \ No newline at end of file + } + ::ng-deep .mat-toolbar.mat-primary { + /* background: #673ab7; */ + background-color: #207b68f2!important; + color: white; +} +.btn{ + background-color: #4caf50!important; + color: white; +} \ No newline at end of file diff --git a/ng-seed/src/app/layouts/admin/admin-layout.component.html b/ng-seed/src/app/layouts/admin/admin-layout.component.html index 36b72c2..7aa5759 100644 --- a/ng-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng-seed/src/app/layouts/admin/admin-layout.component.html @@ -393,9 +393,9 @@ -