Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-02-28 01:00:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): fixed limit user score number to two decimals

Browse Source
This commit is contained in:
OldHawk
2017-11-21 16:26:37 +08:00
parent c6fd184019
commit 415cfab5ce
8 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
modules/core/client/directives/score-level.client.directive.js
View File

@@ -2,11 +2,11 @@
'use strict';
angular.module('core')
.directive('scoreLevel', scoreLevel);
.directive('scoreLevelCurr', scoreLevelCurr);
scoreLevel.$reject = ['ScoreLevelService'];
scoreLevelCurr.$reject = ['ScoreLevelService'];
function scoreLevel(ScoreLevelService) {
function scoreLevelCurr(ScoreLevelService) {
var directive = {
restrict: 'A',
replace: true,
@@ -16,7 +16,7 @@
return directive;
function link(scope, element, attrs) {
scope.$watch(attrs.scoreLevel, function (u) {
scope.$watch(attrs.scoreLevelCurr, function (u) {
if (u) {
console.log(u);
var scoreLevelData = ScoreLevelService.getScoreLevelJson(u.score);
@@ -30,4 +30,34 @@
});
}
}
angular.module('core')
.directive('scoreLevelNext', scoreLevelNext);
scoreLevelNext.$reject = ['ScoreLevelService'];
function scoreLevelNext(ScoreLevelService) {
var directive = {
restrict: 'A',
replace: true,
link: link
};
return directive;
function link(scope, element, attrs) {
scope.$watch(attrs.scoreLevelNext, function (u) {
if (u) {
console.log(u);
var scoreLevelData = ScoreLevelService.getScoreLevelJson(u.score);
var l = 'L' + (scoreLevelData ? scoreLevelData.nextLevel : 0);
l = '<kbd>' + l + '</kbd>';
element.addClass('score-level');
element.html(l);
}
});
}
}
}());

2
modules/core/client/views/header.client.view.html
View File

@@ -57,7 +57,7 @@
<a ui-sref="{{item.state}}" ng-bind="item.title" menu-title="{{item.title}}"></a><span class="badge menu-badge badge_danger" ng-show="vm.user.hnr_warning>0">{{vm.user.hnr_warning}}</span>
</li>
<li ui-sref-active="active" ng-repeat="item in vm.scoreMenu.items" class="menu-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-curr="vm.user"></span>
</li>
<li ui-sref-active="active" ng-repeat="item in vm.inviteMenu.items" class="menu-parent">
<a ui-sref="{{item.state}}" ng-bind="item.title" menu-title="{{item.title}}"></a><span class="badge menu-badge badge_info">{{vm.countMyInvitations}}</span>

2
modules/forums/client/views/topic.client.view.html
View File

@@ -71,7 +71,7 @@
<div class="reply-comment-header-text">
<span user-info="vm.topic.user" info-name></span>
<span vip-flag="vm.topic.user"></span>
<!--<span score-level="vm.getUserScoreLevel(vm.topic.user);"></span>-->
<!--<span score-level-curr="vm.topic.user"></span>-->
<!--<span message-to="vm.topic.user" to-class="message-to-icon"></span>-->
<span class="user-ud-text xs-hide" ng-if="vm.announce.privateTorrentCmsMode">
(<span class="glyphicon glyphicon-arrow-up torrent-up"></span>{{vm.topic.user.uploaded | bytes}}

8
modules/ranking/client/views/ranking.client.view.html
View File

@@ -51,7 +51,7 @@
<td class="text-center">{{user.downloaded | bytes:2}}</td>
<td class="text-center"><span
ng-class="user.ratio == 0 ? 'ratio-warning' : 'ratio-normal' ">{{ user.ratio | ratio}}</span></td>
<td class="text-center">{{user.score}}</td>
<td class="text-center">{{user.score | number: 2}}</td>
<td class="text-center">{{user.seeded}}</td>
<td class="text-center">{{user.leeched}}</td>
<td class="text-center">{{user.finished}}</td>
@@ -102,7 +102,7 @@
<td class="text-center">{{user.uploaded | bytes:2}}</td>
<td class="text-center"><span
ng-class="user.ratio == 0 ? 'ratio-warning' : 'ratio-normal' ">{{ user.ratio | ratio}}</span></td>
<td class="text-center">{{user.score}}</td>
<td class="text-center">{{user.score | number: 2}}</td>
<td class="text-center">{{user.seeded}}</td>
<td class="text-center">{{user.leeched}}</td>
<td class="text-center">{{user.finished}}</td>
@@ -153,7 +153,7 @@
ng-class="user.ratio == 0 ? 'ratio-warning' : 'ratio-normal' ">{{ user.ratio | ratio}}</span></td>
<td class="text-center">{{user.uploaded | bytes:2}}</td>
<td class="text-center">{{user.downloaded | bytes:2}}</td>
<td class="text-center">{{user.score}}</td>
<td class="text-center">{{user.score | number: 2}}</td>
<td class="text-center">{{user.seeded}}</td>
<td class="text-center">{{user.leeched}}</td>
<td class="text-center">{{user.finished}}</td>
@@ -200,7 +200,7 @@
<span vip-flag="user"></span>
<!--<span message-to="user" to-class="message-to-icon"></span>-->
</td>
<td class="text-right ranking-active-col">{{user.score}} <span score-level="user"></span></td>
<td class="text-right ranking-active-col">{{user.score | number: 2}} <span score-level-curr="user"></span></td>
<td class="text-center" ng-if="vm.announce.privateTorrentCmsMode">{{user.uploaded | bytes:2}}</td>
<td class="text-center" ng-if="vm.announce.privateTorrentCmsMode">{{user.downloaded | bytes:2}}</td>
<td class="text-center" ng-if="vm.announce.privateTorrentCmsMode"><span

2
modules/users/client/views/admin/view-user.client.view.html
View File

@@ -105,7 +105,7 @@
<dt class="h-line">{{ 'STATUS_FIELD.SCORE' | translate}}：</dt>
<dd class="h-line">
<span>{{ vm.user.score }}</span> <span score-level="vm.scoreLevelData.currLevel"></span>
<span>{{ vm.user.score | number: 2 }}</span> <span score-level-curr="vm.user"></span>
<div class="pull-right" ng-if="vm.authentication.user.isAdmin">
<button class="btn btn-default btn-xs btn-width-100"

12
modules/users/client/views/score/detail.client.view.html
View File

@@ -1,15 +1,15 @@
<section ng-controller="ScoreController as vm" ng-init="vm.init();">
<div class="margin-top-40">
<div class="text-center">
<span>{{ 'SCORE.CURRENT_SCORE' | translate }}</span> <span class="curr-score">{{ vm.scoreLevelData.score }}</span> <span
score-level="vm.scoreLevelData.currLevel"></span>
<span>{{ 'SCORE.CURRENT_SCORE' | translate }}</span> <span class="curr-score">{{ vm.scoreLevelData.score | number: 2}}</span> <span
score-level-curr="vm.user"></span>
</div>
<div class="row margin-top-30">
<div class="col-sm-8 col-sm-offset-2">
<div>
<span>{{ vm.scoreLevelData.currLevelValue }}</span>
<span class="pull-right">{{ vm.scoreLevelData.nextLevelValue }}</span>
<span>{{ vm.scoreLevelData.currLevelValue | number: 2 }}</span>
<span class="pull-right">{{ vm.scoreLevelData.nextLevelValue | number: 2 }}</span>
</div>
<div class="progress score-progress">
<div class="progress-bar progress-bar-success" style="width: {{ vm.scoreLevelData.currPercentString }}">
@@ -17,8 +17,8 @@
</div>
</div>
<div>
<span class="score-level-default" score-level="vm.scoreLevelData.currLevel"></span>
<span class="score-level-default pull-right" score-level="vm.scoreLevelData.nextLevel"></span>
<span class="score-level-default" score-level-curr="vm.user"></span>
<span class="score-level-default pull-right" score-level-next="vm.user"></span>
</div>
</div>
</div>

2
modules/users/client/views/status/account.client.view.html
View File

@@ -60,7 +60,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
<span class="text-score">{{ vm.user.score | number: 2 }}</span> <span score-level-curr="vm.user"></span> <a
class="pull-right" ui-sref="score.detail">{{ 'STATUS_FIELD.DETAIL' | translate }}</a>
</dd>

2
modules/users/client/views/userinfo/userinfo.client.view.html
View File

@@ -64,7 +64,7 @@
<dt class="h-line">{{ 'STATUS_FIELD.SCORE' | translate}}：</dt>
<dd class="h-line">
<span>{{ vm.user.score }}</span> <span score-level="vm.scoreLevelData.currLevel"></span>
<span>{{ vm.user.score | number: 2 }}</span> <span score-level-curr="vm.user"></span>
</dd>
<li class="status-divider"></li>