Merge branch 'develop' into Evan

mise a jour

1 files changed, 10 insertions, 24 deletions

diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js
index 42a54d4..ce6882e 100644
--- a/client/js/controllers/status.js
+++ b/client/js/controllers/status.js
@@ -1,28 +1,14 @@
-/*
- * mainApp Controller
- */
-
 
 
-mainApp.controller('statusCtrl', function ($scope,$interval,$sce)
+/**
+ * The status controller
+ * 
+ * @param {$scope} $scope The $scope service from angular
+ * @param {sharedProfile} sharedProfile The sharedProfile build by ourself
+ */
+mainApp.controller('statusCtrl', ['$scope','sharedProfile', function ($scope, sharedProfile)
 {
-    $scope.username="John Doe";
-    $scope.projectname="Web Server";
-    // Update status every 2 seconds
-    /*$interval(function(){   
-        var status=identity.fetchStatus();
-        $scope.username=status[1];
-        $scope.lastconnection=status[2];
-        if(status[0] == "1"){
-            $scope.connection=$sce.trustAsHtml("<span style=\"color:green;\">Online</span>");
-        }
-        else{
-            $scope.connection=$sce.trustAsHtml("<span style=\"color:red;\">Offline</span>");
-        }
-    }, 2000);*/
-
-
-
-     
+    $scope.profile=sharedProfile;
+    
      
-});
\ No newline at end of file
+}]);
\ No newline at end of file