Revert some changes and bugfixes

mean-app/dist/main.bundle.js

@@ -56,13 +56,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var DataService = (function () {
     function DataService(http) {
         this.http = http;
-        this.dashboardURL = '/webapi/data';
+        this.baseUrl = '/webapi/data';
     }
-    DataService.prototype.dashboard = function () {
+    DataService.prototype.get = function () {
         var lineChartData$ = 
         //<LineData>( {data: [65, 59, 80, 81, 56, 55, 40], label: 'Series A'} );
         this.http
-            .get(("" + this.dashboardURL), { headers: this.getHeaders() })
+            .get(("" + this.baseUrl), { headers: this.getHeaders() })
             .map(mapData);
         return lineChartData$;
     };
@@ -323,7 +323,7 @@ var LineChartComponent = (function () {
     LineChartComponent.prototype.ngOnInit = function () {
         var _this = this;
         this.dataService
-            .dashboard()
+            .get()
             .subscribe(function (res) {
             console.log("Received from service:");
             console.log(res);

mean-app/server/routes/webapi.js

@@ -25,8 +25,6 @@ router.post('/device', function(req, res){
 });
 
 
-
-
 router.get('/device', function(req, res){
   
   connection.query(
@@ -43,18 +41,11 @@ router.get('/device', function(req, res){
   });
 });
 
-/* GET api listing. */
-router.get('/', function(req, res) {
-  res.status(200);
-  res.send("{\"success\":\"true\"}");
-});
-
-
 
 router.get('/data', function(req, res) {
 
   connection.query(
-    'SELECT TOE1`, time FROM measurement ORDER BY time DESC LIMIT 0,10',
+    'SELECT TOE1, time FROM measurement ORDER BY time DESC LIMIT 0,10',
                      function (error, results, fields) {
    if (error) throw error;
 
@@ -69,4 +60,12 @@ router.get('/data', function(req, res) {
 });
 
 
+/* GET api listing. */
+router.get('/', function(req, res) {
+  res.status(200);
+  res.send("{\"success\":\"true\"}");
+});
+
+
+
 module.exports = router;

mean-app/src/app/chart.component.ts

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

mean-app/src/app/data.service.ts

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