@@ -40,7 +43,7 @@ Service Name - {{row.servicesName}} + {{row.servicesName}} @@ -50,12 +53,12 @@ Fees - {{row.fees}} + {{row.fees | currency: currencySymbol}} Description - {{row.description}} + {{row.description}} diff --git a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts b/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts index 195b013..c0f6384 100644 --- a/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts +++ b/ng-seed/src/app/appoinment/service-list-details/service-list/service-list.component.ts @@ -37,8 +37,11 @@ export class ServiceListComponent implements OnInit { isLoading = true; user_role: any=[]; consultants: any=[]; + currencySymbol: any; - constructor(private notifierService: NotifierService,public _api:ApiServiceService, public dialog: MatDialog) { } + constructor(private notifierService: NotifierService,public _api:ApiServiceService, public dialog: MatDialog) { + this.currencySymbol = localStorage.getItem('currency') + } ngOnInit(): void { diff --git a/ng-seed/src/app/appoinment/user/add-user/add-user.component.html b/ng-seed/src/app/appoinment/user/add-user/add-user.component.html index 894a598..b92cef1 100644 --- a/ng-seed/src/app/appoinment/user/add-user/add-user.component.html +++ b/ng-seed/src/app/appoinment/user/add-user/add-user.component.html @@ -46,7 +46,7 @@ Name - + Username is required Limit exceed diff --git a/ng-seed/src/app/appoinment/user/user-list/user-list.component.html b/ng-seed/src/app/appoinment/user/user-list/user-list.component.html index 95a1739..81a427d 100644 --- a/ng-seed/src/app/appoinment/user/user-list/user-list.component.html +++ b/ng-seed/src/app/appoinment/user/user-list/user-list.component.html @@ -76,7 +76,7 @@ User Name - {{element.userName}} + {{element.userName}} -
+
{{count.user_count}}
@@ -18,12 +106,10 @@
Appointment
- -
+
calendar_today - -
{{count.total_appoinments_count}}
+
{{count.total_appoinments_count}}
@@ -33,8 +119,7 @@
Appointment Earnings
- -
+
20000
@@ -47,8 +132,7 @@
Customer
- -
+
15
@@ -61,12 +145,10 @@
Services
- -
+
- -
{{count.service_count}}
+
{{count.service_count}}
@@ -76,8 +158,7 @@
Service Earnings
- -
+
150
@@ -86,7 +167,40 @@
-
+
--> +
+
+ + + Revenue   + + +
+ + + + +
+ +
+ + + Yearly Sales   + + + +
+ + + + +
+
diff --git a/ng-seed/src/app/dashboard/dashboard.component.scss b/ng-seed/src/app/dashboard/dashboard.component.scss index 3e274ee..14f6c5d 100644 --- a/ng-seed/src/app/dashboard/dashboard.component.scss +++ b/ng-seed/src/app/dashboard/dashboard.component.scss @@ -545,6 +545,7 @@ mat-icon{ // width: 0px !important; align-self: center !important; font-size: 3em !important; + width: unset !important; } .svg{ diff --git a/ng-seed/src/app/dashboard/dashboard.component.ts b/ng-seed/src/app/dashboard/dashboard.component.ts index ec7cf9f..a8d3d51 100644 --- a/ng-seed/src/app/dashboard/dashboard.component.ts +++ b/ng-seed/src/app/dashboard/dashboard.component.ts @@ -24,6 +24,187 @@ export class DashboardComponent { }; public autoScale = true; count: any = []; + + // Shared chart options + globalChartOptions: any = { + responsive: true, + legend: { + display: false, + position: 'bottom' + } + }; + + pieChartData: number[] = [300, 500, 100]; + doughnutOptions: any = Object.assign({ + elements: { + arc: { + borderWidth: 5 + } + } + }, this.globalChartOptions); + doughnutChartColors: any[] = [{ + backgroundColor: ['#673ab7', '#f44336', '#009688 ', '#2196f3'] + }]; + pieChartLabels: string[] = ['Download Sales', 'In-Store Sales', 'Mail Sales']; + pieChartType = 'pie'; + +// Bar +barChartLabels: string[] = ['1', '2', '3', '4', '5', '6', '7']; +barChartType = 'bar'; +barChartLegend = true; +barChartData: any[] = [{ + data: [6, 5, 8, 8, 5, 5, 4], + label: 'Series A', + borderWidth: 0 +}, { + data: [5, 4, 4, 2, 6, 2, 5], + label: 'Series B', + borderWidth: 0 +}]; +barChartOptions: any = Object.assign({ + scaleShowVerticalLines: false, + tooltips: { + mode: 'index', + intersect: false + }, + responsive: true, + scales: { + xAxes: [{ + gridLines: { + color: 'rgba(0,0,0,0.02)', + defaultFontColor: 'rgba(0,0,0,0.02)', + zeroLineColor: 'rgba(0,0,0,0.02)' + }, + stacked: true, + ticks: { + beginAtZero: true + } + }], + yAxes: [{ + gridLines: { + color: 'rgba(0,0,0,0.02)', + defaultFontColor: 'rgba(0,0,0,0.02)', + zeroLineColor: 'rgba(0,0,0,0.02)' + }, + stacked: true + }] + } +}, this.globalChartOptions); + +// Bubble Chart +bubbleChartData: Array = [{ + data: [{ + x: 6, + y: 5, + r: 15, + }, { + x: 5, + y: 4, + r: 10, + }, { + x: 8, + y: 4, + r: 6, + }, { + x: 8, + y: 4, + r: 6, + }, { + x: 5, + y: 14, + r: 14, + }, { + x: 5, + y: 6, + r: 8, + }, { + x: 4, + y: 2, + r: 10, + }], + label: 'Series A', + borderWidth: 1 +}]; +bubbleChartType = 'bubble'; + +// combo chart +comboChartLabels: Array = ['1', '2', '3', '4', '5', '6', '7']; +chartColors: Array = [{ // red + backgroundColor: '#f44336', + borderColor: '#f44336', + pointBackgroundColor: '#f44336', + pointBorderColor: '#fff', + pointHoverBackgroundColor: '#fff', + pointHoverBorderColor: 'rgba(148,159,177,0.8)' +}, { // blue + backgroundColor: '#7986cb', + borderColor: '#3f51b5', + pointBackgroundColor: '#3f51b5', + pointBorderColor: '#fff', + pointHoverBackgroundColor: '#fff', + pointHoverBorderColor: 'rgba(148,159,177,0.8)' +}, { // grey + backgroundColor: 'rgba(148,159,177,0.2)', + borderColor: 'rgba(148,159,177,1)', + pointBackgroundColor: 'rgba(148,159,177,1)', + pointBorderColor: '#fff', + pointHoverBackgroundColor: '#fff', + pointHoverBorderColor: 'rgba(148,159,177,0.8)' +}]; +comboChartLegend = true; +ComboChartData: Array = [{ + data: [6, 5, 8, 8, 5, 5, 4], + label: 'Series A', + borderWidth: 1, + type: 'line', + fill: false +}, { + data: [5, 4, 4, 2, 6, 2, 5], + label: 'Series B', + borderWidth: 1, + type: 'bar', +}]; +ComboChartOptions: any = Object.assign({ + animation: false, + scales: { + xAxes: [{ + gridLines: { + color: 'rgba(0,0,0,0.02)', + zeroLineColor: 'rgba(0,0,0,0.02)' + } + }], + yAxes: [{ + gridLines: { + color: 'rgba(0,0,0,0.02)', + zeroLineColor: 'rgba(0,0,0,0.02)' + }, + ticks: { + beginAtZero: true, + suggestedMax: 9, + } + }] + } +}, this.globalChartOptions); + +// newsfeed +messages: Object[] = [{ + from: 'Carolyn', + message: 'Contrary to popular belief, Lorem Ipsum', + photo: 'assets/images/face3.jpg', + subject: 'Met, consectetur adipisic', +}, { + from: 'Chloe', + message: 'It has roots in a piece of classica', + photo: 'assets/images/face6.jpg', + subject: 'Consectetur adipisic', +}, { + from: 'Diana', + message: 'Professor at Hampden-Sydney College in Virginia', + photo: 'assets/images/face4.jpg', + subject: 'Onsectetur adipisic', +}, ]; + + constructor(public _dash:DashboardService,private matIconRegistry: MatIconRegistry,private domSanitizer: DomSanitizer) { // this.fetch((data) => { this.rows = data; }); Object.assign(this, {single, multi}) diff --git a/ng-seed/src/app/end-user/booking-summary/booking-summary.component.html b/ng-seed/src/app/end-user/booking-summary/booking-summary.component.html index 83eb272..f0eb116 100644 --- a/ng-seed/src/app/end-user/booking-summary/booking-summary.component.html +++ b/ng-seed/src/app/end-user/booking-summary/booking-summary.component.html @@ -23,7 +23,7 @@
-

Your appointment has been successfully registered.

+

Your appointment has been successfully Booked On.

Thank You..! Your order status is {{resPayment.response_message}}. @@ -40,12 +40,12 @@

-
+
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 68ced2a..0079b05 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 @@ -53,11 +53,11 @@ || "ENT" }}
{{consultant.practitionerInfos[0].exp || null}}
Starts at ₹ {{consultant.practitionerInfos[0].fees || 100}}
--> - + - + {{consultant.time}} + -->
-
+
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 68bd48f..654a62b 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 @@ -39,6 +39,7 @@ h5{ background: #EBF4FA; box-shadow: 0 2px 6px $black_10; transition: all 0.3s ease-in-out 0s; + height: 260px; &:hover { box-shadow: 0 0 21px $black_30; cursor: pointer; 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 6bf9814..e56e1d8 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 @@ -225,10 +225,10 @@ export class ConsultantsListComponent implements OnInit { console.log(URL_AS_LIST); if(URL_AS_LIST[2] == 'practitioner'){ - 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('practitioner') }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') } } diff --git a/ng-seed/src/app/end-user/customer-info/customer-info.component.html b/ng-seed/src/app/end-user/customer-info/customer-info.component.html index 7fa3dc4..5df04c5 100644 --- a/ng-seed/src/app/end-user/customer-info/customer-info.component.html +++ b/ng-seed/src/app/end-user/customer-info/customer-info.component.html @@ -272,13 +272,13 @@

AvatarTime

{{bookedDetails.time | date:'shortTime'}}

AvatarAmount

- {{currency}} {{bookedDetails.amount}} + {{bookedDetails.amount | currency: currency}}
- +
diff --git a/ng-seed/src/app/end-user/customer-info/customer-info.component.ts b/ng-seed/src/app/end-user/customer-info/customer-info.component.ts index 715853e..f3314a7 100644 --- a/ng-seed/src/app/end-user/customer-info/customer-info.component.ts +++ b/ng-seed/src/app/end-user/customer-info/customer-info.component.ts @@ -316,20 +316,22 @@ export class CustomerInfoComponent implements OnInit { backClicked() { this._location.back(); } - // backRedireact(){ - // let URL = this.router.url; - // console.log(URL) - // let URL_AS_LIST = URL.split('/'); - // console.log(URL_AS_LIST); + + + backRedireact(){ + let URL = this.router.url; + console.log(URL) + let URL_AS_LIST = URL.split('/'); + console.log(URL_AS_LIST); - // if(URL_AS_LIST[2] == 'practitioner'){ - // this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]+'/details']) - // console.log('practitioner') - // }else{ - // this.router.navigate(['customer/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]]) - // console.log('Business') - // } - // } + if(URL_AS_LIST[2] == 'practitioner'){ + this.router.navigate(['booking/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]]) + console.log('practitioner') + }else{ + this.router.navigate(['booking/'+URL_AS_LIST[2]+'/'+URL_AS_LIST[3]]) + console.log('Business') + } + } // @HostListener('window:popstate', ['$event']) // onPopState(event) { @@ -337,6 +339,13 @@ export class CustomerInfoComponent implements OnInit { // this.backRedireact() // } + @HostListener('window:beforeunload', ['$event']) + beforeUnloadHandler(event: Event) { + // Redirect to the desired route + this.backRedireact() + } + + image_view(image){ return this.apiUrl+'imageViewer?img_name='+image; } 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 597f4fd..ee7ce45 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 @@ -214,7 +214,7 @@

AvatarTime :

{{slotTime | date:'shortTime'}}

AvatarAmount :

- {{currency}} {{ 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) | currency: currency}}
diff --git a/ng-seed/src/environments/environment.ts b/ng-seed/src/environments/environment.ts index 163585f..8ffc279 100644 --- a/ng-seed/src/environments/environment.ts +++ b/ng-seed/src/environments/environment.ts @@ -7,8 +7,8 @@ export const environment = { production: false, environmentName: 'Testing Environment',//Localhost Environment. // apiEndpoint:'http://venbainfotech.com:5000/api/', - // apiEndpoint:'http://192.168.1.23:8080/api/', - apiEndpoint:'https://api.venbait.in/api/', + apiEndpoint:'http://192.168.1.11:8080/api/', + // apiEndpoint:'https://api.venbait.in/api/', //EndUser URL endUserUrl: window.location.origin+'/#/booking/',