diff --git a/static/src/app/users/award-user/award-user.component.html b/static/src/app/users/award-user/award-user.component.html
index 3c99259..22286cb 100644
--- a/static/src/app/users/award-user/award-user.component.html
+++ b/static/src/app/users/award-user/award-user.component.html
@@ -13,7 +13,8 @@
style="min-width: 200px;">
diff --git a/static/src/app/users/award-user/award-user.component.ts b/static/src/app/users/award-user/award-user.component.ts
index e0ee866..ff82b6e 100644
--- a/static/src/app/users/award-user/award-user.component.ts
+++ b/static/src/app/users/award-user/award-user.component.ts
@@ -4,6 +4,7 @@ import {Award, Decoration} from "../../models/model-interfaces";
import {NgForm} from "@angular/forms";
import {AwardingService} from "../../services/army-management/awarding.service";
import {DecorationService} from "../../services/army-management/decoration.service";
+import {Fraction} from "../../utils/fraction.enum";
@Component({
@@ -24,6 +25,8 @@ export class AwardUserComponent {
decoPreviewDisplay = 'none';
+ readonly fraction = Fraction;
+
constructor(private router: Router,
private route: ActivatedRoute,
private awardingService: AwardingService,
diff --git a/static/src/app/users/edit-user/edit-user.component.html b/static/src/app/users/edit-user/edit-user.component.html
index 42dc09e..5bae261 100644
--- a/static/src/app/users/edit-user/edit-user.component.html
+++ b/static/src/app/users/edit-user/edit-user.component.html
@@ -24,7 +24,7 @@
(change)="toggleRanks()">
diff --git a/static/src/app/users/edit-user/edit-user.component.ts b/static/src/app/users/edit-user/edit-user.component.ts
index aab5110..ae36810 100644
--- a/static/src/app/users/edit-user/edit-user.component.ts
+++ b/static/src/app/users/edit-user/edit-user.component.ts
@@ -6,6 +6,7 @@ import {SquadService} from "../../services/army-management/squad.service";
import {RankService} from "../../services/army-management/rank.service";
import {Subscription} from "rxjs";
import {NgForm} from "@angular/forms";
+import {Fraction} from "../../utils/fraction.enum";
@Component({
@@ -32,6 +33,8 @@ export class EditUserComponent {
error: string;
+ readonly fraction = Fraction;
+
constructor(private router: Router,
private route: ActivatedRoute,
private userService: UserService,
diff --git a/static/src/app/users/user-list/user-item.component.html b/static/src/app/users/user-list/user-item.component.html
index 4e4ad63..2f7bdc3 100644
--- a/static/src/app/users/user-list/user-item.component.html
+++ b/static/src/app/users/user-list/user-item.component.html
@@ -6,8 +6,9 @@
{{user.username}}
- CSAT - {{user.squadId.name}}
- NATO - {{user.squadId.name}}
+ {{fraction.OPFOR}} - {{user.squadId.name}}
+ {{fraction.BLUFOR}} - {{user.squadId.name}}
+
ohne Squad/Fraktion
diff --git a/static/src/app/users/user-list/user-item.component.ts b/static/src/app/users/user-list/user-item.component.ts
index ae188d2..f433f57 100644
--- a/static/src/app/users/user-list/user-item.component.ts
+++ b/static/src/app/users/user-list/user-item.component.ts
@@ -1,6 +1,6 @@
import {ChangeDetectionStrategy, Component, EventEmitter} from "@angular/core";
-import {Router} from "@angular/router";
import {User} from "../../models/model-interfaces";
+import {Fraction} from "../../utils/fraction.enum";
@Component({
selector: 'pjm-user-item',
@@ -19,8 +19,9 @@ export class UserItemComponent {
userAward = new EventEmitter();
userDelete = new EventEmitter();
- constructor(private router: Router) {
+ readonly fraction = Fraction;
+ constructor() {
}
select() {
diff --git a/static/src/app/users/user-list/user-list.component.html b/static/src/app/users/user-list/user-list.component.html
index 1f55f83..952dd50 100644
--- a/static/src/app/users/user-list/user-list.component.html
+++ b/static/src/app/users/user-list/user-list.component.html
@@ -1,8 +1,8 @@