From 629f36e1e0903f90c8a94821a2a3815c33781e36 Mon Sep 17 00:00:00 2001 From: Florian Hartwich Date: Thu, 26 Apr 2018 12:26:07 +0200 Subject: [PATCH] loop over scoreboard values from array --- .../scoreboard/scoreboard.component.html | 92 +++--------------- .../scoreboard/scoreboard.component.ts | 9 +- .../scoreboard/{vair.png => vehicleAir.png} | Bin static/src/assets/scoreboard/vehicleHeavy.png | Bin 0 -> 567 bytes .../{vlight.png => vehicleLight.png} | Bin static/src/assets/scoreboard/vheavy.png | Bin 457 -> 0 bytes 6 files changed, 19 insertions(+), 82 deletions(-) rename static/src/assets/scoreboard/{vair.png => vehicleAir.png} (100%) create mode 100644 static/src/assets/scoreboard/vehicleHeavy.png rename static/src/assets/scoreboard/{vlight.png => vehicleLight.png} (100%) delete mode 100644 static/src/assets/scoreboard/vheavy.png diff --git a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html index 7f80d9b..5284f6e 100644 --- a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html +++ b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html @@ -10,7 +10,7 @@ [columnMode]="'force'" [scrollbarV]="true" [selectionType]="'single'"> - + @@ -18,92 +18,24 @@ - + {{value === 'BLUFOR' ? fraction.BLUFOR : fraction.OPFOR}} - - + +
+ + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+ diff --git a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts index 316a561..0ced99b 100644 --- a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts +++ b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts @@ -19,8 +19,13 @@ export class ScoreboardComponent implements OnChanges { @Output() playerTabSwitch = new EventEmitter(); - tableHead = ['Spieler', 'Fraktion', 'Kills', 'FF', 'Fzg(L)', 'Fzg(H)', 'Fzg(A)', - 'Revive', 'Flagge', 'Tod', 'Respawn']; + tableHead = [ + {prop: 'name', head: 'Spieler'}, {prop: 'fraction', head: 'Fraktion'}, {prop: 'kill', head: 'Kills'}, + {prop: 'friendlyFire', head: 'FriendlyFire'}, {prop: 'vehicleLight', head: 'Fahrzeug (leicht)'}, + {prop: 'vehicleHeavy', head: 'Fahrzeug (schwer)'}, {prop: 'vehicleAir', head: 'Fahrzeug (Luft)'}, + {prop: 'revive', head: 'Revive'}, {prop: 'flagTouch', head: 'Flagge'}, {prop: 'death', head: 'Tod'}, + {prop: 'respawn', head: 'Respawn'} + ]; isSteamUUID = PlayerUtils.isSteamUUID; diff --git a/static/src/assets/scoreboard/vair.png b/static/src/assets/scoreboard/vehicleAir.png similarity index 100% rename from static/src/assets/scoreboard/vair.png rename to static/src/assets/scoreboard/vehicleAir.png diff --git a/static/src/assets/scoreboard/vehicleHeavy.png b/static/src/assets/scoreboard/vehicleHeavy.png new file mode 100644 index 0000000000000000000000000000000000000000..f0ec30cb6ff408d39946a359f07148b9c481f238 GIT binary patch literal 567 zcmV-70?7S|P)X4$%!G6fPn;TEEEK>Rg0*FU}dFNimi>H z{sKE8rH#FfKOkMIAYzeND2kFsf?yDX8178&ZokJOdm2pQnS=w2ePG#b=9~AMnRgZ{ zDk>`eH`==A*iISS*~J-=^c3(ASQTb7m>0eaU-F3Nc0ub(00R--gogsg1#1zDy^t@(2Xq2Ht1H3_U>10p;A<_Sai9!t=^$`EgS)^bV7Abkz(@u^3WyAj z7qF0nLMMYpM5JF8*sN?#2M1t6m<%`_a2c2c#(+A|1eSnz!t;PR;b6cFFe)?yhPJyj z&?-M3=MneI3-s>MM~y;93LQ^+QazjWj=JCmZFfPT)7`V}CE!nmP0b4(OB*6u?u{k& zbt;Q{kvyWYrHr)*+Ipgo$#KI8jkMDcc62!DZTmo>Pdhriqq<^~szPt5AJnwZ zyr0x(Ej_wr758#Mp@##`0LOs3keBVbSUO@l;NA|Uej_{pUgZ(XU2At&_`Vs_D0lmH zbx~bbSJZj+N?-q)t7WU&zu!Yi#|xc&Ukakdg00002VoOIv0RM-N z%)bBt0fI?HK~zY`?Ulbvl~EYSKj%o@!W1(oaj-k6NjU{YQ&?M5)X)?-1#UX^54bdl zOH0ubZ7vZwMOZ^qLnd5_Z$u!>fdF_ z5`Zlmyz+}r>;}kMGC1Zl*VN|@Wk*}3=yb%7>ayc4jkAsJE$7s#_bu<#dmV7l{&QqlX?MoAhy}Cg3`YeBfo6-Ai!U!pctO1mGIog~RWN8xR4ifk%Ze zPbCa{Iwt^MbFC->KX@AQXiiX}T$tlcWG9TU!FiSn8_b1$R5!WA7^j+SuX^<_7aDwE zVrtqj$rX>++E3Zr-fL)Zz0v!etkYceF=T{#DW#!pg6Thso6IxMdlpz{g{@G}03?vM z$A`32VUf@8K3&P5;xCRgv*z@G<O|Ca06817q;p$00000NkvXXu0mjfoMF=_