diff --git a/ng-seed/Appointment_Frontend_Build.zip b/ng-seed/Appointment_Frontend_Build.zip new file mode 100644 index 0000000..2afe5be Binary files /dev/null and b/ng-seed/Appointment_Frontend_Build.zip differ diff --git a/ng-seed/src/app/app.component.ts b/ng-seed/src/app/app.component.ts index 6addf51..56922c0 100644 --- a/ng-seed/src/app/app.component.ts +++ b/ng-seed/src/app/app.component.ts @@ -16,6 +16,8 @@ export class AppComponent { } ngOnInit() { - + console.log(window.location.href) + console.log(window.location.pathname) + console.log(window.location.origin) } } diff --git a/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.ts b/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.ts index 9d775c1..a26b53a 100644 --- a/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.ts +++ b/ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.ts @@ -9,7 +9,8 @@ import { environment } from 'environments/environment'; import Swal from 'sweetalert2'; import { AppointmentsService } from '../appointments-service/appointments.service'; import { DialogBoxComponent } from '../dialog-box/dialog-box.component'; -import { Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; +import { DashboardService } from 'app/dashboard/dashboard.service'; export interface UsersData { busId: number; appoinmentTime: string; @@ -59,9 +60,20 @@ export class AppoinmentsListComponent implements OnInit { consultants: any = []; selectPractitioner:any = []; user_role: any=[]; - constructor(private router: Router,private notifierService: NotifierService,public dialog: MatDialog, public _app:AppointmentsService) { } + constructor(private router: Router,private notifierService: NotifierService,public dialog: MatDialog, public _app:AppointmentsService,public _dash:DashboardService) { + + let go_appointment = localStorage.getItem('go_appointment') + console.log(go_appointment) + if(go_appointment == '0'){ + let dataVal = localStorage.getItem('go_appointment_data') + console.log(dataVal) + this.openDialog('Update',JSON.parse(dataVal)) + } + } - ngOnInit(): void { + ngOnInit() { + + this.recordStatus=false; this.user_role = localStorage.getItem('user_role'); if(this.user_role != 'FRONTDESK'){ @@ -269,6 +281,8 @@ export class AppoinmentsListComponent implements OnInit { dialogRef.afterClosed().subscribe(result => { console.log(result) if(result.data == 0){ + localStorage.removeItem('go_appointment_data') + localStorage.setItem('go_appointment','1') if(this.user_role != 'FRONTDESK'){ let param ={"busId":localStorage.getItem('busId'),"userId":localStorage.getItem('user_id')} console.log(param) diff --git a/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.html b/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.html index 0d0282b..603eeb4 100644 --- a/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.html +++ b/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.html @@ -1,6 +1,6 @@
{{action}} Appoinment -
diff --git a/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.ts b/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.ts index 9f350c4..8e1b765 100644 --- a/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.ts +++ b/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.ts @@ -121,13 +121,15 @@ export class DialogBoxComponent implements OnInit { this.local_data = {...data}; this.action = this.local_data.action; this.frontDeskChoosedPractiID = this.local_data['ServicesMapDetail.userId'] - // // console.log(this.frontDeskChoosedPractiID) + console.log(this.local_data) } get f(){ return this.form.controls; } closeDialog(){ + localStorage.removeItem('go_appointment_data') + localStorage.setItem('go_appointment','1') this.dialogRef.close({event:'Cancel'}); } onSelectFile(event) { @@ -139,10 +141,7 @@ export class DialogBoxComponent implements OnInit { } } } - close() { - // // console.log(this.form.value); - this.dialogRef.close(); -} + // toggle() { // this.show = !this.show; @@ -502,6 +501,8 @@ export class DialogBoxComponent implements OnInit { }else{ this.notifierService.notify('success', 'Appointment Added Successfully'); } + localStorage.removeItem('go_appointment_data') + localStorage.setItem('go_appointment','1') let param = {data:0,response:res} this.dialogRef.close(param); this.isSubmitting = false; diff --git a/ng-seed/src/app/dashboard/dashboard.component.html b/ng-seed/src/app/dashboard/dashboard.component.html index 8d339f2..76e34c6 100644 --- a/ng-seed/src/app/dashboard/dashboard.component.html +++ b/ng-seed/src/app/dashboard/dashboard.component.html @@ -12,7 +12,7 @@
-
+
@@ -75,7 +75,7 @@
-
+
@@ -139,7 +139,7 @@
-
+
@@ -400,7 +400,7 @@

Today

- +
@@ -422,7 +422,7 @@

Tomorrow

- +
{{appoinment.customer[0].cusName}}
@@ -442,7 +442,7 @@

Later

- +
{{appoinment.customer[0].cusName}}
diff --git a/ng-seed/src/app/dashboard/dashboard.component.ts b/ng-seed/src/app/dashboard/dashboard.component.ts index 05fdcee..1fbc99a 100644 --- a/ng-seed/src/app/dashboard/dashboard.component.ts +++ b/ng-seed/src/app/dashboard/dashboard.component.ts @@ -6,6 +6,7 @@ import { DomSanitizer } from '@angular/platform-browser'; import * as moment from 'moment'; import { CurrencyPipe, DatePipe } from '@angular/common'; import { AppointmentsService } from 'app/appoinment/appoinments/appointments-service/appointments.service'; +import { Router } from '@angular/router'; @Component({ selector: 'app-dashboard', templateUrl: './dashboard.component.html', @@ -338,7 +339,7 @@ messages: Object[] = [{ appoinmentsListToday:any=[]; appoinmentsListTomorrow:any =[]; appoinmentsListLater:any =[]; - constructor(public _app:AppointmentsService,private currencySymbol: CurrencyPipe,public _dash:DashboardService,private matIconRegistry: MatIconRegistry,private domSanitizer: DomSanitizer) { + constructor(private router:Router,public _app:AppointmentsService,private currencySymbol: CurrencyPipe,public _dash:DashboardService,private matIconRegistry: MatIconRegistry,private domSanitizer: DomSanitizer) { // this.fetch((data) => { this.rows = data; }); Object.assign(this, {single, multi}) this.matIconRegistry.addSvgIcon( @@ -648,7 +649,7 @@ messages: Object[] = [{ //Start Line Chart let lineParams - if(user_role == 'BIZADMIN'){ + if(user_role != 'PRACTITIONER'){ lineParams = {'busId':localStorage.getItem('busId'),'fromDate':startDate,'toDate':EndDate} } this.getLineChartData(lineParams) @@ -736,4 +737,14 @@ messages: Object[] = [{ }) } + + goToBookedAppointment(params){ + console.log(params) + localStorage.setItem('go_appointment','0'); + localStorage.setItem('go_appointment_data',JSON.stringify(params)) + // this._dash.passAppointmentDetails.next(params) + this.router.navigate(['/appointments']) + // this.router.navigate(['/appointments', params]) + } + } diff --git a/ng-seed/src/app/dashboard/dashboard.service.ts b/ng-seed/src/app/dashboard/dashboard.service.ts index f8ff847..367bdf6 100644 --- a/ng-seed/src/app/dashboard/dashboard.service.ts +++ b/ng-seed/src/app/dashboard/dashboard.service.ts @@ -1,13 +1,17 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { environment } from 'environments/environment'; -import { Observable } from 'rxjs'; +import { BehaviorSubject, Observable } from 'rxjs'; @Injectable({ providedIn: 'root' }) export class DashboardService { private apiUrl = environment.apiEndpoint; + + public passAppointmentDetails:BehaviorSubject = new BehaviorSubject([]); + public passAppointmentDetails_observable$ = this.passAppointmentDetails.asObservable(); + constructor(private _http: HttpClient) { } // generateotp(email): Observable { 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 33e572a..b2ac19d 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 Booked On.

+

Your appointment has been successfully Booked.

Thank You..! Your order status is {{resPayment.response_message}}. diff --git a/ng-seed/src/environments/environment.prod.ts b/ng-seed/src/environments/environment.prod.ts index 643c3f6..490c8a8 100644 --- a/ng-seed/src/environments/environment.prod.ts +++ b/ng-seed/src/environments/environment.prod.ts @@ -8,7 +8,7 @@ export const environment = { //EndUser URL endUserUrl: window.location.origin+'/appointment/#/booking/', - mailUrl:window.location.origin, + mailUrl:window.location.origin+'/appointment', payment_api_key :'4cb964d4-9ef4-4a25-8f85-a2a13f43cbba', payment_mode:'TEST', diff --git a/ng-seed/src/environments/environment.ts b/ng-seed/src/environments/environment.ts index 9c84602..009e321 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.14:8080/api/', - apiEndpoint:'https://dev.venbait.in/appointments/api/', + apiEndpoint:'http://192.168.1.29:8080/api/', + // apiEndpoint:'https://dev.venbait.in/appointments/api/', //EndUser URL endUserUrl: window.location.origin+'/#/booking/',