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..d78697e 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%; @@ -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/payment/payment.component.ts b/ng-seed/src/app/end-user/payment/payment.component.ts index 6a59e38..67ffef6 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({ @@ -47,6 +48,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 +58,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/layouts/role-menu-items.pipe.ts b/ng-seed/src/app/layouts/role-menu-items.pipe.ts index 0bad9ad..7e51c4b 100644 --- a/ng-seed/src/app/layouts/role-menu-items.pipe.ts +++ b/ng-seed/src/app/layouts/role-menu-items.pipe.ts @@ -11,7 +11,7 @@ export class RoleMenuItemsPipe implements PipeTransform { // if(type=="1"){ switch(localStorage.getItem('user_role')){ case 'SADMIN': return value.filter(val=>val.state!="appoinments" && val.state!="customers" && val.state != "consultant-setting" && val.state!="consultants" && val.state!="services"); - case 'BADMIN': return value.filter(val=>val.state !="business" && val.state!="users" && val.state!="consultants"); + case 'BADMIN': return value.filter(val=>val.state !="business" && val.state!="users" && val.state!="consultants" && val.state!="appoinments"); case 'PRACTITIONER': return value.filter(val=>val.state !="business" && val.state!="consultants" && val.state!="users" && val.state!="services"); // case 'PRACTITIONER': // case '3': return value.filter(val=>val.state!="settings");