api/apib/dredd/data/war.json

@@ -1,3 +1,2 @@
 {"_id":{"$oid":"5abf65d83fc5fa349ffd5cbb"},"playersBlufor":4,"playersOpfor":4,"budgetBlufor":4535500,"budgetOpfor":4221250,"endBudgetBlufor":997000,"endBudgetOpfor":512000,"title":"Battle #1","campaign":{"$oid":"5abd55ea9e30a76bfef747d6"},"date":{"$date":"2018-03-19T23:00:00.000Z"},"endDate":{"$date":"2018-03-20T01:30:00.000Z"},"ptBlufor":34,"ptOpfor":25,"timestamp":{"$date":"2018-03-31T10:41:28.451Z"},"updatedAt":{"$date":"2018-03-31T10:41:28.451Z"},"__v":0}
 {"_id":{"$oid":"5abf65ae3fc5fa349ffd5ca3"},"playersBlufor":4,"playersOpfor":4,"budgetBlufor":4535500,"budgetOpfor":4221250,"endBudgetBlufor":997000,"endBudgetOpfor":512000,"title":"Test Battle #0","campaign":{"$oid":"5abd55ea9e30a76bfef747d6"},"date":{"$date":"2018-03-19T23:00:00.000Z"},"endDate":{"$date":"2018-03-20T01:30:00.000Z"},"ptBlufor":34,"ptOpfor":25,"timestamp":{"$date":"2018-03-31T10:40:46.695Z"},"updatedAt":{"$date":"2018-03-31T10:40:46.695Z"},"__v":0}
-{"_id":{"$oid":"5abf65ae2df5fa349ffd5ca3"},"playersBlufor":20,"playersOpfor":20,"budgetBlufor":4535500,"budgetOpfor":4535500,"endBudgetBlufor":0,"endBudgetOpfor":20000,"title":"Test Battle XY","campaign":{"$oid":"5abd55ea9e30a76bfef747d6"},"date":{"$date":"2018-03-02T23:00:00.000Z"},"endDate":{"$date":"2018-03-02T01:30:00.000Z"},"ptBlufor":34,"ptOpfor":25,"timestamp":{"$date":"2018-03-02T10:40:46.695Z"},"updatedAt":{"$date":"2018-03-02T10:40:46.695Z"},"__v":0}

api/apib/statistics/wars.apib

@@ -76,35 +76,6 @@ Create a new war
 
     + Attributes (War, fixed-type)
 
-### Update War [PATCH /wars/{id}]
-
-Update a war, identified by its id
-
-**Permission: 3**
-
-+ Parameters
-    + id: `5abf65ae2df5fa349ffd5ca3` (string, required) - unique id of campaign
-
-+ Request (application/json)
-
-    + Attributes
-        + _id: `5abf65ae2df5fa349ffd5ca3` (string, required) - unique id of war
-        + title: `Final Touchdown` (string, optional) - display name of the war
-        + date: `2017-05-11T20:00:00.471Z` (string, optional) - starting date
-        + endDate: `2017-05-12T00:30:32.471Z` (string, optional) - end date
-        + ptBlufor: 5 (number, optional) - points Blufor
-        + ptOpfor: 5 (number, optional) - points Opfor
-        + playersBlufor: 20 (number, optional) - number of players Blufor
-        + playersOpfor: 20 (number, optional) - number of players Opfor
-        + budgetBlufor: 3000000 (number, optional) - start budget Blufor
-        + budgetOpfor: 3000000 (number, optional) - start budget Opfor
-        + endBudgetBlufor: 10000 (number, optional) - end budget Blufor
-        + endBudgetOpfor: 12000 (number, optional) - end budget Opfor
-
-+ Response 200 (application/json; charset=utf-8)
-
-    + Attributes (War, fixed-type)
-
 ### Delete War [DELETE /wars/{id}]
 
 Delete a war

api/routes/wars.js

@@ -168,37 +168,6 @@ wars.route('/:id')
       });
     })
 
-    .patch(apiAuthenticationMiddleware, checkMT, (req, res, next) => {
-      if (!req.body || (req.body._id && req.body._id !== req.params.id)) {
-        // little bit different as in PUT. :id does not need to be in data, but if the _id and url id must match
-        const err = new Error('id of PATCH resource and send JSON body are not equal ' + req.params.id + ' ' +
-          req.body._id);
-        err.status = codes.notfound;
-        next(err);
-        return; // prevent node to process this function further after next() has finished.
-      }
-
-      req.body.updatedAt = new Date();
-      req.body.$inc = {__v: 1};
-      if (req.body.hasOwnProperty('__v')) {
-        delete req.body.__v;
-      }
-
-      // PATCH is easier with mongoose than PUT. You simply update by all data that comes from outside. no need to
-      // reset attributes that are missing.
-      WarModel.findByIdAndUpdate(req.params.id, req.body, {new: true}, (err, item) => {
-        if (err) {
-          err.status = codes.wrongrequest;
-        } else if (!item) {
-          err = new Error('item not found');
-          err.status = codes.notfound;
-        } else {
-          res.locals.items = item;
-        }
-        next(err);
-      });
-    })
-
     .delete(apiAuthenticationMiddleware, checkMT, (req, res, next) => {
       WarModel.findByIdAndRemove(req.params.id, (err, item) => {
         if (err) {

static/src/app/app.routing.ts

@@ -1,7 +1,7 @@
 import {RouterModule, Routes} from '@angular/router';
-import {LoginComponent, LoginGuardMT} from './login';
-import {NotFoundComponent} from './common/not-found';
-import {LoginGuardAdmin, LoginGuardHL} from './login';
+import {LoginComponent} from './login/index';
+import {NotFoundComponent} from './common/not-found/not-found.component';
+import {LoginGuardAdmin, LoginGuardHL} from './login/login.guard';
 import {armyRoutes, armyRoutingComponents} from './army/army.routing';
 import {SignupComponent} from './login/signup.component';
 import {RouteConfig} from './app.config';
@@ -72,4 +72,4 @@ export const appRouting = RouterModule.forRoot(appRoutes);
 
 export const routingComponents = [...armyRoutingComponents, LoginComponent, SignupComponent, NotFoundComponent];
 
-export const routingProviders = [LoginGuardHL, LoginGuardMT, LoginGuardAdmin];
+export const routingProviders = [LoginGuardHL, LoginGuardAdmin];

static/src/app/services/logs/war.service.ts

@@ -38,9 +38,5 @@ export class WarService {
                .map(res => res.json());
   }
 
-  updateWar(war: War) {
-    return this.http.patch(this.config.apiWarPath + '/' + war._id, war)
-               .map(res => res.json());
-  }
 }
 

static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.ts

@@ -26,6 +26,7 @@ export class CampaignSubmitComponent {
   constructor(private route: ActivatedRoute,
               private router: Router,
               private campaignService: CampaignService) {
+
     this.subscription = this.route.params
       .map(params => params['id'])
       .filter(id => id !== undefined)
@@ -54,4 +55,5 @@ export class CampaignSubmitComponent {
     this.router.navigate(['..'], {relativeTo: this.route});
     return false;
   }
+
 }

static/src/app/statistic/stats.routing.ts

@@ -6,13 +6,11 @@ import {WarItemComponent} from './war/war-list/war-item.component';
 import {ModuleWithProviders} from '@angular/core';
 import {CampaignSubmitComponent} from './campaign/campaign-submit/campaign-submit.component';
 import {CampaignPlayerDetailComponent} from './campaign/campaign-player-detail/campaign-player-detail.component';
+import {WarDetailComponent} from './war/war-detail/war-detail.component';
 import {ScoreboardComponent} from './war/scoreboard/scoreboard.component';
-import {WarSubmitComponent} from './war/war-submit/war-submit.component';
+import {WarSubmitComponent} from './war-submit/war-submit.component';
 import {FractionStatsComponent} from './war/fraction-stats/fraction-stats.component';
 import {StatisticHighScoreComponent} from './campaign/highscore/highscore.component';
-import {WarHeaderComponent} from './war/war-header/war-header.component';
-import {WarEditComponent} from './war/war-edit/war-edit.component';
-import {LoginGuardMT} from '../login';
 
 
 export const statsRoutes: Routes = [{
@@ -34,44 +32,35 @@ export const statsRoutes: Routes = [{
     component: StatisticHighScoreComponent,
     outlet: 'right'
   },
+  {
+    path: 'campaign',
+    component: CampaignSubmitComponent,
+    outlet: 'right'
+  },
+  {
+    path: 'campaign/:id',
+    component: CampaignSubmitComponent,
+    outlet: 'right'
+  },
+  {
+    path: 'new',
+    component: WarSubmitComponent,
+    outlet: 'right'
+  },
   {
     path: 'war/:id',
-    component: WarHeaderComponent,
+    component: WarDetailComponent,
     outlet: 'right'
   },
   {
     path: 'campaign-player/:id/:playerName',
     component: CampaignPlayerDetailComponent,
     outlet: 'right'
-  },
-  {
-    path: 'campaign',
-    component: CampaignSubmitComponent,
-    outlet: 'right',
-    canActivate: [LoginGuardMT]
-  },
-  {
-    path: 'campaign/:id',
-    component: CampaignSubmitComponent,
-    outlet: 'right',
-    canActivate: [LoginGuardMT]
-  },
-  {
-    path: 'submit-war',
-    component: WarSubmitComponent,
-    outlet: 'right',
-    canActivate: [LoginGuardMT]
-  },
-  {
-    path: 'submit-war/:id',
-    component: WarEditComponent,
-    outlet: 'right',
-    canActivate: [LoginGuardMT]
   }];
 
 export const statsRouterModule: ModuleWithProviders = RouterModule.forChild(statsRoutes);
 
 export const statsRoutingComponents = [StatisticComponent, StatisticOverviewComponent, StatisticHighScoreComponent,
-  CampaignSubmitComponent, WarListComponent, WarSubmitComponent, WarEditComponent, WarHeaderComponent,
-  ScoreboardComponent, FractionStatsComponent, CampaignPlayerDetailComponent, WarItemComponent];
+  CampaignSubmitComponent, WarListComponent, WarSubmitComponent, WarDetailComponent, ScoreboardComponent,
+  FractionStatsComponent, CampaignPlayerDetailComponent, WarItemComponent];
 

static/src/app/statistic/war-submit/war-submit.component.ts

@@ -1,16 +1,16 @@
 import {Component, ViewChild} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
 import {NgForm} from '@angular/forms';
-import {WarService} from '../../../services/logs/war.service';
-import {War} from '../../../models/model-interfaces';
-import {CampaignService} from '../../../services/logs/campaign.service';
+import {WarService} from '../../services/logs/war.service';
+import {War} from '../../models/model-interfaces';
+import {CampaignService} from '../../services/logs/campaign.service';
 
 
 @Component({
   selector: 'war-submit',
   templateUrl: './war-submit.component.html',
-  styleUrls: ['./war-submit.component.css', '../../../style/load-indicator.css',
-    '../../../style/entry-form.css', '../../../style/overview.css']
+  styleUrls: ['./war-submit.component.css', '../../style/load-indicator.css',
+    '../../style/entry-form.css', '../../style/overview.css']
 })
 export class WarSubmitComponent {
 
@@ -70,4 +70,5 @@ export class WarSubmitComponent {
     this.router.navigate(['..'], {relativeTo: this.route});
     return false;
   }
+
 }

static/src/app/statistic/war/war-detail/war-detail.component.ts

@@ -10,10 +10,10 @@ import {ScoreboardComponent} from '../scoreboard/scoreboard.component';
 
 @Component({
   selector: 'war-detail',
-  templateUrl: './war-header.component.html',
-  styleUrls: ['./war-header.component.css', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css']
+  templateUrl: './war-detail.component.html',
+  styleUrls: ['./war-detail.component.css', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css']
 })
-export class WarHeaderComponent implements OnInit {
+export class WarDetailComponent implements OnInit {
 
   readonly fraction = Fraction;
 

static/src/app/statistic/war/war-edit/war-edit.component.html

@@ -1,88 +0,0 @@
-<form #form="ngForm" class="overview">
-  <h3>Schlacht bearbeiten</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 displayName="Name" controlPath="title"></show-error>
-  </div>
-
-  <div class="form-group">
-    <label for="campaign">Kampagne</label>
-    <select class="form-control"
-            name="campaign"
-            id="campaign"
-            [(ngModel)]="war.campaign"
-            required>
-      <option *ngFor="let campaign of campaignService.campaigns" [ngValue]="campaign._id">
-        {{campaign.title}}
-      </option>
-    </select>
-  </div>
-
-  <div class="form-group">
-    <label for="ptBlufor">Punkte NATO</label>
-    <input type="number" class="form-control"
-           [(ngModel)]="war.ptBlufor"
-           name="ptBlufor"
-           id="ptBlufor"
-           required min="0"/>
-    <show-error displayName="Name" controlPath="ptBlufor"></show-error>
-  </div>
-
-  <div class="form-group">
-    <label for="ptOpfor">Punkte CSAT</label>
-    <input type="number" class="form-control"
-           [(ngModel)]="war.ptOpfor"
-           name="ptOpfor"
-           id="ptOpfor"
-           required min="0"/>
-    <show-error displayName="Name" controlPath="ptOpfor"></show-error>
-  </div>
-
-  <div class="form-group">
-    <label for="endBudgetBlufor">Endbudget NATO</label>
-    <input type="number" class="form-control"
-           [(ngModel)]="war.endBudgetBlufor"
-           name="endBudgetBlufor"
-           id="endBudgetBlufor"
-           required />
-    <show-error displayName="Name" controlPath="endBudgetBlufor"></show-error>
-  </div>
-
-  <div class="form-group">
-    <label for="endBudgetOpfor">Endbudget CSAT</label>
-    <input type="number" class="form-control"
-           [(ngModel)]="war.endBudgetOpfor"
-           name="endBudgetOpfor"
-           id="endBudgetOpfor"
-           required />
-    <show-error displayName="Name" controlPath="endBudgetOpfor"></show-error>
-  </div>
-
-  <button id="cancel"
-          *ngIf="!loading"
-          (click)="cancel()"
-          class="btn btn-default">
-    Abbrechen
-  </button>
-
-  <button id="save"
-          *ngIf="!loading"
-          (click)="updateWar()"
-          class="btn btn-default"
-          [disabled]="!form.valid">
-    Bestätigen
-  </button>
-
-  <span *ngIf="loading" class="load-indicator 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>

static/src/app/statistic/war/war-edit/war-edit.component.ts

@@ -1,58 +0,0 @@
-import {Component, ViewChild} from '@angular/core';
-import {ActivatedRoute, Router} from '@angular/router';
-import {NgForm} from '@angular/forms';
-import {WarService} from '../../../services/logs/war.service';
-import {War} from '../../../models/model-interfaces';
-import {CampaignService} from '../../../services/logs/campaign.service';
-import {Subscription} from 'rxjs/Subscription';
-
-
-@Component({
-  selector: 'war-edit',
-  templateUrl: './war-edit.component.html',
-  styleUrls: ['./war-edit.component.css', '../../../style/load-indicator.css',
-    '../../../style/entry-form.css', '../../../style/overview.css']
-})
-export class WarEditComponent {
-
-  war: War = {players: []};
-
-  subscription: Subscription;
-
-  showFileError = false;
-
-  showErrorLabel = false;
-
-  error;
-
-  @ViewChild(NgForm) form: NgForm;
-
-  constructor(private route: ActivatedRoute,
-              private router: Router,
-              private warService: WarService,
-              private campaignService: CampaignService) {
-    this.subscription = this.route.params
-                            .map(params => params['id'])
-                            .filter(id => id !== undefined)
-                            .flatMap(id => this.warService.getWar(id))
-                            .subscribe(war => {
-                              this.war = war;
-                            });
-  }
-
-  updateWar() {
-    this.warService.updateWar(this.war)
-        .subscribe(war => {
-            this.router.navigate(['../../war/' + war._id], {relativeTo: this.route});
-          },
-          error => {
-            this.error = error._body.error.message;
-            this.showErrorLabel = true;
-          });
-  }
-
-  cancel() {
-    this.router.navigate(['..'], {relativeTo: this.route});
-    return false;
-  }
-}

static/src/app/statistic/war/war-list/war-item.component.html

@@ -13,10 +13,6 @@
       <span (click)="delete(); $event.stopPropagation()"
             title="Löschen"
             class="glyphicon glyphicon-trash trash"></span>
-      <span (click)="edit(); $event.stopPropagation()"
-            style="padding-right: 10px;"
-            title="Bearbeiten"
-            class="glyphicon glyphicon-edit trash"></span>
     </div>
 
   </div>

static/src/app/statistic/war/war-list/war-item.component.ts

@@ -16,8 +16,6 @@ export class WarItemComponent implements OnInit {
 
   @Output() warSelected = new EventEmitter();
 
-  @Output() warEdit = new EventEmitter();
-
   @Output() warDelete = new EventEmitter();
 
   constructor(public loginService: LoginService) {
@@ -30,10 +28,6 @@ export class WarItemComponent implements OnInit {
     this.warSelected.emit(this.war._id);
   }
 
-  edit() {
-    this.warEdit.emit(this.war._id);
-  }
-
   delete() {
     this.warDelete.emit(this.war);
   }

static/src/app/statistic/war/war-list/war-list.component.html

@@ -47,7 +47,6 @@
         <div *ngFor="let war of campaign.wars">
           <pjm-war-item
             [war]="war"
-            (warEdit)="editWar($event)"
             (warDelete)="deleteWar(war)"
             (warSelected)="selectWar($event)"
             [selected]="war._id == selectedWarId">

static/src/app/statistic/war/war-list/war-list.component.ts

@@ -49,6 +49,11 @@ export class WarListComponent implements OnInit {
     this.router.navigate([{outlets: {'right': ['campaign']}}], {relativeTo: this.route});
   }
 
+  selectNewWar() {
+    this.selectedWarId = null;
+    this.router.navigate([{outlets: {'right': ['new']}}], {relativeTo: this.route});
+  }
+
   selectWar(warId) {
     if (this.selectedWarId !== warId) {
       this.selectedWarId = warId;
@@ -70,16 +75,6 @@ export class WarListComponent implements OnInit {
     }
   }
 
-  selectNewWar() {
-    this.selectedWarId = null;
-    this.router.navigate([{outlets: {'right': ['submit-war']}}], {relativeTo: this.route});
-  }
-
-  editWar(warId) {
-    this.selectedWarId = warId;
-    this.router.navigate([{outlets: {'right': ['submit-war', warId]}}], {relativeTo: this.route});
-  }
-
   deleteWar(war: War) {
     if (confirm('Soll die Schlacht ' + war.title + ' wirklich gelöscht werden?')) {
       this.warService.deleteWar(war._id)
@@ -87,9 +82,7 @@ export class WarListComponent implements OnInit {
             if (this.selectedWarId === war._id) {
               this.selectOverview('all');
             }
-            this.campaigns.forEach(campaign => {
-              campaign.wars.splice(campaign.wars.indexOf(war), 1);
-            });
+            this.campaigns.splice(this.campaigns.indexOf(war), 1);
           });
     }
   }