Merge pull request #7 from IBM/video

Video

Author: scottdangelo

src/app/app.module.ts

@@ -1,7 +1,6 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
-import { HttpService } from './http.service'
-import { HereService } from './here.service'
+import { HttpService } from './http.service';
 import { HttpClientModule, HttpClient } from '@angular/common/http'
 import { FormsModule } from '@angular/forms';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
@@ -39,7 +38,7 @@ import { ViewEntryComponent } from './view-entry/view-entry.component';
  apiKey: 'AIzaSyAM0KXiz3xTv9KAvnOIdm5J0Agnwp3_lOI'
  })
  ],
- providers: [HttpService,HereService],
+ providers: [HttpService],
  bootstrap: [AppComponent]
 })
 export class AppModule { }

src/app/header/header.component.html

@@ -1,27 +1,24 @@
-
-
- <nav id="page-top" class="navbar navbar-dark navbar-expand bg-dark shadow mb-4 topbar static-top" >
-
- <div class="container-fluid">
- <a class="navbar-brand" [routerLink]="['']">House2Home</a>
- <ul class="nav navbar-nav flex-nowrap ml-auto">
- <li class="nav-item no-arrow" role="presentation">
- <li class="nav-item no-arrow">
- <a class=" nav-link" aria-expanded="false" [routerLink]="['']">
- <span class="d-none d-lg-inline mr-2 text-gray-600 small">Load</span> </a>
- </li>
- <div class="d-none d-sm-block topbar-divider"></div>
- <li class="nav-item no-arrow" role="presentation">
- <li class="nav-item no-arrow">
- <a class=" nav-link" aria-expanded="false" [routerLink]="['/viewData']">
- <span class="d-none d-lg-inline mr-2 text-gray-600 small">View/Manage</span> </a>
- </li>
- <div class="d-none d-sm-block topbar-divider"></div>
- <li class="nav-item no-arrow" role="presentation">
- <li class="nav-item no-arrow">
- <a class=" nav-link" aria-expanded="false" [routerLink]="['/predictData']">
- <span class="d-none d-lg-inline mr-2 text-gray-600 small">Predict</span> </a>
- </li>
- </ul>
- </div>
- </nav>
+<nav id="page-top" class="navbar navbar-dark navbar-expand bg-dark shadow mb-4 topbar static-top">
+ <div class="container-fluid">
+ <a class="navbar-brand" [routerLink]="['']">House2Home</a>
+ <ul class="nav navbar-nav flex-nowrap ml-auto">
+ <li class="nav-item no-arrow" role="presentation">
+ <li class="nav-item no-arrow">
+ <a class=" nav-link" aria-expanded="false" [routerLink]="['']">
+ <span class="d-none d-lg-inline mr-2 text-gray-600 small">Load</span> </a>
+ </li>
+ <div class="d-none d-sm-block topbar-divider"></div>
+ <li class="nav-item no-arrow" role="presentation">
+ <li class="nav-item no-arrow">
+ <a class=" nav-link" aria-expanded="false" [routerLink]="['/viewData']">
+ <span class="d-none d-lg-inline mr-2 text-gray-600 small">View/Manage</span> </a>
+ </li>
+ <div class="d-none d-sm-block topbar-divider"></div>
+ <li class="nav-item no-arrow" role="presentation">
+ <li class="nav-item no-arrow">
+ <a class=" nav-link" aria-expanded="false" [routerLink]="['/predictData']">
+ <span class="d-none d-lg-inline mr-2 text-gray-600 small">Predict</span> </a>
+ </li>
+ </ul>
+ </div>
+</nav>

src/app/here.service.spec.ts

@@ -1,60 +1,61 @@
-//@author Rohith Ravindranath
-//@version July 10 2019
 import { Injectable } from '@angular/core';
-import {HttpClient,HttpHeaders} from '@angular/common/http'
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { PredictHouseInfo } from './models/predict-house-info';
+import { environment } from '../environments/environment';
 
 @Injectable({
  providedIn: 'root'
 })
 
 export class HttpService {
 
- GO_HOST_NAME = 'http://localhost:8080/'
- NODE_HOST_NAME = 'http://localhost:8888/'
-
- constructor(private _http: HttpClient) {
+ constructor(private http: HttpClient) {
 
  }
 
  httpOptions = {
-  headers: new HttpHeaders({
-  'Content-Type': 'application/json;charset=UTF-8',
-  'Accept': 'application/json',
-  })
+ headers: new HttpHeaders({
+ 'Content-Type': 'application/json;charset=UTF-8',
+ Accept: 'application/json',
+ })
  };
 
- createNewDataEntry(houseInfo,addressInfo){
+ createNewDataEntry(houseInfo, addressInfo) {
  const payload = JSON.stringify(houseInfo);
  const payload2 = JSON.stringify(addressInfo);
- return this._http.post(this.NODE_HOST_NAME + 'newDataEntry', {house:payload,address:payload2}, this.httpOptions);
+ return this.http.post(environment.NODE_HOST + 'newDataEntry', { house: payload, address: payload2 }, this.httpOptions);
  }
 
- getDataFromDatabase(number){
- return this._http.post(this.NODE_HOST_NAME + 'getData', {num:number},this.httpOptions);
+ getDataFromDatabase(id) {
+ return this.http.post(environment.NODE_HOST + 'getData', { num: id }, this.httpOptions);
  }
 
- getUniqueDataFromDatabase(id){
- return this._http.post(this.NODE_HOST_NAME + 'getUniqueData', {id:id}, this.httpOptions);
+ getUniqueDataFromDatabase(id) {
+ return this.http.post(environment.NODE_HOST + 'getUniqueData', { id: id }, this.httpOptions);
  }
 
- deleteDataFromDatabase(id){
- return this._http.post(this.NODE_HOST_NAME + 'deleteData',{id:id} ,this.httpOptions);
+ deleteDataFromDatabase(id) {
+ return this.http.post(environment.NODE_HOST + 'deleteData', { id: id }, this.httpOptions);
  }
 
- updateDataEntry(id,houseInfo,addressInfo){
+ updateDataEntry(id, houseInfo, addressInfo) {
  const payload = JSON.stringify(houseInfo);
- console.log(payload);
- return this._http.post(this.NODE_HOST_NAME + 'updateDataEntry',{id:id,data:houseInfo,addressInfo:addressInfo} ,this.httpOptions);
+ return this.http.post(environment.NODE_HOST + 'updateDataEntry', { id: id, data: houseInfo, addressInfo: addressInfo }, this.httpOptions);
  }
 
- predict(houseInfo){
+ predict(predictOption: string, houseInfo: PredictHouseInfo) {
  const payload = JSON.stringify(houseInfo);
- console.log(payload);
- return this._http.get(this.NODE_HOST_NAME + 'predict');
+ let api = '';
+ if (predictOption.toLowerCase() === 'db2') {
+ api = environment.GO_DB2_API;
+ } else {
+ api = environment.IBM_WML_API;
+ } 
+ return this.http.post(api, payload, this.httpOptions);
  }
 
- getCoordinates(address1, city, state, zipcode){
- return this._http.post(this.NODE_HOST_NAME + 'geocode',{address1:address1,city:city, state:state, zipcode:zipcode},this.httpOptions);
+ getCoordinates(address1, city, state, zipcode) {
+ return this.http.post(environment.NODE_HOST + 'geocode', { address1: address1, city: city, state: state, zipcode: zipcode }, this.httpOptions);
  }
 
 }

src/app/here.service.ts

@@ -14,8 +14,9 @@ import { AddressInfo } from '../models/address-info';
 export class LoadDataComponent implements OnInit {
 
  model: HouseInfo;
-  addressModel:AddressInfo;
+ addressModel:AddressInfo;
 
+ errPredictOption: boolean;
  errLotArea:boolean;
  errBldgType:boolean;
  errHouseStyle:boolean;
@@ -70,7 +71,7 @@ export class LoadDataComponent implements OnInit {
  this.model = new HouseInfo('', 'Select BldgType', 'Select HouseStyle', '', '', '', '', '', '', 'Select KitchenQual', '', 'Select Heating', 'Select HeatingQC', 'Select CentralAir', 'Select Electrical', 'Select RoofStyle', 'Select ExterCond', 'Select Foundation', 'Select BsmtCond', '', 'Select PoolQC', '', 'Select FireplaceQu', 'Select GarageType', 'Select GarageFinish', '', 'Select GarageCond', 'Select Fence', '', '', '');
 
  this.addressModel = new AddressInfo('', ' ', '', '', '', '');
-
+ 
  this.errAddress1 = false;
  this.errAddress2= false;
  this.errCity= false;
@@ -157,7 +158,7 @@ export class LoadDataComponent implements OnInit {
  validateInputs(){
  this.validate_inputs = true;
  if(this.model.bldgType.search('Select') != -1){ this.errBldgType= true; this.validate_inputs=false; }
- else{ this.errBldgType= false; }
+ else{ this.errBldgType= false; } 
  if(this.model.houseStyle.search('Select') != -1){ this.errHouseStyle= true; this.validate_inputs=false; }
  else{ this.errHouseStyle= false; }
  if(this.model.kitchenQual.search('Select') != -1){ this.errKitchenQual= true; this.validate_inputs=false; }

src/app/http.service.spec.ts

@@ -1,8 +1,6 @@
-//@author Rohith Ravindranath
-//@version July 10 2019
 export class HouseInfo {
  constructor(
- public lotArea:string,
+ public lotArea: string,
  public bldgType:string,
  public houseStyle:string,
  public overallCond:string,

src/app/http.service.ts

@@ -1,42 +1,34 @@
-//@author Rohith Ravindranath
-//@version July 10 2019
 export class PredictHouseInfo {
  constructor(
- public address1:string,
- public address2:string,
- public city:string,
- public state:string,
- public zipcode:string,
- public country:string,
- public lotArea:string,
- public bldgType:string,
- public houseStyle:string,
- public overallCond:string,
- public yearBuilt:string,
- public fullBath:string,
- public halfBath:string,
- public bedroomAbvGr:string,
- public kitchenAbvGr:string,
- public kitchenQual:string,
- public totalRmsAbvGrd:string,
- public heating:string,
- public heatingQC:string,
- public centralAir:string,
- public electrical:string,
- public roofStyle:string,
- public exterCond:string,
- public foundation:string,
- public bsmtCond:string,
- public poolArea:string,
- public poolQC:string,
- public fireplaces:string,
- public fireplaceQu:string,
- public garageType:string,
- public garageFinish:string,
- public garageCars:string,
- public garageCond:string,
- public fence:string,
- public moSold:string,
- public yrSold:string
+ public lotArea: string,
+ public bldgType: string,
+ public houseStyle: string,
+ public overallCond: string,
+ public yearBuilt: string,
+ public fullBath: string,
+ public halfBath: string,
+ public bedroomAbvGr: string,
+ public kitchenAbvGr: string,
+ public kitchenQual: string,
+ public totalRmsAbvGrd: string,
+ public heating: string,
+ public heatingQC: string,
+ public centralAir: string,
+ public electrical: string,
+ public roofStyle: string,
+ public exterCond: string,
+ public foundation: string,
+ public bsmtCond: string,
+ public poolArea: string,
+ public poolQC: string,
+ public fireplaces: string,
+ public fireplaceQu: string,
+ public garageType: string,
+ public garageFinish: string,
+ public garageCars: string,
+ public garageCond: string,
+ public fence: string,
+ public moSold: string,
+ public yrSold: string
  ) { }
 }