From d6703f715df18bdf7c9ad64063ea60028ee78421 Mon Sep 17 00:00:00 2001
From: HardiReady <hardi@noarch.de>
Date: Sat, 5 May 2018 09:14:49 +0200
Subject: [PATCH] Simplify highscore code and adjust font in table head

---
 .../campaign-player-detail.component.ts       |  2 +-
 .../highscore/highscore.component.css         |  4 ++++
 .../highscore/highscore.component.html        |  2 +-
 .../campaign/highscore/highscore.component.ts | 20 +++++++------------
 .../war/scoreboard/scoreboard.component.css   |  4 ++++
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.ts b/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.ts
index a84c77f..c0f6953 100644
--- a/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.ts
+++ b/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.ts
@@ -60,7 +60,7 @@ export class CampaignPlayerDetailComponent implements OnInit {
           this.campaignPlayer = campaignPlayer;
 
           this.graphData = [
-            { key: 'kill', label: 'Kills', },
+            { key: 'kill', label: 'Abschüsse', },
             { key: 'friendlyFire', label: 'Friendly Fire', },
             { key: 'death', label: 'Tode', },
             { key: 'respawn', label: 'Respawn', },
diff --git a/static/src/app/statistic/campaign/highscore/highscore.component.css b/static/src/app/statistic/campaign/highscore/highscore.component.css
index 6e8508b..da5284b 100644
--- a/static/src/app/statistic/campaign/highscore/highscore.component.css
+++ b/static/src/app/statistic/campaign/highscore/highscore.component.css
@@ -57,6 +57,10 @@ ngx-datatable {
   background-color: #f7f7f7;
 }
 
+:host /deep/ .ngx-datatable.fixed-header .datatable-header .datatable-header-inner .datatable-header-cell {
+  margin: auto;
+}
+
 /* Table Scrollbar BEGIN */
 
 :host /deep/ .ngx-datatable.scroll-vertical .datatable-body::-webkit-scrollbar {
diff --git a/static/src/app/statistic/campaign/highscore/highscore.component.html b/static/src/app/statistic/campaign/highscore/highscore.component.html
index e739427..475e567 100644
--- a/static/src/app/statistic/campaign/highscore/highscore.component.html
+++ b/static/src/app/statistic/campaign/highscore/highscore.component.html
@@ -15,7 +15,7 @@
     </span>
   </div>
 
-  <div *ngFor="let attributeMap of playerAttributeDisplayNames.slice(2, playerAttributeDisplayNames.length)">
+  <div *ngFor="let attributeMap of playerAttributeDisplayNames">
     <ngx-datatable
       [rows]="players[attributeMap.prop]"
       [messages]="emptyMessage"
diff --git a/static/src/app/statistic/campaign/highscore/highscore.component.ts b/static/src/app/statistic/campaign/highscore/highscore.component.ts
index 519bab5..1954314 100644
--- a/static/src/app/statistic/campaign/highscore/highscore.component.ts
+++ b/static/src/app/statistic/campaign/highscore/highscore.component.ts
@@ -28,7 +28,7 @@ export class StatisticHighScoreComponent implements OnInit {
 
   playersStored = {};
 
-  playerAttributeDisplayNames = PlayerUtils.attributeDisplayNames;
+  playerAttributeDisplayNames = PlayerUtils.attributeDisplayNames.slice(2, PlayerUtils.attributeDisplayNames.length);
 
   cellHeight = 40;
 
@@ -36,7 +36,7 @@ export class StatisticHighScoreComponent implements OnInit {
 
   nameColWidth = 210;
 
-  valueColWidth = 50;
+  valueColWidth = 55;
 
   emptyMessage = {emptyMessage: 'Keine Einträge'};
 
@@ -87,17 +87,11 @@ export class StatisticHighScoreComponent implements OnInit {
     if (!this.searchTerm.value || this.searchTerm.value === '') {
       this.players = this.playersStored;
     } else {
-      this.players = {
-        kill: this.filterPlayerAttribute('kill'),
-        friendlyFire: this.filterPlayerAttribute('friendlyFire'),
-        vehicleLight: this.filterPlayerAttribute('vehicleLight'),
-        vehicleHeavy: this.filterPlayerAttribute('vehicleLight'),
-        vehicleAir: this.filterPlayerAttribute('vehicleLight'),
-        death: this.filterPlayerAttribute('death'),
-        respawn: this.filterPlayerAttribute('respawn'),
-        revive: this.filterPlayerAttribute('revive'),
-        flagTouch: this.filterPlayerAttribute('flagTouch')
-      };
+      this.players = {};
+      for (let i = 0; i < this.playerAttributeDisplayNames.length; i++) {
+        const attributeProperty = this.playerAttributeDisplayNames[i].prop;
+        this.players[attributeProperty] = this.filterPlayerAttribute(attributeProperty);
+      }
     }
   }
 
diff --git a/static/src/app/statistic/war/scoreboard/scoreboard.component.css b/static/src/app/statistic/war/scoreboard/scoreboard.component.css
index 97c9a5f..c06a7a6 100644
--- a/static/src/app/statistic/war/scoreboard/scoreboard.component.css
+++ b/static/src/app/statistic/war/scoreboard/scoreboard.component.css
@@ -43,6 +43,10 @@ ngx-datatable {
   background-color: #f7f7f7;
 }
 
+:host /deep/ .ngx-datatable.fixed-header .datatable-header .datatable-header-inner .datatable-header-cell {
+  margin: auto;
+}
+
 /* Table Scrollbar BEGIN */
 :host /deep/ .ngx-datatable.scroll-vertical .datatable-body::-webkit-scrollbar {
   width: 12px;