diff --git a/static/src/app/squads/edit-squad/edit-squad.component.html b/static/src/app/squads/edit-squad/edit-squad.component.html
index 61ada09..c230836 100644
--- a/static/src/app/squads/edit-squad/edit-squad.component.html
+++ b/static/src/app/squads/edit-squad/edit-squad.component.html
@@ -18,8 +18,8 @@
diff --git a/static/src/app/squads/edit-squad/edit-squad.component.ts b/static/src/app/squads/edit-squad/edit-squad.component.ts
index 6ebef35..3a7d4fa 100644
--- a/static/src/app/squads/edit-squad/edit-squad.component.ts
+++ b/static/src/app/squads/edit-squad/edit-squad.component.ts
@@ -4,6 +4,7 @@ import {NgForm} from "@angular/forms";
import {Squad} from "../../models/model-interfaces";
import {SquadService} from "../../services/army-management/squad.service";
import {Subscription} from "rxjs/Subscription";
+import {Fraction} from "../../utils/fraction.enum";
@Component({
@@ -28,6 +29,8 @@ export class EditSquadComponent {
@ViewChild(NgForm) form: NgForm;
+ readonly fraction = Fraction;
+
constructor(private route: ActivatedRoute,
private router: Router,
private squadService: SquadService) {
diff --git a/static/src/app/squads/squad-list/squad-item.component.html b/static/src/app/squads/squad-list/squad-item.component.html
index 9f77b26..af111b8 100644
--- a/static/src/app/squads/squad-list/squad-item.component.html
+++ b/static/src/app/squads/squad-list/squad-item.component.html
@@ -6,8 +6,8 @@
{{squad.name}}
- CSAT
- NATO
+ {{fraction.OPFOR}}
+ {{fraction.BLUFOR}}
diff --git a/static/src/app/squads/squad-list/squad-item.component.ts b/static/src/app/squads/squad-list/squad-item.component.ts
index 9e85bc6..b44ffa7 100644
--- a/static/src/app/squads/squad-list/squad-item.component.ts
+++ b/static/src/app/squads/squad-list/squad-item.component.ts
@@ -1,6 +1,6 @@
import {ChangeDetectionStrategy, Component, EventEmitter} from "@angular/core";
-import {Router} from "@angular/router";
import {Squad} from "../../models/model-interfaces";
+import {Fraction} from "../../utils/fraction.enum";
@Component({
selector: 'pjm-squad-item',
@@ -20,7 +20,9 @@ export class SquadItemComponent {
imageSrc;
- constructor(private router: Router) {
+ readonly fraction = Fraction;
+
+ constructor() {
}
ngOnInit() {
diff --git a/static/src/app/squads/squad-list/squad-list.component.html b/static/src/app/squads/squad-list/squad-list.component.html
index a965dd7..08b1b13 100644
--- a/static/src/app/squads/squad-list/squad-list.component.html
+++ b/static/src/app/squads/squad-list/squad-list.component.html
@@ -1,8 +1,8 @@
diff --git a/static/src/app/squads/squad-list/squad-list.component.ts b/static/src/app/squads/squad-list/squad-list.component.ts
index fcb5582..ca54e1e 100644
--- a/static/src/app/squads/squad-list/squad-list.component.ts
+++ b/static/src/app/squads/squad-list/squad-list.component.ts
@@ -6,6 +6,7 @@ import {ActivatedRoute, Router} from "@angular/router";
import {Observable} from "rxjs/Observable";
import {Squad} from "../../models/model-interfaces";
import {SquadService} from "../../services/army-management/squad.service";
+import {Fraction} from "../../utils/fraction.enum";
@Component({
selector: 'squad-list',
@@ -22,6 +23,8 @@ export class SquadListComponent implements OnInit {
public radioModel: string;
+ readonly fraction = Fraction;
+
constructor(private squadService: SquadService,
private router: Router,
private route: ActivatedRoute,
@@ -58,7 +61,7 @@ export class SquadListComponent implements OnInit {
}
deleteSquad(squad) {
- const fraction = squad.fraction === 'OPFOR' ? 'CSAT' : 'NATO';
+ const fraction = squad.fraction === 'OPFOR' ? Fraction.OPFOR : Fraction.BLUFOR;
if (confirm('Soll das Squad "' + squad.name + '" (' + fraction + ') wirklich gelöscht werden?')) {
this.squadService.deleteSquad(squad)
.subscribe((res) => {