diff --git a/mean-app/src/app/data.service.ts b/mean-app/src/app/data.service.ts index f413b52..78b27cd 100644 --- a/mean-app/src/app/data.service.ts +++ b/mean-app/src/app/data.service.ts @@ -1,15 +1,23 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; +import { Http, Response, Headers } from '@angular/http'; import { LineData } from './line-data'; @Injectable() export class DataService { - + private baseUrl: string = 'http://localhost:3000/webapi/data'; + + constructor(private http : Http){} + get(): Observable { - - let lineChartData$:LineData = - ( {data: [65, 59, 80, 81, 56, 55, 40], label: 'Series A'} ); + + let lineChartData$ = + //( {data: [65, 59, 80, 81, 56, 55, 40], label: 'Series A'} ); + this.http + .get((`${this.baseUrl}`) + , {headers: this.getHeaders()}) + .map(mapData); return Observable.create(observer => { observer.next(lineChartData$); @@ -17,4 +25,25 @@ export class DataService { }); } -} \ No newline at end of file + + private getHeaders(){ + let headers = new Headers(); + headers.append('Accept', 'application/json'); + return headers; + } +} + +function mapData(response:Response): LineData { + return response.json().data.map(toBeer) +} + +function toBeer(r:any): LineData{ + let lineData = ({ + data: r.TOE1, + label: r.time, + description: (r.description || "No description") + }); + console.log('Parsed Data:', lineData); + return lineData; +} +