Revert some changes and bugfixes

This commit is contained in:
2017-04-05 11:24:58 +02:00
parent efc2f1284d
commit ba5715c613
6 changed files with 19 additions and 20 deletions
+1 -1
View File
@@ -43,7 +43,7 @@ export class LineChartComponent implements OnInit {
ngOnInit(): void {
this.dataService
.dashboard()
.get()
.subscribe(res => {
console.log("Received from service:");
console.log(res);
+3 -3
View File
@@ -9,15 +9,15 @@ import { LabelData } from './label-data';
@Injectable()
export class DataService {
private dashboardURL: string = '/webapi/data';
private baseUrl: string = '/webapi/data';
constructor(private http : Http){}
dashboard(): Observable<GraphData> {
get(): Observable<GraphData> {
let lineChartData$ =
//<LineData>( {data: [65, 59, 80, 81, 56, 55, 40], label: 'Series A'} );
this.http
.get((`${this.dashboardURL}`)
.get((`${this.baseUrl}`)
, {headers: this.getHeaders()})
.map(mapData);