diff --git a/ng-seed/Appointment_Frontend_Build.zip b/ng-seed/Appointment_Frontend_Build.zip index d1a4631..888d223 100644 Binary files a/ng-seed/Appointment_Frontend_Build.zip and b/ng-seed/Appointment_Frontend_Build.zip differ 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 62a0ac7..5c561ec 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,10 +14,10 @@ - + @@ -71,20 +71,21 @@ Action edit - delete + - - + + - + +
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 99150c4..9baddf0 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 @@ -142,4 +142,7 @@ tr.mat-header-row { ::ng-deep .mat-button-toggle-button { padding: 5px 7px !important; +} +.action-link{ +text-align: center; } \ No newline at end of file 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 f070990..58de661 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 @@ -69,6 +69,16 @@ Choose a Time --> + + Date + + + + + Time + +
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 efaa038..46ebca1 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 @@ -115,7 +115,8 @@ export class DialogBoxComponent implements OnInit { console.log(data); this.local_data = {...data}; this.action = this.local_data.action; - + this.frontDeskChoosedPractiID = this.local_data['ServicesMapDetail.userId'] + console.log(this.frontDeskChoosedPractiID) } get f(){ return this.form.controls; @@ -489,6 +490,7 @@ export class DialogBoxComponent implements OnInit { goToSlotBooking(i){ + console.log(i) // this.days[] if(this.clicks { if (res.status == 200) { console.log(res) @@ -528,8 +530,10 @@ export class DialogBoxComponent implements OnInit { // }); } }) + this.form.controls['appoinmentDate'].setValue(this.days[ this.clicks]) } goToSlotBooking2(){ + // this.days[] if(this.clicks >0){ this.clicks -= 1; @@ -550,7 +554,7 @@ export class DialogBoxComponent implements OnInit { userId = this.frontDeskChoosedPractiID } let params ={"id":userId , "day": this.dayName , "addcount": this.clicks} - +console.log(params) this.end_user.getSlots(params).subscribe(res => { if (res.status == 200) { console.log(res) @@ -559,6 +563,7 @@ export class DialogBoxComponent implements OnInit { } }) console.log( this.clicks) + this.form.controls['appoinmentDate'].setValue(this.days[ this.clicks]) } check(param){ return param[this.clicks]; 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 4f047a2..a490086 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 @@ -1,19 +1,19 @@

Business Details

-
+
Filter
-
+
Active Inactive
-
+
@@ -84,14 +84,13 @@ - - - + - + +
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 3591fe5..e84fdce 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 @@ -94,6 +94,7 @@ export class BusinessListComponent implements OnInit { getBusinessList() { //this._pd.getTabStatusPdDetails(this.tabStatus) this._bus.getBusinessListDetails().subscribe(res => { + if (res.status == 200) { this.isLoading = false this.businessList = res.data; 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 3814350..775bb05 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 @@ -236,7 +236,8 @@ mat-tab-body { background-color: #FAFAFA; border-bottom: 1px solid #EFEFEF; height: 63px; - padding: 0 30px; + padding-right: 30px; + padding-left: 10px; } .staff-title{ 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 e7ea9e0..1eb8c37 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 @@ -57,13 +57,13 @@ - - + - + +
diff --git a/ng-seed/src/app/appoinment/mail/mail-log/mail-log.component.html b/ng-seed/src/app/appoinment/mail/mail-log/mail-log.component.html index a59253c..119812e 100644 --- a/ng-seed/src/app/appoinment/mail/mail-log/mail-log.component.html +++ b/ng-seed/src/app/appoinment/mail/mail-log/mail-log.component.html @@ -9,7 +9,7 @@
- + @@ -42,16 +42,17 @@ - +
{{element.createdAt | date:'short'}}
- - + - + + +
diff --git a/ng-seed/src/app/appoinment/mail/mail-log/mail-log.component.scss b/ng-seed/src/app/appoinment/mail/mail-log/mail-log.component.scss index 186d218..1087075 100644 --- a/ng-seed/src/app/appoinment/mail/mail-log/mail-log.component.scss +++ b/ng-seed/src/app/appoinment/mail/mail-log/mail-log.component.scss @@ -1,6 +1,6 @@ -// .scrollHV { -// height: calc(100vh - 250px); -// } +.scrollHV { + height: calc(100vh - 253px); +} .fullscreen{ position: absolute !important; height: auto !important; @@ -16,3 +16,9 @@ font-weight: 600; font-size: 14px; } +th.mat-header-cell, td.mat-cell, td.mat-footer-cell { + padding: 6px; + border-bottom-width: 1px; + border-bottom-style: solid; + border: 1px solid #fff; +} diff --git a/ng-seed/src/app/appoinment/mail/mail-log/mail-log.component.ts b/ng-seed/src/app/appoinment/mail/mail-log/mail-log.component.ts index a234398..0ddb004 100644 --- a/ng-seed/src/app/appoinment/mail/mail-log/mail-log.component.ts +++ b/ng-seed/src/app/appoinment/mail/mail-log/mail-log.component.ts @@ -29,6 +29,7 @@ export class MailLogComponent implements OnInit { displayedColumns: string[] = ['id', 'subject', 'recipients', 'contentPage','status', 'createdAt']; dataSource = ELEMENT_DATA; + length = 5; pageIndex = 0; pageSize = 10; @@ -66,12 +67,13 @@ export class MailLogComponent implements OnInit { this.isLoading = false this.mailLogList = res.data; console.log(this.mailLogList) - this.mailLogListLength = res.data.length; + // this.mailLogListLength = res.data.length; this.mailLogList.forEach((element, index) => { element.index = index }); this.mailLogListSource['data'] = this.mailLogList; + this.mailLogListLength = this.mailLogList.length; console.log(this.mailLogListSource) this.recordStatus=false; } 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 bffee95..57b6ede 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 @@ -9,7 +9,7 @@ ServiceName is required Limit exceed - + + + Duration + +
+ Mins +
+ Fees is required + + Fees 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 b56d34b..62693a1 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 @@ -61,13 +61,14 @@ - - + + - + +
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 170a212..ea54d01 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 @@ -78,7 +78,7 @@ export class AddUserComponent implements OnInit { ),],valData), // password: new FormControl('', [Validators.required, Validators.minLength(6)]), password: new FormControl('', [Validators.required,Validators.pattern( - '^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*_=+-]).{8,12}$' + '^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*_=+-]).{16,}$' )]), logo: new FormControl('', null), // confirmPassword: new FormControl('', [Validators.required, Validators.minLength(6)]), 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 a8fdfae..95a1739 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,19 +1,19 @@

Users Details

-
+
Filter
-
+
Active Inactive
-
+
@@ -131,14 +131,14 @@ - - - + - + + +
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 1e253c3..d139319 100644 --- a/ng-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng-seed/src/app/layouts/admin/admin-layout.component.html @@ -20,13 +20,13 @@