diff --git a/ng-seed/Appointment_Frontend_Build.zip b/ng-seed/Appointment_Frontend_Build.zip new file mode 100644 index 0000000..bf81bf1 Binary files /dev/null and b/ng-seed/Appointment_Frontend_Build.zip differ 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 75612d5..3de8b1a 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 @@ -16,45 +16,91 @@ --> - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
S.No {{row.id}} Logo Name {{row.busName}} Email {{row.email}} Mobile no {{row.contactNo}} Address {{row.address}},{{row.city}} , {{row.state}} Action + edit + delete +
+ + + S.No {{row.id}} - + Logo - + Name {{row.busName}} - + Email {{row.email}} - + Mobile No {{row.contactNo}} - + Address {{row.address}}
{{row.city}}
{{row.state}} - + Action @@ -67,7 +113,7 @@ - + --> Duration - {{row.duration}} + {{row.duration}} Mins Fees 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 8ad5c6e..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 @@ -76,24 +76,31 @@ export class UserListComponent implements OnInit { this.getBusinessList() } getUsersList() { - //this._pd.getTabStatusPdDetails(this.tabStatus) - this._use.getUsersListDetails().subscribe(res => { - if (res.status == 200) { - this.isLoading = false - let usersList = res.data - usersList.sort((a: any, b: any) => { - return b.id - a.id; - }); - this.usersList['data'] = usersList; - this.usersListLength = res.data.length; - this.recordStatus=false; - } - else{ - // this.usersList=[]; - // this.dataSource = null; - this.recordStatus=true; - } - },error => this.isLoading = false); + let userRole = localStorage.getItem('user_role') + let param; + if(userRole == 'BADMIN'){ + param ={"busId": localStorage.getItem('busId')} + }else { + param = {} + } + this._use.getUsersListDetails(param).subscribe(res => { + if (res.status == 200) { + this.isLoading = false + let usersList = res.data + usersList.sort((a: any, b: any) => { + return b.id - a.id; + }); + this.usersList['data'] = usersList; + this.usersListLength = res.data.length; + this.recordStatus=false; + } + else{ + // this.usersList=[]; + // this.dataSource = null; + this.recordStatus=true; + } + },error => this.isLoading = false); + } getBusinessList() { //this._pd.getTabStatusPdDetails(this.tabStatus) @@ -111,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/appoinment/user/user-service/user.service.ts b/ng-seed/src/app/appoinment/user/user-service/user.service.ts index cfbea3f..8d9ec72 100644 --- a/ng-seed/src/app/appoinment/user/user-service/user.service.ts +++ b/ng-seed/src/app/appoinment/user/user-service/user.service.ts @@ -11,11 +11,17 @@ export class UserService { private apiUrl = environment.apiEndpoint; constructor(private _http: HttpClient) { } - - getUsersListDetails(): Observable { + getUsersListDetails2(): Observable { console.log('IN') - //return this._http.post(this.apiUrl + "getusers") - return this._http.post(this.apiUrl + 'getusers', {}) + return this._http.post(this.apiUrl + "getusers",{}) + // .pipe( + // catchError(this.handleError('role', [])) + // ) + } + + getUsersListDetails(param): Observable { + console.log('IN') + return this._http.post(this.apiUrl + "getusers",param) // .pipe( // catchError(this.handleError('role', [])) // ) 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 c1e8d16..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({ @@ -48,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) @@ -57,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/search-category/search-category.component.ts b/ng-seed/src/app/end-user/search-category/search-category.component.ts index 5221884..6fbdd62 100644 --- a/ng-seed/src/app/end-user/search-category/search-category.component.ts +++ b/ng-seed/src/app/end-user/search-category/search-category.component.ts @@ -123,7 +123,7 @@ export class SearchCategoryComponent implements OnInit { } }); } else if(this.eventData == 'consultants'){ - this._use.getUsersListDetails().subscribe(res => { + this._use.getUsersListDetails2().subscribe(res => { if (res.status == 200) { console.log(res) // let data = res['data'].filter(val => val.role == 'PRACTITIONER') diff --git a/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.html b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.html index ad49105..4013e1b 100644 --- a/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.html +++ b/ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.html @@ -81,8 +81,7 @@

AvatarTime :

{{slotTime | date:'shortTime'}}

AvatarAmount :

- ₹ {{ serviceMapdetails[0].duration.length>0 ? serviceMapdetails[0].duration[0].fees:serviceMapdetails[0].service[0].fees - }} + ₹ {{ serviceMapdetails[0].duration.length>0 ? serviceMapdetails[0].duration[0].fees:serviceMapdetails[0].service[0].fees}}
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 3c3eff1..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 @@ -58,6 +58,7 @@ export class SlotBookingDetailsComponent implements OnInit { if(res.length>0){ this.serviceMapdetails =res this.servicesName = res[0].service[0] + console.log(this.servicesName) this.user = res[0].user[0] this.doctor = res[0].user[0].userName this.getApiData() 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..22324ac 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 @@