api/package.json

@@ -34,7 +34,6 @@
   "devDependencies": {
     "chai": "^3.5.0",
     "chai-http": "^3.0.0",
-    "mocha": "^3.3.0",
+    "mocha": "^3.3.0"
-    "nodemon": "^1.11.0"
   }
 }

package.json

@@ -1,13 +1,13 @@
 {
   "name": "opt-cc",
-  "version": "1.1.2",
+  "version": "1.1.1",
   "license": "MIT",
   "private": true,
   "scripts": {
     "start": "npm run deploy-static-prod && npm start --prefix ./api",
     "dev": "npm run deploy-static && npm run dev --prefix ./api",
-    "deploy-static": "cd ./static && $(npm bin)/ng build && ln -s ../api/resource/ ../public/resource",
+    "deploy-static": "cd ./static && ng build && ln -s ../api/resource/ ../public/resource",
-    "deploy-static-prod": "cd ./static && $(npm bin)/ng build --env=prod && ln -s ../api/resource/ ../public/resource",
+    "deploy-static-prod": "cd ./static && ng build --env=prod && ln -s ../api/resource/ ../public/resource",
     "postinstall": "npm install --prefix ./static && npm install --prefix  ./api",
     "mongodb": "mkdir -p mongodb-data && mongod --dbpath ./mongodb-data",
     "test": "npm test --prefix ./api",

static/src/app/app.component.css

@@ -28,30 +28,3 @@ li {
   max-height: 200px;
   overflow-x: hidden;
 }
-
-.unprocessed {
-  -webkit-animation-name: color-blink; /* Safari 4.0 - 8.0 */
-  -webkit-animation-duration: 4s; /* Safari 4.0 - 8.0 */
-  animation-name: color-blink;
-  animation-duration: 4s;
-  animation-iteration-count: infinite;
-}
-
-.unprocessed-child {
-  background-color: orange;
-}
-
-unprocessed-child:hover {
-  background-color: orange;
-}
-
-/* Safari 4.0 - 8.0 */
-@-webkit-keyframes color-blink {
-  from {background-color: #222222;}
-  to {background-color: orange;}
-}
-
-@keyframes color-blink {
-  from {background-color: #222222;}
-  to {background-color: orange;}
-}

static/src/app/app.component.html

@@ -67,17 +67,17 @@
             </ul>
           </li>
           <li *ngIf="loginService.hasPermission(2) && loginService.hasSquad()" class="dropdown">
-            <a href="#"  [ngClass]="{'unprocessed': promotionService.hasUnprocessedPromotion || awardingService.hasUnprocessedAwards}" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
                aria-expanded="false">
               Anträge
               <span class="caret"></span>
             </a>
             <ul class="dropdown-menu">
               <li>
-                <a [ngClass]="{'unprocessed-child': promotionService.hasUnprocessedPromotion}" [routerLink]="['/confirm-promotion']">Beförderung</a>
+                <a [routerLink]="['/confirm-promotion']">Beförderung</a>
               </li>
               <li>
-                <a [ngClass]="{'unprocessed-child': awardingService.hasUnprocessedAwards}" [routerLink]="['/confirm-award']">Orden/ Auszeichnung</a>
+                <a [routerLink]="['/confirm-award']">Orden/ Auszeichnung</a>
               </li>
             </ul>
           </li>

static/src/app/app.component.ts

@@ -1,11 +1,14 @@
 import {Component, Inject, Optional} from '@angular/core';
-import {Router} from '@angular/router';
+import {
+  Router,
+  NavigationEnd,
+  ActivatedRoute,
+} from '@angular/router';
 import {LoginService} from './services/login-service/login-service';
+import {Title} from '@angular/platform-browser';
 import {AUTH_ENABLED} from './app.tokens';
 import {WarService} from "./services/war-service/war.service";
 import {War} from "./models/model-interfaces";
-import {PromotionService} from "./services/promotion-service/promotion.service";
-import {AwardingService} from "./services/awarding-service/awarding.service";
 
 @Component({
   selector: 'app-root',
@@ -14,34 +17,41 @@ import {AwardingService} from "./services/awarding-service/awarding.service";
 })
 export class AppComponent {
 
+  defaultTitle: string;
+
   wars: War[] = [];
 
   constructor(@Optional() @Inject(AUTH_ENABLED) public authEnabled,
               private loginService: LoginService,
               private warService: WarService,
-              private promotionService: PromotionService,
+              private activatedRoute: ActivatedRoute,
-              private awardingService: AwardingService,
+              private router: Router,
-              private router: Router) {
+              private titleService: Title) {
   }
 
 
   ngOnInit() {
+    this.defaultTitle = this.titleService.getTitle();
+    this.router.events
+      .filter(event => event instanceof NavigationEnd)
+      .subscribe(event => {
+        this.setBrowserTitle();
+      });
     this.warService.getAllWars().subscribe((wars) => {
       this.wars = wars;
-    });
+    })
-    if (this.loginService.hasPermission(2)) {
+
-      const fraction = this.loginService.getCurrentUser().squad.fraction;
+  }
-      this.promotionService.getUnconfirmedPromotions(fraction).subscribe((items) => {
+
-        if (items.length > 0) {
+  setBrowserTitle() {
-          this.promotionService.hasUnprocessedPromotion = true;
+    let title = this.defaultTitle;
-        }
+    let route = this.activatedRoute;
-      });
+    // firstChild gibt die Haupt-Kindroute der übergebenen Route zurück
-      this.awardingService.getUnconfirmedAwards(fraction).subscribe((items) => {
+    while (route.firstChild) {
-        if (items.length > 0) {
+      route = route.firstChild;
-          this.awardingService.hasUnprocessedAwards = true;
+      title = route.snapshot.data['title'] || title;
-        }
-      })
     }
+    this.titleService.setTitle(title);
   }
 
   logout() {

static/src/app/request/award/req-award.component.html

@@ -26,7 +26,7 @@
             (change)="toggleDecoPreview(decoDescription, decoPreview)"
             required>
       <option *ngFor="let deco of decorations" [ngValue]="deco">
-        {{deco.name}}
+        {{deco.fraction == 'BLUFOR'? 'NATO' : deco.fraction == 'OPFOR'? 'CSAT' : 'Global'}}: {{deco.name}}
       </option>
     </select>
   </div>

static/src/app/request/confirm-award/confirm-award.component.ts

@@ -1,4 +1,5 @@
 import {Component} from "@angular/core";
+import {ActivatedRoute, Router} from "@angular/router";
 import {Award} from "../../models/model-interfaces";
 import {AwardingService} from "../../services/awarding-service/awarding.service";
 
@@ -13,7 +14,9 @@ export class ConfirmAwardComponent {
 
   showSuccessLabel = false;
 
-  constructor(private awardingService: AwardingService) {
+  constructor(private router: Router,
+              private route: ActivatedRoute,
+              private awardingService: AwardingService) {
   }
 
   ngOnInit() {
@@ -34,9 +37,6 @@ export class ConfirmAwardComponent {
       let currentUser = JSON.parse(localStorage.getItem('currentUser'));
       this.awardingService.getUnconfirmedAwards(currentUser.squad.fraction).subscribe(awards => {
         this.awards = awards;
-        if (awards.length < 1) {
-          this.awardingService.hasUnprocessedAwards = false;
-        }
         this.showSuccessLabel = true;
         setTimeout(() => {
           this.showSuccessLabel = false;

static/src/app/request/confirm-promotion/confirm-promotion.component.ts

@@ -17,7 +17,9 @@ export class ConfirmPromotionComponent {
 
   promotions: Promotion[];
 
-  constructor(private rankService: RankService,
+  constructor(private router: Router,
+              private route: ActivatedRoute,
+              private rankService: RankService,
               private promotionService: PromotionService) {
   }
 
@@ -43,9 +45,6 @@ export class ConfirmPromotionComponent {
       let currentUser = JSON.parse(localStorage.getItem('currentUser'));
       this.promotionService.getUnconfirmedPromotions(currentUser.squad.fraction).subscribe(promotions => {
         this.promotions = promotions;
-        if (promotions.length < 1) {
-          this.promotionService.hasUnprocessedPromotion = false;
-        }
         this.showSuccessLabel = true;
         setTimeout(() => {
           this.showSuccessLabel = false;

static/src/app/services/awarding-service/awarding.service.ts

@@ -1,13 +1,13 @@
 import {Injectable} from "@angular/core";
-import {Award} from "../../models/model-interfaces";
+import {Award, User} from "../../models/model-interfaces";
+import {Headers, Http} from "@angular/http";
+import {Observable} from "rxjs/Observable";
 import {AppConfig} from "../../app.config";
 import {HttpClient} from "../http-client";
 
 @Injectable()
 export class AwardingService {
 
-  hasUnprocessedAwards = false;
-
   constructor(private http: HttpClient,
               private config: AppConfig) {
   }

static/src/app/services/login-service/login-service.ts

@@ -4,7 +4,6 @@ import "rxjs/add/operator/map";
 
 import {AppConfig} from "../../app.config";
 import {AUTH_ENABLED} from "../../app.tokens";
-import {AppUser} from "../../models/model-interfaces";
 
 @Injectable()
 export class LoginService {
@@ -46,10 +45,6 @@ export class LoginService {
     return this.isLoggedIn() && currentUser.permission >= level;
   }
 
-  getCurrentUser() :AppUser {
-    return JSON.parse(localStorage.getItem('currentUser'));
-  }
-
   hasSquad() {
     let currentUser = JSON.parse(localStorage.getItem('currentUser'));
     return currentUser.squad != null;

static/src/app/services/promotion-service/promotion.service.ts

@@ -6,8 +6,6 @@ import {Promotion} from "../../models/model-interfaces";
 @Injectable()
 export class PromotionService {
 
-  hasUnprocessedPromotion = false;
-
   constructor(private http: HttpClient,
               private config: AppConfig) {
   }