diff --git a/static/src/app/army/army-member.component.css b/static/src/app/army/army-member.component.css index 8c49849..3f5b1b9 100644 --- a/static/src/app/army/army-member.component.css +++ b/static/src/app/army/army-member.component.css @@ -27,16 +27,6 @@ overflow-x: auto; } -.opfor { - color: firebrick; - font-weight: 600; -} - -.blufor { - color: blue; - font-weight: 600; -} - .table-head { background: #222222; color: white; diff --git a/static/src/app/army/army-member.component.html b/static/src/app/army/army-member.component.html index fdc6cf9..21f0e93 100644 --- a/static/src/app/army/army-member.component.html +++ b/static/src/app/army/army-member.component.html @@ -2,7 +2,7 @@
< zurück zur Übersicht -

+

Auszeichnungen von {{user.username}}

diff --git a/static/src/app/army/army-member.component.ts b/static/src/app/army/army-member.component.ts index 76c938a..6ecc23b 100644 --- a/static/src/app/army/army-member.component.ts +++ b/static/src/app/army/army-member.component.ts @@ -5,6 +5,7 @@ import {UserService} from "../services/army-management/user.service"; import {Subscription} from "rxjs/Subscription"; import {RouteConfig} from "../app.config"; import {AwardingService} from "../services/army-management/awarding.service"; +import {Fraction} from "../utils/fraction.enum"; @Component({ @@ -24,6 +25,8 @@ export class ArmyMemberComponent { isCopied = false; + readonly fraction = Fraction; + constructor(private router: Router, private route: ActivatedRoute, private userService: UserService, diff --git a/static/src/app/army/army.component.css b/static/src/app/army/army.component.css index cbbe5fe..634c812 100644 --- a/static/src/app/army/army.component.css +++ b/static/src/app/army/army.component.css @@ -58,14 +58,6 @@ img { text-decoration: underline; } -.text-opfor { - color: firebrick; -} - -.text-blufor { - color: blue; -} - .army-head { font-weight: bolder; text-align: center diff --git a/static/src/app/army/army.component.html b/static/src/app/army/army.component.html index 031ebee..4d62234 100644 --- a/static/src/app/army/army.component.html +++ b/static/src/app/army/army.component.html @@ -2,7 +2,7 @@

Übersicht über alle Spieler, Squads und Armeen

-

{{BLUFOR}}

+

{{fraction.BLUFOR}}

- @@ -31,7 +31,7 @@
-

{{OPFOR}}

+

{{fraction.OPFOR}}

- diff --git a/static/src/app/army/army.component.ts b/static/src/app/army/army.component.ts index 6adf825..3cf8566 100644 --- a/static/src/app/army/army.component.ts +++ b/static/src/app/army/army.component.ts @@ -14,9 +14,7 @@ export class ArmyComponent { army: Army = {BLUFOR: {squads: [], memberCount: 0}, OPFOR: {squads: [], memberCount: 0}}; - BLUFOR: string = Fraction.BLUFOR; - - OPFOR: string = Fraction.OPFOR; + readonly fraction = Fraction; constructor(private router: Router, private route: ActivatedRoute,