Appointment/appointments_frontend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

copy link and dashboard changes done

Browse Source
This commit is contained in:
Surendiran 2023-05-29 18:08:23 +05:30
parent 87ea4a06be
commit 720ff5246f
17 changed files with 129 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ng-seed/src/app/app.routing.ts
View File

@ -62,7 +62,7 @@ export const AppRoutes: Routes = [{
//component: AuthLayoutComponent, //component: AuthLayoutComponent,
children: [ children: [
{ {
path: 'customer', path: 'booking',
loadChildren: () => import('./end-user/end-user.module').then(m => m.EndUserModule) loadChildren: () => import('./end-user/end-user.module').then(m => m.EndUserModule)
} }

2
ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.ts
View File

@ -395,7 +395,7 @@ unavailability(action,obj) {
console.log(this.practitionerdetails) console.log(this.practitionerdetails)
if(this.userRole == 'PRACTITIONER' || this.userRole == 'FRONTDESK'){ if(this.userRole == 'PRACTITIONER' || this.userRole == 'FRONTDESK'){
this.endUserURL = this.end_User_Url+'practitioner/'+this.usersList.randStr+"/details" this.endUserURL = this.end_User_Url+'practitioner/'+this.usersList.randStr
} else if (this.userRole == 'BIZADMIN'){ } else if (this.userRole == 'BIZADMIN'){
this.endUserURL = this.end_User_Url+'business/'+this.usersList['BusinessDetails'][0].randStr this.endUserURL = this.end_User_Url+'business/'+this.usersList['BusinessDetails'][0].randStr
} }

60
ng-seed/src/app/dashboard/dashboard.component.html
View File

@ -7,8 +7,8 @@
<!-- <div class="date">This Week</div> --> <!-- <div class="date">This Week</div> -->
<div class="weather"> <div class="weather">
<div class="sun d-flex justify-content-between"> <div class="sun d-flex justify-content-between">
<i class="fa fa-shopping-bag fa-3x align-self-center"></i> <i class="fa fa fa-users fa-3x align-self-center"></i>
<div class="temp align-self-center">190</div> <div class="temp align-self-center">{{count.user_count}}</div>
</div> </div>
</div> </div>
</div> </div>
@ -21,8 +21,9 @@
<!-- <div class="date">This Week</div> --> <!-- <div class="date">This Week</div> -->
<div class="weather"> <div class="weather">
<div class="sun d-flex justify-content-between"> <div class="sun d-flex justify-content-between">
<i class="fa fa fa-users fa-3x align-self-center"></i> <mat-icon>calendar_today</mat-icon>
<div class="temp align-self-center">987</div> <!-- <i class="fa fa fa-users fa-3x align-self-center"></i> -->
<div class="temp align-self-center">{{count.total_appoinments_count}}</div>
</div> </div>
</div> </div>
</div> </div>
@ -30,18 +31,61 @@
</div> </div>
<div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100" class="m-gap p-gap"> <div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100" class="m-gap p-gap">
<mat-card> <mat-card>
<div class="card-wheather grad-red"> <div class="card-wheather grad-blue">
<div class="city">Users</div> <div class="city">Appointment Earnings</div>
<!-- <div class="date">This Week</div> --> <!-- <div class="date">This Week</div> -->
<div class="weather"> <div class="weather">
<div class="sun d-flex justify-content-between"> <div class="sun d-flex justify-content-between">
<i class="fa fa-inbox fa-3x align-self-center"></i> <i class="fa fa fa-money fa-3x align-self-center"></i>
<div class="temp align-self-center">236</div> <div class="temp align-self-center">20000</div>
</div> </div>
</div> </div>
</div> </div>
</mat-card> </mat-card>
</div> </div>
<div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100" class="m-gap p-gap">
<mat-card>
<div class="card-wheather grad-green">
<div class="city">Customer</div>
<!-- <div class="date">This Week</div> -->
<div class="weather">
<div class="sun d-flex justify-content-between">
<i class="fa fa-file-text-o fa-3x align-self-center"></i>
<div class="temp align-self-center">15</div>
</div>
</div>
</div>
</mat-card>
</div>
<div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100" class="m-gap p-gap">
<mat-card>
<div class="card-wheather grad-blue">
<div class="city">Services</div>
<!-- <div class="date">This Week</div> -->
<div class="weather">
<div class="sun d-flex justify-content-between">
<mat-icon class="svg" svgIcon="service"></mat-icon>
<!-- <i class="fa fa-inbox fa-3x align-self-center"></i> -->
<div class="temp align-self-center">{{count.service_count}}</div>
</div>
</div>
</div>
</mat-card>
</div>
<div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100" class="m-gap p-gap">
<mat-card>
<div class="card-wheather grad-green">
<div class="city">Service Earnings</div>
<!-- <div class="date">This Week</div> -->
<div class="weather">
<div class="sun d-flex justify-content-between">
<i class="fa fa-inbox fa-3x align-self-center"></i>
<div class="temp align-self-center">150</div>
</div>
</div>
</div>
</mat-card>
</div>
</div> </div>
<div fxLayout="row wrap"> <div fxLayout="row wrap">
<div fxFlex.gt-sm="100" fxFlex.gt-xs="100" fxFlex="100" class="m-gap p-gap"> <div fxFlex.gt-sm="100" fxFlex.gt-xs="100" fxFlex="100" class="m-gap p-gap">

12
ng-seed/src/app/dashboard/dashboard.component.scss
View File

@ -540,3 +540,15 @@ a.link {
font-size: 50px; font-size: 50px;
display: inline-block; display: inline-block;
} }
mat-icon{
height: unset !important;
// width: 0px !important;
align-self: center !important;
font-size: 3em !important;
}
.svg{
width: 50px !important;
align-self: unset !important;
font-size: unset !important;
}

26
ng-seed/src/app/dashboard/dashboard.component.ts
View File

@ -1,5 +1,8 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { single, multi } from './charts.data'; import { single, multi } from './charts.data';
import { DashboardService } from './dashboard.service';
import { MatIconRegistry } from '@angular/material/icon';
import { DomSanitizer } from '@angular/platform-browser';
@Component({ @Component({
selector: 'app-dashboard', selector: 'app-dashboard',
templateUrl: './dashboard.component.html', templateUrl: './dashboard.component.html',
@ -20,10 +23,31 @@ export class DashboardComponent {
domain: ['#673ab7', '#f44336', '#009688 ', '#2196f3'] domain: ['#673ab7', '#f44336', '#009688 ', '#2196f3']
}; };
public autoScale = true; public autoScale = true;
constructor() { count: any = [];
constructor(public _dash:DashboardService,private matIconRegistry: MatIconRegistry,private domSanitizer: DomSanitizer) {
// this.fetch((data) => { this.rows = data; }); // this.fetch((data) => { this.rows = data; });
Object.assign(this, {single, multi}) Object.assign(this, {single, multi})
this.matIconRegistry.addSvgIcon(
'service',
this.domSanitizer.bypassSecurityTrustResourceUrl('assets/images/service_icon.svg')
);
} }
ngOnInit() {
let buiId = {'busId':localStorage.getItem('busId')}
this.getCount(buiId)
}
getCount(param){
this._dash.getCountDetails(param).subscribe(res => {
if (res.status == 200) {
console.log(res)
this.count = res['data']
}
})
}
onSelect(event) { onSelect(event) {
console.log(event); console.log(event);
} }

21
ng-seed/src/app/dashboard/dashboard.service.ts
View File

@ -1,22 +1,23 @@
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { environment } from 'environments/environment';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class DashboardService { export class DashboardService {
apiUrl: string; private apiUrl = environment.apiEndpoint;
constructor(private _http: HttpClient) { }
constructor(private _http: HttpClient // generateotp(email): Observable<any> {
) { }
generateotp(email): Observable<any> {
return this._http.post(this.apiUrl + 'generateOTP', { "records":{ "email":email}}) // return this._http.post(this.apiUrl + 'getcount', { "records":{ "email":email}})
// .pipe( // // .pipe(
// catchError(this.handleError('role', [])) // // catchError(this.handleError('role', []))
// ) // // )
// }
getCountDetails(param): Observable<any> {
return this._http.post(this.apiUrl + 'getcount', param)
} }
} }

4
ng-seed/src/app/end-user/booking-summary/booking-summary.component.ts
View File

@ -233,10 +233,10 @@ html2pdf().from(element).set(opt).save();
console.log(URL_AS_LIST); console.log(URL_AS_LIST);
if(URL_AS_LIST[2] == 'practitioner'){ if(URL_AS_LIST[2] == 'practitioner'){
this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]+'/details']) this.router.navigate(['booking/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]])
console.log('practitioner') console.log('practitioner')
}else{ }else{
this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]]) this.router.navigate(['booking/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]])
console.log('Business') console.log('Business')
} }
} }

2
ng-seed/src/app/end-user/consultants/consultants-list.component.html
View File

@ -75,7 +75,7 @@
</div> </div>
<!-- <p class="message text-center">Apollo Hospitals Cancer Centre Nandanam,Chennai</p> --> <!-- <p class="message text-center">Apollo Hospitals Cancer Centre Nandanam,Chennai</p> -->
<div style="text-align: center;"> <div style="text-align: center;">
<button class="button pill-shape text-center" routerLink="/customer/doctor-profile"> View Profile</button> <button class="button pill-shape text-center" routerLink="/booking/doctor-profile"> View Profile</button>
</div> </div>
<!-- <div class="align-self-center"> <!-- <div class="align-self-center">

2
ng-seed/src/app/end-user/consultants/consultants-list.component.ts
View File

@ -225,7 +225,7 @@ export class ConsultantsListComponent implements OnInit {
console.log(URL_AS_LIST); console.log(URL_AS_LIST);
if(URL_AS_LIST[2] == 'practitioner'){ if(URL_AS_LIST[2] == 'practitioner'){
this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]+'/details']) this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]])
console.log('practitioner') console.log('practitioner')
}else{ }else{
this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]]) this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]])

2
ng-seed/src/app/end-user/customer-info/customer-info.component.ts
View File

@ -115,7 +115,7 @@ export class CustomerInfoComponent implements OnInit {
order_id: generateRandomString(), order_id: generateRandomString(),
description: 'testing', description: 'testing',
mode: 'TEST', mode: 'TEST',
return_url: 'http://localhost:8080/api/paymentResponse', return_url: this.apiUrl+'paymentResponse',
currency: 'INR', currency: 'INR',
country: 'IND', country: 'IND',
udf1: ''+busId+'', udf1: ''+busId+'',

2
ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.html
View File

@ -45,7 +45,7 @@
<mat-toolbar> <mat-toolbar>
<div fxLayout="row wrap" style="padding:15px 0px;"> <div fxLayout="row wrap" style="padding:15px 0px;">
<div fxFlex.xs="10" fxFlex.sm="10" fxFlex.md="10" fxFlex.lg="10" fxFlex.xl="10" fxLayoutAlign="start center"> <div fxFlex.xs="10" fxFlex.sm="10" fxFlex.md="10" fxFlex.lg="10" fxFlex.xl="10" fxLayoutAlign="start center">
<button *ngIf="backRouting != 'details'" (click)="backClicked()" mat-icon-button class="backStyle" aria-label="Example icon button with a home icon"> <button *ngIf="backRouting != 'practitioner'" (click)="backClicked()" mat-icon-button class="backStyle" aria-label="Example icon button with a home icon">
<mat-icon>keyboard_backspace</mat-icon> <mat-icon>keyboard_backspace</mat-icon>
</button> </button>
</div> </div>

8
ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.ts
View File

@ -28,7 +28,7 @@ export class DoctorProfileComponent implements OnInit {
console.log(URL) console.log(URL)
let URL_AS_LIST = URL.split('/'); let URL_AS_LIST = URL.split('/');
console.log(URL_AS_LIST); console.log(URL_AS_LIST);
this.backRouting = URL_AS_LIST[4] this.backRouting = URL_AS_LIST[2]
console.log(this.backRouting) console.log(this.backRouting)
console.log(URL_AS_LIST[2]) console.log(URL_AS_LIST[2])
if(URL_AS_LIST[2] != 'business'){ if(URL_AS_LIST[2] != 'business'){
@ -69,7 +69,7 @@ export class DoctorProfileComponent implements OnInit {
console.log(URL) console.log(URL)
let URL_AS_LIST = URL.split('/'); let URL_AS_LIST = URL.split('/');
console.log(URL_AS_LIST); console.log(URL_AS_LIST);
// this.router.navigate(['customer/business/'+URL_AS_LIST[3]]) // this.router.navigate(['booking/business/'+URL_AS_LIST[3]])
} }
setTimeout(() => { setTimeout(() => {
/** spinner ends after 5 seconds */ /** spinner ends after 5 seconds */
@ -175,10 +175,10 @@ export class DoctorProfileComponent implements OnInit {
// console.log(URL_AS_LIST); // console.log(URL_AS_LIST);
// if(URL_AS_LIST[2] == 'practitioner'){ // if(URL_AS_LIST[2] == 'practitioner'){
// this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]+'/details']) // this.router.navigate(['booking/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]+'/details'])
// console.log('practitioner') // console.log('practitioner')
// }else{ // }else{
// this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]]) // this.router.navigate(['booking/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]])
// console.log('Business') // console.log('Business')
// } // }
// } // }

8
ng-seed/src/app/end-user/payment/payment.component.ts
View File

@ -30,8 +30,8 @@ export class PaymentComponent implements OnInit {
console.log(URL) console.log(URL)
let URL_AS_LIST = URL.split('/'); let URL_AS_LIST = URL.split('/');
console.log(URL_AS_LIST); console.log(URL_AS_LIST);
//this.router.navigate(['customer/business/'+URL_AS_LIST[3]]) //this.router.navigate(['booking/business/'+URL_AS_LIST[3]])
this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]]) this.router.navigate(['booking/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]])
} }
}) })
this.router.getCurrentNavigation().extras; this.router.getCurrentNavigation().extras;
@ -118,10 +118,10 @@ export class PaymentComponent implements OnInit {
console.log(URL_AS_LIST); console.log(URL_AS_LIST);
if(URL_AS_LIST[2] == 'practitioner'){ if(URL_AS_LIST[2] == 'practitioner'){
this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]+'/details']) this.router.navigate(['booking/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]])
console.log('practitioner') console.log('practitioner')
}else{ }else{
this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]]) this.router.navigate(['booking/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]])
console.log('Business') console.log('Business')
} }
} }

4
ng-seed/src/app/end-user/service-list-details/service-list.component.ts
View File

@ -250,10 +250,10 @@ let updatevalue = { serviceId: row_obj.serviceId,
// console.log(URL_AS_LIST); // console.log(URL_AS_LIST);
// if(URL_AS_LIST[2] == 'practitioner'){ // if(URL_AS_LIST[2] == 'practitioner'){
// this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]+'/details']) // this.router.navigate(['booking/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]+'/details'])
// console.log('practitioner') // console.log('practitioner')
// }else{ // }else{
// this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]]) // this.router.navigate(['booking/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]])
// console.log('Business') // console.log('Business')
// } // }
// } // }

10
ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.ts
View File

@ -79,9 +79,9 @@ export class SlotBookingDetailsComponent implements OnInit {
console.log(URL_AS_LIST); console.log(URL_AS_LIST);
// if(URL_AS_LIST[2] == 'practitioner'){ // if(URL_AS_LIST[2] == 'practitioner'){
// this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]+'/details']) // this.router.navigate(['booking/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]+'/details'])
// }else{ // }else{
// this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]]) // this.router.navigate(['booking/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]])
// } // }
} }
@ -233,7 +233,7 @@ if(this.getHours.length != 0){
console.log(URL) console.log(URL)
let URL_AS_LIST = URL.split('/'); let URL_AS_LIST = URL.split('/');
console.log(URL_AS_LIST); console.log(URL_AS_LIST);
this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]+'/details']) this.router.navigate(['booking/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]])
} }
// this.form.controls['note'].setValue('Sample') // this.form.controls['note'].setValue('Sample')
this.form.patchValue(this.local_data) this.form.patchValue(this.local_data)
@ -469,10 +469,10 @@ if(this.getHours.length != 0){
// console.log(URL_AS_LIST); // console.log(URL_AS_LIST);
// if(URL_AS_LIST[2] == 'practitioner'){ // if(URL_AS_LIST[2] == 'practitioner'){
// this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]+'/details']) // this.router.navigate(['booking/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]+'/details'])
// console.log('practitioner') // console.log('practitioner')
// }else{ // }else{
// this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]]) // this.router.navigate(['booking/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]])
// console.log('Business') // console.log('Business')
// } // }
// } // }

5
ng-seed/src/environments/environment.prod.ts
View File

@ -6,8 +6,9 @@ export const environment = {
apiEndpoint:'https://api.venbait.in/api/', apiEndpoint:'https://api.venbait.in/api/',
//EndUser URL //EndUser URL
endUserUrl: window.location.origin+'/appointment/#/customer/', endUserUrl: window.location.origin+'/#/booking/',
mailUrl:window.location.origin+'/appointment', mailUrl:window.location.origin,
firebase: { firebase: {
apiKey: "AIzaSyCKbfDJ5Qf0rDP3WKppa94u9xuVaVabaDw", apiKey: "AIzaSyCKbfDJ5Qf0rDP3WKppa94u9xuVaVabaDw",

6
ng-seed/src/environments/environment.ts
View File

@ -7,11 +7,11 @@ export const environment = {
production: false, production: false,
environmentName: 'Testing Environment',//Localhost Environment. environmentName: 'Testing Environment',//Localhost Environment.
// apiEndpoint:'http://venbainfotech.com:5000/api/', // apiEndpoint:'http://venbainfotech.com:5000/api/',
apiEndpoint:'http://192.168.1.23:8080/api/', // apiEndpoint:'http://192.168.1.23:8080/api/',
// apiEndpoint:'https://api.venbait.in/api/', apiEndpoint:'https://api.venbait.in/api/',
//EndUser URL //EndUser URL
endUserUrl: window.location.origin+'/#/customer/', endUserUrl: window.location.origin+'/#/booking/',
mailUrl:window.location.origin, mailUrl:window.location.origin,
firebase: { firebase: {