hardi
/
opt-cc
1
0
Fork 0
Code Pull Requests Releases 47 Activity

reformat code

pull/30/head
HardiReady 2018-03-11 09:39:05 +01:00
parent c4a876bbda
commit 53a99020b8
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
static/src/app/services/army-management/awarding.service.ts
View File

@ -14,7 +14,7 @@ export class AwardingService {
getUnconfirmedAwards(fraction?: string) { getUnconfirmedAwards(fraction?: string) {
return this.http.get(this.config.apiAwardPath + '?inProgress=true&fractFilter=' + fraction) return this.http.get(this.config.apiAwardPath + '?inProgress=true&fractFilter=' + fraction)
.map(res => res.json()); .map(res => res.json());
} }
checkUnprocessedAwards(fraction?: string) { checkUnprocessedAwards(fraction?: string) {
@ -30,7 +30,7 @@ export class AwardingService {
*/ */
getUserAwardings(userId: string) { getUserAwardings(userId: string) {
return this.http.get(this.config.apiAwardPath + '?userId=' + userId) return this.http.get(this.config.apiAwardPath + '?userId=' + userId)
.map(res => res.json()); .map(res => res.json());
} }
addAwarding(award: Award) { addAwarding(award: Award) {
@ -39,7 +39,7 @@ export class AwardingService {
updateAward(award) { updateAward(award) {
return this.http.patch(this.config.apiAwardPath + '/' + award._id, award) return this.http.patch(this.config.apiAwardPath + '/' + award._id, award)
.map(res => res.json()); .map(res => res.json());
} }
requestAwarding(award: Award) { requestAwarding(award: Award) {

4
static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts
View File

@ -97,7 +97,9 @@ export class CampaignPlayerDetailComponent implements OnInit {
this.captureData = this.assignData(this.yAxisCapture, 'flagTouch'); this.captureData = this.assignData(this.yAxisCapture, 'flagTouch');
this.kdRatio = parseFloat((this.totalKills / (this.totalDeath === 0 ? 1 : this.totalDeath)).toFixed(2)); this.kdRatio = parseFloat((this.totalKills / (this.totalDeath === 0 ? 1 : this.totalDeath)).toFixed(2));
if (this.kdRatio > 1) { this.maxKd = this.kdRatio * 1.7; } if (this.kdRatio > 1) {
this.maxKd = this.kdRatio * 1.7;
}
this.respawnDeathRatio = parseFloat((this.totalRespawn / (this.totalDeath === 0 ? 1 : this.totalDeath)).toFixed(2)); this.respawnDeathRatio = parseFloat((this.totalRespawn / (this.totalDeath === 0 ? 1 : this.totalDeath)).toFixed(2));

2
static/src/app/statistic/highscore/highscore.component.css
View File

@ -58,6 +58,7 @@ ngx-datatable {
} }
/* Table Scrollbar BEGIN */ /* Table Scrollbar BEGIN */
:host /deep/ .ngx-datatable.scroll-vertical .datatable-body::-webkit-scrollbar { :host /deep/ .ngx-datatable.scroll-vertical .datatable-body::-webkit-scrollbar {
width: 12px; width: 12px;
} }
@ -72,4 +73,5 @@ ngx-datatable {
background: #4b4b4b; background: #4b4b4b;
-webkit-box-shadow: inset 0 0 6px rgba(255, 255, 255, 0.5); -webkit-box-shadow: inset 0 0 6px rgba(255, 255, 255, 0.5);
} }
/* Table Scrollbar END */ /* Table Scrollbar END */