MycroftAI
/
selene-ui
mirror of https://github.com/MycroftAI/selene-ui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

moved form building outside of service

pull/3/head
Chris Veilleux 2019-03-14 17:35:03 -05:00
parent 0b8e1c854a
commit 2de9cb1b22
1 changed files with 6 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
projects/account/src/app/core/http/device.service.ts
View File

@ -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]
}
);
}
}