From 5b79b720edfeef774ce53dfdb915eddf0bd6b944 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 12 Jun 2017 12:16:57 +0800
Subject: [PATCH] feat(users): show scoreLevel on admin manage user view

---
 .../core/client/controllers/header.client.controller.js  | 2 +-
 .../client/directives/score-level.client.directive.js    | 3 ++-
 modules/core/client/views/header.client.view.html        | 2 +-
 .../client/controllers/admin/user.client.controller.js   | 9 +++++++--
 .../users/client/views/admin/view-user.client.view.html  | 2 +-
 .../users/client/views/status/account.client.view.html   | 2 +-
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js
index af283d18..aafbdd63 100644
--- a/modules/core/client/controllers/header.client.controller.js
+++ b/modules/core/client/controllers/header.client.controller.js
@@ -6,7 +6,7 @@
     .controller('HeaderController', HeaderController);
 
   HeaderController.$inject = ['$scope', '$state', '$stateParams', '$translate', 'Authentication', 'menuService', 'MeanTorrentConfig', 'localStorageService',
-  'ScoreLevelService'];
+    'ScoreLevelService'];
 
   function HeaderController($scope, $state, $stateParams, $translate, Authentication, menuService, MeanTorrentConfig, localStorageService, ScoreLevelService) {
     var vm = this;
diff --git a/modules/core/client/directives/score-level.client.directive.js b/modules/core/client/directives/score-level.client.directive.js
index 7f42ac93..7a72bedb 100644
--- a/modules/core/client/directives/score-level.client.directive.js
+++ b/modules/core/client/directives/score-level.client.directive.js
@@ -7,6 +7,7 @@
   function scoreLevel() {
     var directive = {
       restrict: 'A',
+      replace: true,
       link: link
     };
 
@@ -14,7 +15,7 @@
 
     function link(scope, element, attrs) {
       scope.$watch(attrs.scoreLevel, function (level) {
-        var l = 'L' + attrs.scoreLevel;
+        var l = 'L' + level;
         l = '<kbd>' + l + '</kbd>';
 
         element.addClass('score-level');
diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html
index be021ec4..f237f6b8 100644
--- a/modules/core/client/views/header.client.view.html
+++ b/modules/core/client/views/header.client.view.html
@@ -49,7 +49,7 @@
             <a ui-sref="{{item.state}}" ng-bind="item.title" menu-title="{{item.title}}"></a>
           </li>
           <li ui-sref-active="active" ng-repeat="item in vm.scoreMenu.items" class="menu-score-parent">
-            <a ui-sref="{{item.state}}" ng-bind="item.title" menu-title="{{item.title}}"></a><span class="menu-score" score-level="{{vm.scoreLevelData.currLevel}}"></span>
+            <a ui-sref="{{item.state}}" ng-bind="item.title" menu-title="{{item.title}}"></a><span class="menu-score" score-level="vm.scoreLevelData.currLevel"></span>
           </li>
           <li class="divider"></li>
           <li ui-sref-active="active" ng-repeat="item in vm.accountMenu.items">
diff --git a/modules/users/client/controllers/admin/user.client.controller.js b/modules/users/client/controllers/admin/user.client.controller.js
index da837b8e..96a4785d 100644
--- a/modules/users/client/controllers/admin/user.client.controller.js
+++ b/modules/users/client/controllers/admin/user.client.controller.js
@@ -6,9 +6,10 @@
     .controller('UserController', UserController);
 
   UserController.$inject = ['$scope', '$state', '$window', 'Authentication', 'userResolve', 'Notification', 'NotifycationService', 'MeanTorrentConfig',
-    'AdminService'];
+    'AdminService', 'ScoreLevelService'];
 
-  function UserController($scope, $state, $window, Authentication, user, Notification, NotifycationService, MeanTorrentConfig, AdminService) {
+  function UserController($scope, $state, $window, Authentication, user, Notification, NotifycationService, MeanTorrentConfig, AdminService,
+                          ScoreLevelService) {
     var vm = this;
 
     vm.authentication = Authentication;
@@ -18,6 +19,7 @@
     vm.remove = remove;
     vm.update = update;
     vm.isContextUserSelf = isContextUserSelf;
+    vm.scoreLevelData = ScoreLevelService.getScoreLevelJson(vm.user.score);
 
     vm.setUserScorePopover = {
       title: 'SCORE_TITLE',
@@ -156,6 +158,9 @@
 
       function onSetScoreSuccess(response) {
         vm.user = response;
+        console.log(vm.scoreLevelData);
+        vm.scoreLevelData = ScoreLevelService.getScoreLevelJson(vm.user.score);
+        console.log(vm.scoreLevelData);
 
         NotifycationService.showSuccessNotify('SET_SCORE_SUCCESSFULLY');
       }
diff --git a/modules/users/client/views/admin/view-user.client.view.html b/modules/users/client/views/admin/view-user.client.view.html
index 3255649f..c0d5242f 100644
--- a/modules/users/client/views/admin/view-user.client.view.html
+++ b/modules/users/client/views/admin/view-user.client.view.html
@@ -149,7 +149,7 @@
 
                 <dt class="h-line">{{ 'STATUS_FIELD.SCORE' | translate}}：</dt>
                 <dd class="h-line">
-                    <span>{{ vm.user.score }}</span>
+                    <span>{{ vm.user.score }}</span> <span score-level="vm.scoreLevelData.currLevel"></span>
 
                     <div class="pull-right" ng-if="vm.authentication.user.isAdmin">
                         <button class="btn btn-default btn-xs" style="width: 64px;"
diff --git a/modules/users/client/views/status/account.client.view.html b/modules/users/client/views/status/account.client.view.html
index 65f84a98..e6afe9e5 100644
--- a/modules/users/client/views/status/account.client.view.html
+++ b/modules/users/client/views/status/account.client.view.html
@@ -34,7 +34,7 @@
 
                 <dt class="h-line">{{ 'STATUS_FIELD.SCORE' | translate}}：</dt>
                 <dd class="h-line">
-                    <span class="text-score">{{ vm.user.score }}</span> <span score-level="{{vm.scoreLevelData.currLevel}}"></span> <a ui-sref="score.detail">{{ 'STATUS_FIELD.DETAIL' | translate }}</a>
+                    <span class="text-score">{{ vm.user.score }}</span> <span score-level="vm.scoreLevelData.currLevel"></span> <a ui-sref="score.detail">{{ 'STATUS_FIELD.DETAIL' | translate }}</a>
                 </dd>
 
                 <div class="margin-top-10">