diff --git a/.idea/abb-ventilation-controller.iml b/.idea/abb-ventilation-controller.iml
index 0c8867d..0001a9c 100644
--- a/.idea/abb-ventilation-controller.iml
+++ b/.idea/abb-ventilation-controller.iml
@@ -8,5 +8,6 @@
+
\ No newline at end of file
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
index d23208f..febcbe5 100644
--- a/.idea/jsLibraryMappings.xml
+++ b/.idea/jsLibraryMappings.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bede74a..f63bfe8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,12 +2,14 @@
-
-
+
+
-
-
+
+
+
+
diff --git a/js/server.js b/js/server.js
index 28eb6a5..97e51b6 100644
--- a/js/server.js
+++ b/js/server.js
@@ -9,6 +9,7 @@ const mqtt = require('mqtt');
const {SerialPort} = require('serialport');
const {ReadlineParser} = require("@serialport/parser-readline");
const {hashPassword, verifyPassword} = require("./pbkdf2");
+const moment = require('moment');
const MongoClient = require('mongodb').MongoClient;
const url = "mongodb://localhost:27017";
@@ -47,7 +48,7 @@ app.post('/signup', (req, res) => {
const username = req.body.username;
const password = req.body.password;
hashPassword(password).then(hashedPassword => {
- const newUser = {username, hashedPassword, logins: [], logouts: []};
+ const newUser = {username, hashedPassword, logins: [],logouts: []};
addUser(newUser).then(msg => res.redirect('/')).catch(err_msg => res.send(err_msg));
}).catch(err => res.send(err));
});
@@ -134,8 +135,8 @@ app.get('/user_data', async (req, res) => {
const size = user.logins.length;
const logins = arr[0].logins.slice(0, size - 1);
console.log(logins.length);
- console.log(user.logouts.length);
- const data1 = {x: logins, y: user.logouts.map((v, i) => v - logins[i]), t: 0, z: 0};
+ console.log(user.logouts);
+ const data1 = {x: logins, y: user.logouts.map((v, i) => v - logins[i]), logout_time: user.logouts, z: 0};
console.log(data1);
res.json(data1);
}
diff --git a/js/views/user_stats.ejs b/js/views/user_stats.ejs
index 3f19a95..661ec39 100644
--- a/js/views/user_stats.ejs
+++ b/js/views/user_stats.ejs
@@ -3,8 +3,10 @@
Temperature Statistics
-
+
+
+
+
@@ -12,12 +14,15 @@