+ 
diff --git a/packages/vehicle-manufacture-car-builder/src/pages/login/login.module.ts b/packages/vehicle-manufacture-car-builder/src/pages/login/login.module.ts
deleted file mode 100644
index 26c575df..00000000
--- a/packages/vehicle-manufacture-car-builder/src/pages/login/login.module.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-import { NgModule } from '@angular/core';
-import { IonicModule } from 'ionic-angular';
-import { LoginPage } from './login';
-
-@NgModule({
- declarations: [
- LoginPage,
- ],
- imports: [
- IonicModule.forRoot(LoginPage),
- ],
- exports: [
- LoginPage
- ]
-})
-export class LoginPageModule {}
diff --git a/packages/vehicle-manufacture-car-builder/src/pages/login/login.scss b/packages/vehicle-manufacture-car-builder/src/pages/login/login.scss
index 403d658b..8800543b 100644
--- a/packages/vehicle-manufacture-car-builder/src/pages/login/login.scss
+++ b/packages/vehicle-manufacture-car-builder/src/pages/login/login.scss
@@ -25,6 +25,14 @@ page-login {
background: url("../assets/background.png");
background-size: cover;
+ #cog {
+ position: absolute;
+ top: 25px;
+ right: 25px;
+ cursor: pointer;
+ z-index: 11;
+ }
+
.map {
position: absolute;
z-index: 5;
diff --git a/packages/vehicle-manufacture-car-builder/src/pages/login/login.ts b/packages/vehicle-manufacture-car-builder/src/pages/login/login.ts
index 63ec4cce..028b0971 100644
--- a/packages/vehicle-manufacture-car-builder/src/pages/login/login.ts
+++ b/packages/vehicle-manufacture-car-builder/src/pages/login/login.ts
@@ -12,8 +12,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { Component } from '@angular/core';
-import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import { NavController, NavParams } from 'ionic-angular';
import { DesignerPage } from '../designer/designer';
+import { SettingsPage } from '../settings/settings';
/**
* Generated class for the LoginPage page.
@@ -21,7 +22,6 @@ import { DesignerPage } from '../designer/designer';
* See http://ionicframework.com/docs/components/#navigation for more info
* on Ionic pages and navigation.
*/
-@IonicPage()
@Component({
selector: 'page-login',
templateUrl: 'login.html',
@@ -36,4 +36,7 @@ export class LoginPage {
this.navController.push(DesignerPage);
}
+ settings() {
+ this.navController.push(SettingsPage);
+ }
}
diff --git a/packages/vehicle-manufacture-car-builder/src/pages/settings/settings.html b/packages/vehicle-manufacture-car-builder/src/pages/settings/settings.html
new file mode 100644
index 00000000..6c8fbc96
--- /dev/null
+++ b/packages/vehicle-manufacture-car-builder/src/pages/settings/settings.html
@@ -0,0 +1,33 @@
+
+
+
diff --git a/packages/vehicle-manufacture-car-builder/src/pages/settings/settings.scss b/packages/vehicle-manufacture-car-builder/src/pages/settings/settings.scss
new file mode 100644
index 00000000..da213371
--- /dev/null
+++ b/packages/vehicle-manufacture-car-builder/src/pages/settings/settings.scss
@@ -0,0 +1,107 @@
+/*
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+page-settings {
+
+ ion-content.content > .scroll-content {
+ padding: 0 !important;
+ }
+
+ .content {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ background: url("../assets/background.png");
+ background-size: cover;
+
+ #back {
+ position: absolute;
+ top: 25px;
+ left: 25px;
+ z-index: 11;
+ cursor: pointer;
+ }
+
+ .map {
+ position: absolute;
+ z-index: 5;
+ opacity: 0.2;
+ height: 100%;
+ pointer-events: none;
+ }
+
+ ion-card.card {
+
+ max-width: 700px;
+
+ &:last-of-type {
+ padding: 0;
+ height: 60px;
+ }
+
+ .card-content {
+ background-color: #F3F3F3;
+ padding-top: 13px;
+ display: grid;
+ grid-column-gap: 15px;
+ grid-row-gap: 30px;
+ grid-template-columns: min-content auto;
+
+ label {
+ white-space: nowrap;
+ }
+
+ input[type=text] {
+ font-size: 1.4rem;
+ font-family: OpenSans;
+ border: 0;
+ border-bottom: 1px solid;
+ background: none;
+ flex: 1;
+ -webkit-appearance: none;
+ }
+ }
+
+ button {
+ margin: 0;
+ width: 100%;
+ height: 100%;
+ opacity: 1;
+ font-size: 1.4rem;
+ font-family: OpenSans;
+ background: map-get($colors, secondary);
+ text-transform: uppercase;
+
+ .button-inner {
+ width: 100%;
+ height: 100%;
+ }
+
+ img {
+ display: inline;
+ float: none;
+ margin-left: 10px;
+ }
+ }
+
+ button.outline-btn {
+ border: 3px solid map-get($colors, secondary);
+ background: white;
+ border-radius: 8px;
+ }
+ }
+ }
+ }
+
\ No newline at end of file
diff --git a/packages/vehicle-manufacture-car-builder/src/pages/settings/settings.ts b/packages/vehicle-manufacture-car-builder/src/pages/settings/settings.ts
new file mode 100644
index 00000000..b5765b8e
--- /dev/null
+++ b/packages/vehicle-manufacture-car-builder/src/pages/settings/settings.ts
@@ -0,0 +1,40 @@
+import { Keyboard } from '@ionic-native/keyboard';
+import { Component } from '@angular/core';
+import { NavController, NavParams } from 'ionic-angular';
+import { ConfigProvider } from '../../providers/config/config'
+
+/**
+ * Generated class for the SettingsPage page.
+ *
+ * See http://ionicframework.com/docs/components/#navigation for more info
+ * on Ionic pages and navigation.
+ */
+@Component({
+ selector: 'page-settings',
+ templateUrl: 'settings.html'
+})
+export class SettingsPage {
+
+ private storedConfig;
+ private ready = false;
+
+ constructor(public navController: NavController, public navParams: NavParams, private keyboard: Keyboard, private configProvider: ConfigProvider) {
+ this.configProvider.ready.subscribe((ready) => {
+ if (ready) {
+ this.ready = true;
+ this.storedConfig = this.configProvider.getConfig();
+ }
+ });
+ }
+
+ back() {
+ this.navController.pop();
+ }
+
+ update() {
+ this.configProvider.setConfig(this.storedConfig);
+ this.keyboard.close();
+ this.back();
+ }
+
+}
diff --git a/packages/vehicle-manufacture-car-builder/src/pages/status/status.module.ts b/packages/vehicle-manufacture-car-builder/src/pages/status/status.module.ts
deleted file mode 100644
index f8ca6ff3..00000000
--- a/packages/vehicle-manufacture-car-builder/src/pages/status/status.module.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-import { NgModule } from '@angular/core';
-import { IonicModule } from 'ionic-angular';
-import { StatusPage } from './status';
-
-@NgModule({
- declarations: [
- StatusPage,
- ],
- imports: [
- IonicModule.forRoot(StatusPage),
- ],
- exports: [
- StatusPage
- ]
-})
-export class StatusPageModule {}
diff --git a/packages/vehicle-manufacture-car-builder/src/pages/status/status.ts b/packages/vehicle-manufacture-car-builder/src/pages/status/status.ts
index 92c72a7c..0737d6e3 100644
--- a/packages/vehicle-manufacture-car-builder/src/pages/status/status.ts
+++ b/packages/vehicle-manufacture-car-builder/src/pages/status/status.ts
@@ -12,8 +12,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { Component } from '@angular/core';
-import { IonicPage, NavController, NavParams } from 'ionic-angular';
-import { Http, Response } from '@angular/http';
+import { NavController, NavParams } from 'ionic-angular';
+import { Http } from '@angular/http';
+import { ConfigProvider } from '../../providers/config/config';
/**
* Generated class for the StatusPage page.
@@ -21,7 +22,6 @@ import { Http, Response } from '@angular/http';
* See http://ionicframework.com/docs/components/#navigation for more info
* on Ionic pages and navigation.
*/
-@IonicPage()
@Component({
selector: 'page-status',
templateUrl: 'status.html',
@@ -33,7 +33,7 @@ export class StatusPage {
relativeDate: any;
config: any;
- constructor(public navCtrl: NavController, public navParams: NavParams, private http: Http) {
+ constructor(public navCtrl: NavController, public navParams: NavParams, private http: Http, private configProvider: ConfigProvider) {
this.car = navParams.get('car');
this.stage = [Date.now() + ''];
this.orderId = navParams.get('orderId');
@@ -79,17 +79,11 @@ export class StatusPage {
};
}
- this.loadConfig()
- .then((config) => {
- this.config = config;
+ this.configProvider.ready.subscribe((ready) => {
+ if (ready) {
+ this.config = this.configProvider.getConfig();
openWebSocket();
- });
- }
-
- loadConfig(): Promise {
- // Load the config data.
- return this.http.get('/assets/config.json')
- .map((res: Response) => res.json())
- .toPromise();
+ }
+ });
}
}
diff --git a/packages/vehicle-manufacture-car-builder/src/providers/config/config.ts b/packages/vehicle-manufacture-car-builder/src/providers/config/config.ts
new file mode 100644
index 00000000..248647cc
--- /dev/null
+++ b/packages/vehicle-manufacture-car-builder/src/providers/config/config.ts
@@ -0,0 +1,63 @@
+import { Injectable } from '@angular/core';
+import { Http, Response } from '@angular/http';
+import { ReplaySubject } from 'rxjs';
+
+/*
+ Generated class for the ConfigProvider provider.
+
+ See https://angular.io/docs/ts/latest/guide/dependency-injection.html
+ for more info on providers and Angular 2 DI.
+*/
+@Injectable()
+export class ConfigProvider {
+
+ private config = {
+ restServer: {
+ webSocketURL: null,
+ httpURL: null
+ }
+ };
+
+ public ready: ReplaySubject = new ReplaySubject(1);
+
+ constructor(public http: Http) {
+ this.loadConfig()
+ .then((config) => {
+ this.config = config;
+ this.ready.next(true);
+ })
+ .catch((err) => {
+ console.log('ERROR GETTING CONFIG USING DEFAULT', err.message);
+ this.config = {
+ restServer: {
+ webSocketURL: "ws://localhost:3000",
+ httpURL: "http://localhost:3000/api"
+ }
+ }
+ this.ready.next(true);
+ })
+ }
+
+ getConfig() {
+ if(localStorage.getItem('config')){
+ return JSON.parse(localStorage.getItem('config'));
+ }
+
+ return this.config;
+ }
+
+ setConfig(newConfig) {
+ localStorage.setItem('config', JSON.stringify(newConfig));
+ }
+
+ resetConfig() {
+ localStorage.removeItem('config');
+ }
+
+ loadConfig(): Promise {
+ // Load the config data.
+ return this.http.get('/assets/config.json')
+ .map((res: Response) => res.json())
+ .toPromise();
+ }
+}
\ No newline at end of file
diff --git a/packages/vehicle-manufacture-vda/client/app/directives/header/header.directive.js b/packages/vehicle-manufacture-vda/client/app/directives/header/header.directive.js
index 1b8e39c3..d40ecfe0 100644
--- a/packages/vehicle-manufacture-vda/client/app/directives/header/header.directive.js
+++ b/packages/vehicle-manufacture-vda/client/app/directives/header/header.directive.js
@@ -82,7 +82,7 @@ angular.module('bc-vda')
}
var message = JSON.parse(event.data);
- if (message.$class = 'org.acme.vehicle_network.UpdateOrderStatusEvent') {
+ if (message.$class === 'org.acme.vehicle_network.UpdateOrderStatusEvent') {
if (message.orderStatus === 'VIN_ASSIGNED') {
scope.registered_vehicles++;
scope.vin_assigned++;
diff --git a/packages/vehicle-manufacture/README.md b/packages/vehicle-manufacture/README.md
index b60ba05d..9e9cc9bf 100644
--- a/packages/vehicle-manufacture/README.md
+++ b/packages/vehicle-manufacture/README.md
@@ -21,6 +21,8 @@ This is an application that has been designed by the manufacturer **Arium** and
Location localhost:8100.
+You can also run this application on mobile using the instructions on the [Ionic Website](https://ionicframework.com/docs/intro/deploying/). When running the application on mobile you can point it to the REST server by pressing the cog icon on the login screen and updating the settings. This usually involves changing localhost to your PC's IP. Note that the REST server and mobile device need to be on the same network in most cases.
+
### Manufacturer Screen
This application displays to the manufacturer **Arium** the orders that have been placed with them through the *Vehicle Builder* application. Within this screen the manufacturer starts the manufacture on the order and updates the status of the order to mark where in the process the vehicle is.
diff --git a/packages/vehicle-manufacture/installers/hlfv1/install.sh.in b/packages/vehicle-manufacture/installers/hlfv1/install.sh.in
index 344cc17f..1bbdb559 100755
--- a/packages/vehicle-manufacture/installers/hlfv1/install.sh.in
+++ b/packages/vehicle-manufacture/installers/hlfv1/install.sh.in
@@ -282,7 +282,7 @@ docker run \
-d \
--network composer_default \
--name car-builder \
--e REST_SERVER_CONFIG='{"webSocketURL": "ws://rest:3000", "httpURL": "http://rest:3000/api"}' \
+-e REST_SERVER_CONFIG='{"webSocketURL": "ws://localhost:3000", "httpURL": "http://localhost:3000/api"}' \
-e NODE_RED_BASE_URL=ws://node-red:1880 \
-p 8100:8100 \
hyperledger/vehicle-manufacture-car-builder:{{VEHICLE-MANUFACTURE-VERSION}}
+
+ 
+
+
+ REST Server Settings
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+