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 f34524e..ebc7080 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 @@ -14,6 +14,7 @@ +
- + @@ -62,9 +63,12 @@ delete - + +
Time
{{element.date}}

{{element.time}}
{{element.date | date:'mediumDate'}}

{{element.time}}
Booking ID
+
diff --git a/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.scss b/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.scss index be748ee..04e3287 100644 --- a/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.scss +++ b/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.scss @@ -1,5 +1,5 @@ .my-table{ - width: 120%; + width: 100%; } .button{ float: right; @@ -20,7 +20,7 @@ th.mat-header-cell, td.mat-cell, td.mat-footer-cell { } ::ng-deep .body-container { overflow-x: hidden; - overflow-y: auto; + overflow-y: hidden; background-color: #ffff; } ::ng-deep .mat-expansion-panel:not([class*='mat-elevation-z']) { @@ -60,7 +60,7 @@ img { } ::ng-deep .mat-content { - display: flex; + display: block!important; flex: 1; /* flex-direction: row; */ /* overflow: hidden; */ @@ -91,4 +91,11 @@ img { } ::ng-deep body.swal2-height-auto { height: 100% !important - } \ No newline at end of file + } + .example-container { + display: block; + height: 365px; + /* overflow: auto; */ + overflow-x: hidden; + overflow-y: auto; + } 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 7d2f2d0..af4d889 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,98 +1,98 @@ -
- {{action}} Appoinment - -
-
-
-
- - - - -- - - {{business.workspace}} - - - Please choose an Workspace - Please choose any other - -
-
- - - - -- - - {{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 +
+ {{action}} Appoinment + +
+
+
+
+ + + + -- + + {{business.workspace}} + + + Please choose an Workspace + Please choose any other + +
+
+ + + + -- + + {{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 1bc0a5e..10033b6 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 @@ -15,7 +15,7 @@ position: inherit; bottom: 0px; right: 0px; - width: 350px; + width: 100%; z-index: 9; top: 58px; } @@ -47,8 +47,6 @@ } } -//25/02/2023 - .field{ display: flex; } @@ -71,7 +69,7 @@ width: 175%!important; } .mate{ - width: 27%!important; + width: 18%!important; } .date-marge{ margin-left: 6rem; @@ -82,3 +80,10 @@ ::ng-deep .swal2-height-auto { // height: auto!important; } +::ng-deep .mat-dialog-content { + max-height: 75vh!important; + overflow: hidden!important; +} +::ng-deep .mat-dialog-container{ + overflow: hidden!important; +} diff --git a/ng-seed/src/app/appoinment/business/business-list/business-list.component.html b/ng-seed/src/app/appoinment/business/business-list/business-list.component.html index 5ae5d89..c6a7b2d 100644 --- a/ng-seed/src/app/appoinment/business/business-list/business-list.component.html +++ b/ng-seed/src/app/appoinment/business/business-list/business-list.component.html @@ -11,6 +11,7 @@ +
@@ -60,9 +61,10 @@ delete - - + +
+
diff --git a/ng-seed/src/app/appoinment/business/business-list/business-list.component.scss b/ng-seed/src/app/appoinment/business/business-list/business-list.component.scss index a0c8d86..054f56c 100644 --- a/ng-seed/src/app/appoinment/business/business-list/business-list.component.scss +++ b/ng-seed/src/app/appoinment/business/business-list/business-list.component.scss @@ -1,5 +1,5 @@ .my-table{ - width: 120%; + width: 100%; } .button{ float: right; @@ -20,7 +20,7 @@ th.mat-header-cell, td.mat-cell, td.mat-footer-cell { } ::ng-deep .body-container { overflow-x: hidden; - overflow-y: auto; + overflow-y: hidden; background-color: #ffff; } ::ng-deep .mat-expansion-panel:not([class*='mat-elevation-z']) { @@ -60,7 +60,7 @@ img { } ::ng-deep .mat-content { - display: flex; + display: block!important; flex: 1; /* flex-direction: row; */ /* overflow: hidden; */ @@ -75,4 +75,11 @@ img { } ::ng-deep body.swal2-height-auto { height: 100% !important + } + .example-container { + display: block; + height: 348px; + /* overflow: auto; */ + overflow-x: hidden; + overflow-y: auto; } \ No newline at end of file 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 9967d48..f0d9ec2 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 @@ -84,7 +84,7 @@ export class BusinessListComponent implements OnInit { openDialog(action,obj) { obj.action = action; const dialogRef = this.dialog.open(DialogBoxComponent, { - // width: '30%', + width: '32%', height: '100%', // maxWidth: '38vw', position: { right: '0' }, diff --git a/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.scss b/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.scss index 0bad49d..cf68fba 100644 --- a/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.scss +++ b/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.scss @@ -9,7 +9,8 @@ margin-bottom: 1rem; background-color: #ffff; margin-top: -1rem; - margin-left: 6rem; + // margin-left: 6rem; + float: right; } ::ng-deep .mat-card.settings-panel { position: inherit; @@ -46,3 +47,10 @@ width: 90%!important; } } +::ng-deep .mat-dialog-content { + max-height: 75vh!important; + overflow: hidden!important; +} +::ng-deep .mat-dialog-container{ + overflow: hidden!important; +} \ No newline at end of file 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 c6a108c..56d45ab 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 @@ -1,19 +1,19 @@ // @import "../../../assets/styles/scss/components/calendar"; :host { - margin-left: -5px; - margin-right: -5px; - margin-top: -5px; - display: block; - } - mat-card { - margin: 8px; - } - ::ng-deep .mat-toolbar.mat-primary { - /* background: #673ab7; */ - background-color: #207b68f2!important; - color: white; + margin-left: -5px; + margin-right: -5px; + margin-top: -5px; + display: block; +} +mat-card { + margin: 8px; +} +::ng-deep .mat-toolbar.mat-primary { + /* background: #673ab7; */ + background-color: #207b68f2!important; + color: white; } .btn{ - background-color: #4caf50!important; - color: white; +background-color: #4caf50!important; +color: white; } \ No newline at end of file diff --git a/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.ts b/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.ts index 4764f48..ee2646c 100644 --- a/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.ts +++ b/ng-seed/src/app/appoinment/calendars/calendar-list/calendar-list.component.ts @@ -105,7 +105,7 @@ export class CalendarListComponent implements OnInit { draggable: true }]; - activeDayIsOpen = true; + activeDayIsOpen = false; table: any; constructor(public dialog: MatDialog) { @@ -171,6 +171,8 @@ export class CalendarListComponent implements OnInit { dayClicked({date, events}: {date: Date, events: CalendarEvent[]}): void { console.log(date, events) +this.openDialog('Add', {date:date}) +// this.openDialog('calender', {date:date}) this.addEvent(date) if (isSameMonth(date, this.viewDate)) { if ( @@ -202,9 +204,15 @@ this.addEvent(date) }); } openDialog(action,obj) { - obj.action = action; + console.log(obj, action) + if(action=='calender'){ + + }else{ + obj.action = action; + } + const dialogRef = this.dialog.open(DialogBoxComponent, { - width: '45%', + width: '40%', height: '100%', // maxWidth: '38vw', position: { right: '0' }, diff --git a/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.html b/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.html index a3074a5..cb4dbe9 100644 --- a/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.html +++ b/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.html @@ -11,6 +11,7 @@ +
@@ -65,9 +66,10 @@ delete - +
+
diff --git a/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.scss b/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.scss index 367c018..176b8a1 100644 --- a/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.scss +++ b/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.scss @@ -1,5 +1,5 @@ .my-table{ - width: 120%; + width: 100%; } .button{ float: right; @@ -20,7 +20,7 @@ th.mat-header-cell, td.mat-cell, td.mat-footer-cell { } ::ng-deep .body-container { overflow-x: hidden; - overflow-y: auto; + overflow-y: hidden; background-color: #ffff; } ::ng-deep .mat-expansion-panel:not([class*='mat-elevation-z']) { @@ -60,7 +60,7 @@ img { } ::ng-deep .mat-content { - display: flex; + display: block!important; flex: 1; /* flex-direction: row; */ /* overflow: hidden; */ @@ -74,11 +74,18 @@ img { margin: 0 15px!important; } mat-paginator{ - margin-top: -8px; + margin-top: -5px; } ::ng-deep .mat-paginator { margin-top: -10px!important; } ::ng-deep body.swal2-height-auto { height: 100% !important + } + .example-container { + display: block; + height: 365px; + /* overflow: auto; */ + overflow-x: hidden; + overflow-y: auto; } \ No newline at end of file diff --git a/ng-seed/src/app/appoinment/customers/dialog-box/dialog-box.component.scss b/ng-seed/src/app/appoinment/customers/dialog-box/dialog-box.component.scss index 0bad49d..e7ca036 100644 --- a/ng-seed/src/app/appoinment/customers/dialog-box/dialog-box.component.scss +++ b/ng-seed/src/app/appoinment/customers/dialog-box/dialog-box.component.scss @@ -9,7 +9,8 @@ margin-bottom: 1rem; background-color: #ffff; margin-top: -1rem; - margin-left: 6rem; + // margin-left: 6rem; + float: right; } ::ng-deep .mat-card.settings-panel { position: inherit; @@ -46,3 +47,8 @@ width: 90%!important; } } +::ng-deep .mat-dialog-content { + max-height: 80vh!important; + overflow: hidden!important; + +} diff --git a/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.scss b/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.scss index 786a21f..9d29136 100644 --- a/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.scss +++ b/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.scss @@ -9,7 +9,8 @@ margin-bottom: 1rem; background-color: #ffff; margin-top: -1rem; - margin-left: 6rem; + // margin-left: 6rem; + float: right; } ::ng-deep .mat-card.settings-panel { position: inherit; @@ -23,4 +24,10 @@ ::ng-deep body .mat-card { box-shadow:none!important; } - +::ng-deep .mat-dialog-content { + max-height: 75vh!important; + overflow: hidden!important; +} +::ng-deep .mat-dialog-container{ + overflow: hidden!important; +} 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 8bfa2c0..e31010e 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 @@ -1,3 +1,11 @@ + +

Users Details

Filter @@ -11,6 +19,7 @@ +
@@ -70,9 +79,10 @@ delete - - + +
+
diff --git a/ng-seed/src/app/appoinment/user/user-list/user-list.component.scss b/ng-seed/src/app/appoinment/user/user-list/user-list.component.scss index f647261..f8a6ba4 100644 --- a/ng-seed/src/app/appoinment/user/user-list/user-list.component.scss +++ b/ng-seed/src/app/appoinment/user/user-list/user-list.component.scss @@ -1,5 +1,5 @@ .my-table{ - width: 120%; + width: 100%; } .button{ float: right; @@ -20,7 +20,7 @@ th.mat-header-cell, td.mat-cell, td.mat-footer-cell { } ::ng-deep .body-container { overflow-x: hidden; - overflow-y: auto; + overflow-y: hidden; background-color: #ffff; } ::ng-deep .mat-expansion-panel:not([class*='mat-elevation-z']) { @@ -60,7 +60,7 @@ img { } ::ng-deep .mat-content { - display: flex; + display: block!important; flex: 1; /* flex-direction: row; */ /* overflow: hidden; */ @@ -68,11 +68,21 @@ img { overflow-y: auto!important; } ::ng-deep .mat-paginator { - margin-top: -15px!important; + margin-top: -22px!important; } ::ng-deep .mat-select-arrow { margin: 0 15px!important; } ::ng-deep body.swal2-height-auto { height: 100% !important - } \ No newline at end of file + } + .example-container { + display: block; + height: 300px; + /* overflow: auto; */ + overflow-x: hidden; + overflow-y: auto; + } + .mat-elevation-z8 { + box-shadow: none!important; +} \ No newline at end of file