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/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", 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 4b0020e..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 @@ -
+
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 4d9b059..ae07c5b 100644 --- a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts +++ b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts @@ -1,4 +1,4 @@ -import {Component, ElementRef, EventEmitter, SimpleChanges, ViewChild} from "@angular/core"; +import {Component, EventEmitter, SimpleChanges} from "@angular/core"; import {War} from "../../../models/model-interfaces"; import {Fraction} from "../../../utils/fraction.enum"; diff --git a/static/src/app/statistic/war-detail/war-detail.component.css b/static/src/app/statistic/war-detail/war-detail.component.css index 9f2dc98..d104953 100644 --- a/static/src/app/statistic/war-detail/war-detail.component.css +++ b/static/src/app/statistic/war-detail/war-detail.component.css @@ -1,11 +1,11 @@ .war-header-container { width: 920px; - min-height: 205px; + min-height: 168px; margin: auto; } .head-field { - font-size: 24px; + font-size: 22px; margin-top: 10px; margin-bottom: 10px; } diff --git a/static/src/app/statistic/war-detail/war-detail.component.html b/static/src/app/statistic/war-detail/war-detail.component.html index ea77b1b..ddcf567 100644 --- a/static/src/app/statistic/war-detail/war-detail.component.html +++ b/static/src/app/statistic/war-detail/war-detail.component.html @@ -1,6 +1,6 @@
-

{{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/app/statistic/war-list/war-item.component.html b/static/src/app/statistic/war-list/war-item.component.html index 85ca722..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 @@
-
+
{{war.title}} @@ -9,9 +9,10 @@ vom {{war.date | date: 'dd.MM.yyyy'}}
-
- +
+
diff --git a/static/src/assets/fraction-btn.png b/static/src/assets/fraction-btn.png index 56771c1..5f4a80c 100644 Binary files a/static/src/assets/fraction-btn.png and b/static/src/assets/fraction-btn.png differ diff --git a/static/src/assets/player-stats-btn.png b/static/src/assets/player-stats-btn.png index fd9cf06..4a2ee86 100644 Binary files a/static/src/assets/player-stats-btn.png and b/static/src/assets/player-stats-btn.png differ diff --git a/static/src/assets/scoreboard-btn.png b/static/src/assets/scoreboard-btn.png index 9f01646..614de33 100644 Binary files a/static/src/assets/scoreboard-btn.png and b/static/src/assets/scoreboard-btn.png differ