fix
This commit is contained in:
@@ -59,6 +59,14 @@ const routes: Routes = [
|
|||||||
path: 'merms-opencare',
|
path: 'merms-opencare',
|
||||||
loadChildren: () => import('./care/merms-opencare/merms-opencare.module').then( m => m.MermsOpencarePageModule)
|
loadChildren: () => import('./care/merms-opencare/merms-opencare.module').then( m => m.MermsOpencarePageModule)
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: 'add-practice',
|
||||||
|
loadChildren: () => import('./modal/add-practice/add-practice.module').then( m => m.AddPracticePageModule)
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'consult-billing',
|
||||||
|
loadChildren: () => import('./modal/consult-billing/consult-billing.module').then( m => m.ConsultBillingPageModule)
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
|
|||||||
@@ -3,9 +3,12 @@ import { Router, NavigationExtras, ActivatedRoute } from '@angular/router'
|
|||||||
import {
|
import {
|
||||||
NavController,
|
NavController,
|
||||||
AlertController,
|
AlertController,
|
||||||
|
ModalController,
|
||||||
LoadingController,
|
LoadingController,
|
||||||
} from '@ionic/angular'
|
} from '@ionic/angular'
|
||||||
|
|
||||||
|
import { ConsultBillingPage } from './../modal/consult-billing/consult-billing.page';
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-merms-patient',
|
selector: 'app-merms-patient',
|
||||||
@@ -25,7 +28,8 @@ export class MermsPatientPage implements OnInit {
|
|||||||
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,
|
||||||
|
public modalController: ModalController) {
|
||||||
console.log('-----------------------------xxxx-----------------------------');
|
console.log('-----------------------------xxxx-----------------------------');
|
||||||
console.log(this.router.getCurrentNavigation().extras.queryParams);
|
console.log(this.router.getCurrentNavigation().extras.queryParams);
|
||||||
this.patientData = this.router.getCurrentNavigation().extras.queryParams;
|
this.patientData = this.router.getCurrentNavigation().extras.queryParams;
|
||||||
@@ -64,7 +68,10 @@ export class MermsPatientPage implements OnInit {
|
|||||||
this.router.navigateByUrl('/merms-dash')
|
this.router.navigateByUrl('/merms-dash')
|
||||||
}
|
}
|
||||||
|
|
||||||
goConsultBillProfine() {
|
async goConsultBillProfine() {
|
||||||
|
const modal = await this.modalController.create({
|
||||||
|
component: ConsultBillingPage
|
||||||
|
});
|
||||||
|
return await modal.present();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
|
import { AddPracticePage } from './../modal/add-practice/add-practice.page';
|
||||||
import { Component, OnInit } from '@angular/core';
|
import { Component, OnInit } from '@angular/core';
|
||||||
import { Router, NavigationExtras } from '@angular/router'
|
import { Router, NavigationExtras } from '@angular/router'
|
||||||
import {
|
import {
|
||||||
NavController,
|
NavController,
|
||||||
AlertController,
|
AlertController,
|
||||||
|
ModalController,
|
||||||
LoadingController,
|
LoadingController,
|
||||||
} from '@ionic/angular'
|
} from '@ionic/angular'
|
||||||
|
|
||||||
@@ -19,7 +21,8 @@ export class MermsPracticePage implements OnInit {
|
|||||||
|
|
||||||
constructor(public navCtrl: NavController, private router: Router,
|
constructor(public navCtrl: NavController, private router: Router,
|
||||||
private mermsServiceProviderService: MermsServiceProviderService,
|
private mermsServiceProviderService: MermsServiceProviderService,
|
||||||
private mermsSessionService: MermsSessionService
|
private mermsSessionService: MermsSessionService,
|
||||||
|
public modalController: ModalController
|
||||||
) {
|
) {
|
||||||
this.getPracticeData();
|
this.getPracticeData();
|
||||||
}
|
}
|
||||||
@@ -63,7 +66,10 @@ export class MermsPracticePage implements OnInit {
|
|||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
goAddPractice() {
|
async goAddPractice() {
|
||||||
|
const modal = await this.modalController.create({
|
||||||
|
component: AddPracticePage
|
||||||
|
});
|
||||||
|
return await modal.present();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { Routes, RouterModule } from '@angular/router';
|
||||||
|
|
||||||
|
import { AddPracticePage } from './add-practice.page';
|
||||||
|
|
||||||
|
const routes: Routes = [
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
component: AddPracticePage
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [RouterModule.forChild(routes)],
|
||||||
|
exports: [RouterModule],
|
||||||
|
})
|
||||||
|
export class AddPracticePageRoutingModule {}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { FormsModule } from '@angular/forms';
|
||||||
|
|
||||||
|
import { IonicModule } from '@ionic/angular';
|
||||||
|
|
||||||
|
import { AddPracticePageRoutingModule } from './add-practice-routing.module';
|
||||||
|
|
||||||
|
import { AddPracticePage } from './add-practice.page';
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
CommonModule,
|
||||||
|
FormsModule,
|
||||||
|
IonicModule,
|
||||||
|
AddPracticePageRoutingModule
|
||||||
|
],
|
||||||
|
declarations: [AddPracticePage]
|
||||||
|
})
|
||||||
|
export class AddPracticePageModule {}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<ion-header>
|
||||||
|
<ion-toolbar>
|
||||||
|
<ion-title>addPractice</ion-title>
|
||||||
|
</ion-toolbar>
|
||||||
|
</ion-header>
|
||||||
|
|
||||||
|
<ion-content>
|
||||||
|
<ion-button color="success" (click)="dismiss()">Close</ion-button>
|
||||||
|
</ion-content>
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
import { IonicModule } from '@ionic/angular';
|
||||||
|
|
||||||
|
import { AddPracticePage } from './add-practice.page';
|
||||||
|
|
||||||
|
describe('AddPracticePage', () => {
|
||||||
|
let component: AddPracticePage;
|
||||||
|
let fixture: ComponentFixture<AddPracticePage>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ AddPracticePage ],
|
||||||
|
imports: [IonicModule.forRoot()]
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(AddPracticePage);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
}));
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { ModalController } from '@ionic/angular';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-add-practice',
|
||||||
|
templateUrl: './add-practice.page.html',
|
||||||
|
styleUrls: ['./add-practice.page.scss'],
|
||||||
|
})
|
||||||
|
export class AddPracticePage implements OnInit {
|
||||||
|
|
||||||
|
constructor(private modalCtrl:ModalController) { }
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
}
|
||||||
|
|
||||||
|
dismiss() {
|
||||||
|
// using the injected ModalController this page
|
||||||
|
// can "dismiss" itself and optionally pass back data
|
||||||
|
this.modalCtrl.dismiss({
|
||||||
|
'dismissed': true
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { Routes, RouterModule } from '@angular/router';
|
||||||
|
|
||||||
|
import { ConsultBillingPage } from './consult-billing.page';
|
||||||
|
|
||||||
|
const routes: Routes = [
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
component: ConsultBillingPage
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [RouterModule.forChild(routes)],
|
||||||
|
exports: [RouterModule],
|
||||||
|
})
|
||||||
|
export class ConsultBillingPageRoutingModule {}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { FormsModule } from '@angular/forms';
|
||||||
|
|
||||||
|
import { IonicModule } from '@ionic/angular';
|
||||||
|
|
||||||
|
import { ConsultBillingPageRoutingModule } from './consult-billing-routing.module';
|
||||||
|
|
||||||
|
import { ConsultBillingPage } from './consult-billing.page';
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
CommonModule,
|
||||||
|
FormsModule,
|
||||||
|
IonicModule,
|
||||||
|
ConsultBillingPageRoutingModule
|
||||||
|
],
|
||||||
|
declarations: [ConsultBillingPage]
|
||||||
|
})
|
||||||
|
export class ConsultBillingPageModule {}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<ion-header>
|
||||||
|
<ion-toolbar>
|
||||||
|
<ion-title>consultBilling</ion-title>
|
||||||
|
</ion-toolbar>
|
||||||
|
</ion-header>
|
||||||
|
|
||||||
|
<ion-content>
|
||||||
|
<ion-button color="success" (click)="dismiss()">Close</ion-button>
|
||||||
|
</ion-content>
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
import { IonicModule } from '@ionic/angular';
|
||||||
|
|
||||||
|
import { ConsultBillingPage } from './consult-billing.page';
|
||||||
|
|
||||||
|
describe('ConsultBillingPage', () => {
|
||||||
|
let component: ConsultBillingPage;
|
||||||
|
let fixture: ComponentFixture<ConsultBillingPage>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ ConsultBillingPage ],
|
||||||
|
imports: [IonicModule.forRoot()]
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(ConsultBillingPage);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
}));
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { ModalController } from '@ionic/angular';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-consult-billing',
|
||||||
|
templateUrl: './consult-billing.page.html',
|
||||||
|
styleUrls: ['./consult-billing.page.scss'],
|
||||||
|
})
|
||||||
|
export class ConsultBillingPage implements OnInit {
|
||||||
|
|
||||||
|
constructor(private modalCtrl:ModalController) { }
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
}
|
||||||
|
dismiss() {
|
||||||
|
// using the injected ModalController this page
|
||||||
|
// can "dismiss" itself and optionally pass back data
|
||||||
|
this.modalCtrl.dismiss({
|
||||||
|
'dismissed': true
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user