Browse Source

Modified topbar to get first char of user

pull/146/head
Mohammed Tantawy 7 years ago
parent
commit
9158609d46
3 changed files with 16 additions and 17 deletions
  1. +5
    -5
      src/assets/scripts/dashboard/dashboard.controller.js
  2. +1
    -1
      src/assets/scripts/nwTopbar/nwTopbar.html
  3. +10
    -11
      src/assets/scripts/nwTopbar/topbar.controller.js

+ 5
- 5
src/assets/scripts/dashboard/dashboard.controller.js View File

@ -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();
}

+ 1
- 1
src/assets/scripts/nwTopbar/nwTopbar.html View File

@ -40,7 +40,7 @@
<a href="" class="dropdown-toggle no-after peers fxw-nw ai-c lh-1" data-toggle="dropdown">
<div class="peer">
<span class="fsz-sm c-grey-900 visible-user.role text-capitalize" ng-show="user.role == 'admin' || user.role == 'nomit'">{{user.role}}</span>
<span class="fsz-sm c-grey-900 visible-user.role" ng-show="user.role == 'company' || user.role == 'user'">{{user.fullname}}</span>
<span class="fsz-sm c-grey-900 visible-user.role" ng-show="user.role == 'company' || user.role == 'user'">{{user.name}}</span>
</div>
<div class="peer mR-10 visible-nomit" ng-show="user.role == 'nomit'">
<img class="w-2r bdrs-50p mL-10 nomit-logo-top" src="assets/static/images/nomit-logo.png" alt="">


+ 10
- 11
src/assets/scripts/nwTopbar/topbar.controller.js View File

@ -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();


Loading…
Cancel
Save