From d5a4e4c47f4abe7411a5c2e1e6359a774ba81936 Mon Sep 17 00:00:00 2001
From: idoctnef <idoctnef@openmailbox.org>
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;
             });
-
         };
         /* </DASHBOARD initialization */
 
@@ -255,7 +255,6 @@ angular.module('workApp', ['chart.js'])
     $scope.currentprojectIndex;
     $scope.projectSelect = function(index){
         //$scope.btnStop();
-        console.log(index);
         $scope.currentprojectIndex=index;
         $scope.currentproject=$scope.projects[index];
     };
@@ -310,6 +309,7 @@ angular.module('workApp', ['chart.js'])
                 }
                 $scope.projects=response.data;
                 $scope.getLoggedUser();
+                $scope.currentproject=$scope.projects[$scope.currentprojectIndex];
             },
             function(response) {// failed
             });
diff --git a/webapp/dashboard.html b/webapp/dashboard.html
index dbb3bff..c0a40d3 100644
--- a/webapp/dashboard.html
+++ b/webapp/dashboard.html
@@ -52,7 +52,8 @@
             <li ng-repeat="user in users" class="collection-item avatar blue-grey darken-3">
                 <img ng-src="img/avatars/{{user.avatar}}.png" class="circle">
                 <span class="title">{{user.username}}</span>
-                <span ng-show="user.connected" class="new badge" data-badge-caption="online"></span>
+                <span ng-show="user.connected" class="new badge blue" data-badge-caption="online"></span>
+                <span ng-show="user.working" class="new badge" data-badge-caption="working"></span>
                 <p>{{user.description}}</p>
             </li>
         </ul>
@@ -120,7 +121,7 @@
                         {{currentproject.title}}
                     </span>
                     <p>
-                        Total time: {{currentproject.totaltime | secondsToDateTime | date:'HH:mm:ss'}}
+                        Current strike time: {{currentproject.totaltime | secondsToDateTime | date:'HH:mm:ss'}}
                     </p>
                     <p ng-repeat="user in currentproject.users">
                         {{user.username}}: <b>{{user.time | secondsToDateTime | date:'HH:mm:ss'}}</b>
@@ -130,6 +131,10 @@
                 <div class="card-action">
                     <div ng-show="arrayObjectIndexOf(currentproject.users, user.username, 'username')!=-1">
                         <a ng-click="btnWork()" ng-show="!user.working" class="waves-effect waves-light btn green lighten-2">Work!</a>
+
+                        <div ng-show="user.working" class="progress">
+                            <div class="indeterminate"></div>
+                        </div>
                         <a ng-click="btnStop()" ng-show="user.working" class="waves-effect waves-light btn red lighten-2">Stop!</a>
                     </div>
                     <div ng-show="arrayObjectIndexOf(currentproject.users, user.username, 'username')==-1">