From 6fd2381b49df0e74d02485e8ec65ddff5078c6b9 Mon Sep 17 00:00:00 2001 From: Manduro Date: Tue, 31 Jan 2017 00:16:35 +0100 Subject: [PATCH] Clean up, metadata, formatting, consistency --- package.json | 11 +- src/app/app.component.ts | 118 ++++++++---------- src/app/app.module.ts | 64 +++++----- src/app/app.scss | 19 +++ src/index.html | 2 +- src/manifest.json | 10 +- src/pages/about/about.ts | 6 +- .../basic-info.html} | 0 .../basic-info.scss} | 2 +- src/pages/basic-info/basic-info.ts | 22 ++++ src/pages/basicinfo/basicinfo.ts | 22 ---- .../index.html => clinician/clinician.html} | 0 src/pages/clinician/clinician.scss | 3 + src/pages/clinician/clinician.ts | 11 ++ src/pages/clinicians/index.scss | 16 --- src/pages/clinicians/index.ts | 13 -- src/pages/disclaimer/disclaimer.ts | 9 +- .../help-settings.html} | 0 src/pages/help-settings/help-settings.scss | 3 + src/pages/help-settings/help-settings.ts | 11 ++ src/pages/help/index.scss | 1 - src/pages/help/index.ts | 13 -- .../history-problems.html} | 0 .../history-problems/history-problems.scss | 4 + .../history-problems/history-problems.ts | 11 ++ .../history/{index.html => history.html} | 0 src/pages/history/history.scss | 3 + src/pages/history/history.ts | 16 +++ src/pages/history/index.scss | 1 - src/pages/history/index.ts | 16 --- src/pages/history/problems.scss | 1 - src/pages/history/problems.ts | 11 -- src/pages/home/home.scss | 17 +-- src/pages/home/home.ts | 13 +- .../location-resources.html} | 0 .../location-resources.scss | 3 + .../location-resources/location-resources.ts | 11 ++ src/pages/{patients => patient}/patient.html | 0 src/pages/patient/patient.scss | 3 + src/pages/patient/patient.ts | 17 +++ src/pages/patients/patient.scss | 16 --- src/pages/patients/patient.ts | 17 --- src/pages/pregnancy/index.scss | 1 - src/pages/pregnancy/index.ts | 13 -- .../pregnancy/{index.html => pregnancy.html} | 0 src/pages/pregnancy/pregnancy.scss | 3 + src/pages/pregnancy/pregnancy.ts | 11 ++ src/pages/resources/index.scss | 1 - src/pages/resources/index.ts | 13 -- .../symptoms-entry.html} | 0 src/pages/symptoms-entry/symptoms-entry.scss | 3 + src/pages/symptoms-entry/symptoms-entry.ts | 71 +++++++++++ .../symptoms-log.html} | 0 src/pages/symptoms-log/symptoms-log.scss | 3 + src/pages/symptoms-log/symptoms-log.ts | 55 ++++++++ src/pages/symptoms/entry.scss | 1 - src/pages/symptoms/entry.ts | 68 ---------- src/pages/symptoms/log.scss | 1 - src/pages/symptoms/log.ts | 53 -------- 59 files changed, 395 insertions(+), 418 deletions(-) rename src/pages/{basicinfo/basicinfo.html => basic-info/basic-info.html} (100%) rename src/pages/{basicinfo/basicinfo.scss => basic-info/basic-info.scss} (69%) create mode 100644 src/pages/basic-info/basic-info.ts delete mode 100644 src/pages/basicinfo/basicinfo.ts rename src/pages/{clinicians/index.html => clinician/clinician.html} (100%) create mode 100644 src/pages/clinician/clinician.scss create mode 100644 src/pages/clinician/clinician.ts delete mode 100644 src/pages/clinicians/index.scss delete mode 100644 src/pages/clinicians/index.ts rename src/pages/{help/index.html => help-settings/help-settings.html} (100%) create mode 100644 src/pages/help-settings/help-settings.scss create mode 100644 src/pages/help-settings/help-settings.ts delete mode 100644 src/pages/help/index.scss delete mode 100644 src/pages/help/index.ts rename src/pages/{history/problems.html => history-problems/history-problems.html} (100%) create mode 100644 src/pages/history-problems/history-problems.scss create mode 100644 src/pages/history-problems/history-problems.ts rename src/pages/history/{index.html => history.html} (100%) create mode 100644 src/pages/history/history.scss create mode 100644 src/pages/history/history.ts delete mode 100644 src/pages/history/index.scss delete mode 100644 src/pages/history/index.ts delete mode 100644 src/pages/history/problems.scss delete mode 100644 src/pages/history/problems.ts rename src/pages/{resources/index.html => location-resources/location-resources.html} (100%) create mode 100644 src/pages/location-resources/location-resources.scss create mode 100644 src/pages/location-resources/location-resources.ts rename src/pages/{patients => patient}/patient.html (100%) create mode 100644 src/pages/patient/patient.scss create mode 100644 src/pages/patient/patient.ts delete mode 100644 src/pages/patients/patient.scss delete mode 100644 src/pages/patients/patient.ts delete mode 100644 src/pages/pregnancy/index.scss delete mode 100644 src/pages/pregnancy/index.ts rename src/pages/pregnancy/{index.html => pregnancy.html} (100%) create mode 100644 src/pages/pregnancy/pregnancy.scss create mode 100644 src/pages/pregnancy/pregnancy.ts delete mode 100644 src/pages/resources/index.scss delete mode 100644 src/pages/resources/index.ts rename src/pages/{symptoms/entry.html => symptoms-entry/symptoms-entry.html} (100%) create mode 100644 src/pages/symptoms-entry/symptoms-entry.scss create mode 100644 src/pages/symptoms-entry/symptoms-entry.ts rename src/pages/{symptoms/log.html => symptoms-log/symptoms-log.html} (100%) create mode 100644 src/pages/symptoms-log/symptoms-log.scss create mode 100644 src/pages/symptoms-log/symptoms-log.ts delete mode 100644 src/pages/symptoms/entry.scss delete mode 100644 src/pages/symptoms/entry.ts delete mode 100644 src/pages/symptoms/log.scss delete mode 100644 src/pages/symptoms/log.ts diff --git a/package.json b/package.json index df05181..ee426ef 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,9 @@ { - "name": "ionic-hello-world", - "author": "Ionic Framework", - "homepage": "http://ionicframework.com/", + "name": "io.empowerhack.hababy", + "author": "HaBaby Team", + "homepage": "http://empowerhack.io/", + "description": "HaBaby: An Ionic project", + "version": "0.0.1", "private": true, "scripts": { "ionic:build": "ionic-app-scripts build", @@ -44,6 +46,5 @@ "version": "", "locator": "ios" } - ], - "description": "HaBaby: An Ionic project" + ] } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 968945b..f701007 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,32 +1,32 @@ -import{Component, ViewChild}from '@angular/core'; -import {Platform, MenuController, Nav, Events }from 'ionic-angular'; -import {StatusBar, Splashscreen, SQLite}from 'ionic-native'; -import {TranslateService}from 'ng2-translate/ng2-translate'; - +import { Component, ViewChild } from '@angular/core'; +import { Platform, MenuController, Nav, Events } from 'ionic-angular'; +import { StatusBar, Splashscreen, SQLite } from 'ionic-native'; +import { TranslateService } from 'ng2-translate'; + +import { ClinicianPage } from '../pages/clinician/clinician'; +import { HelpSettingsPage } from '../pages/help-settings/help-settings'; +import { HistoryPage } from '../pages/history/history'; import { HomePage } from '../pages/home/home'; -import { PatientPage } from '../pages/patients/patient'; -import { ClinicianPage } from '../pages/clinicians/index'; -import { SymptomEntryPage } from '../pages/symptoms/entry'; -import { MedicalHistoryPage } from '../pages/history/index'; -import { PregnancyInfoPage } from '../pages/pregnancy/index'; -import { LocationResourcesPage } from '../pages/resources/index'; -import { HelpSettingsPage } from '../pages/help/index'; +import { LocationResourcesPage } from '../pages/location-resources/location-resources'; +import { PatientPage } from '../pages/patient/patient'; +import { PregnancyPage } from '../pages/pregnancy/pregnancy'; +import { SymptomsEntryPage } from '../pages/symptoms-entry/symptoms-entry'; @Component({ templateUrl: 'app.html' }) export class MyApp { rootPage: any = HomePage; - menuPages: Array<{title: string, component: any}>; + menuPages: Array<{ title: string, component: any }>; // the root nav is a child of the root app component // @ViewChild(Nav) gets a reference to the app's root nav @ViewChild(Nav) nav: Nav; constructor(platform: Platform, - public menu: MenuController, - public events: Events, - private translate: TranslateService + public menu: MenuController, + public events: Events, + private translate: TranslateService ) { platform.ready().then(() => { @@ -36,19 +36,19 @@ export class MyApp { Splashscreen.hide(); this.initializeTranslateServiceConfig(); - let db = new SQLite(); - db.openDatabase({ - name: "data.db", - location: "default" - }).then(() => { - db.executeSql("CREATE TABLE IF NOT EXISTS symptom_log (id INTEGER PRIMARY KEY AUTOINCREMENT, timestamp TEXT, symptom1 INTEGER, symptom2 INTEGER, symptom3 INTEGER, notes TEXT)", {}).then((data) => { - console.log("TABLE CREATED: ", data); - }, (error) => { - console.error("Unable to execute sql", error); - }) + let db = new SQLite(); + db.openDatabase({ + name: "data.db", + location: "default" + }).then(() => { + db.executeSql("CREATE TABLE IF NOT EXISTS symptom_log (id INTEGER PRIMARY KEY AUTOINCREMENT, timestamp TEXT, symptom1 INTEGER, symptom2 INTEGER, symptom3 INTEGER, notes TEXT)", {}).then((data) => { + console.log("TABLE CREATED: ", data); }, (error) => { - console.error("Unable to open database", error); - }); + console.error("Unable to execute sql", error); + }) + }, (error) => { + console.error("Unable to open database", error); + }); }); @@ -75,37 +75,34 @@ export class MyApp { } updateMenuOptions(menu) { - if (menu == "patient") - { - // set patient section's pages - this.menuPages = [ - { title: this.translate.instant('menu.medicalHistory'), component: MedicalHistoryPage }, - { title: this.translate.instant('menu.symptomEntry'), component: SymptomEntryPage }, - { title: this.translate.instant('menu.pregnancyInfo'), component: PregnancyInfoPage }, - { title: this.translate.instant('menu.resources'), component: LocationResourcesPage }, - { title: this.translate.instant('menu.help'), component: HelpSettingsPage } - ]; - } - else if (menu == "clinician") - { - // set clinician section's pages - this.menuPages = [ - { title: this.translate.instant('menu.symptomEntry'), component: SymptomEntryPage }, - { title: this.translate.instant('menu.pregnancyInfo'), component: PregnancyInfoPage }, - { title: this.translate.instant('menu.resources'), component: LocationResourcesPage }, - { title: this.translate.instant('menu.help'), component: HelpSettingsPage } - ]; - } - else - { - // default - this.menuPages = [ - { title: 'Home', component: HomePage } - ]; - } + if (menu == "patient") { + // set patient section's pages + this.menuPages = [ + { title: this.translate.instant('menu.medicalHistory'), component: HistoryPage }, + { title: this.translate.instant('menu.symptomEntry'), component: SymptomsEntryPage }, + { title: this.translate.instant('menu.pregnancyInfo'), component: PregnancyPage }, + { title: this.translate.instant('menu.resources'), component: LocationResourcesPage }, + { title: this.translate.instant('menu.help'), component: HelpSettingsPage } + ]; + } + else if (menu == "clinician") { + // set clinician section's pages + this.menuPages = [ + { title: this.translate.instant('menu.symptomEntry'), component: SymptomsEntryPage }, + { title: this.translate.instant('menu.pregnancyInfo'), component: PregnancyPage }, + { title: this.translate.instant('menu.resources'), component: LocationResourcesPage }, + { title: this.translate.instant('menu.help'), component: HelpSettingsPage } + ]; + } + else { + // default + this.menuPages = [ + { title: 'Home', component: HomePage } + ]; + } } - openPage(page: {title: string, component: any}) { + openPage(page: { title: string, component: any }) { // the nav component was found using @ViewChild(Nav) // reset the nav to remove previous pages and only have this page @@ -127,13 +124,8 @@ export class MyApp { this.translate.use(userLang); this.translate.onLangChange.subscribe((event: Event) => { - this.updateMenuOptions(""); + this.updateMenuOptions(""); }); } - } - - - - diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 45416ad..623e098 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,22 +1,38 @@ import { NgModule } from '@angular/core'; import { IonicApp, IonicModule } from 'ionic-angular'; import { HttpModule, Http } from '@angular/http'; -import { TranslateModule, TranslateLoader, TranslateStaticLoader } from 'ng2-translate/ng2-translate'; +import { TranslateModule, TranslateLoader, TranslateStaticLoader } from 'ng2-translate'; import { MyApp } from './app.component'; import { AboutPage } from '../pages/about/about'; -import { HomePage } from '../pages/home/home'; +import { BasicInfoPage } from '../pages/basic-info/basic-info'; +import { ClinicianPage } from '../pages/clinician/clinician'; import { DisclaimerPage } from '../pages/disclaimer/disclaimer'; -import { BasicInfoPage } from '../pages/basicinfo/basicinfo'; -import { PatientPage } from '../pages/patients/patient'; -import { ClinicianPage } from '../pages/clinicians/index'; -import { SymptomEntryPage } from '../pages/symptoms/entry'; -import { MedicalHistoryPage } from '../pages/history/index'; -import { HistoryProblemsPage } from '../pages/history/problems'; +import { HelpSettingsPage } from '../pages/help-settings/help-settings'; +import { HistoryPage } from '../pages/history/history'; +import { HistoryProblemsPage } from '../pages/history-problems/history-problems'; +import { HomePage } from '../pages/home/home'; +import { LocationResourcesPage } from '../pages/location-resources/location-resources'; +import { PatientPage } from '../pages/patient/patient'; +import { PregnancyPage } from '../pages/pregnancy/pregnancy'; +import { SymptomsEntryPage } from '../pages/symptoms-entry/symptoms-entry'; +import { SymptomsLogPage } from '../pages/symptoms-log/symptoms-log'; -import { PregnancyInfoPage } from '../pages/pregnancy/index'; -import { LocationResourcesPage } from '../pages/resources/index'; -import { HelpSettingsPage } from '../pages/help/index'; +export const pages = [ + AboutPage, + BasicInfoPage, + ClinicianPage, + DisclaimerPage, + HelpSettingsPage, + HistoryPage, + HistoryProblemsPage, + HomePage, + LocationResourcesPage, + PatientPage, + PregnancyPage, + SymptomsEntryPage, + SymptomsLogPage +]; export function createTranslateLoader(http: Http) { return new TranslateStaticLoader(http, './assets/i18n', '.json'); @@ -25,18 +41,7 @@ export function createTranslateLoader(http: Http) { @NgModule({ declarations: [ MyApp, - AboutPage, - HomePage, - DisclaimerPage, - BasicInfoPage, - PatientPage, - ClinicianPage, - SymptomEntryPage, - MedicalHistoryPage, - HistoryProblemsPage, - PregnancyInfoPage, - LocationResourcesPage, - HelpSettingsPage + pages ], imports: [ HttpModule, @@ -50,18 +55,7 @@ export function createTranslateLoader(http: Http) { bootstrap: [IonicApp], entryComponents: [ MyApp, - AboutPage, - HomePage, - DisclaimerPage, - BasicInfoPage, - PatientPage, - ClinicianPage, - SymptomEntryPage, - MedicalHistoryPage, - HistoryProblemsPage, - PregnancyInfoPage, - LocationResourcesPage, - HelpSettingsPage + pages ], providers: [] }) diff --git a/src/app/app.scss b/src/app/app.scss index ea3d14a..81735d4 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -53,3 +53,22 @@ button.inline { .bar-button { color: #fff; } + +.scroll-content { + text-align: center; +} +h2.apptitle { + font-size: 24px; + padding-top: 2em; + padding-bottom: 1em; +} +.language { + margin: 20px 32px; + font-size: 12px; +} +.tagline { + margin-top: 48px; + font-size: 11px; +} + + diff --git a/src/index.html b/src/index.html index a5c1c2a..9c85937 100644 --- a/src/index.html +++ b/src/index.html @@ -2,7 +2,7 @@ - Ionic App + HaBaby diff --git a/src/manifest.json b/src/manifest.json index f6456bb..3a1ebd4 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,13 +1,13 @@ { - "name": "Ionic", - "short_name": "Ionic", + "name": "HaBaby", + "short_name": "HaBaby", "start_url": "index.html", "display": "standalone", "icons": [{ - "src": "assets/imgs/logo.png", - "sizes": "512x512", + "src": "assets/hababy_logo.png", + "sizes": "373x373", "type": "image/png" }], "background_color": "#4e8ef7", "theme_color": "#4e8ef7" -} \ No newline at end of file +} diff --git a/src/pages/about/about.ts b/src/pages/about/about.ts index 1b4c5ad..2982efa 100644 --- a/src/pages/about/about.ts +++ b/src/pages/about/about.ts @@ -1,15 +1,11 @@ import { Component } from '@angular/core'; -import { NavController } from 'ionic-angular'; - @Component({ selector: 'page-about', templateUrl: 'about.html' }) export class AboutPage { - constructor(public navCtrl: NavController) { - - } + constructor() {} } diff --git a/src/pages/basicinfo/basicinfo.html b/src/pages/basic-info/basic-info.html similarity index 100% rename from src/pages/basicinfo/basicinfo.html rename to src/pages/basic-info/basic-info.html diff --git a/src/pages/basicinfo/basicinfo.scss b/src/pages/basic-info/basic-info.scss similarity index 69% rename from src/pages/basicinfo/basicinfo.scss rename to src/pages/basic-info/basic-info.scss index 2b6b037..0dc0b30 100644 --- a/src/pages/basicinfo/basicinfo.scss +++ b/src/pages/basic-info/basic-info.scss @@ -1,4 +1,4 @@ -page-basicinfo { +page-basic-info { .question { font-size: 16px; } diff --git a/src/pages/basic-info/basic-info.ts b/src/pages/basic-info/basic-info.ts new file mode 100644 index 0000000..ca20b95 --- /dev/null +++ b/src/pages/basic-info/basic-info.ts @@ -0,0 +1,22 @@ +import { Component } from '@angular/core'; +import { NavController, Events } from 'ionic-angular'; + +@Component({ + selector: 'page-basic-info', + templateUrl: 'basic-info.html' +}) +export class BasicInfoPage { + + constructor( + private navCtrl: NavController, + private events: Events + ) {} + + clickPregnant() { + this.events.publish('user:patient'); + } + clickCaregiver() { + this.events.publish('user:clinician'); + } + +} diff --git a/src/pages/basicinfo/basicinfo.ts b/src/pages/basicinfo/basicinfo.ts deleted file mode 100644 index 1347877..0000000 --- a/src/pages/basicinfo/basicinfo.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Component } from '@angular/core'; -import { TranslateService } from 'ng2-translate/ng2-translate'; - -import { NavController, Events } from 'ionic-angular'; -import { PatientPage } from '../patients/patient'; - -@Component({ - selector: 'page-basicinfo', - templateUrl: 'basicinfo.html' -}) -export class BasicInfoPage { - - constructor(public navCtrl: NavController, public events: Events, private translate: TranslateService) { } - - clickPregnant() { - this.events.publish('user:patient'); - } - clickCaregiver() { - this.events.publish('user:clinician'); - } - -} diff --git a/src/pages/clinicians/index.html b/src/pages/clinician/clinician.html similarity index 100% rename from src/pages/clinicians/index.html rename to src/pages/clinician/clinician.html diff --git a/src/pages/clinician/clinician.scss b/src/pages/clinician/clinician.scss new file mode 100644 index 0000000..4355b39 --- /dev/null +++ b/src/pages/clinician/clinician.scss @@ -0,0 +1,3 @@ +page-clinician { + +} diff --git a/src/pages/clinician/clinician.ts b/src/pages/clinician/clinician.ts new file mode 100644 index 0000000..28a1329 --- /dev/null +++ b/src/pages/clinician/clinician.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'page-clinician', + templateUrl: 'clinician.html' +}) +export class ClinicianPage { + + constructor() {} + +} diff --git a/src/pages/clinicians/index.scss b/src/pages/clinicians/index.scss deleted file mode 100644 index 1beab57..0000000 --- a/src/pages/clinicians/index.scss +++ /dev/null @@ -1,16 +0,0 @@ -.scroll-content { - text-align: center; -} -h2.apptitle { - font-size: 24px; - padding-top: 2em; - padding-bottom: 1em; -} -.language { - margin: 20px 32px; - font-size: 12px; -} -.tagline { - margin-top: 48px; - font-size: 11px; -} diff --git a/src/pages/clinicians/index.ts b/src/pages/clinicians/index.ts deleted file mode 100644 index c341c87..0000000 --- a/src/pages/clinicians/index.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Component } from '@angular/core'; -import { TranslateService } from 'ng2-translate/ng2-translate'; - -import { BasicInfoPage } from '../../pages/basicinfo/basicinfo'; - -@Component({ - templateUrl: 'index.html' -}) -export class ClinicianPage { - - constructor( private translate: TranslateService ) { - } -} diff --git a/src/pages/disclaimer/disclaimer.ts b/src/pages/disclaimer/disclaimer.ts index c32bf49..b351630 100644 --- a/src/pages/disclaimer/disclaimer.ts +++ b/src/pages/disclaimer/disclaimer.ts @@ -1,8 +1,7 @@ import { Component } from '@angular/core'; -import { TranslateService } from 'ng2-translate/ng2-translate'; - import { NavController } from 'ionic-angular'; -import { BasicInfoPage } from '../basicinfo/basicinfo'; + +import { BasicInfoPage } from '../basic-info/basic-info'; @Component({ selector: 'page-disclaimer', @@ -10,7 +9,9 @@ import { BasicInfoPage } from '../basicinfo/basicinfo'; }) export class DisclaimerPage { - constructor(public navCtrl: NavController, private translate: TranslateService) { } + constructor( + private navCtrl: NavController + ) {} acceptDisclaimer() { this.navCtrl.setRoot(BasicInfoPage); diff --git a/src/pages/help/index.html b/src/pages/help-settings/help-settings.html similarity index 100% rename from src/pages/help/index.html rename to src/pages/help-settings/help-settings.html diff --git a/src/pages/help-settings/help-settings.scss b/src/pages/help-settings/help-settings.scss new file mode 100644 index 0000000..e83073f --- /dev/null +++ b/src/pages/help-settings/help-settings.scss @@ -0,0 +1,3 @@ +page-help-settings { + +} diff --git a/src/pages/help-settings/help-settings.ts b/src/pages/help-settings/help-settings.ts new file mode 100644 index 0000000..ff53ec0 --- /dev/null +++ b/src/pages/help-settings/help-settings.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'page-help-settings', + templateUrl: 'help-settings.html' +}) +export class HelpSettingsPage { + + constructor() {} + +} diff --git a/src/pages/help/index.scss b/src/pages/help/index.scss deleted file mode 100644 index 8b13789..0000000 --- a/src/pages/help/index.scss +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/pages/help/index.ts b/src/pages/help/index.ts deleted file mode 100644 index d8ebe84..0000000 --- a/src/pages/help/index.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Component } from '@angular/core'; -import {TranslateService } from 'ng2-translate/ng2-translate'; - -import { PatientPage } from '../patients/patient'; - -@Component({ - templateUrl: 'index.html' -}) -export class HelpSettingsPage { - - constructor( private translate: TranslateService ) { - } -} diff --git a/src/pages/history/problems.html b/src/pages/history-problems/history-problems.html similarity index 100% rename from src/pages/history/problems.html rename to src/pages/history-problems/history-problems.html diff --git a/src/pages/history-problems/history-problems.scss b/src/pages/history-problems/history-problems.scss new file mode 100644 index 0000000..accbd37 --- /dev/null +++ b/src/pages/history-problems/history-problems.scss @@ -0,0 +1,4 @@ +page-history-problems { + +} + diff --git a/src/pages/history-problems/history-problems.ts b/src/pages/history-problems/history-problems.ts new file mode 100644 index 0000000..fea5f0f --- /dev/null +++ b/src/pages/history-problems/history-problems.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'page-history-problems', + templateUrl: 'history-problems.html' +}) +export class HistoryProblemsPage { + + constructor() {} + +} diff --git a/src/pages/history/index.html b/src/pages/history/history.html similarity index 100% rename from src/pages/history/index.html rename to src/pages/history/history.html diff --git a/src/pages/history/history.scss b/src/pages/history/history.scss new file mode 100644 index 0000000..6e8bec8 --- /dev/null +++ b/src/pages/history/history.scss @@ -0,0 +1,3 @@ +page-history { + +} diff --git a/src/pages/history/history.ts b/src/pages/history/history.ts new file mode 100644 index 0000000..e12569f --- /dev/null +++ b/src/pages/history/history.ts @@ -0,0 +1,16 @@ +import { Component } from '@angular/core'; + +import { HistoryProblemsPage } from '../history-problems/history-problems'; + +@Component({ + selector: 'page-history', + templateUrl: 'history.html' +}) +export class HistoryPage { + + public nextPage; + + constructor() { + this.nextPage = HistoryProblemsPage; + } +} diff --git a/src/pages/history/index.scss b/src/pages/history/index.scss deleted file mode 100644 index 8b13789..0000000 --- a/src/pages/history/index.scss +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/pages/history/index.ts b/src/pages/history/index.ts deleted file mode 100644 index b85dd6e..0000000 --- a/src/pages/history/index.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Component } from '@angular/core'; -import { TranslateService } from 'ng2-translate/ng2-translate'; -import { HistoryProblemsPage } from '../history/problems'; -import { NavController } from 'ionic-angular'; - -@Component({ - templateUrl: 'index.html' -}) -export class MedicalHistoryPage { - - public nextPage; - - constructor(public navCtrl: NavController, private translate: TranslateService) { - this.nextPage = HistoryProblemsPage; - } -} diff --git a/src/pages/history/problems.scss b/src/pages/history/problems.scss deleted file mode 100644 index 8b13789..0000000 --- a/src/pages/history/problems.scss +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/pages/history/problems.ts b/src/pages/history/problems.ts deleted file mode 100644 index f794c42..0000000 --- a/src/pages/history/problems.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Component } from '@angular/core'; -import {TranslateService } from 'ng2-translate/ng2-translate'; - -@Component({ - templateUrl: 'problems.html' -}) -export class HistoryProblemsPage { - - constructor( private translate: TranslateService ) { - } -} diff --git a/src/pages/home/home.scss b/src/pages/home/home.scss index 1beab57..d4cc8fc 100644 --- a/src/pages/home/home.scss +++ b/src/pages/home/home.scss @@ -1,16 +1,3 @@ -.scroll-content { - text-align: center; -} -h2.apptitle { - font-size: 24px; - padding-top: 2em; - padding-bottom: 1em; -} -.language { - margin: 20px 32px; - font-size: 12px; -} -.tagline { - margin-top: 48px; - font-size: 11px; +page-home { + } diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts index 2d1393f..d7c579c 100644 --- a/src/pages/home/home.ts +++ b/src/pages/home/home.ts @@ -1,18 +1,19 @@ import { Component } from '@angular/core'; -import {TranslateService } from 'ng2-translate/ng2-translate'; - -import { NavController, Platform } from 'ionic-angular'; +import { TranslateService } from 'ng2-translate'; +import { NavController } from 'ionic-angular'; import { DisclaimerPage } from '../disclaimer/disclaimer'; @Component({ + selector: 'page-home', templateUrl: 'home.html' }) export class HomePage { - constructor( public navCtrl: NavController, - private translate: TranslateService ) { - } + constructor( + private navCtrl: NavController, + private translate: TranslateService + ) {} goEnglish() { this.translate.use('en'); diff --git a/src/pages/resources/index.html b/src/pages/location-resources/location-resources.html similarity index 100% rename from src/pages/resources/index.html rename to src/pages/location-resources/location-resources.html diff --git a/src/pages/location-resources/location-resources.scss b/src/pages/location-resources/location-resources.scss new file mode 100644 index 0000000..2c28e41 --- /dev/null +++ b/src/pages/location-resources/location-resources.scss @@ -0,0 +1,3 @@ +page-location-resources { + +} diff --git a/src/pages/location-resources/location-resources.ts b/src/pages/location-resources/location-resources.ts new file mode 100644 index 0000000..8b4d6a9 --- /dev/null +++ b/src/pages/location-resources/location-resources.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'page-location-resources', + templateUrl: 'location-resources.html' +}) +export class LocationResourcesPage { + + constructor() {} + +} diff --git a/src/pages/patients/patient.html b/src/pages/patient/patient.html similarity index 100% rename from src/pages/patients/patient.html rename to src/pages/patient/patient.html diff --git a/src/pages/patient/patient.scss b/src/pages/patient/patient.scss new file mode 100644 index 0000000..ecf05b0 --- /dev/null +++ b/src/pages/patient/patient.scss @@ -0,0 +1,3 @@ +page-patient { + +} diff --git a/src/pages/patient/patient.ts b/src/pages/patient/patient.ts new file mode 100644 index 0000000..6803a81 --- /dev/null +++ b/src/pages/patient/patient.ts @@ -0,0 +1,17 @@ +import { Component } from '@angular/core'; + +import { HistoryPage } from '../history/history'; + +@Component({ + selector: 'page-patient', + templateUrl: 'patient.html' +}) +export class PatientPage { + + public historyPage; + + constructor() { + this.historyPage = HistoryPage; + } + +} diff --git a/src/pages/patients/patient.scss b/src/pages/patients/patient.scss deleted file mode 100644 index 1beab57..0000000 --- a/src/pages/patients/patient.scss +++ /dev/null @@ -1,16 +0,0 @@ -.scroll-content { - text-align: center; -} -h2.apptitle { - font-size: 24px; - padding-top: 2em; - padding-bottom: 1em; -} -.language { - margin: 20px 32px; - font-size: 12px; -} -.tagline { - margin-top: 48px; - font-size: 11px; -} diff --git a/src/pages/patients/patient.ts b/src/pages/patients/patient.ts deleted file mode 100644 index fee76c6..0000000 --- a/src/pages/patients/patient.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Component } from '@angular/core'; -import { TranslateService } from 'ng2-translate/ng2-translate'; - -import { BasicInfoPage } from '../basicinfo/basicinfo'; -import { MedicalHistoryPage } from '../history/index'; - -@Component({ - templateUrl: 'patient.html' -}) -export class PatientPage { - - public historyPage; - - constructor( private translate: TranslateService ) { - this.historyPage = MedicalHistoryPage; - } -} diff --git a/src/pages/pregnancy/index.scss b/src/pages/pregnancy/index.scss deleted file mode 100644 index 8b13789..0000000 --- a/src/pages/pregnancy/index.scss +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/pages/pregnancy/index.ts b/src/pages/pregnancy/index.ts deleted file mode 100644 index 17973f2..0000000 --- a/src/pages/pregnancy/index.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Component } from '@angular/core'; -import {TranslateService } from 'ng2-translate/ng2-translate'; - -import { PatientPage } from '../patients/patient'; - -@Component({ - templateUrl: 'index.html' -}) -export class PregnancyInfoPage { - - constructor( private translate: TranslateService ) { - } -} diff --git a/src/pages/pregnancy/index.html b/src/pages/pregnancy/pregnancy.html similarity index 100% rename from src/pages/pregnancy/index.html rename to src/pages/pregnancy/pregnancy.html diff --git a/src/pages/pregnancy/pregnancy.scss b/src/pages/pregnancy/pregnancy.scss new file mode 100644 index 0000000..063dae4 --- /dev/null +++ b/src/pages/pregnancy/pregnancy.scss @@ -0,0 +1,3 @@ +page-pregnancy { + +} diff --git a/src/pages/pregnancy/pregnancy.ts b/src/pages/pregnancy/pregnancy.ts new file mode 100644 index 0000000..88994e5 --- /dev/null +++ b/src/pages/pregnancy/pregnancy.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'page-pregnancy', + templateUrl: 'pregnancy.html' +}) +export class PregnancyPage { + + constructor() {} + +} diff --git a/src/pages/resources/index.scss b/src/pages/resources/index.scss deleted file mode 100644 index 8b13789..0000000 --- a/src/pages/resources/index.scss +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/pages/resources/index.ts b/src/pages/resources/index.ts deleted file mode 100644 index dbb86fc..0000000 --- a/src/pages/resources/index.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Component } from '@angular/core'; -import {TranslateService } from 'ng2-translate/ng2-translate'; - -import { PatientPage } from '../patients/patient'; - -@Component({ - templateUrl: 'index.html' -}) -export class LocationResourcesPage { - - constructor( private translate: TranslateService ) { - } -} diff --git a/src/pages/symptoms/entry.html b/src/pages/symptoms-entry/symptoms-entry.html similarity index 100% rename from src/pages/symptoms/entry.html rename to src/pages/symptoms-entry/symptoms-entry.html diff --git a/src/pages/symptoms-entry/symptoms-entry.scss b/src/pages/symptoms-entry/symptoms-entry.scss new file mode 100644 index 0000000..44d23ce --- /dev/null +++ b/src/pages/symptoms-entry/symptoms-entry.scss @@ -0,0 +1,3 @@ +page-symptoms-entry { + +} diff --git a/src/pages/symptoms-entry/symptoms-entry.ts b/src/pages/symptoms-entry/symptoms-entry.ts new file mode 100644 index 0000000..e7b69ad --- /dev/null +++ b/src/pages/symptoms-entry/symptoms-entry.ts @@ -0,0 +1,71 @@ +import { Component } from '@angular/core'; +import { NavController, Platform } from 'ionic-angular'; +import { SQLite } from "ionic-native"; + +import { SymptomsLogPage } from '../symptoms-log/symptoms-log'; + +@Component({ + selector: 'page-symptoms-entry', + templateUrl: 'symptoms-entry.html' +}) +export class SymptomsEntryPage { + + public database: SQLite; + public symptom_log: Array; + public notes: string; + public date: Date; + public formattedDate: string; + + constructor( + private navCtrl: NavController, + private platform: Platform + ) { + platform.ready().then((readySource) => { + this.database = new SQLite(); + this.database.openDatabase({name: "data.db", location: "default"}).then(() => { + this.refresh(); + }, (error) => { + console.log("ERROR: ", error); + }); + + this.platform = platform; + this.notes = ""; + + console.log('Platform ready from', readySource); + }); + } + + public add() { + this.date = new Date(); + this.formattedDate = this.date.getDay() + "-" + this.date.getMonth() + "-" + this.date.getFullYear() + + ", " + this.date.getHours() + ":" + this.date.getMinutes(); + this.database.executeSql("INSERT INTO symptom_log (timestamp, symptom1, symptom2, symptom3, notes) VALUES (?, 1, 0, 1, ?)", [this.formattedDate, this.notes]).then((data) => { + console.log("INSERTED: " + JSON.stringify(data)); + }, (error) => { + console.log("ERROR: " + JSON.stringify(error.err)); + }); + this.navCtrl.setRoot(SymptomsLogPage); + } + + public delete() { + this.database.executeSql("DELETE FROM symptom_log", []).then((data) => { + console.log("DELETED " + JSON.stringify(data)); + }, (error) => { + console.log("ERROR: " + JSON.stringify(error.err)); + }); + } + + public refresh() { + this.database.executeSql("SELECT * FROM symptom_log", []).then((data) => { + this.symptom_log = []; + if (data.rows.length > 0) { + for (var i = 0; i < data.rows.length; i++) { + this.symptom_log.push({ timestamp: data.rows.item(i).timestamp, symptom1: data.rows.item(i).symptom1, symptom2: data.rows.item(i).symptom2, symptom3: data.rows.item(i).symptom3, notes: data.rows.item(i).notes }); + } + } + }, (error) => { + console.log("ERROR: " + JSON.stringify(error)); + }); + } + +} diff --git a/src/pages/symptoms/log.html b/src/pages/symptoms-log/symptoms-log.html similarity index 100% rename from src/pages/symptoms/log.html rename to src/pages/symptoms-log/symptoms-log.html diff --git a/src/pages/symptoms-log/symptoms-log.scss b/src/pages/symptoms-log/symptoms-log.scss new file mode 100644 index 0000000..d50785e --- /dev/null +++ b/src/pages/symptoms-log/symptoms-log.scss @@ -0,0 +1,3 @@ +page-symptoms-log { + +} diff --git a/src/pages/symptoms-log/symptoms-log.ts b/src/pages/symptoms-log/symptoms-log.ts new file mode 100644 index 0000000..eab1d4c --- /dev/null +++ b/src/pages/symptoms-log/symptoms-log.ts @@ -0,0 +1,55 @@ +import { Component } from '@angular/core'; +import { SQLite } from 'ionic-native'; +import { NavController, Platform } from 'ionic-angular'; + +@Component({ + selector: 'page-symptoms-log', + templateUrl: 'symptoms-log.html' +}) +export class SymptomsLogPage { + public database: SQLite; + public symptom_log: Array; + public notes: string; + public date: Date; + public formattedDate: string; + + constructor( + private navCtrl: NavController, + private platform: Platform + ) { + platform.ready().then((readySource) => { + this.database = new SQLite(); + this.database.openDatabase({ name: "data.db", location: "default" }).then(() => { + this.refresh(); + }, (error) => { + console.log("ERROR: ", error); + }); + + this.platform = platform; + this.notes = ""; + + console.log('Platform ready from', readySource); + }); + } + + public refresh() { + this.database.executeSql("SELECT * FROM symptom_log", []).then((data) => { + this.symptom_log = []; + if (data.rows.length > 0) { + for (var i = 0; i < data.rows.length; i++) { + this.symptom_log.push({ timestamp: data.rows.item(i).timestamp, symptom1: data.rows.item(i).symptom1, symptom2: data.rows.item(i).symptom2, symptom3: data.rows.item(i).symptom3, notes: data.rows.item(i).notes }); + } + } + }, (error) => { + console.log("ERROR: " + JSON.stringify(error)); + }); + } + + public delete() { + this.database.executeSql("DELETE FROM symptom_log", []).then((data) => { + console.log("DELETED " + JSON.stringify(data)); + }, (error) => { + console.log("ERROR: " + JSON.stringify(error.err)); + }); + } +} diff --git a/src/pages/symptoms/entry.scss b/src/pages/symptoms/entry.scss deleted file mode 100644 index 8b13789..0000000 --- a/src/pages/symptoms/entry.scss +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/pages/symptoms/entry.ts b/src/pages/symptoms/entry.ts deleted file mode 100644 index a520946..0000000 --- a/src/pages/symptoms/entry.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { Component } from '@angular/core'; -import {TranslateService } from 'ng2-translate/ng2-translate'; -import { NavController, Platform } from 'ionic-angular'; -import {SQLite} from "ionic-native"; -import { PatientPage } from '../patients/patient'; -import {SymptomLogPage} from '../symptoms/log'; - -@Component({ - templateUrl: 'entry.html' -}) -export class SymptomEntryPage { - - public database: SQLite; - public symptom_log: Array; - public notes: string; - public date: Date; - public formattedDate: string; - - constructor( public navCtrl: NavController, private translate: TranslateService, private platform: Platform) { - platform.ready().then((readySource) => { - this.database = new SQLite(); - this.database.openDatabase({name: "data.db", location: "default"}).then(() => { - this.refresh(); - }, (error) => { - console.log("ERROR: ", error); - }); - - this.platform = platform; - this.notes= ""; - - console.log('Platform ready from', readySource); - }); - } - - public add() { - this.date = new Date(); - this.formattedDate = this.date.getDay() + "-" + this.date.getMonth() + "-" + this.date.getFullYear() + - ", " +this.date.getHours() + ":" + this.date.getMinutes(); - this.database.executeSql("INSERT INTO symptom_log (timestamp, symptom1, symptom2, symptom3, notes) VALUES (?, 1, 0, 1, ?)", [this.formattedDate, this.notes]).then((data) => { - console.log("INSERTED: " + JSON.stringify(data)); - }, (error) => { - console.log("ERROR: " + JSON.stringify(error.err)); - }); - this.navCtrl.setRoot(SymptomLogPage); - } - - public delete() { - this.database.executeSql("DELETE FROM symptom_log", []).then((data) => { - console.log("DELETED " + JSON.stringify(data)); - }, (error) => { - console.log("ERROR: " + JSON.stringify(error.err)); - }); - } - - public refresh() { - this.database.executeSql("SELECT * FROM symptom_log", []).then((data) => { - this.symptom_log = []; - if(data.rows.length > 0) { - for(var i = 0; i < data.rows.length; i++) { - this.symptom_log.push({timestamp: data.rows.item(i).timestamp, symptom1: data.rows.item(i).symptom1, symptom2: data.rows.item(i).symptom2, symptom3: data.rows.item(i).symptom3, notes: data.rows.item(i).notes}); - } - } - }, (error) => { - console.log("ERROR: " + JSON.stringify(error)); - }); - } - -} diff --git a/src/pages/symptoms/log.scss b/src/pages/symptoms/log.scss deleted file mode 100644 index 8b13789..0000000 --- a/src/pages/symptoms/log.scss +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/pages/symptoms/log.ts b/src/pages/symptoms/log.ts deleted file mode 100644 index d116b8d..0000000 --- a/src/pages/symptoms/log.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { Component } from '@angular/core'; -import { TranslateService } from 'ng2-translate/ng2-translate'; -import {SQLite} from "ionic-native"; -import { NavController, Platform } from 'ionic-angular'; -import { BasicInfoPage } from '../basicinfo/basicinfo'; - -@Component({ - templateUrl: 'log.html' -}) -export class SymptomLogPage { - public database: SQLite; - public symptom_log: Array; - public notes: string; - public date: Date; - public formattedDate: string; - - constructor( public navCtrl: NavController, private translate: TranslateService, private platform: Platform) { - platform.ready().then((readySource) => { - this.database = new SQLite(); - this.database.openDatabase({name: "data.db", location: "default"}).then(() => { - this.refresh(); - }, (error) => { - console.log("ERROR: ", error); - }); - - this.platform = platform; - this.notes= ""; - - console.log('Platform ready from', readySource); - }); - } - - public refresh() { - this.database.executeSql("SELECT * FROM symptom_log", []).then((data) => { - this.symptom_log = []; - if(data.rows.length > 0) { - for(var i = 0; i < data.rows.length; i++) { - this.symptom_log.push({timestamp: data.rows.item(i).timestamp, symptom1: data.rows.item(i).symptom1, symptom2: data.rows.item(i).symptom2, symptom3: data.rows.item(i).symptom3, notes: data.rows.item(i).notes}); - } - } - }, (error) => { - console.log("ERROR: " + JSON.stringify(error)); - }); - } - - public delete() { - this.database.executeSql("DELETE FROM symptom_log", []).then((data) => { - console.log("DELETED " + JSON.stringify(data)); - }, (error) => { - console.log("ERROR: " + JSON.stringify(error.err)); - }); - } -}