Merge branch 'release/v1.6.5' of hardi/opt-cc into master

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opt-cc",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "license": "MIT",
   "author": "Florian Hartwich <hardi@noarch.de>",
   "private": true,

static/package-lock.json

@@ -213,9 +213,9 @@
       "integrity": "sha512-918ksaRl8RvGWGOjpUCywTS1MnLTqHki53XXibyhZkmHGSP5yLkcArBAFhFLvtQTTbuX8KSz2WFKxwaJ3JuJFw=="
     },
     "@swimlane/ngx-datatable": {
-      "version": "10.4.0",
+      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-10.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-11.0.4.tgz",
-      "integrity": "sha512-wTV/64vEGPFlcpE+ezTN18baOsNXyfLLvdmhEoaDQt2OJtTKtNxJkze24w71utoJxutQRrfHJUVSkAF4CLNckA=="
+      "integrity": "sha512-c/IA4wSeauLhImwkeNYpgB/QZBOPfHCBYXYie18yySUhBxBkY13mss1v0OsR17O0BJgrl79wq9uNs/FKLBo7aQ=="
     },
     "@types/jasmine": {
       "version": "2.5.38",

static/package.json

@@ -24,7 +24,7 @@
     "@angular/platform-browser-dynamic": "^5.0.0",
     "@angular/router": "^5.0.0",
     "@swimlane/ngx-charts": "^6.1.0",
-    "@swimlane/ngx-datatable": "^10.4.0",
+    "@swimlane/ngx-datatable": "^11.0.4",
     "bootstrap": "^3.3.7",
     "d3": "^4.11.0",
     "jquery": "^3.1.0",

static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.css

@@ -17,7 +17,7 @@
   width: 95%;
   margin: 2%;
   min-width: 900px;
-  height: 600px;
+  height: 50vh;
   padding: 15px;
   float: left;
 }

static/src/app/statistic/war-detail/scoreboard/scoreboard.component.css

@@ -4,6 +4,12 @@
 
 /* ########### DATATABLE ########### */
 
+ngx-datatable {
+  width: 1020px;
+  margin: auto;
+  height: 68vh;
+}
+
 :host /deep/ .datatable-header {
   background: #222222;
   font-weight: 700;

static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html

@@ -1,6 +1,5 @@
-<div class="fade-in" xmlns="http://www.w3.org/1999/html">
+<div class="fade-in" style="overflow-x: auto" xmlns="http://www.w3.org/1999/html">
   <ngx-datatable
-    style="width:1020px; margin:auto"
     [rows]="rows"
     [sorts]="[{prop: 'kill', dir: 'desc'}]"
     [reorderable]="reorderable"
@@ -8,6 +7,8 @@
     [headerHeight]="cellHeight"
     [rowHeight]="cellHeight"
     [cssClasses]='customClasses'
+    [columnMode]="'force'"
+    [scrollbarV]="true"
     [selectionType]="'single'">
     <ngx-datatable-column name="Spieler" prop="name" [width]="210" style="padding-left:10px">
       <ng-template ngx-datatable-cell-template let-row="row" let-value="value">

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

@@ -1,4 +1,4 @@
-import {Component, ElementRef, EventEmitter, SimpleChanges, ViewChild} from "@angular/core";
+import {Component, EventEmitter, SimpleChanges} from "@angular/core";
 import {War} from "../../../models/model-interfaces";
 import {Fraction} from "../../../utils/fraction.enum";
 

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

@@ -1,11 +1,11 @@
 .war-header-container {
   width: 920px;
-  min-height: 205px;
+  min-height: 168px;
   margin: auto;
 }
 
 .head-field {
-  font-size: 24px;
+  font-size: 22px;
   margin-top: 10px;
   margin-bottom: 10px;
 }

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

@@ -1,6 +1,6 @@
 <div *ngIf="war" class="war-header fade-in" xmlns="http://www.w3.org/1999/html">
   <div class="war-header-container">
-    <h2>{{war.title}} - vom {{war.date | date: 'dd.MM.yyyy'}}</h2>
+    <h3>{{war.title}} - vom {{war.date | date: 'dd.MM.yyyy'}}</h3>
     <div class="pull-left head-field" style="width: 250px">
       <h4>Endpunktestand:</h4>
       <span [style.color]="fraction.COLOR_BLUFOR" style="font-weight: bold; margin-right: 10px">{{fraction.BLUFOR}} {{war.ptBlufor}}</span>
@@ -8,9 +8,10 @@
       <span [style.color]="fraction.COLOR_OPFOR" style="font-weight: bold; margin-left: 10px;">{{war.ptOpfor}} {{fraction.OPFOR}}</span>
     </div>
 
-    <div class="pull-left head-field " style="padding-left: 140px;">
+    <div class="pull-left head-field " style="padding-left: 100px;">
-      <h4 style="margin-bottom: 0;">Teilnehmer:</h4>
+      <h4 class="pull-left" style="margin-bottom: 0;">Teilnehmer:</h4>
       <ngx-charts-pie-chart
+        class="pull-left"
         [view]="[120, 120]"
         [scheme]="colorScheme"
         [results]="playerChart"
@@ -22,7 +23,7 @@
       </ngx-charts-pie-chart>
     </div>
 
-    <div class="pull-left " style="padding-left: 150px; padding-top:15px">
+    <div class="pull-left " style="padding-left: 100px; padding-top:15px">
       <a class="btn btn-default" style="margin: 20px" target="_blank" href="resource/logs/{{war._id}}/clean.log">Logfile
         anzeigen</a>
       <form class="form-group" *ngIf="tab === 0">

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

@@ -1,7 +1,7 @@
 <div class="fade-in list-entry" [ngClass]="{selected : selected}" (click)="select()">
 
   <div class="row">
-    <div class="col-xs-9">
+    <div [ngClass]="[loginService.hasPermission(3) ? 'col-xs-9' : 'col-xs-11']">
       <span>
         <a style="font-size: 22px;">{{war.title}}</a>
       </span>
@@ -9,9 +9,10 @@
       <small>vom {{war.date | date: 'dd.MM.yyyy'}}</small>
     </div>
 
-    <div class="col-xs-3">
+    <div class="col-xs-3" *ngIf="loginService.hasPermission(3)">
-      <span (click)="delete(); $event.stopPropagation()" title="Löschen" class="glyphicon glyphicon-trash trash"
+      <span (click)="delete(); $event.stopPropagation()"
-            *ngIf="loginService.hasPermission(3)"></span>
+            title="Löschen"
+            class="glyphicon glyphicon-trash trash"></span>
     </div>
 
   </div>