From 6bf7992f0fdbd175ca9611aee1043dddca23b5c6 Mon Sep 17 00:00:00 2001
From: Florian Hartwich <hardi@noarch.de>
Date: Fri, 14 Jul 2017 23:33:17 +0200
Subject: [PATCH] Add war submit form

---
 api/routes/wars.js                            |  16 ++--
 static/src/app/app.component.html             |  10 ++-
 static/src/app/app.routing.ts                 |  10 +--
 static/src/app/login/login.component.html     |   2 +-
 static/src/app/login/login.guard.ts           |  40 ++++++++--
 static/src/app/models/model-interfaces.ts     |   2 +-
 .../app/services/war-service/war.service.ts   |   7 +-
 static/src/app/wars/war-detail.component.ts   |   1 -
 static/src/app/wars/war-submit.component.css  |  28 +++++++
 static/src/app/wars/war-submit.component.html |  75 ++++++++++++++++++
 static/src/app/wars/war-submit.component.ts   |  72 +++++++++++++++++
 static/src/app/wars/wars.routing.ts           |  19 +++++
 static/src/assets/loading.png                 | Bin 0 -> 7974 bytes
 13 files changed, 250 insertions(+), 32 deletions(-)
 create mode 100644 static/src/app/wars/war-submit.component.css
 create mode 100644 static/src/app/wars/war-submit.component.html
 create mode 100644 static/src/app/wars/war-submit.component.ts
 create mode 100644 static/src/app/wars/wars.routing.ts
 create mode 100644 static/src/assets/loading.png

diff --git a/api/routes/wars.js b/api/routes/wars.js
index f7f6579..8506b7d 100644
--- a/api/routes/wars.js
+++ b/api/routes/wars.js
@@ -69,16 +69,14 @@ wars.route('/')
               if (error) {
                 return next(error);
               }
-              let obj = JSON.parse(`${stdout}`);
-              console.log(obj);
-              PlayerModel.create(obj, function (err) {
-                if (err) {
-                  return next(err);
+              exec(__dirname + '/../war-parser/clean.sh /../' + folderName + ' | tee ' + folderName + '/clean.log', (error) => {
+                if (error) {
+                  return next(error);
                 }
-
-                exec(__dirname + '/../war-parser/clean.sh /../' + folderName + ' | tee ' + folderName + '/clean.log', (error) => {
-                  if (error) {
-                    return next(error);
+                let obj = JSON.parse(`${stdout}`);
+                PlayerModel.create(obj, function (err) {
+                  if (err) {
+                    return next(err);
                   }
                   res.status(codes.created);
                   res.locals.items = item;
diff --git a/static/src/app/app.component.html b/static/src/app/app.component.html
index e8e6db8..5a58439 100644
--- a/static/src/app/app.component.html
+++ b/static/src/app/app.component.html
@@ -28,8 +28,13 @@
               <span class="caret"></span>
             </a>
             <ul class="dropdown-menu scrollable-menu">
+              <li *ngIf="loginService.hasPermission(3)">
+                <a routerLink='/cc-wars' class="link">Hinzufügen...</a>
+              </li>
               <li *ngFor="let war of wars">
-                <a [routerLink]="['/cc-wars/' + war._id]">{{war.title}} <small>{{war.date | date: 'dd.MM.yy'}}</small></a>
+                <a [routerLink]="['/cc-wars/' + war._id]">{{war.title}}
+                  <small>{{war.date | date: 'dd.MM.yy'}}</small>
+                </a>
               </li>
             </ul>
           </li>
@@ -45,7 +50,8 @@
           <li *ngIf="loginService.hasPermission(2)" routerLinkActive="active">
             <a routerLink='/cc-ranks' class="link">Ränge</a>
           </li>
-          <li *ngIf="loginService.hasPermission(1) && !loginService.hasPermission(2) && loginService.hasSquad()" class="dropdown">
+          <li *ngIf="loginService.hasPermission(1) && !loginService.hasPermission(2) && loginService.hasSquad()"
+              class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
                aria-expanded="false">
               Beantragen
diff --git a/static/src/app/app.routing.ts b/static/src/app/app.routing.ts
index 1ffd6cf..0973f27 100644
--- a/static/src/app/app.routing.ts
+++ b/static/src/app/app.routing.ts
@@ -1,7 +1,7 @@
 import {RouterModule, Routes} from "@angular/router";
 import {LoginComponent} from "./login/index";
 import {NotFoundComponent} from "./not-found/not-found.component";
-import {LoginGuardAdmin, LoginGuardHL, LoginGuardSQL} from "./login/login.guard";
+import {LoginGuardAdmin, LoginGuardHL, LoginGuardMT, LoginGuardSQL} from "./login/login.guard";
 import {usersRoutes, usersRoutingComponents} from "./users/users.routing";
 import {squadsRoutes, squadsRoutingComponents} from "./squads/squads.routing";
 import {decorationsRoutes, decorationsRoutingComponents} from "./decorations/decoration.routing";
@@ -13,7 +13,7 @@ import {RequestAwardComponent} from "./request/award/req-award.component";
 import {RequestPromotionComponent} from "./request/promotion/req-promotion.component";
 import {ConfirmPromotionComponent} from "./request/confirm-promotion/confirm-promotion.component";
 import {ConfirmAwardComponent} from "./request/confirm-award/confirm-award.component";
-import {WarDetailComponent} from "./wars/war-detail.component";
+import {warRoutes, warsRoutingComponents} from "./wars/wars.routing";
 
 
 export const appRoutes: Routes = [
@@ -21,7 +21,7 @@ export const appRoutes: Routes = [
   {path: 'cc-overview', children: armyRoutes},
   {path: '', redirectTo: '/cc-overview', pathMatch: 'full'},
 
-  {path: 'cc-wars/:id', component: WarDetailComponent},
+  {path: 'cc-wars', children: warRoutes},
 
   {path: 'login', component: LoginComponent},
   {path: 'signup', component: SignupComponent},
@@ -47,6 +47,6 @@ export const appRouting = RouterModule.forRoot(appRoutes);
 
 export const routingComponents = [LoginComponent, SignupComponent, RequestAwardComponent, RequestPromotionComponent, ConfirmAwardComponent,
   ConfirmPromotionComponent, AdminComponent, ...armyRoutingComponents, NotFoundComponent, ...usersRoutingComponents,
-  ...squadsRoutingComponents, ...decorationsRoutingComponents, ...ranksRoutingComponents, WarDetailComponent];
+  ...squadsRoutingComponents, ...decorationsRoutingComponents, ...ranksRoutingComponents, ...warsRoutingComponents];
 
-export const routingProviders = [LoginGuardHL];
+export const routingProviders = [LoginGuardSQL, LoginGuardHL, LoginGuardMT, LoginGuardAdmin];
diff --git a/static/src/app/login/login.component.html b/static/src/app/login/login.component.html
index 1300f59..b66611c 100644
--- a/static/src/app/login/login.component.html
+++ b/static/src/app/login/login.component.html
@@ -18,7 +18,7 @@
       <span *ngIf="showErrorLabel"
             class="center-block label label-danger" style="font-size: medium; padding: 2px; margin-top: 2px">
         {{error}}
-    </span>
+      </span>
     </div>
 
 
diff --git a/static/src/app/login/login.guard.ts b/static/src/app/login/login.guard.ts
index 1083734..1edecee 100644
--- a/static/src/app/login/login.guard.ts
+++ b/static/src/app/login/login.guard.ts
@@ -1,10 +1,11 @@
-import { Injectable } from '@angular/core';
-import { Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import {Injectable} from '@angular/core';
+import {Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
 
 @Injectable()
 export class LoginGuardSQL implements CanActivate {
 
-  constructor(private router: Router) { }
+  constructor(private router: Router) {
+  }
 
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
     if (localStorage.getItem('currentUser')) {
@@ -16,7 +17,7 @@ export class LoginGuardSQL implements CanActivate {
     }
 
     // not logged in so redirect to login page with the return url
-    this.router.navigate(['/login'], { queryParams: { returnUrl: state.url }});
+    this.router.navigate(['/login'], {queryParams: {returnUrl: state.url}});
     return false;
   }
 }
@@ -24,7 +25,8 @@ export class LoginGuardSQL implements CanActivate {
 @Injectable()
 export class LoginGuardHL implements CanActivate {
 
-  constructor(private router: Router) { }
+  constructor(private router: Router) {
+  }
 
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
     if (localStorage.getItem('currentUser')) {
@@ -36,7 +38,28 @@ export class LoginGuardHL implements CanActivate {
     }
 
     // not logged in so redirect to login page with the return url
-    this.router.navigate(['/login'], { queryParams: { returnUrl: state.url }});
+    this.router.navigate(['/login'], {queryParams: {returnUrl: state.url}});
+    return false;
+  }
+}
+
+@Injectable()
+export class LoginGuardMT implements CanActivate {
+
+  constructor(private router: Router) {
+  }
+
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
+    if (localStorage.getItem('currentUser')) {
+      let currentUser = JSON.parse(localStorage.getItem('currentUser'));
+      if (currentUser.permission >= 3) {
+        // logged and correct permission so return true
+        return true;
+      }
+    }
+
+    // not logged in so redirect to login page with the return url
+    this.router.navigate(['/login'], {queryParams: {returnUrl: state.url}});
     return false;
   }
 }
@@ -44,7 +67,8 @@ export class LoginGuardHL implements CanActivate {
 @Injectable()
 export class LoginGuardAdmin implements CanActivate {
 
-  constructor(private router: Router) { }
+  constructor(private router: Router) {
+  }
 
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
     if (localStorage.getItem('currentUser')) {
@@ -56,7 +80,7 @@ export class LoginGuardAdmin implements CanActivate {
     }
 
     // not logged in so redirect to login page with the return url
-    this.router.navigate(['/login'], { queryParams: { returnUrl: state.url }});
+    this.router.navigate(['/login'], {queryParams: {returnUrl: state.url}});
     return false;
   }
 }
diff --git a/static/src/app/models/model-interfaces.ts b/static/src/app/models/model-interfaces.ts
index 18cb679..5b0a706 100644
--- a/static/src/app/models/model-interfaces.ts
+++ b/static/src/app/models/model-interfaces.ts
@@ -30,7 +30,7 @@ export interface Player {
 export interface War {
   _id?: string;
   title?: string;
-  date?: Date;
+  date?: string;
   ptBlufor?: number;
   ptOpfor?: number;
   bestPlayerId?: Player;
diff --git a/static/src/app/services/war-service/war.service.ts b/static/src/app/services/war-service/war.service.ts
index 9805a60..343fcfd 100644
--- a/static/src/app/services/war-service/war.service.ts
+++ b/static/src/app/services/war-service/war.service.ts
@@ -21,7 +21,7 @@ export class WarService {
   }
 
 
-  submitDecoration(war: War, logFile?) {
+  submitWar(war: War, logFile?) {
     let body;
 
     if (logFile) {
@@ -34,11 +34,8 @@ export class WarService {
       body.append('log', logFile, logFile.name);
     }
 
-    return this.http.post(this.config.apiUrl + this.config.apiDecorationPath, body)
+    return this.http.post(this.config.apiUrl + this.config.apiWarPath, body)
       .map(res => res.json())
-      .do(savedDecoration => {
-        console.log('saved successfully')
-      });
   }
 
 }
diff --git a/static/src/app/wars/war-detail.component.ts b/static/src/app/wars/war-detail.component.ts
index fd64ccc..ac11f9b 100644
--- a/static/src/app/wars/war-detail.component.ts
+++ b/static/src/app/wars/war-detail.component.ts
@@ -39,7 +39,6 @@ export class WarDetailComponent {
   filterPlayersByFraction(fraction: string) {
     if (fraction) {
       this.players = this.war.players.filter((player) => {
-        console.log(player.fraction + " ....  " + fraction);
         return player.fraction === fraction;
       })
     } else {
diff --git a/static/src/app/wars/war-submit.component.css b/static/src/app/wars/war-submit.component.css
new file mode 100644
index 0000000..9adf959
--- /dev/null
+++ b/static/src/app/wars/war-submit.component.css
@@ -0,0 +1,28 @@
+.overview {
+  position: fixed;
+  width: 25%;
+  padding-left: 50px;
+  padding-top: 70px;
+  margin-left: 10px;
+}
+
+.load-arrow {
+  background: url(../../assets/loading.png) no-repeat;
+  display: block;
+  width: 120px;
+  height: 120px;
+}
+
+/* Loading Animation */
+.glyphicon-refresh-animate {
+  animation: spin 1.5s linear infinite;
+}
+
+@keyframes spin {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
diff --git a/static/src/app/wars/war-submit.component.html b/static/src/app/wars/war-submit.component.html
new file mode 100644
index 0000000..bfea0a9
--- /dev/null
+++ b/static/src/app/wars/war-submit.component.html
@@ -0,0 +1,75 @@
+<form #form="ngForm" class="overview">
+  <h3>Schlacht hinzufügen</h3>
+
+  <div class="form-group">
+    <label for="title">Titel</label>
+    <input type="text" class="form-control"
+           [(ngModel)]="war.title"
+           name="title"
+           id="title"
+           required maxlength="50"/>
+
+    <show-error text="Name" path="title"></show-error>
+  </div>
+
+  <div class="form-group">
+    <label for="date">Datum</label>
+    <input type="date" class="form-control"
+           [(ngModel)]="war.date"
+           name="date"
+           id="date"
+           required/>
+    <show-error text="Datum" path="date"></show-error>
+  </div>
+
+  <div class="form-group">
+    <label for="ptblu">Punkte NATO</label>
+    <input type="number" class="form-control" step="1"
+           [(ngModel)]="war.ptBlufor"
+           name="ptblu"
+           id="ptblu"
+           required/>
+    <show-error text="Punkte NATO" path="ptnblu"></show-error>
+  </div>
+
+  <div class="form-group">
+    <label for="ptopf">Punkte CSAT</label>
+    <input type="number" class="form-control" step="1"
+           [(ngModel)]="war.ptOpfor"
+           name="ptopf"
+           id="ptopf"
+           required/>
+    <show-error text="Punkte CSAT" path="ptopf"></show-error>
+  </div>
+
+  <div class="form-group">
+    <label for="log">Logfile</label>
+    <input id="log" name="log" class="ui-button form-control" type="file"
+           (change)="fileChange($event)">
+    <span class="label label-bg label-danger center-block" style="font-size:small" *ngIf="showImageError">
+        Logfile muss im Format RPT, LOG oder TXT vorliegen
+    </span>
+  </div>
+
+  <button id="cancel"
+          *ngIf="!loading"
+          (click)="cancel()"
+          class="btn btn-default">
+    Abbrechen
+  </button>
+
+  <button id="save"
+          *ngIf="!loading"
+          (click)="saveWar()"
+          class="btn btn-default"
+          [disabled]="!form.valid">
+    Bestätigen
+  </button>
+
+  <span *ngIf="loading" class="load-arrow glyphicon-refresh-animate"></span>
+  <span *ngIf="showErrorLabel"
+        class="center-block label label-danger" style="font-size: medium; padding: 2px; margin-top: 2px">
+        {{error}}
+      </span>
+
+</form>
diff --git a/static/src/app/wars/war-submit.component.ts b/static/src/app/wars/war-submit.component.ts
new file mode 100644
index 0000000..9ac4b12
--- /dev/null
+++ b/static/src/app/wars/war-submit.component.ts
@@ -0,0 +1,72 @@
+import {Component, ViewChild} from "@angular/core";
+import {Player, War} from "../models/model-interfaces";
+import {WarService} from "../services/war-service/war.service";
+import {ActivatedRoute, Router} from "@angular/router";
+import {NgForm} from "@angular/forms";
+
+
+@Component({
+  selector: 'war-submit',
+  templateUrl: './war-submit.component.html',
+  styleUrls: ['./war-submit.component.css']
+})
+export class WarSubmitComponent {
+
+  war: War = {date: new Date().toISOString().slice(0, 10), players: []};
+
+  fileList: FileList;
+
+  showImageError = false;
+
+  showErrorLabel = false;
+
+  loading = false;
+
+  error;
+
+  @ViewChild(NgForm) form: NgForm;
+
+  constructor(private route: ActivatedRoute,
+              private router: Router,
+              private warService: WarService) {
+  }
+
+  fileChange(event) {
+    if (!event.target.files[0].name.endsWith('.rpt')
+      && !event.target.files[0].name.endsWith('.log')
+      && !event.target.files[0].name.endsWith('.txt')) {
+      this.showImageError = true;
+      this.fileList = undefined;
+    } else {
+      this.showImageError = false;
+      this.fileList = event.target.files;
+    }
+  }
+
+  saveWar() {
+    let file: File;
+    console.log(this.war.date)
+    if (this.fileList) {
+      file = this.fileList[0];
+      this.loading = true;
+
+      this.warService.submitWar(this.war, file)
+        .subscribe(war => {
+            this.router.navigate([war._id], {relativeTo: this.route});
+          },
+          error => {
+            this.error = error._body;
+            this.showErrorLabel = true;
+            this.loading = false;
+          });
+    } else {
+      return window.alert(`Logfile ist ein Pflichtfeld`);
+    }
+  }
+
+  cancel() {
+    this.router.navigate(['..'], {relativeTo: this.route});
+    return false;
+  }
+
+}
diff --git a/static/src/app/wars/wars.routing.ts b/static/src/app/wars/wars.routing.ts
new file mode 100644
index 0000000..70085c8
--- /dev/null
+++ b/static/src/app/wars/wars.routing.ts
@@ -0,0 +1,19 @@
+import {Routes} from "@angular/router";
+import {WarSubmitComponent} from "./war-submit.component";
+import {WarDetailComponent} from "./war-detail.component";
+import {LoginGuardMT} from "../login/login.guard";
+
+
+export const warRoutes: Routes = [
+  {
+    path: '',
+    component: WarSubmitComponent,
+    canActivate: [LoginGuardMT]
+  },
+  {
+    path: ':id',
+    component: WarDetailComponent,
+  }];
+
+export const warsRoutingComponents = [WarSubmitComponent, WarDetailComponent];
+
diff --git a/static/src/assets/loading.png b/static/src/assets/loading.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e00d49a95b34e04bf30cfeee1779562886c756e
GIT binary patch
literal 7974
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%0A)EJBlwaMso{Egs(O&S&|`h
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
Z;P{bJz7z;8A>3#Kx|)U>wQ3G;{tp6jUW@<$

literal 0
HcmV?d00001