Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'origin/development' into faults
  • Loading branch information
ema14006 committed Apr 15, 2019
2 parents 8a65f09 + b9cac43 commit 2fd9d3c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion src/app/generator-object.ts
Expand Up @@ -11,7 +11,9 @@ export interface GeneratorState {
status: string; status: string;
status_code: number; status_code: number;
fault_count: number | null; fault_count: number | null;
fault_codes: Array<string> | null; fault_codes: Array<string>;
status_count: number;
status_codes: Array<string>;
ip: string; ip: string;
} }


2 changes: 1 addition & 1 deletion src/app/services/generator.service.ts
Expand Up @@ -35,7 +35,7 @@ export class GeneratorService {


getGeneratorState(gen_id: number, token: string): Promise<GeneratorState> { getGeneratorState(gen_id: number, token: string): Promise<GeneratorState> {
return new Promise<GeneratorState>((resolve, reject) => { return new Promise<GeneratorState>((resolve, reject) => {
this.http.get('http://sd5-backend.engr.uconn.edu/generator/' + gen_id + '/status', { this.http.get('http://sd5-backend.engr.uconn.edu/generator/' + gen_id + '/state', {
headers: { headers: {
Authorization: 'Bearer ' + token Authorization: 'Bearer ' + token
} }
Expand Down

0 comments on commit 2fd9d3c

Please sign in to comment.