diff --git a/.AMEYE b/.AMEYE index bc77278..cf1f30b 100644 --- a/.AMEYE +++ b/.AMEYE @@ -21,7 +21,7 @@ git remote add origin https://gitlab.chiefsoft.net/IONIC/eRx.git ionic generate page users/dash ionic generate page users/schedule - +ionic generate page users/settings ionic generate component CardTiles diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index c4c7062..964a67c 100755 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -30,6 +30,10 @@ const routes: Routes = [ path: 'encounter', loadChildren: () => import('./users/encounter/encounter.module').then( m => m.EncounterPageModule) }, + { + path: 'settings', + loadChildren: () => import('./users/settings/settings.module').then( m => m.SettingsPageModule) + }, ]; diff --git a/src/app/component/footer-menu/footer-menu.component.ts b/src/app/component/footer-menu/footer-menu.component.ts index 0d8d2cd..f89d75b 100644 --- a/src/app/component/footer-menu/footer-menu.component.ts +++ b/src/app/component/footer-menu/footer-menu.component.ts @@ -7,6 +7,7 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./footer-menu.component.scss'], }) export class FooterMenuComponent implements OnInit { + constructor(public router: Router) {} ngOnInit() {} @@ -25,7 +26,7 @@ export class FooterMenuComponent implements OnInit { break; case 'SETTINGS': - this.router.navigate(['/schedule']); + this.router.navigate(['/settings']); break; } } diff --git a/src/app/users/encounter/encounter.module.ts b/src/app/users/encounter/encounter.module.ts index e385d1c..4db1bf4 100644 --- a/src/app/users/encounter/encounter.module.ts +++ b/src/app/users/encounter/encounter.module.ts @@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular'; import { EncounterPageRoutingModule } from './encounter-routing.module'; import { EncounterPage } from './encounter.page'; +import { FooterMenuComponent } from '../../component/footer-menu/footer-menu.component'; @NgModule({ imports: [ @@ -15,6 +16,6 @@ import { EncounterPage } from './encounter.page'; IonicModule, EncounterPageRoutingModule ], - declarations: [EncounterPage] + declarations: [EncounterPage,FooterMenuComponent] }) export class EncounterPageModule {} diff --git a/src/app/users/encounter/encounter.page.html b/src/app/users/encounter/encounter.page.html index d06a6ea..ade08f0 100644 --- a/src/app/users/encounter/encounter.page.html +++ b/src/app/users/encounter/encounter.page.html @@ -5,35 +5,34 @@ -

Text Item

Detail set to true - detail arrow displays on both modes

- +

Button Item

Default detail - detail arrow displays on iOS only

- +

Button Item

Detail set to true - detail arrow displays on both modes

- +

Button Item

Detail set to false - detail arrow hidden on both modes

- +

Button Item

@@ -41,5 +40,8 @@

Detail icon set to caret-forward-outline

-
+ + + + diff --git a/src/app/users/schedule/schedule.module.ts b/src/app/users/schedule/schedule.module.ts index 8fb96c8..0a42c53 100644 --- a/src/app/users/schedule/schedule.module.ts +++ b/src/app/users/schedule/schedule.module.ts @@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular'; import { SchedulePageRoutingModule } from './schedule-routing.module'; import { SchedulePage } from './schedule.page'; +import { FooterMenuComponent } from '../../component/footer-menu/footer-menu.component'; @NgModule({ imports: [ @@ -15,6 +16,6 @@ import { SchedulePage } from './schedule.page'; IonicModule, SchedulePageRoutingModule ], - declarations: [SchedulePage] + declarations: [SchedulePage,FooterMenuComponent] }) export class SchedulePageModule {} diff --git a/src/app/users/schedule/schedule.page.html b/src/app/users/schedule/schedule.page.html index 8b9743a..bd8d6a8 100644 --- a/src/app/users/schedule/schedule.page.html +++ b/src/app/users/schedule/schedule.page.html @@ -7,3 +7,7 @@ + + + + \ No newline at end of file diff --git a/src/app/users/settings/settings-routing.module.ts b/src/app/users/settings/settings-routing.module.ts new file mode 100644 index 0000000..59decc0 --- /dev/null +++ b/src/app/users/settings/settings-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { SettingsPage } from './settings.page'; + +const routes: Routes = [ + { + path: '', + component: SettingsPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class SettingsPageRoutingModule {} diff --git a/src/app/users/settings/settings.module.ts b/src/app/users/settings/settings.module.ts new file mode 100644 index 0000000..59eff3c --- /dev/null +++ b/src/app/users/settings/settings.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { SettingsPageRoutingModule } from './settings-routing.module'; + +import { SettingsPage } from './settings.page'; +import { FooterMenuComponent } from '../../component/footer-menu/footer-menu.component'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + SettingsPageRoutingModule + ], + declarations: [SettingsPage,FooterMenuComponent] +}) +export class SettingsPageModule {} diff --git a/src/app/users/settings/settings.page.html b/src/app/users/settings/settings.page.html new file mode 100644 index 0000000..e098666 --- /dev/null +++ b/src/app/users/settings/settings.page.html @@ -0,0 +1,12 @@ + + + settings + + + + + + + + + \ No newline at end of file diff --git a/src/app/users/settings/settings.page.scss b/src/app/users/settings/settings.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/users/settings/settings.page.spec.ts b/src/app/users/settings/settings.page.spec.ts new file mode 100644 index 0000000..5e32e9c --- /dev/null +++ b/src/app/users/settings/settings.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { SettingsPage } from './settings.page'; + +describe('SettingsPage', () => { + let component: SettingsPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ SettingsPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(SettingsPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/users/settings/settings.page.ts b/src/app/users/settings/settings.page.ts new file mode 100644 index 0000000..7bc0fd2 --- /dev/null +++ b/src/app/users/settings/settings.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-settings', + templateUrl: './settings.page.html', + styleUrls: ['./settings.page.scss'], +}) +export class SettingsPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +}