fix
This commit is contained in:
@@ -6,8 +6,8 @@ android {
|
|||||||
applicationId "com.mermsemr.providers"
|
applicationId "com.mermsemr.providers"
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 1032
|
versionCode 1033
|
||||||
versionName "1.0.32"
|
versionName "1.0.33"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
|||||||
@@ -40,12 +40,26 @@ export class MermsCalendarPage implements OnInit {
|
|||||||
// Change current month/week/day
|
// 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() {
|
goPatient() {
|
||||||
|
|||||||
@@ -14,6 +14,11 @@
|
|||||||
<!-- Item Dividers in a List -->
|
<!-- Item Dividers in a List -->
|
||||||
<ion-list>
|
<ion-list>
|
||||||
|
|
||||||
|
<ion-item>
|
||||||
|
<ion-label>Bill: $1000.23 Pending</ion-label>
|
||||||
|
<ion-icon name="heart" (click)="goConsultBillProfine()"></ion-icon>
|
||||||
|
</ion-item>
|
||||||
|
|
||||||
<ion-item>
|
<ion-item>
|
||||||
<ion-label>Reason:{{reason}}</ion-label>
|
<ion-label>Reason:{{reason}}</ion-label>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
|
|||||||
@@ -16,13 +16,13 @@ export class MermsPatientPage implements OnInit {
|
|||||||
patient_name: string = "Selected Patient";
|
patient_name: string = "Selected Patient";
|
||||||
patientData: any;
|
patientData: any;
|
||||||
reason: string;
|
reason: string;
|
||||||
patient_id : number = 0;
|
patient_id: number = 0;
|
||||||
lastname : string ='';
|
lastname: string = '';
|
||||||
firstname : string ='';
|
firstname: string = '';
|
||||||
appt : string ='';
|
appt: string = '';
|
||||||
gender : string ='';
|
gender: string = '';
|
||||||
age : number =0;
|
age: number = 0;
|
||||||
profile_picture:string ="../../assets/imgs/merms-signup.jpg";
|
profile_picture: string = "../../assets/imgs/merms-signup.jpg";
|
||||||
|
|
||||||
|
|
||||||
constructor(public navCtrl: NavController, private router: Router, private route: ActivatedRoute) {
|
constructor(public navCtrl: NavController, private router: Router, private route: ActivatedRoute) {
|
||||||
@@ -40,8 +40,8 @@ export class MermsPatientPage implements OnInit {
|
|||||||
this.appt = params.appt;
|
this.appt = params.appt;
|
||||||
this.patient_id = params.id;
|
this.patient_id = params.id;
|
||||||
this.firstname = params.firstname;
|
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 => {
|
// this.route.queryParams.subscribe(params => {
|
||||||
// console.log(params);
|
// console.log(params);
|
||||||
|
|
||||||
@@ -63,4 +63,8 @@ export class MermsPatientPage implements OnInit {
|
|||||||
goHome() {
|
goHome() {
|
||||||
this.router.navigateByUrl('/merms-dash')
|
this.router.navigateByUrl('/merms-dash')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
goConsultBillProfine() {
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user