From ca65114fdee7c1077f2be563f3775c47115e0339 Mon Sep 17 00:00:00 2001 From: Smart Date: Fri, 31 Mar 2023 17:52:53 +0530 Subject: [PATCH 1/2] ui-fix --- .../consultants-list.component.html | 43 ++++++----- .../consultants-list.component.scss | 75 +++++++++++++------ .../consultants/consultants-list.component.ts | 1 + ng-seed/src/assets/images/facebook.svg | 1 + ng-seed/src/assets/images/instagram.svg | 1 + ng-seed/src/assets/images/twitter.svg | 1 + 6 files changed, 82 insertions(+), 40 deletions(-) create mode 100644 ng-seed/src/assets/images/facebook.svg create mode 100644 ng-seed/src/assets/images/instagram.svg create mode 100644 ng-seed/src/assets/images/twitter.svg 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 217f1b6..6474f68 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 @@ -19,13 +19,12 @@
-
-
-
-
+
+ +
+ -
+
-->
@@ -33,33 +32,41 @@
-
-
{{consultant.userName}}
- {{consultant.practitionerInfos[0].designtion +
+
Dr.{{consultant.userName}}
+ {{consultant.practitionerInfos[0].qualification || null}}
+ + + access_time + 10:00 Am + +
- + +
+ Avatar + Avatar + Avatar +
+

Apollo Hospitals Cancer Centre Nandanam,Chennai

+ -
+
diff --git a/ng-seed/src/app/end-user/consultants/consultants-list.component.scss b/ng-seed/src/app/end-user/consultants/consultants-list.component.scss index 91791f2..d4c504f 100644 --- a/ng-seed/src/app/end-user/consultants/consultants-list.component.scss +++ b/ng-seed/src/app/end-user/consultants/consultants-list.component.scss @@ -9,6 +9,9 @@ $black_60: rgba(0, 0, 0, 0.6); padding: 0rem 0.5rem 1rem; // padding-bottom: 4rem; } +h5{ + margin-top: 1rem; +} .flexRow{ display: flex !important; } @@ -21,7 +24,7 @@ $black_60: rgba(0, 0, 0, 0.6); } .consultant-list-card { border-radius: 10px; - background: $white; + background: #EBF4FA; box-shadow: 0 2px 6px $black_10; transition: all 0.3s ease-in-out 0s; &:hover { @@ -41,9 +44,9 @@ $black_60: rgba(0, 0, 0, 0.6); font-weight: 700; } .consultant-qualification{ - font-size: 12px; - color: #658F9B; - font-weight: 600; + font-size: 13px; + color: #0087ba; + // font-weight: 600; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; @@ -67,33 +70,61 @@ $black_60: rgba(0, 0, 0, 0.6); white-space: nowrap; text-overflow: ellipsis; } -.consultant-img { - top: 25px; - left: 25px; - height: 24px; - display: flex; - text-align: center; - align-items: center; - border-radius: 6px; - justify-content: center; +.consultant-time{ + margin-left: 5rem; + margin-top: 0.5rem; } +.button { + background-color: #4caf50; + color: #efefef; + border: none; + text-align: center; + padding: 10px 20px; + border-radius: 25px; + margin-left: 4rem; + margin-top: 1rem; + cursor: pointer; + margin-bottom: 1rem; + } + .img{ + width: 25px; + margin-right: 10px; +} +.message { + color: rgba(0, 0, 0, 0.54); + font-size: 12px; + font-weight: 600; + // line-height: 10px; + word-break: break-word; + } +// .consultant-img { +// top: 25px; +// left: 25px; +// height: 24px; +// display: flex; +// text-align: center; +// align-items: center; +// border-radius: 6px; +// justify-content: center; +// } // .mb{ // margin-bottom: 0.20rem; // } -.consultant-card-cover { - padding: 0rem 6rem; - position: relative; - background-size: cover; - margin-left: -8rem; -} +// .consultant-card-cover { +// padding: 0rem 6rem; +// position: relative; +// background-size: cover; +// margin-left: -8rem; +// } .consultant-thumb { - position: absolute; + // position: absolute; margin-top: 20px; img { border: 5px solid $white; border-radius: 100%; - height: 75px; - width: 75px; + height: 90px; + width: 90px; + margin-top: 20px; } } .btn-red { diff --git a/ng-seed/src/app/end-user/consultants/consultants-list.component.ts b/ng-seed/src/app/end-user/consultants/consultants-list.component.ts index 501ac03..9b3a388 100644 --- a/ng-seed/src/app/end-user/consultants/consultants-list.component.ts +++ b/ng-seed/src/app/end-user/consultants/consultants-list.component.ts @@ -8,6 +8,7 @@ import { Router } from '@angular/router'; styleUrls: ['./consultants-list.component.scss'] }) export class ConsultantsListComponent implements OnInit { + animal: string; name: string; consultants:any =[]; diff --git a/ng-seed/src/assets/images/facebook.svg b/ng-seed/src/assets/images/facebook.svg new file mode 100644 index 0000000..b47fbbd --- /dev/null +++ b/ng-seed/src/assets/images/facebook.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ng-seed/src/assets/images/instagram.svg b/ng-seed/src/assets/images/instagram.svg new file mode 100644 index 0000000..e513c16 --- /dev/null +++ b/ng-seed/src/assets/images/instagram.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ng-seed/src/assets/images/twitter.svg b/ng-seed/src/assets/images/twitter.svg new file mode 100644 index 0000000..365dace --- /dev/null +++ b/ng-seed/src/assets/images/twitter.svg @@ -0,0 +1 @@ + \ No newline at end of file From 98ed6b750009f91e3d7b97a74da12ea7423696cc Mon Sep 17 00:00:00 2001 From: "surendar.m@watermelon.us" Date: Fri, 31 Mar 2023 18:05:23 +0530 Subject: [PATCH 2/2] appointment table customer info --- .../appoinments-list.component.html | 38 +++++++++---------- .../appoinments-list.component.ts | 18 +-------- 2 files changed, 20 insertions(+), 36 deletions(-) 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 fe3be01..2e1794d 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 @@ -18,11 +18,11 @@ - + - + @@ -30,26 +30,24 @@ --> - - - + - - - - + + + + - - - - - + 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 51c5666..8641ec9 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 @@ -19,20 +19,7 @@ export interface UsersData { note: string; appoinmentSlots: string; } -const ELEMENT_DATA: UsersData[] = [ - {busId: 1 , appoinmentSlots: '"start": "09:00",', appoinmentTime: '11:00', booking: '#SA-00001', workspace: 'Sample', service: 'Hospital', staff: 'Kumar.S', customer:'A', paymentStatus:'Free', status: 'Pending', appoinmentDate:'01 Mar 2023', note: 'Financial statement footnotes are used as additional information by individuals reading financial statements.'}, - {busId: 2 ,appoinmentSlots: '"start": "09:00",', appoinmentTime: '12:00', booking: '#SA-00002', workspace: 'Test', service: 'School', staff: 'Devi.k', customer:'B', paymentStatus:'Paid', status: 'Completed', appoinmentDate:'22 Feb 2023', note: 'Financial statement footnotes are used as additional information by individuals reading financial statements.'}, - {busId: 3 ,appoinmentSlots: '"start": "09:00",', appoinmentTime: '13:00', booking: '#SA-00003', workspace: 'Sample', service: 'Sports', staff: 'Kumar.S', customer:'C', paymentStatus:'Free', status: 'Pending', appoinmentDate:'21 Feb 2023', note: 'Financial statement footnotes are used as additional information by individuals reading financial statements.'}, - {busId: 4 ,appoinmentSlots: '"start": "09:00",', appoinmentTime: '14:00', booking: '#SA-00004', workspace: 'Test', service: 'Hospital', staff: 'Devi.k', customer:'A', paymentStatus:'Paid', status: 'Completed', appoinmentDate:'20 Feb 2023', note: 'Financial statement footnotes are used as additional information by individuals reading financial statements.'}, - {busId: 5 ,appoinmentSlots: '"start": "09:00",', appoinmentTime: '15:00', booking: '#SA-00005', workspace: 'Sample', service: 'School', staff: 'Kumar.S', customer:'B', paymentStatus:'Free', status: 'Pending', appoinmentDate:'17 Feb 2023', note: 'Financial statement footnotes are used as additional information by individuals reading financial statements.'}, - {busId: 6 ,appoinmentSlots: '"start": "09:00",', appoinmentTime: '16:00', booking: '#SA-00006', workspace: 'Test', service: 'Sports', staff: 'Devi.k', customer:'C', paymentStatus:'Paid', status: 'Completed', appoinmentDate:'16 Feb 2023', note: 'Financial statement footnotes are used as additional information by individuals reading financial statements.'}, - {busId: 7 ,appoinmentSlots: '"start": "09:00",', appoinmentTime: '17:00', booking: '#SA-00007', workspace: 'Sample', service: 'Hospital', staff: 'Kumar.S', customer:'A', paymentStatus:'Free', status: 'Pending', appoinmentDate:'15 Feb 2023', note: 'Financial statement footnotes are used as additional information by individuals reading financial statements.'}, - {busId: 8 ,appoinmentSlots: '"start": "09:00",', appoinmentTime: '18:00', booking: '#SA-00008', workspace: 'Test', service: 'School', staff: 'Devi.k', customer:'B', paymentStatus:'Paid', status: 'Completed', appoinmentDate:'14 Feb 2023', note: 'Financial statement footnotes are used as additional information by individuals reading financial statements.'}, - {busId: 9 ,appoinmentSlots: '"start": "09:00",', appoinmentTime: '10:00', booking: '#SA-00009', workspace: 'Sample', service: 'Sports', staff: 'Kumar.S', customer:'C', paymentStatus:'Free', status: 'Pending', appoinmentDate:'13 Feb 2023', note: 'Financial statement footnotes are used as additional information by individuals reading financial statements.'}, - {busId: 10 ,appoinmentSlots: '"start": "09:00",', appoinmentTime: '09:00', booking: '#SA-000010', workspace: 'Test', service: 'Hospital', staff: 'Devi.k', customer:'A', paymentStatus:'Paid', status: 'Completed', appoinmentDate:'12 Feb 2023', note: 'Financial statement footnotes are used as additional information by individuals reading financial statements.'}, - {busId: 11 ,appoinmentSlots: '"start": "09:00",', appoinmentTime: '08:00', booking: '#SA-000011', workspace: 'Sample', service: 'School', staff: 'Kumar.S', customer:'B', paymentStatus:'Free', status: 'Pending', appoinmentDate:'11 Feb 2023', note: 'Financial statement footnotes are used as additional information by individuals reading financial statements.'}, -]; @Component({ selector: 'app-appoinments-list', templateUrl: './appoinments-list.component.html', @@ -41,7 +28,7 @@ const ELEMENT_DATA: UsersData[] = [ export class AppoinmentsListComponent implements OnInit { push: any; - displayedColumns: string[] = ['Profile', 'ClientName','date','time','status', 'action']; + displayedColumns: string[] = ['Profile', 'ClientName','datetime','phoneNo','email','address','status', 'action']; // dataSource: any; public appoinmentsList:any = new MatTableDataSource(); // dataSource: any = new MatTableDataSource(ELEMENT_DATA); @@ -70,8 +57,7 @@ export class AppoinmentsListComponent implements OnInit { this.appoinmentsList console.log(this.appoinmentsList) - let filter = this.appoinmentsList.filter(arr=>{return arr["ServicesMapDetail.userId"] - == id}) + let filter = this.appoinmentsList.filter(arr=>{return arr["ServicesMapDetail.userId"] == id}) console.log(filter) this.appoinmentsList = filter }
Profile
Client Name
{{element.customer[0].cusName || null }}
{{element.customer[0].cusName || null }} Date & Time {{element.picker}} Appointment Date
{{element.appoinmentDate | date:'dd-MMM-YYYY' }}
+ + 		Appointment Date and Time{{element.appoinmentDate | date:'dd-MMM-YYYY'}}, {{element.appoinmentSlots}} Appointment Time
{{element.appoinmentSlots }}
 Mobile No {{element.customer[0].phoneNo}} Status
{{element.status == 0 ? 'Booked':'Cancelled'}} 		{{element.status == 0 ? 'Booked':'Cancelled'}} Action