diff --git a/src/assets/scripts/dashboard/dashboard.controller.js b/src/assets/scripts/dashboard/dashboard.controller.js index 8fbde3d..433dff8 100644 --- a/src/assets/scripts/dashboard/dashboard.controller.js +++ b/src/assets/scripts/dashboard/dashboard.controller.js @@ -1,14 +1,14 @@ -import * as $ from 'jquery'; -import masonry from '../masonry'; +import masonry from "../masonry"; /** @ngInject */ const DashboardController = ($scope, UserService) => { $scope.$on('loadUserSuccess', function(event, user) { $scope.user = user; + window.dispatchEvent(window.EVENT); }); - // tutte le funzioni del controller - masonry(); - + + // tutte le funzioni del controller + masonry(); UserService.loadUser(); } diff --git a/src/assets/scripts/nwTopbar/nwTopbar.html b/src/assets/scripts/nwTopbar/nwTopbar.html index 630cd76..5a8e98f 100644 --- a/src/assets/scripts/nwTopbar/nwTopbar.html +++ b/src/assets/scripts/nwTopbar/nwTopbar.html @@ -40,7 +40,7 @@
{{user.role}} - {{user.fullname}} + {{user.name}}
diff --git a/src/assets/scripts/nwTopbar/topbar.controller.js b/src/assets/scripts/nwTopbar/topbar.controller.js index 1690024..143a072 100644 --- a/src/assets/scripts/nwTopbar/topbar.controller.js +++ b/src/assets/scripts/nwTopbar/topbar.controller.js @@ -8,20 +8,19 @@ import masonry from '../masonry'; const TopbarController = ($scope, UserService) => { $scope.$on('loadUserSuccess', function (event, user) { $scope.user = user; - }); - $scope.avatar = new Avatar(document.getElementById('avatar'), { - 'useGravatar': false, - 'initials': 'AD', // it will be`${$scope.user.first_name[0]}${$scope.user.last_name[1]}` - 'initial_weight': 300, - }); + $scope.avatar = new Avatar(document.getElementById('avatar'), { + 'useGravatar': false, + 'initials': user.name[0], + 'initial_weight': 300, + }); - $scope.$on('needReload', function(event){ - console.log("NEED RELOAD!"); - functionSearch(); - masonry(); + $scope.$on('needReload', function(event){ + console.log("NEED RELOAD!"); + functionSearch(); + masonry(); + }); }); - UserService.loadUser();