diff --git a/android/app/build.gradle b/android/app/build.gradle index 92b7045..0a094fa 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "com.mermsemr.providers" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1032 - versionName "1.0.32" + versionCode 1033 + versionName "1.0.33" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/src/app/merms-calendar/merms-calendar.page.ts b/src/app/merms-calendar/merms-calendar.page.ts index adf3a6e..052c05d 100644 --- a/src/app/merms-calendar/merms-calendar.page.ts +++ b/src/app/merms-calendar/merms-calendar.page.ts @@ -40,12 +40,26 @@ export class MermsCalendarPage implements OnInit { // Change current month/week/day - onEventSelected(eEvent:any){ - + onEventSelected(eEvent: any) { + console.log('onEventSelected'); } - onViewTitleChanged(eEvent:any){ + onViewTitleChanged(eEvent: any) { + console.log('onViewTitleChanged'); + } + onCurrentDateChanged(event: Date) { + var today = new Date(); + today.setHours(0, 0, 0, 0); + event.setHours(0, 0, 0, 0); + console.log('onCurrentDateChanged'); + if (this.calendar.mode === 'month') { + if (event.getFullYear() < today.getFullYear() || (event.getFullYear() === today.getFullYear() && event.getMonth() <= today.getMonth())) { + // this.lockSwipeToPrev = true; + } else { + // this.lockSwipeToPrev = false; + } + } } goPatient() { diff --git a/src/app/merms-patient/merms-patient.page.html b/src/app/merms-patient/merms-patient.page.html index af69197..990de96 100644 --- a/src/app/merms-patient/merms-patient.page.html +++ b/src/app/merms-patient/merms-patient.page.html @@ -14,6 +14,11 @@ + + Bill: $1000.23 Pending + + + Reason:{{reason}} diff --git a/src/app/merms-patient/merms-patient.page.ts b/src/app/merms-patient/merms-patient.page.ts index d60e90a..1c5b9df 100644 --- a/src/app/merms-patient/merms-patient.page.ts +++ b/src/app/merms-patient/merms-patient.page.ts @@ -16,13 +16,13 @@ export class MermsPatientPage implements OnInit { patient_name: string = "Selected Patient"; patientData: any; reason: string; - patient_id : number = 0; - lastname : string =''; - firstname : string =''; - appt : string =''; - gender : string =''; - age : number =0; - profile_picture:string ="../../assets/imgs/merms-signup.jpg"; + patient_id: number = 0; + lastname: string = ''; + firstname: string = ''; + appt: string = ''; + gender: string = ''; + age: number = 0; + profile_picture: string = "../../assets/imgs/merms-signup.jpg"; constructor(public navCtrl: NavController, private router: Router, private route: ActivatedRoute) { @@ -40,8 +40,8 @@ export class MermsPatientPage implements OnInit { this.appt = params.appt; this.patient_id = params.id; this.firstname = params.firstname; - this.profile_picture = "../../assets/imgs/avatar"+this.gender+ ".png"; - + this.profile_picture = "../../assets/imgs/avatar" + this.gender + ".png"; + // this.route.queryParams.subscribe(params => { // console.log(params); @@ -63,4 +63,8 @@ export class MermsPatientPage implements OnInit { goHome() { this.router.navigateByUrl('/merms-dash') } + + goConsultBillProfine() { + + } }