From 73d6f3dd98f6df57db1f4367e1edb69aa8a83d43 Mon Sep 17 00:00:00 2001 From: Evan Langlais Date: Wed, 10 Apr 2019 17:45:40 -0400 Subject: [PATCH] Changed state and type --- src/app/generator-object.ts | 2 +- src/app/services/generator.service.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/generator-object.ts b/src/app/generator-object.ts index f2b5f0b..949eef2 100644 --- a/src/app/generator-object.ts +++ b/src/app/generator-object.ts @@ -11,7 +11,7 @@ export interface GeneratorState { status: string; status_code: number; fault_count: number | null; - fault_codes: Array | null; + fault_codes: Array | null; ip: string; } diff --git a/src/app/services/generator.service.ts b/src/app/services/generator.service.ts index f4fc231..de612df 100644 --- a/src/app/services/generator.service.ts +++ b/src/app/services/generator.service.ts @@ -19,7 +19,7 @@ export class GeneratorService { }).subscribe(async (raw_generators: Array) => { const generators: Array = []; for (const generator of raw_generators) { - await this.getGeneratorStatus(generator.gen_id, token).then((state: GeneratorState) => { + await this.getGeneratorState(generator.gen_id, token).then((state: GeneratorState) => { generator.state = state; generators.push(generator); }, (error) => { @@ -33,7 +33,7 @@ export class GeneratorService { }); } - getGeneratorStatus(gen_id: number, token: string): Promise { + getGeneratorState(gen_id: number, token: string): Promise { return new Promise((resolve, reject) => { this.http.get('http://sd5-backend.engr.uconn.edu/generator/' + gen_id + '/status', { headers: {