From 4a836f4deebf13b8abe98e16cb27a00239ae1cf5 Mon Sep 17 00:00:00 2001 From: HardiReady Date: Wed, 15 Nov 2017 00:58:36 +0100 Subject: [PATCH 1/5] update ngx-datatable --- static/package-lock.json | 6 +++--- static/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/static/package-lock.json b/static/package-lock.json index 617528a..c956c85 100644 --- a/static/package-lock.json +++ b/static/package-lock.json @@ -213,9 +213,9 @@ "integrity": "sha512-918ksaRl8RvGWGOjpUCywTS1MnLTqHki53XXibyhZkmHGSP5yLkcArBAFhFLvtQTTbuX8KSz2WFKxwaJ3JuJFw==" }, "@swimlane/ngx-datatable": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-10.4.0.tgz", - "integrity": "sha512-wTV/64vEGPFlcpE+ezTN18baOsNXyfLLvdmhEoaDQt2OJtTKtNxJkze24w71utoJxutQRrfHJUVSkAF4CLNckA==" + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-11.0.4.tgz", + "integrity": "sha512-c/IA4wSeauLhImwkeNYpgB/QZBOPfHCBYXYie18yySUhBxBkY13mss1v0OsR17O0BJgrl79wq9uNs/FKLBo7aQ==" }, "@types/jasmine": { "version": "2.5.38", diff --git a/static/package.json b/static/package.json index 075e567..818a180 100644 --- a/static/package.json +++ b/static/package.json @@ -24,7 +24,7 @@ "@angular/platform-browser-dynamic": "^5.0.0", "@angular/router": "^5.0.0", "@swimlane/ngx-charts": "^6.1.0", - "@swimlane/ngx-datatable": "^10.4.0", + "@swimlane/ngx-datatable": "^11.0.4", "bootstrap": "^3.3.7", "d3": "^4.11.0", "jquery": "^3.1.0", From ca9420f3cfa9a0453af6dfe04540e5d6464e485c Mon Sep 17 00:00:00 2001 From: HardiReady Date: Sun, 19 Nov 2017 11:34:36 +0100 Subject: [PATCH 2/5] Use fixed position scroll for stats --- package.json | 2 +- .../war-detail/scoreboard/scoreboard.component.html | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 4ee7696..e367a2a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opt-cc", - "version": "1.6.4", + "version": "1.6.5", "license": "MIT", "author": "Florian Hartwich ", "private": true, 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 4b0020e..9a4f5fa 100644 --- a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html +++ b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html @@ -1,6 +1,6 @@ -
+
From f749185eaeeffa515eaa699ee4db85584286ddc2 Mon Sep 17 00:00:00 2001 From: HardiReady Date: Sun, 19 Nov 2017 13:20:57 +0100 Subject: [PATCH 3/5] rearrange header and use display dependent heights in scoreboard --- .../fraction-stats.component.css | 2 +- .../scoreboard/scoreboard.component.css | 6 ++++++ .../scoreboard/scoreboard.component.html | 1 - .../scoreboard/scoreboard.component.ts | 2 +- .../war-detail/war-detail.component.css | 4 ++-- .../war-detail/war-detail.component.html | 9 +++++---- static/src/assets/fraction-btn.png | Bin 1710 -> 1659 bytes static/src/assets/player-stats-btn.png | Bin 623 -> 557 bytes static/src/assets/scoreboard-btn.png | Bin 797 -> 810 bytes 9 files changed, 15 insertions(+), 9 deletions(-) diff --git a/static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.css b/static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.css index eff3b2f..f89d2fa 100644 --- a/static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.css +++ b/static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.css @@ -17,7 +17,7 @@ width: 95%; margin: 2%; min-width: 900px; - height: 600px; + height: 50vh; padding: 15px; float: left; } diff --git a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.css b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.css index 856b24a..4fa0a59 100644 --- a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.css +++ b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.css @@ -4,6 +4,12 @@ /* ########### DATATABLE ########### */ +ngx-datatable { + width: 1020px; + margin: auto; + height: 68vh; +} + :host /deep/ .datatable-header { background: #222222; font-weight: 700; 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 9a4f5fa..2ceebb8 100644 --- a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html +++ b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html @@ -1,6 +1,5 @@
-

{{war.title}} - vom {{war.date | date: 'dd.MM.yyyy'}}

+

{{war.title}} - vom {{war.date | date: 'dd.MM.yyyy'}}

Endpunktestand:

{{fraction.BLUFOR}} {{war.ptBlufor}} @@ -8,9 +8,10 @@ {{war.ptOpfor}} {{fraction.OPFOR}}
-
-

Teilnehmer:

+
+

Teilnehmer:

-
+
Logfile anzeigen
diff --git a/static/src/assets/fraction-btn.png b/static/src/assets/fraction-btn.png index 56771c1683f1176892679a1b39e2e37d52607933..5f4a80c55d190ce4fa9962da82fc3d180341b07a 100644 GIT binary patch literal 1659 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 no6TnNKcb!)|A~msc6) zL_t(Y$JLh4OH@%5$3J&W(KMrwphZc6LC_*vv=Leu6ok9zPl*1Cb`kCR4}vzWGH4M& zZ37`UE{q^5F(WLg#?feEX8g1{uU^Bb^YD$(fycY|+{5{vbMERt8Rf1ZR`eePfSp`I8Ny%UD@{?0%9@s(GlsefBcv0Zy4(BIgae=nNHy*8jmd>O5%)1?lH7z(G`*pGlGx&2_2Q>osLsxxXcynCY_P{-9z!F#J7 zFU{kaHZ@=ls0aH-N@+c%f3yTV2wp3z@ltwqE;Gkt27duw=AJ*ZxloUH+cb)l(?WQ3 z2pGwEwG#g!;8f`^5MVh%-QU)DGWQMwlf4*=eIZ{5>Jd(XkHH%Nj`bqc-(xy8126;l z3M_`qYN=TrGz)x-J8k67>%jfkzAp_p7q)3&B9yoOD5z8#z|)9AKCN5eZeN*$z`8mG zEToivwuvkPH?u1!^&zjOR;!h&)oPxXUsu$wbLKa$c)#PKJ>m4}|^y?6f_ynW+zI``g(!0e|1GQ5VaA!F|d-8!)n(hIi+r`$#%4^Q}0r5%KMo~ zGTNZtuP&&6sz=nf)N3o}u2Emk=jPR2>Z@w!asbt+U+|yuq1qWmt!`A0mF(x$@9TU= z6(}N5R{`$=Yk+N)JL`c%z;<8;*a&oh0(c5I3-o|NM7*cABVzEcOw@bSf1dSnp(u)j zHTsL{bL#0a_wFlavqF7X{XGNq)Iv?8(Mh; zN8O@cSL?T~Kf2xSXfiyle>xZpcBhoSsW|RefY+4$q?E3xmr&Pd2X8DcF3zQtdNm|? zOx>&A)>NJLIFL;9msI-w{;8>{sat`yrDKuymWQg_r%ht`DU{3WlCm(0IrChi30fZLbj8TM%|)1i{?YV~IIdUca})p7u> hQn#s_n}}1V{|leoKX)IsFC72?002ovPDHLkV1lCqh_(O# delta 790 zcmV+x1L^##2Au{WiBL{Q4GJ0x0000DNk~Le0000U0000U2nGNE06Q?QqLCpLf6_@r zK~zY`y_P>{R6!8NfBTX%#E7v_LKGn&YD5(A4`QQ*XklZaVqq!^#VQdoqM)E4Xd$Ad zq>7*kh>cAO;Xn}~Di&gq1Vt2-GYS5?)7*Ra_Osc;_3`eKTrT;V-JPACdEdO5orMaJ z#DYVT@#YsKon1)h&m=w7KlDzce?KexL6yB*z%OqdO6ribKIzEK8ztS4^h(l6C*Lk9 zQ!Dcq`X8aB))c*)3B3U~cFdM>8U2ZM2FN;Rt33ISgx*154EU7xD@>K-S_cdQA+RGw ztsS@y8~_@DW!~Nw;2Q87_y+8=)?NyNpad9W%w(nT_NY3>r>3SZRM`6}f9a~E&sEOv z|1Uu#wMgo7n~|hA?Nl7cT~QQ0uVD13q?M8i3Hhj`aY@~h7Mldq%fL2Z9C+tKxE9z6 ztZ{0ea=F}wwzjq(KtqMRD7mu$dEkgKW+=7v9OI@6p)C9!$y%FF zalED)AIPnGy1q# zEH=-elm=?<$F7V3e!8&;*i0sKERN%`l$*-Op}9N+%J}HUMZknHraK6N^9h|}z^Oz{ z*XG#WSPj4fCmIG?ftSXZNA5l^BL{5t*2B{|ZmhD`1at#OfKlL{G3K`SVI#l_w_FBH zcxT7z^4jzgtvsGiY$VejNoTzE;C#G3lUY6J z5-~_LkJpm!){ UNwtZzPXGV_07*qoM6N<$f>6qX+W-In From 0bbda3623974d36adcf5a21b1adb6c3e804100bb Mon Sep 17 00:00:00 2001 From: HardiReady Date: Sun, 19 Nov 2017 15:01:41 +0100 Subject: [PATCH 4/5] remove empty column for trash symbol on missing access --- static/src/app/statistic/war-list/war-item.component.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/static/src/app/statistic/war-list/war-item.component.html b/static/src/app/statistic/war-list/war-item.component.html index 85ca722..0d9cd73 100644 --- a/static/src/app/statistic/war-list/war-item.component.html +++ b/static/src/app/statistic/war-list/war-item.component.html @@ -9,9 +9,10 @@ vom {{war.date | date: 'dd.MM.yyyy'}}
-
- +
+
From a32bb610208088d5f8af7e508bc6f83e8c035d1a Mon Sep 17 00:00:00 2001 From: HardiReady Date: Sun, 19 Nov 2017 15:10:14 +0100 Subject: [PATCH 5/5] change war list entry titzle width field --- static/src/app/statistic/war-list/war-item.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/src/app/statistic/war-list/war-item.component.html b/static/src/app/statistic/war-list/war-item.component.html index 0d9cd73..0545d74 100644 --- a/static/src/app/statistic/war-list/war-item.component.html +++ b/static/src/app/statistic/war-list/war-item.component.html @@ -1,7 +1,7 @@
-
+