From 3b5807da3a0796022f20bc8cfb272f16a3d2f887 Mon Sep 17 00:00:00 2001
From: kennyboy55 <kennyboy@live.nl>
Date: Tue, 4 Apr 2017 13:23:27 +0200
Subject: [PATCH 1/2] Test data api

---
 mean-app/server/db.js            |  2 +-
 mean-app/server/routes/webapi.js | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/mean-app/server/db.js b/mean-app/server/db.js
index eaaea89..c741ebd 100644
--- a/mean-app/server/db.js
+++ b/mean-app/server/db.js
@@ -7,7 +7,7 @@ var connection = mysql.createConnection({
 });
 
 connection.connect(function(err) {
-    //if (err) throw err;
+    if (err) throw err;
 });
 
 module.exports = connection;
\ No newline at end of file
diff --git a/mean-app/server/routes/webapi.js b/mean-app/server/routes/webapi.js
index 45b87d6..5c8478a 100644
--- a/mean-app/server/routes/webapi.js
+++ b/mean-app/server/routes/webapi.js
@@ -23,8 +23,6 @@ router.post('/device', function(req, res){
 
 
 
-
-
 router.get('/device', function(req, res){
   
   connection.query(
@@ -50,5 +48,23 @@ router.get('/', function(req, res) {
 
 
 
+router.get('/data', function(req, res) {
+
+  connection.query(
+    'SELECT * FROM measurement ORDER BY time DESC LIMIT 0,10',
+                     function (error, results, fields) {
+   if (error) throw error;
+
+   if (results.length  > 0) {
+        console.log(results);
+
+        res.status(200);
+        res.send(results);
+    }
+
+  });
+
+});
+
 
 module.exports = router;

From ed37b3ce996b0c8e8b51b46578d38c1a78cb0025 Mon Sep 17 00:00:00 2001
From: kennyboy55 <kennyboy@live.nl>
Date: Tue, 4 Apr 2017 13:30:50 +0200
Subject: [PATCH 2/2] Test data to json

---
 mean-app/server/routes/webapi.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/mean-app/server/routes/webapi.js b/mean-app/server/routes/webapi.js
index 5c8478a..a963972 100644
--- a/mean-app/server/routes/webapi.js
+++ b/mean-app/server/routes/webapi.js
@@ -4,6 +4,9 @@ var connection = require('../db');
 const express = require('express');
 const router = express.Router();
 
+router.all('*', function(req, res){
+  console.log(req.path);
+});
 
 router.post('/device', function(req, res){
   console.log("Device received: ");
@@ -31,7 +34,6 @@ router.get('/device', function(req, res){
    if (error) throw error;
 
    if (results.length  > 0) {
-        console.log(results);
 
         res.status(200);
         res.send(results);
@@ -51,15 +53,14 @@ router.get('/', function(req, res) {
 router.get('/data', function(req, res) {
 
   connection.query(
-    'SELECT * 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;
 
    if (results.length  > 0) {
-        console.log(results);
 
         res.status(200);
-        res.send(results);
+        res.send(JSON.stringify(results));
     }
 
   });