From d5a4e4c47f4abe7411a5c2e1e6359a774ba81936 Mon Sep 17 00:00:00 2001 From: idoctnef Date: Sun, 11 Sep 2016 18:23:55 +0200 Subject: [PATCH] little changes --- intervalComprovations.js | 1 + webapp/controllers.js | 4 ++-- webapp/dashboard.html | 9 +++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/intervalComprovations.js b/intervalComprovations.js index f1830b6..68522de 100644 --- a/intervalComprovations.js +++ b/intervalComprovations.js @@ -32,6 +32,7 @@ exports.lastConnectionUser = function() { if(err) return res.send(500, err.message); //console.log("user: " + users[i].username + ", connected=false"); }); + //falta posar el .working a false, i si estava a true, anar al projecte i posar l'hora actual com a final al workStrike } } } diff --git a/webapp/controllers.js b/webapp/controllers.js index 31a49c7..4a7f877 100644 --- a/webapp/controllers.js +++ b/webapp/controllers.js @@ -39,6 +39,7 @@ angular.module('workApp', ['chart.js']) users = result.data; }); }; + $scope.countingTime; /* DASHBOARD initialization */ $scope.dashboardInit = function(){ if(localStorage.getItem('owt_token')){// adding token to the headers @@ -102,7 +103,6 @@ angular.module('workApp', ['chart.js']) .then(function(result){ users = result.data; }); - }; /* {{user.username}} - + +

{{user.description}}

@@ -120,7 +121,7 @@ {{currentproject.title}}

- Total time: {{currentproject.totaltime | secondsToDateTime | date:'HH:mm:ss'}} + Current strike time: {{currentproject.totaltime | secondsToDateTime | date:'HH:mm:ss'}}

{{user.username}}: {{user.time | secondsToDateTime | date:'HH:mm:ss'}} @@ -130,6 +131,10 @@

Work! + +
+
+
Stop!