From b79e5200619d15ae158dd5c5d99343779d26a57d Mon Sep 17 00:00:00 2001 From: Olu Amey Date: Sat, 21 Nov 2020 21:12:09 -0500 Subject: [PATCH] fix --- src/app/app-routing.module.ts | 4 ++++ .../merms-calendar-routing.module.ts | 17 +++++++++++++ .../merms-calendar/merms-calendar.module.ts | 20 ++++++++++++++++ .../merms-calendar/merms-calendar.page.html | 9 +++++++ .../merms-calendar/merms-calendar.page.scss | 0 .../merms-calendar.page.spec.ts | 24 +++++++++++++++++++ src/app/merms-calendar/merms-calendar.page.ts | 15 ++++++++++++ src/app/merms-dash/merms-dash.page.html | 6 ++--- src/app/merms-dash/merms-dash.page.ts | 2 +- 9 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 src/app/merms-calendar/merms-calendar-routing.module.ts create mode 100644 src/app/merms-calendar/merms-calendar.module.ts create mode 100644 src/app/merms-calendar/merms-calendar.page.html create mode 100644 src/app/merms-calendar/merms-calendar.page.scss create mode 100644 src/app/merms-calendar/merms-calendar.page.spec.ts create mode 100644 src/app/merms-calendar/merms-calendar.page.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index c36f420..bfb0700 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -35,6 +35,10 @@ const routes: Routes = [ path: 'merms-patient', loadChildren: () => import('./merms-patient/merms-patient.module').then( m => m.MermsPatientPageModule) }, + { + path: 'merms-calendar', + loadChildren: () => import('./merms-calendar/merms-calendar.module').then( m => m.MermsCalendarPageModule) + }, ]; @NgModule({ diff --git a/src/app/merms-calendar/merms-calendar-routing.module.ts b/src/app/merms-calendar/merms-calendar-routing.module.ts new file mode 100644 index 0000000..00a34cf --- /dev/null +++ b/src/app/merms-calendar/merms-calendar-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { MermsCalendarPage } from './merms-calendar.page'; + +const routes: Routes = [ + { + path: '', + component: MermsCalendarPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class MermsCalendarPageRoutingModule {} diff --git a/src/app/merms-calendar/merms-calendar.module.ts b/src/app/merms-calendar/merms-calendar.module.ts new file mode 100644 index 0000000..583f9cf --- /dev/null +++ b/src/app/merms-calendar/merms-calendar.module.ts @@ -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 { MermsCalendarPageRoutingModule } from './merms-calendar-routing.module'; + +import { MermsCalendarPage } from './merms-calendar.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + MermsCalendarPageRoutingModule + ], + declarations: [MermsCalendarPage] +}) +export class MermsCalendarPageModule {} diff --git a/src/app/merms-calendar/merms-calendar.page.html b/src/app/merms-calendar/merms-calendar.page.html new file mode 100644 index 0000000..dccef3f --- /dev/null +++ b/src/app/merms-calendar/merms-calendar.page.html @@ -0,0 +1,9 @@ + + + merms-calendar + + + + + + diff --git a/src/app/merms-calendar/merms-calendar.page.scss b/src/app/merms-calendar/merms-calendar.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/merms-calendar/merms-calendar.page.spec.ts b/src/app/merms-calendar/merms-calendar.page.spec.ts new file mode 100644 index 0000000..b505a8d --- /dev/null +++ b/src/app/merms-calendar/merms-calendar.page.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { MermsCalendarPage } from './merms-calendar.page'; + +describe('MermsCalendarPage', () => { + let component: MermsCalendarPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ MermsCalendarPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(MermsCalendarPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/merms-calendar/merms-calendar.page.ts b/src/app/merms-calendar/merms-calendar.page.ts new file mode 100644 index 0000000..4c1d316 --- /dev/null +++ b/src/app/merms-calendar/merms-calendar.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-merms-calendar', + templateUrl: './merms-calendar.page.html', + styleUrls: ['./merms-calendar.page.scss'], +}) +export class MermsCalendarPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/merms-dash/merms-dash.page.html b/src/app/merms-dash/merms-dash.page.html index 5da175c..b15703f 100644 --- a/src/app/merms-dash/merms-dash.page.html +++ b/src/app/merms-dash/merms-dash.page.html @@ -148,17 +148,17 @@ -
+
- +
- +
diff --git a/src/app/merms-dash/merms-dash.page.ts b/src/app/merms-dash/merms-dash.page.ts index b473470..f84ba5b 100644 --- a/src/app/merms-dash/merms-dash.page.ts +++ b/src/app/merms-dash/merms-dash.page.ts @@ -74,6 +74,6 @@ export class MermsDashPage implements OnInit { } goCalendar(){ - + this.router.navigateByUrl('/merms-calendar') } }