WIP migration fixes

openchargemap · Oct 18, 2016 · 7cdd2f8 · 7cdd2f8
1 parent e575fd9
commit 7cdd2f8
Show file tree

Hide file tree

Showing 16 changed files with 180 additions and 165 deletions.
diff --git a/App/Ionic2/ocm-app/config.xml b/App/Ionic2/ocm-app/config.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version='1.0' encoding='utf-8'?>
 <widget id="com.webprofusion.openchargemap" version="6.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-  <name>Open Charge Map</name>
-  <description>EV Charging Locations</description>
-  <author email="[email protected]" href="http://webprofusion.com/">Webprofusion</author>
-  <content src="index.html"/>
-  <access origin="*"/>
-  <allow-intent href="http://*/*"/>
-  <allow-intent href="https://*/*"/>
-  <allow-intent href="tel:*"/>
-  <allow-intent href="sms:*"/>
-  <allow-intent href="mailto:*"/>
-  <allow-intent href="geo:*"/>
-  <allow-intent href="maps:*"/>
-  <allow-navigation href="gap:*"/>
-  <platform name="android">
-    <allow-intent href="market:*"/>
-  </platform>
-  <platform name="ios">
-    <allow-intent href="itms:*"/>
-    <allow-intent href="itms-apps:*"/>
-  </platform>
-  <preference name="webviewbounce" value="false"/>
-  <preference name="UIWebViewBounce" value="false"/>
-  <preference name="DisallowOverscroll" value="true"/>
-  <preference name="android-minSdkVersion" value="16"/>
-  <preference name="BackupWebStorage" value="none"/>
-  <preference name="windows-target-version" value="10.0"/>
-  <preference name="SplashScreen" value="screen"/>
-  <preference name="SplashScreenDelay" value="3000"/>
-  <preference name="FadeSplashScreenDuration" value="2000"/>
-  <preference name="loadUrlTimeoutValue" value="700000"/>
-  <feature name="StatusBar">
-    <param name="ios-package" onload="true" value="CDVStatusBar"/>
-  </feature>
-  <icon src="resources\android\icon\drawable-xhdpi-icon.png"/>
-  <engine name="android" spec="~5.1.1"/>
-  <engine name="ios" spec="~4.1.1"/>
-  <plugin name="cordova-plugin-inappbrowser" spec="~1.4.0"/>
-  <plugin name="cordova-plugin-whitelist" spec="~1.3.0"/>
-  <plugin name="cordova-plugin-device" spec="~1.1.3"/>
-  <plugin name="cordova-plugin-geolocation" spec="~2.2.0"/>
-  <plugin name="cordova-plugin-statusbar" spec="~2.2.0"/>
-  <plugin name="ionic-plugin-keyboard" spec="~2.2.1"/>
-  <plugin name="cordova-plugin-splashscreen" spec="~4.0.0"/>
-</widget>
+    <name>Open Charge Map</name>
+    <description>EV Charging Locations</description>
+    <author email="[email protected]" href="http://webprofusion.com/">Webprofusion</author>
+    <content src="index.html" />
+    <access origin="*" />
+    <allow-intent href="http://*/*" />
+    <allow-intent href="https://*/*" />
+    <allow-intent href="tel:*" />
+    <allow-intent href="sms:*" />
+    <allow-intent href="mailto:*" />
+    <allow-intent href="geo:*" />
+    <allow-intent href="maps:*" />
+    <allow-navigation href="gap:*" />
+    <platform name="android">
+        <allow-intent href="market:*" />
+    </platform>
+    <platform name="ios">
+        <allow-intent href="itms:*" />
+        <allow-intent href="itms-apps:*" />
+    </platform>
+    <preference name="webviewbounce" value="false" />
+    <preference name="UIWebViewBounce" value="false" />
+    <preference name="DisallowOverscroll" value="true" />
+    <preference name="android-minSdkVersion" value="16" />
+    <preference name="BackupWebStorage" value="none" />
+    <preference name="windows-target-version" value="10.0" />
+    <preference name="SplashScreen" value="screen" />
+    <preference name="SplashScreenDelay" value="3000" />
+    <preference name="FadeSplashScreenDuration" value="2000" />
+    <preference name="loadUrlTimeoutValue" value="700000" />
+    <feature name="StatusBar">
+        <param name="ios-package" onload="true" value="CDVStatusBar" />
+    </feature>
+    <icon src="resources\android\icon\drawable-xhdpi-icon.png" />
+    <engine name="android" spec="~5.1.1" />
+    <engine name="ios" spec="~4.1.1" />
+    <plugin name="cordova-plugin-inappbrowser" spec="~1.4.0" />
+    <plugin name="cordova-plugin-geolocation" spec="~2.2.0" />
+    <plugin name="cordova-plugin-statusbar" spec="~2.2.0" />
+    <plugin name="ionic-plugin-keyboard" spec="~2.2.1" />
+    <plugin name="cordova-plugin-whitelist" spec="~1.3.0" />
+    <plugin name="cordova-plugin-device" spec="~1.1.3" />
+    <plugin name="cordova-plugin-splashscreen" spec="~4.0.0" />
+</widget>
diff --git a/App/Ionic2/ocm-app/src/app/app.module.ts b/App/Ionic2/ocm-app/src/app/app.module.ts
@@ -16,7 +16,7 @@ import { GoogleMapsDirections } from './../providers/GoogleMapsDirections';
 import { ReferenceDataManager } from './../providers/ReferenceDataManager';
 import { SubmissionQueue } from './../providers/SubmissionQueue';
 import { APIClient } from './../providers/APIClient';
-import { Http } from '@angular/http';
+import { Http, HttpModule } from '@angular/http';
 import { Mapping } from './../providers/mapping/Mapping';
 import { POIManager } from './../providers/POIManager';
 import { DecimalPipe } from '@angular/common';
@@ -27,7 +27,8 @@ import { IonicApp, IonicModule, Events } from 'ionic-angular';
 import { MyApp } from './app.component';
 
 import { TabsPage } from '../pages/tabs/tabs';
-import { TranslateService, TranslateLoader, TranslateStaticLoader, TranslateModule } from 'ng2-translate';
+import {TranslateModule } from 'ng2-translate/ng2-translate';
+import { TranslateService, TranslateLoader, TranslateStaticLoader } from 'ng2-translate/src/translate.service';
 
 import {NullableTranslatePipe} from '../pipes/NullableTranslatePipe';
 export function createTranslateLoader(http: Http) {
@@ -38,6 +39,7 @@ export function createTranslateLoader(http: Http) {
 
 @NgModule({
   declarations: [
+    MyApp,
     //pages
     CommentPage,
     FavouriteEditorPage,
@@ -53,15 +55,17 @@ export function createTranslateLoader(http: Http) {
     //components
     PlaceSearch,
     PoiDetails,
-    RoutePlanner,
+    RoutePlanner
     //pipes
-  NullableTranslatePipe
+
   ],
   imports: [
     IonicModule.forRoot(MyApp),
+
+    HttpModule,
     TranslateModule.forRoot({
       provide: TranslateLoader,
-      useFactory: (createTranslateLoader),
+      useFactory: createTranslateLoader,
       deps: [Http]
     })
   ],
@@ -88,7 +92,6 @@ export function createTranslateLoader(http: Http) {
     POIManager,
     Mapping,
     Events,
-    TranslateService,
     APIClient,
     SubmissionQueue,
     JourneyManager,

diff --git a/App/Ionic2/ocm-app/src/components/place-search/place-search.ts b/App/Ionic2/ocm-app/src/components/place-search/place-search.ts
@@ -2,7 +2,7 @@ import { Logging } from './../../providers/Logging';
 import { PlaceSearchResult } from './../../model/PlaceSearchResult';
 import { Component, Input, Output, ChangeDetectorRef, EventEmitter } from '@angular/core';
 
-declare var google:any;
+declare var google: any;
 /*
   Component to provide geographic place search lookup
 */
@@ -12,17 +12,15 @@ declare var google:any;
 })
 export class PlaceSearch {
 
+    private placeSearchType: string;
+    private placeList: Array<PlaceSearchResult>;
+    private searchInProgress: boolean = false;
+
     @Input()
     searchKeyword: string;
 
     placeSearchFocused: boolean;
-
-    private placeSearchType: string;
-
-    private placeList: Array<PlaceSearchResult>;
-    private placeSearchActive: boolean = false;
-
-    private searchInProgress: boolean = false;
+    placeSearchActive: boolean = false;
 
     @Output()
     selectedPlace: any;
@@ -31,7 +29,8 @@ export class PlaceSearch {
     placeChanged = new EventEmitter();
 
     constructor(public logging: Logging, public changeDetector: ChangeDetectorRef) {
-
+        this.searchKeyword = "";
+        this.searchInProgress = false;
     }
 
 

diff --git a/App/Ionic2/ocm-app/src/components/poi-details/poi-details.ts b/App/Ionic2/ocm-app/src/components/poi-details/poi-details.ts
@@ -3,7 +3,7 @@ import { MediaUploadPage } from './../../pages/mediaupload/mediaupload';
 import { CommentPage } from './../../pages/comment/comment';
 import { Logging } from './../../providers/Logging';
 import { AppManager } from './../../providers/AppManager';
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnInit, SimpleChanges } from '@angular/core';
 import { NavController, ViewController, ModalController, ActionSheetController } from 'ionic-angular';
 import { TranslateService } from 'ng2-translate/ng2-translate';
 
@@ -19,6 +19,8 @@ export class PoiDetails implements OnInit {
   selectedTab: string;
   json: string;
 
+  hasNavBar: boolean = false;
+
   constructor(
     public appManager: AppManager,
     public nav: NavController,
@@ -30,7 +32,7 @@ export class PoiDetails implements OnInit {
 
   }
 
-  ngOnChanges() {
+  ngOnChanges(changes: SimpleChanges) {
     this.logging.log("In ngOnChanges of POI Details");
 
 

diff --git a/App/Ionic2/ocm-app/src/components/route-planner/route-planner.ts b/App/Ionic2/ocm-app/src/components/route-planner/route-planner.ts
@@ -17,17 +17,21 @@ import { DecimalPipe } from '@angular/common';
 })
 export class RoutePlanner {
 
-
-    private routeStartPlace: any;
-    private routeDestinationPlace: any;
     private routeSearchDistance: number = 5;
     private journeyRoutes: Array<JourneyRoute>;
-    private selectedJourneyRoute: JourneyRoute;
+     selectedJourneyRoute: JourneyRoute;
     private routePolyline: string;
-    private routeCalcInProgress: boolean = false;
-    private advancedSettingsMode: boolean = false;
     private kWhPerKM: number;
 
+    routeStartPlace: any;
+    routeDestinationPlace: any;
+
+    routeCalcInProgress: boolean = false;
+    advancedSettingsMode: boolean = false;
+
+    routeStart:string="";
+    routeDestination:string="";
+
     constructor(
         public mapping: Mapping,
         public directions: GoogleMapsDirections,

diff --git a/App/Ionic2/ocm-app/src/index.html b/App/Ionic2/ocm-app/src/index.html
@@ -23,7 +23,7 @@
 
   <link href="build/main.css" rel="stylesheet">
 
-  <link rel="stylesheet" href="lib/leaflet/leaflet.css" />
+  <link rel="stylesheet" href="assets/lib/leaflet/leaflet.css" />
 
   <style>
     .loading {

diff --git a/App/Ionic2/ocm-app/src/model/Journey.ts b/App/Ionic2/ocm-app/src/model/Journey.ts
@@ -6,7 +6,7 @@ export interface ISyncItem {
     _sync: SyncItem;
 }
 
-class JourneyBaseItem implements ISyncItem {
+export class JourneyBaseItem implements ISyncItem {
     public Title: string;
     public Notes: string;
     public _sync: SyncItem;

diff --git a/App/Ionic2/ocm-app/src/pages/comment/comment.html b/App/Ionic2/ocm-app/src/pages/comment/comment.html
@@ -33,7 +33,7 @@ <h1>{{poi.AddressInfo.Title}}</h1>
 
     <ion-item>
       <ion-label stacked>Did You Successfully Charge?</ion-label>
-      <ion-select [(ngModel)]="commentModel.CheckStatusTypeID">
+      <ion-select [(ngModel)]="commentModel.CheckinStatusTypeID">
         <ion-option *ngFor="let item of checkinTypes" [value]="item.ID" [selected]="false">{{item.Title}}</ion-option>
       </ion-select>
 

diff --git a/App/Ionic2/ocm-app/src/pages/comment/comment.ts b/App/Ionic2/ocm-app/src/pages/comment/comment.ts
@@ -16,6 +16,7 @@ export class CommentPage {
 
     commentTypes: any;
     checkinTypes: any;
+
     constructor(
         public navParams: NavParams,
         public appManager: AppManager,

diff --git a/App/Ionic2/ocm-app/src/pages/poi-details/poi-details.html b/App/Ionic2/ocm-app/src/pages/poi-details/poi-details.html
@@ -1,5 +1,5 @@
 <ion-header>
-    <ion-navbar primary>
+    <ion-navbar color="primary">
         <ion-title>
             {{ 'ocm.details.sectionTitle' | translate }}
         </ion-title>

diff --git a/App/Ionic2/ocm-app/src/pages/poi-details/poi-details.ts b/App/Ionic2/ocm-app/src/pages/poi-details/poi-details.ts
@@ -7,7 +7,8 @@ import {NavController, NavParams, ViewController} from 'ionic-angular';
 
 export class POIDetailsPage {
 
-    private poi: any;
+    poi: any;
+    hasNavbar:boolean=false;
 
     constructor(
         public nav: NavController, 

diff --git a/App/Ionic2/ocm-app/src/pages/route-planner/route-planner.ts b/App/Ionic2/ocm-app/src/pages/route-planner/route-planner.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { NavController, ViewController } from 'ionic-angular';
-import { RoutePlanner} from '../../components/route-planner/route-planner';
+import { RoutePlanner } from '../../components/route-planner/route-planner';
 /*
   Generated class for the RoutePlannerPage page.
 
@@ -12,13 +12,14 @@ import { RoutePlanner} from '../../components/route-planner/route-planner';
 })
 export class RoutePlannerPage {
 
+  hasNavbar: boolean=false;
   constructor(public nav: NavController, public view: ViewController) {
 
   }
 
-    close() {
-        this.view.dismiss();
-    }
+  close() {
+    this.view.dismiss();
+  }
 
 
 }