diff --git a/static/src/app/decorations/decoration-list/decoration-item.component.html b/static/src/app/decorations/decoration-list/decoration-item.component.html index 4e8fe41..4b1cf4c 100644 --- a/static/src/app/decorations/decoration-list/decoration-item.component.html +++ b/static/src/app/decorations/decoration-list/decoration-item.component.html @@ -6,8 +6,8 @@ {{decoration.name}}
- CSAT - NATO + {{fraction.OPFOR}} + {{fraction.BLUFOR}} Global - Sortierung: {{decoration.sortingNumber}} diff --git a/static/src/app/decorations/decoration-list/decoration-item.component.ts b/static/src/app/decorations/decoration-list/decoration-item.component.ts index f366857..810fda1 100644 --- a/static/src/app/decorations/decoration-list/decoration-item.component.ts +++ b/static/src/app/decorations/decoration-list/decoration-item.component.ts @@ -1,9 +1,9 @@ import {ChangeDetectionStrategy, Component, EventEmitter} from "@angular/core"; -import {Router} from "@angular/router"; import {Decoration} from "../../models/model-interfaces"; +import {Fraction} from "../../utils/fraction.enum"; @Component({ - selector: 'pjm-decoration-item', + selector: 'decoration-item', templateUrl: './decoration-item.component.html', styleUrls: ['./decoration-item.component.css', '../../style/list-entry.css'], changeDetection: ChangeDetectionStrategy.OnPush, @@ -20,7 +20,9 @@ export class DecorationItemComponent { decorationSelected = new EventEmitter(); decorationDelete = new EventEmitter(); - constructor(private router: Router) { + readonly fraction = Fraction; + + constructor() { } ngOnInit() { diff --git a/static/src/app/decorations/decoration-list/decoration-list.component.html b/static/src/app/decorations/decoration-list/decoration-list.component.html index 87f24a8..05b0047 100644 --- a/static/src/app/decorations/decoration-list/decoration-list.component.html +++ b/static/src/app/decorations/decoration-list/decoration-list.component.html @@ -1,9 +1,9 @@
- - - + + +
+
@@ -22,12 +22,12 @@
- - +
diff --git a/static/src/app/decorations/decoration-list/decoration-list.component.ts b/static/src/app/decorations/decoration-list/decoration-list.component.ts index 83448fe..5397cab 100644 --- a/static/src/app/decorations/decoration-list/decoration-list.component.ts +++ b/static/src/app/decorations/decoration-list/decoration-list.component.ts @@ -6,6 +6,7 @@ import {ActivatedRoute, Router} from "@angular/router"; import {Observable} from "rxjs/Observable"; import {Decoration} from "../../models/model-interfaces"; import {DecorationService} from "../../services/army-management/decoration.service"; +import {Fraction} from "../../utils/fraction.enum"; @Component({ selector: 'decoration-list', @@ -22,6 +23,8 @@ export class DecorationListComponent implements OnInit { public radioModel: string; + readonly fraction = Fraction; + constructor(private decorationService: DecorationService, private router: Router, private route: ActivatedRoute, @@ -29,7 +32,6 @@ export class DecorationListComponent implements OnInit { } ngOnInit() { - this.decorations$ = this.decorationService.decorations$; const paramsStream = this.route.queryParams @@ -44,7 +46,6 @@ export class DecorationListComponent implements OnInit { .distinctUntilChanged() .switchMap(query => this.decorationService.findDecorations(query, this.radioModel)) .subscribe(); - } openNewDecorationForm() { @@ -59,8 +60,8 @@ export class DecorationListComponent implements OnInit { deleteDecoration(decoration) { let fraction = 'Global'; - if (decoration.fraction === 'BLUFOR') fraction = 'NATO'; - else if (decoration.fraction === 'OPFOR') fraction = 'CSAT'; + if (decoration.fraction === 'BLUFOR') fraction = Fraction.BLUFOR; + else if (decoration.fraction === 'OPFOR') fraction = Fraction.OPFOR; if (confirm('Soll die Auszeichnung "' + decoration.name + '" (' + fraction + ') wirklich gelöscht werden?')) { this.decorationService.deleteDecoration(decoration) diff --git a/static/src/app/decorations/edit-decoration/edit-decoration.component.html b/static/src/app/decorations/edit-decoration/edit-decoration.component.html index 12e84e8..c97369b 100644 --- a/static/src/app/decorations/edit-decoration/edit-decoration.component.html +++ b/static/src/app/decorations/edit-decoration/edit-decoration.component.html @@ -17,8 +17,8 @@ diff --git a/static/src/app/decorations/edit-decoration/edit-decoration.component.ts b/static/src/app/decorations/edit-decoration/edit-decoration.component.ts index e7ed88c..f752c83 100644 --- a/static/src/app/decorations/edit-decoration/edit-decoration.component.ts +++ b/static/src/app/decorations/edit-decoration/edit-decoration.component.ts @@ -4,6 +4,7 @@ import {NgForm} from "@angular/forms"; import {Decoration} from "../../models/model-interfaces"; import {DecorationService} from "../../services/army-management/decoration.service"; import {Subscription} from "rxjs/Subscription"; +import {Fraction} from "../../utils/fraction.enum"; @Component({ templateUrl: './edit-decoration.component.html', @@ -25,6 +26,8 @@ export class EditDecorationComponent { @ViewChild(NgForm) form: NgForm; + readonly fraction = Fraction; + constructor(private route: ActivatedRoute, private router: Router, private decorationService: DecorationService) {