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 9957d07..62a0ac7 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 @@ - + diff --git a/ng-seed/src/app/appoinment/appoinments/appointment-addcustomer/appointment-addcustomer.component.scss b/ng-seed/src/app/appoinment/appoinments/appointment-addcustomer/appointment-addcustomer.component.scss index 55ece68..f9d77df 100644 --- a/ng-seed/src/app/appoinment/appoinments/appointment-addcustomer/appointment-addcustomer.component.scss +++ b/ng-seed/src/app/appoinment/appoinments/appointment-addcustomer/appointment-addcustomer.component.scss @@ -89,7 +89,7 @@ $tem-color : #217e69; // // height: auto!important; // } ::ng-deep .mat-dialog-content { - max-height: 75vh!important; + max-height: unset !important; overflow: unset!important; // overflow: hidden!important; } 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 572687c..f070990 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 @@ -75,9 +75,11 @@ {{check(days) | date:'longDate'}}
- - - +
+ + + +
@@ -125,22 +127,24 @@ -
+ - - Sure to delete {{local_data.cusName}}? - +
- -
+
-
+
+ + + + 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 859803b..6bc7d56 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 @@ -89,7 +89,7 @@ $tem-color : #217e69; // // height: auto!important; // } ::ng-deep .mat-dialog-content { - max-height: 75vh!important; + max-height: unset !important; overflow: unset!important; // overflow: hidden!important; } @@ -97,7 +97,7 @@ $tem-color : #217e69; overflow: hidden!important; } .scrollHV { - height: calc(100vh - 190px); + height: calc(100vh - 85px); } .scrollHV2 { height: calc(100vh - 462px); diff --git a/ng-seed/src/app/appoinment/business/add-business/add-business.component.scss b/ng-seed/src/app/appoinment/business/add-business/add-business.component.scss index 4791ddb..c5845d4 100644 --- a/ng-seed/src/app/appoinment/business/add-business/add-business.component.scss +++ b/ng-seed/src/app/appoinment/business/add-business/add-business.component.scss @@ -48,8 +48,9 @@ } } ::ng-deep .mat-dialog-content { - max-height: 170vh !important; - overflow: hidden!important; + max-height: unset !important; + overflow: unset!important; + // overflow: hidden!important; } ::ng-deep .mat-dialog-container{ overflow: hidden!important; diff --git a/ng-seed/src/app/appoinment/consultant-setting/assign-service/assign-service.component.scss b/ng-seed/src/app/appoinment/consultant-setting/assign-service/assign-service.component.scss index ad079c5..021902e 100644 --- a/ng-seed/src/app/appoinment/consultant-setting/assign-service/assign-service.component.scss +++ b/ng-seed/src/app/appoinment/consultant-setting/assign-service/assign-service.component.scss @@ -48,8 +48,9 @@ } } ::ng-deep .mat-dialog-content { - max-height: 170vh !important; - overflow: hidden!important; + max-height: unset !important; + overflow: unset!important; + // overflow: hidden!important; } ::ng-deep .mat-dialog-container{ overflow: hidden!important; diff --git a/ng-seed/src/app/appoinment/customers/add-customers/add-customers.component.scss b/ng-seed/src/app/appoinment/customers/add-customers/add-customers.component.scss index 07b61ed..ed5ecc1 100644 --- a/ng-seed/src/app/appoinment/customers/add-customers/add-customers.component.scss +++ b/ng-seed/src/app/appoinment/customers/add-customers/add-customers.component.scss @@ -48,9 +48,12 @@ } } ::ng-deep .mat-dialog-content { - max-height: 170vh!important; + max-height: unset !important; + overflow: unset!important; + // overflow: hidden!important; +} +::ng-deep .mat-dialog-container{ overflow: hidden!important; - } .scrollHV { height: calc(100vh - 150px); 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 0028ef9..e7ea9e0 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 @@ -1,5 +1,5 @@ -

Customer Details

+

Booking Details

Filter diff --git a/ng-seed/src/app/appoinment/user/add-user/add-user.component.scss b/ng-seed/src/app/appoinment/user/add-user/add-user.component.scss index d36c1d3..939eba3 100644 --- a/ng-seed/src/app/appoinment/user/add-user/add-user.component.scss +++ b/ng-seed/src/app/appoinment/user/add-user/add-user.component.scss @@ -25,12 +25,12 @@ box-shadow:none!important; } ::ng-deep .mat-dialog-content { - max-height: 75vh!important; - overflow: unset!important; - // overflow: hidden!important; + max-height: unset !important; + overflow: unset!important; + // overflow: hidden!important; } ::ng-deep .mat-dialog-container{ - overflow: hidden!important; + overflow: hidden!important; } .scrollHV { height: calc(100vh - 83px); diff --git a/ng-seed/src/app/end-user/customer-info/customer-info.component.html b/ng-seed/src/app/end-user/customer-info/customer-info.component.html index 3d08419..63de99c 100644 --- a/ng-seed/src/app/end-user/customer-info/customer-info.component.html +++ b/ng-seed/src/app/end-user/customer-info/customer-info.component.html @@ -35,10 +35,10 @@ Please enter a valid email address - - + email is required +
diff --git a/ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.ts b/ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.ts index 723b910..ee4e421 100644 --- a/ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.ts +++ b/ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.ts @@ -48,6 +48,7 @@ export class DoctorProfileComponent implements OnInit { console.log('booked', res); if(res.length>0){ + localStorage.setItem('busId',res[0].business[0].busId) localStorage.setItem('busName',res[0].business[0].busName) localStorage.setItem('logo',res[0].business[0].logo) this.bookedAppointment = res[0].user[0] diff --git a/ng-seed/src/app/end-user/service-list-details/service-list.component.ts b/ng-seed/src/app/end-user/service-list-details/service-list.component.ts index 8f94d27..4923d98 100644 --- a/ng-seed/src/app/end-user/service-list-details/service-list.component.ts +++ b/ng-seed/src/app/end-user/service-list-details/service-list.component.ts @@ -82,6 +82,7 @@ export class ServiceListComponent implements OnInit { this.full_data = res['data'] console.log(this.full_data) this.full_data[0].business[0].busName + localStorage.setItem('busId',this.full_data[0].business[0].busId) localStorage.setItem('busName',this.full_data[0].business[0].busName) localStorage.setItem('currency',this.full_data[0].business[0].currency) localStorage.setItem('logo',this.full_data[0].business[0].logo) 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 d152289..1e253c3 100644 --- a/ng-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng-seed/src/app/layouts/admin/admin-layout.component.html @@ -20,10 +20,23 @@
-
\ No newline at end of file +
+ + \ No newline at end of file diff --git a/ng-seed/src/app/layouts/admin/admin-layout.component.ts b/ng-seed/src/app/layouts/admin/admin-layout.component.ts index edaf2f7..fb2a649 100644 --- a/ng-seed/src/app/layouts/admin/admin-layout.component.ts +++ b/ng-seed/src/app/layouts/admin/admin-layout.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy, ViewChild, HostListener } from '@angular/core'; +import { Component, OnInit, OnDestroy, ViewChild, HostListener, ElementRef } from '@angular/core'; import { Router, NavigationEnd } from '@angular/router'; import { MenuItems } from '../../shared/menu-items/menu-items'; import { HorizontalMenuItems } from '../../shared/menu-items/horizontal-menu-items'; @@ -13,6 +13,9 @@ PerfectScrollbarComponent, PerfectScrollbarDirective } from 'ngx-perfect-scrollb import { RoleMenuItemsPipe } from '../role-menu-items.pipe'; import { ConsultantService } from 'app/appoinment/consultant-setting/consultant-service/consultant.service'; import { environment } from 'environments/environment'; +import { NotifierService } from 'angular-notifier'; +import { BusinessService } from 'app/appoinment/business/business-service/business.service'; +import { UserService } from 'app/appoinment/user/user-service/user.service'; @Component({ selector: 'app-layout', @@ -54,11 +57,14 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { getUserData: any = []; userLength: any = []; roleName: any; - constructor(public _con:ConsultantService,private router: Router, public menuItems: MenuItems, public horizontalMenuItems : HorizontalMenuItems, public translate: TranslateService ) { + // fileInput: HTMLInputElement; + @ViewChild('fileInput') uploadImage; + formData: any=[]; + constructor(public _use:UserService,public _bus:BusinessService,private notifierService: NotifierService,public _con:ConsultantService,private router: Router, public menuItems: MenuItems, public horizontalMenuItems : HorizontalMenuItems, public translate: TranslateService ) { const browserLang: string = translate.getBrowserLang(); translate.use(browserLang.match(/en|fr/) ? browserLang : 'en'); this.getUser = localStorage.getItem('user_role') - + this.formData= new FormData(); } //08/02/2023 @@ -93,7 +99,10 @@ users() { } - + openFileInput() { + console.log('in') + this.uploadImage.nativeElement.click(); + } getUserDetails(){ let userID = localStorage.getItem('user_id') console.log('in') @@ -266,5 +275,71 @@ users() { localStorage.clear(); this.router.navigate(['/authentication/login']); } + + 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]; + console.log(file) + // return; + // if(event != null){ + // // this.imageViewStatus = true + // } + // this.form['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) + // } + // } + let user_id = localStorage.getItem('user_id') + // let busUserID = this.getUserData.BusinessDetails[0].id + this.formData = [] + this.formData= new FormData(); + this.formData.append('image', file, file.name); + this.formData.append('logo', '1'); + this.formData.append('id',user_id) + // this.formData.append('isActive','1') + // this.formData.append('id',user_id) + console.log(this.formData) + // let user_role = localStorage.getItem('user_role') + // let service + // if(user_role == 'BIZADMIN'){ + // console.log('BIZADMIN',busUserID) + // this.formData.append('id',busUserID) + // service = this._bus + // }else { + // console.log('oThers') + // this.formData.append('id',user_id) + // service = this._use + // } + this._use.addFormDetails(this.formData).subscribe(res => { + if (res.status == 200) { + this.notifierService.notify('success', 'Profile Updated Successfully'); + this.getUserDetails() + } + + else{ + console.log(res.message) + // this.notifierService.notify('success', 'You are awesome! I mean it!'); + this.notifierService.notify('warning', res.message); + } + }) + } + } 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/assets/styles/scss/utilities/_general.scss b/ng-seed/src/assets/styles/scss/utilities/_general.scss index 4452d91..156f00e 100644 --- a/ng-seed/src/assets/styles/scss/utilities/_general.scss +++ b/ng-seed/src/assets/styles/scss/utilities/_general.scss @@ -9,8 +9,64 @@ $hover-icon-color:#2393db; .radius-round { border-radius: $border-radius-base; } +// .profilepic { +// position: relative; +// width: 125px; +// height: 125px; +// border-radius: 50%; +// overflow: hidden; +// background-color: #111; +// } + + .profilepic:hover .profilepic__content { + opacity: 1; + } + + .profilepic:hover .rad-full { + opacity: .5; + } + + .rad-full { + object-fit: cover; + opacity: 1; + transition: opacity .2s ease-in-out; + } + + .profilepic__content { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + color: white; + opacity: 0; + transition: opacity .2s ease-in-out; + } + + .profilepic__icon { + color: white; + padding-bottom: 60px; + cursor: pointer; + } + + .fas { + font-size: 20px; + } + + .profilepic__text { + text-transform: uppercase; + font-size: 12px; + width: 50%; + text-align: center; + } .rad-full{ border-radius: 100%; + height: 100px !important; + width: 100px !important; } .radius-circle { border-radius: 50%; diff --git a/ng-seed/src/favicon.ico b/ng-seed/src/favicon.ico index 8081c7c..5425c9f 100644 Binary files a/ng-seed/src/favicon.ico and b/ng-seed/src/favicon.ico differ