From 2de9cb1b226db5937b4c9df8bb569d658e091c79 Mon Sep 17 00:00:00 2001
From: Chris Veilleux <veilleux.chris@gmail.com>
Date: Thu, 14 Mar 2019 17:35:03 -0500
Subject: [PATCH] moved form building outside of service

---
 .../src/app/core/http/device.service.ts       | 48 +++----------------
 1 file changed, 6 insertions(+), 42 deletions(-)

diff --git a/projects/account/src/app/core/http/device.service.ts b/projects/account/src/app/core/http/device.service.ts
index 66947e4..88e4bbf 100644
--- a/projects/account/src/app/core/http/device.service.ts
+++ b/projects/account/src/app/core/http/device.service.ts
@@ -1,6 +1,5 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 
 import { AccountPreferences } from '../../shared/models/preferences.model';
 import { Device } from '../../shared/models/device.model';
@@ -19,13 +18,14 @@ const wakeWordUrl = '/api/wake-words';
 })
 export class DeviceService {
     public devicePlacements: DeviceAttribute[] = [
-        { id: '1', name: 'None', userDefined: true},
-        { id: null, name: 'Bedroom', userDefined: true},
-        { id: null, name: 'Kitchen', userDefined: true},
-        { id: '2', name: 'Living Room', userDefined: false}
+        {id: '1', name: 'None', userDefined: true},
+        {id: null, name: 'Bedroom', userDefined: true},
+        {id: null, name: 'Kitchen', userDefined: true},
+        {id: '2', name: 'Living Room', userDefined: false}
     ];
 
-    constructor(private http: HttpClient, private formBuilder: FormBuilder) { }
+    constructor(private http: HttpClient) {
+    }
 
     getDevices() {
         return this.http.get<Device[]>(deviceUrl);
@@ -50,40 +50,4 @@ export class DeviceService {
     getWakeWords() {
         return this.http.get<DeviceAttribute[]>(wakeWordUrl);
     }
-
-    /**
-     * Building this form object here because it is used in device setup and preference editing
-     */
-    buildPreferencesForm(preferences: AccountPreferences): FormGroup {
-        const geographyGroup = this.formBuilder.group(
-            {
-                country: [preferences ? preferences.geography.country : null],
-                region: [preferences ? preferences.geography.region : null],
-                city: [preferences ? preferences.geography.city : null],
-                timezone: [preferences ? preferences.geography.timezone : null],
-                latitude: [preferences ? preferences.geography.latitude : null],
-                longitude: [preferences ? preferences.geography.longitude : null]
-            }
-        );
-        return this.formBuilder.group(
-            {
-                dateFormat: [
-                    preferences ? preferences.dateFormat : null,
-                    Validators.required
-                ],
-                measurementSystem: [
-                    preferences ? preferences.measurementSystem : null,
-                    Validators.required
-                ],
-                timeFormat: [
-                    preferences ? preferences.timeFormat : null,
-                    Validators.required
-                ],
-                geography: geographyGroup,
-                voice: [preferences ? preferences.voice : null],
-                wakeWord: [preferences ? preferences.wakeWord : null]
-            }
-        );
-    }
-
 }