diff --git a/static/src/app/ranks/edit-rank/edit-rank.component.html b/static/src/app/ranks/edit-rank/edit-rank.component.html
index 286a6a5..2b8884e 100644
--- a/static/src/app/ranks/edit-rank/edit-rank.component.html
+++ b/static/src/app/ranks/edit-rank/edit-rank.component.html
@@ -18,8 +18,8 @@
diff --git a/static/src/app/ranks/edit-rank/edit-rank.component.ts b/static/src/app/ranks/edit-rank/edit-rank.component.ts
index 67fd866..d1b50dd 100644
--- a/static/src/app/ranks/edit-rank/edit-rank.component.ts
+++ b/static/src/app/ranks/edit-rank/edit-rank.component.ts
@@ -4,6 +4,7 @@ import {NgForm} from "@angular/forms";
import {Rank} from "../../models/model-interfaces";
import {RankService} from "../../services/army-management/rank.service";
import {Subscription} from "rxjs/Subscription";
+import {Fraction} from "../../utils/fraction.enum";
@Component({
@@ -28,6 +29,8 @@ export class EditRankComponent {
@ViewChild(NgForm) form: NgForm;
+ readonly fraction = Fraction;
+
constructor(private route: ActivatedRoute,
private router: Router,
private rankService: RankService) {
diff --git a/static/src/app/ranks/rank-list/rank-item.component.html b/static/src/app/ranks/rank-list/rank-item.component.html
index dabe0c1..163065e 100644
--- a/static/src/app/ranks/rank-list/rank-item.component.html
+++ b/static/src/app/ranks/rank-list/rank-item.component.html
@@ -6,8 +6,8 @@
{{rank.name}}
- CSAT
- NATO
+ {{fraction.OPFOR}}
+ {{fraction.BLUFOR}}
- Stufe {{rank.level}}
diff --git a/static/src/app/ranks/rank-list/rank-item.component.ts b/static/src/app/ranks/rank-list/rank-item.component.ts
index 3c4994c..d28eee0 100644
--- a/static/src/app/ranks/rank-list/rank-item.component.ts
+++ b/static/src/app/ranks/rank-list/rank-item.component.ts
@@ -1,6 +1,6 @@
import {ChangeDetectionStrategy, Component, EventEmitter} from "@angular/core";
-import {Router} from "@angular/router";
import {Rank} from "../../models/model-interfaces";
+import {Fraction} from "../../utils/fraction.enum";
@Component({
selector: 'pjm-rank-item',
@@ -19,8 +19,9 @@ export class RankItemComponent {
rankSelected = new EventEmitter();
rankDelete = new EventEmitter();
- constructor(private router: Router) {
+ readonly fraction = Fraction;
+ constructor() {
}
ngOnInit() {
diff --git a/static/src/app/ranks/rank-list/rank-list.component.html b/static/src/app/ranks/rank-list/rank-list.component.html
index a6bce4c..0c2cee1 100644
--- a/static/src/app/ranks/rank-list/rank-list.component.html
+++ b/static/src/app/ranks/rank-list/rank-list.component.html
@@ -1,8 +1,8 @@
diff --git a/static/src/app/ranks/rank-list/rank-list.component.ts b/static/src/app/ranks/rank-list/rank-list.component.ts
index 807720f..ed8db72 100644
--- a/static/src/app/ranks/rank-list/rank-list.component.ts
+++ b/static/src/app/ranks/rank-list/rank-list.component.ts
@@ -6,6 +6,7 @@ import {ActivatedRoute, Router} from "@angular/router";
import {Observable} from "rxjs/Observable";
import {Rank} from "../../models/model-interfaces";
import {RankService} from "../../services/army-management/rank.service";
+import {Fraction} from "../../utils/fraction.enum";
@Component({
selector: 'rank-list',
@@ -22,6 +23,8 @@ export class RankListComponent implements OnInit {
public radioModel: string;
+ readonly fraction = Fraction;
+
constructor(private rankService: RankService,
private router: Router,
private route: ActivatedRoute,
@@ -62,7 +65,7 @@ export class RankListComponent implements OnInit {
}
deleteRank(rank) {
- const fraction = rank.fraction === 'OPFOR' ? 'CSAT' : 'NATO';
+ const fraction = rank.fraction === 'OPFOR' ? Fraction.OPFOR : Fraction.BLUFOR;
if (confirm('Soll der Rang ' + rank.name + ' (' + fraction + ') wirklich gelöscht werden?')) {
this.rankService.deleteRank(rank)
.subscribe((res) => {