update of user data after submission

sails/src/assets/scripts/controllers/main.js

@@ -73,11 +73,6 @@ dashboardControllers.controller('MainCtrl', function MainCtrl($scope, $window, $
   // Controller's functions
   //
 
-  // Returns the full name of the user
-  $scope.user.getFullName = function(){
-    return $scope.user.name + ($scope.user.isOffice ? "" : " " + $scope.user.surname);
-  };
-
   // Logout
   $scope.logout = function(){
 

sails/src/assets/scripts/modules/supervisor/controllers/setup.js

@@ -21,8 +21,7 @@ dashboardControllers.controller('SetupCtrl', function SetupCtrl(
   $scope.showmessage = false;
 
   // Restore user values from sessionStorage
-  user = JSON.parse($window.sessionStorage.user);
-  $scope.formdata = user;
+  $scope.formdata = JSON.parse($window.sessionStorage.user);;
 
   $scope.changeImg = function () {
 
@@ -53,7 +52,7 @@ dashboardControllers.controller('SetupCtrl', function SetupCtrl(
       data: {
         filename: name,
         folder: 'supervisors',
-        id: user.id,
+        id: $scope.user.id,
         file: Upload.dataUrltoBlob(dataUrl, name)
       }
     })
@@ -61,8 +60,7 @@ dashboardControllers.controller('SetupCtrl', function SetupCtrl(
       function (res) {
         $timeout(function () {
           $scope.user.pic = '/upload/supervisorAvatar/' + res.data.file.name;
-          user.pic = $scope.user.pic;
-          $window.sessionStorage.user = JSON.stringify(user);
+          $window.sessionStorage.user = JSON.stringify($scope.user);
           cb();
         });
       }, function (res) {
@@ -113,26 +111,10 @@ dashboardControllers.controller('SetupCtrl', function SetupCtrl(
     .success(function (data) {
       ngToast.success({ content: $translate.instant('data_saved') });
 
-      // Modify the name in the header
-      $scope.name = data.name + ' ' + data.surname;
-      // Modify the user data in session
-      $scope.user.name = data.name;
-      $scope.user.surname = data.surname;
-      $scope.user.address = data.address;
-      $scope.user.phone = data.phone;
-      $scope.user.email = data.email;
-      $scope.user.lang = data.lang;
-      $scope.user.pic = data.pic;
-      $scope.user.role = data.role;
-
-      // Delete because at the beginning the variable user is bind
-      // with the form
-      delete user.password;
-      delete user.password_confirm;
-
+      delete data.password;
+      delete data.password_confirm;
+      $scope.user = JSON.parse(JSON.stringify(data));
       $window.sessionStorage.user = JSON.stringify($scope.user);
-      // $location.path("/students");
-
       //$scope.$apply();
     })
     .error(function () {

sails/src/assets/scripts/modules/supervisor/views/header.html

@@ -39,7 +39,7 @@
     <div class="topbar__supervisor nav navbar-nav navbar-right">
       <div class="dropdown">
         <div class="topbar__supervisor__name">
-          <div class="topbar__supervisor__name__fullname">{{ user.getFullName() }}</div>
+          <div class="topbar__supervisor__name__fullname">{{ user.name }} <span ng-if="!user.isOffice"> {{ user.surname }}</span></div>
           <div class="topbar__supervisor__name__role ng-binding">{{ user.role | translate }}</div>
         </div>
         <div