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 a80d857..ac69342 100644 --- a/static/src/app/statistic/war-detail/war-detail.component.css +++ b/static/src/app/statistic/war-detail/war-detail.component.css @@ -34,14 +34,6 @@ font-weight: bold; } -.text-opfor { - color: firebrick; -} - -.text-blufor { - color: blue; -} - /* ########### TABS ########### */ :host /deep/ .nav-tabs { 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 4962068..a3a25a2 100644 --- a/static/src/app/statistic/war-detail/war-detail.component.html +++ b/static/src/app/statistic/war-detail/war-detail.component.html @@ -5,16 +5,16 @@

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

Endpunktestand:

- {{BLUFOR}} {{war.ptBlufor}} + {{fraction.BLUFOR}} {{war.ptBlufor}} | - {{war.ptOpfor}} {{OPFOR}} + {{war.ptOpfor}} {{fraction.OPFOR}}

Teilnehmer:

{{BLUFOR}} + (change)="filterPlayersByFraction(fractRadioBufor.value)">{{fraction.BLUFOR}}
@@ -73,14 +73,14 @@ + [style.color]="row['fraction'] === 'BLUFOR' ? fraction.COLOR_BLUFOR : fraction.COLOR_OPFOR"> {{value}} - {{value === 'BLUFOR' ? BLUFOR : OPFOR}} + {{value === 'BLUFOR' ? fraction.BLUFOR : fraction.OPFOR}} @@ -98,35 +98,37 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
- + - +
diff --git a/static/src/app/statistic/war-detail/war-detail.component.ts b/static/src/app/statistic/war-detail/war-detail.component.ts index fd9cf72..99b39d2 100644 --- a/static/src/app/statistic/war-detail/war-detail.component.ts +++ b/static/src/app/statistic/war-detail/war-detail.component.ts @@ -17,9 +17,7 @@ import {Fraction} from "../../utils/fraction.enum"; }) export class WarDetailComponent { - BLUFOR: string = Fraction.BLUFOR; - - OPFOR: string = Fraction.OPFOR; + readonly fraction = Fraction; @ViewChild('overview') private overviewContainer: ElementRef; @@ -103,7 +101,7 @@ export class WarDetailComponent { .subscribe(war => { this.war = war; this.rows = war.players; - this.playerChart = ChartUtils.getSingleDataArray(this.OPFOR, war.playersOpfor, this.BLUFOR, war.playersBlufor); + this.playerChart = ChartUtils.getSingleDataArray(Fraction.OPFOR, war.playersOpfor, Fraction.BLUFOR, war.playersBlufor); this.initialized = { basic: false,