- + - +
diff --git a/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts b/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts index 7c07159..938c752 100644 --- a/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts +++ b/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts @@ -118,7 +118,7 @@ export class UserListComponent implements OnInit { }) } hashPassword(password: string){ - return "*".repeat(password.length) + return "*".repeat(6) } ngAfterViewInit() { console.log(this.usersList,this.paginator) diff --git a/ng-seed/src/app/dashboard/dashboard.component.html b/ng-seed/src/app/dashboard/dashboard.component.html index e074976..52a1cef 100644 --- a/ng-seed/src/app/dashboard/dashboard.component.html +++ b/ng-seed/src/app/dashboard/dashboard.component.html @@ -1,9 +1,10 @@ +
-
New Orders
-
This Week
+
Practitioner
+
@@ -16,8 +17,8 @@
-
Total Profit
-
This Week
+
Appointment
+
@@ -30,8 +31,8 @@
-
Email
-
This Week
+
Users
+
@@ -61,4 +62,5 @@
-
\ No newline at end of file +
+ \ No newline at end of file diff --git a/ng-seed/src/app/dashboard/dashboard.component.scss b/ng-seed/src/app/dashboard/dashboard.component.scss index 66b88e6..2908d83 100644 --- a/ng-seed/src/app/dashboard/dashboard.component.scss +++ b/ng-seed/src/app/dashboard/dashboard.component.scss @@ -2,6 +2,9 @@ $red: #f5515f; $blue: #05abe0; $grey: #343434; $p: 12px; +.scrollHV { + height: calc(100vh - 162px); + } .profile { position: relative; width: 100%; @@ -83,7 +86,7 @@ $p: 12px; } .avatar { - background: url('/assets/images/1.jpg') no-repeat center center / cover; + background: url('assets/images/1.jpg') no-repeat center center / cover; clip-path: polygon(0 0, 100% 0, 100% 75%, 0% 100%); } @@ -496,7 +499,7 @@ a.link { //wheather .card-wheather { - height: 220px; + height: 150px; color: #fff; } diff --git a/ng-seed/src/app/dashboard/dashboard.module.ts b/ng-seed/src/app/dashboard/dashboard.module.ts index e2af852..e39d520 100644 --- a/ng-seed/src/app/dashboard/dashboard.module.ts +++ b/ng-seed/src/app/dashboard/dashboard.module.ts @@ -15,6 +15,7 @@ import { NgxDatatableModule } from '@swimlane/ngx-datatable'; import { DashboardComponent } from './dashboard.component'; import { DashboardRoutes } from './dashboard.routing'; +import { NgScrollbarModule } from 'ngx-scrollbar'; @NgModule({ imports: [ @@ -29,7 +30,8 @@ import { DashboardRoutes } from './dashboard.routing'; ChartsModule, NgxChartsModule, NgxDatatableModule, - FlexLayoutModule + FlexLayoutModule, + NgScrollbarModule ], declarations: [ DashboardComponent ] }) 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 c6fd1e0..6a1b22f 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 @@ -113,6 +113,7 @@ export class ConsultantsListComponent implements OnInit { } goToSlotBooking(param){ + localStorage.setItem('user_id',param.id) let URL = this.router.url; console.log(URL,param) let URL_AS_LIST = URL.split('/'); 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 b9cd563..d0a0192 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 @@ -37,7 +37,8 @@ export class DoctorProfileComponent implements OnInit { this.profileDetails = this.bookedAppointment.practitionerInfos[0] console.log(this.profileDetails) this.skillsDetails = JSON.parse(this.profileDetails.skills) - console.log(this.skillsDetails) + this.skillsDetails = JSON.parse(this.skillsDetails) + }else{ let URL = this.router.url; diff --git a/ng-seed/src/app/end-user/payment/payment.component.ts b/ng-seed/src/app/end-user/payment/payment.component.ts index 6a59e38..a65b94a 100644 --- a/ng-seed/src/app/end-user/payment/payment.component.ts +++ b/ng-seed/src/app/end-user/payment/payment.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; +import { local } from 'd3'; import { EndUserService } from '../end-user.service'; @Component({ @@ -23,7 +24,8 @@ export class PaymentComponent implements OnInit { console.log(URL) let URL_AS_LIST = URL.split('/'); console.log(URL_AS_LIST); - this.router.navigate(['customer/business/'+URL_AS_LIST[3]]) + //this.router.navigate(['customer/business/'+URL_AS_LIST[3]]) + this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]]) } }) @@ -47,6 +49,7 @@ export class PaymentComponent implements OnInit { submit(){ console.log(this.form.value) let slot_array = JSON.parse(localStorage.getItem("slotData")) + let service = localStorage.getItem("servicedetails") let serviceDetails = JSON.parse(service) @@ -56,11 +59,15 @@ export class PaymentComponent implements OnInit { console.log(URL,slot_array) let URL_AS_LIST = URL.split('/'); console.log(URL_AS_LIST); + // if(serviceDetails.hasOwnProperty('userId')){ + serviceDetails.userId = localStorage.getItem('user_id') + // } let paramsmap= { - "serviceId": ""+serviceDetails.serviceId+"", + "serviceId": ""+serviceDetails.serviceId+"", "userId": serviceDetails.userId, - "busId": serviceDetails.busId + "busId": serviceDetails.busId } + console.log(paramsmap) this.enduser.CreatecusServicesMapDetails(paramsmap).subscribe(res => { if (res.status == 200) { console.log(res) diff --git a/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.ts b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.ts index 2259b05..8ed957f 100644 --- a/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.ts +++ b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.ts @@ -69,7 +69,7 @@ export class SlotBookingDetailsComponent implements OnInit { console.log(URL) let URL_AS_LIST = URL.split('/'); console.log(URL_AS_LIST); - this.router.navigate(['customer/business/'+URL_AS_LIST[3]]) + this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]]) } }) 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 8e2b73b..050e83c 100644 --- a/ng-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng-seed/src/app/layouts/admin/admin-layout.component.html @@ -10,7 +10,7 @@
-

{{getUserData.BusinessDetails[0].busName}} +

{{getUserData.role == 'SADMIN' ? 'Appointment' : getUserData.BusinessDetails[0].busName}}

@@ -18,7 +18,8 @@
S.No