Add player count statistic

minify.sh

@@ -8,4 +8,5 @@ for i in "${FILES[@]}"
 do
   echo "minify ${i} ..."
   $(npm bin)/uglifyjs public/${i}.bundle.js ${OPTIONS} -o public/${i}.bundle.js
+  rm -f public/${i}.bundle.js.map
 done

package-lock.json

@@ -128,7 +128,8 @@
     "commander": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz",
-      "integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0="
+      "integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0=",
+      "dev": true
     },
     "concurrently": {
       "version": "3.5.0",
@@ -631,8 +632,15 @@
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.26.tgz",
       "integrity": "sha512-+D/BjzuvT1oRMSkH0fuF3M/BCvDxDywmZasd1UTPPHsdsHZqJEAZSvrojgFlS7lrM3ZZWq5h7Bb5i96X1TbOJw==",
       "requires": {
-        "commander": "2.6.0",
+        "commander": "2.11.0",
         "source-map": "0.5.6"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.11.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+          "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="
+        }
       }
     },
     "uuid": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opt-cc",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "license": "MIT",
   "private": true,
   "scripts": {

static/package.json

@@ -51,7 +51,6 @@
     "protractor": "~5.1.1",
     "protractor-jasmine2-screenshot-reporter": "^0.3.2",
     "ts-node": "1.2.1",
-    "tslint": "^4.3.0",
-    "typescript": "^2.3.2"
+    "tslint": "^4.3.0"
   }
 }

static/src/app/statistic/statistic.component.css

@@ -1,48 +1,5 @@
-h1 {
+h3 {
   width: 920px;
   margin-bottom: 50px;
   margin-left: 25%
 }
-
-img {
-  margin-top: 10px;
-  padding-right: 30px;
-}
-
-.div-table {
-  display: table;
-  border-radius: 10px;
-  margin-left: 1%;
-  width: auto;
-  border-spacing: 5px; /* cellspacing:poor IE support for  this */
-}
-
-.div-table-row {
-  display: table-row;
-  width: auto;
-  clear: both;
-}
-
-.div-table-col {
-  float: left; /* fix for  buggy browsers */
-  display: table-column;
-  padding: 5px 15px 5px 15px;
-}
-
-.army-head {
-  font-weight: bolder;
-  text-align: center
-}
-
-.member-link {
-  cursor: pointer;
-  text-decoration: underline;
-}
-
-.text-opfor {
-  color: firebrick;
-}
-
-.text-blufor {
-  color: blue;
-}

static/src/app/statistic/statistic.component.html

@@ -13,10 +13,9 @@
     [legendTitle]="''"
     [showXAxisLabel]="true"
     [showYAxisLabel]="true"
-    [xAxisLabel]="Schlachtdatum"
-    [yAxisLabel]="Punkte"
+    [xAxisLabel]="'Schlachtdatum'"
+    [yAxisLabel]="'Punkte'"
     [autoScale]="false"
-    [timeline]="true"
     (select)="onSelect($event)">
   </ngx-charts-line-chart>
 

static/src/app/statistic/statistic.component.ts

@@ -1,4 +1,5 @@
 import {Component} from "@angular/core";
+import {AppComponent} from "../app.component";
 import {WarService} from "../services/war-service/war.service";
 
 
@@ -12,40 +13,70 @@ export class StatisticComponent {
   chartData: any[] = [];
 
   colorScheme = {
-    domain: ['#0000FF', '#B22222', '#C7B42C', '#AAAAAA']
+    domain: ['#0000FF', '#B22222', '#595DC7', '#B25D62']
   };
 
-  constructor(private warService: WarService) {
-    Object.assign(this, this.chartData)
+  constructor(private appComponent: AppComponent,
+              private warService: WarService) {
   }
 
   ngOnInit() {
-    this.warService.getAllWars()
-      .subscribe((wars) => {
-        let updateObj = [{
-          "name": "NATO",
-          "series": []
-        },
-          {
-            "name": "CSAT",
-            "series": []
-          }];
-        for (let i = 0; i < wars.length; i++) {
-          let warDateString = new Date(wars[i].date);
-          let bluforData = {
-            name: warDateString,
-            value: wars[i].ptBlufor
-          };
-          updateObj[0].series.push(bluforData);
-          let opforData = {
-            name: warDateString,
-            value: wars[i].ptOpfor
-          };
-          updateObj[1].series.push(opforData);
-        }
-        this.chartData = updateObj;
+    let wars = this.appComponent.wars;
+    if (wars.length === 0) {
+      this.warService.getAllWars().subscribe(items => {
+        this.initChart(items);
       })
-  };
+    }
+    this.initChart(wars);
+  }
+
+  initChart(wars: any[]) {
+    let updateObj = [
+      {
+        "name": "NATO",
+        "series": []
+      },
+      {
+        "name": "CSAT",
+        "series": []
+      },
+      {
+        "name": "Anz. Spieler NATO",
+        "series": []
+      },
+      {
+        "name": "Anz. Spieler CSAT",
+        "series": []
+      }];
+    for (let i = wars.length - 1; i >= 0; i--) {
+      let isoDate = wars[i].date.slice(0, 10);
+      let dayDate = parseInt(isoDate.slice(8, 10)) + 1;
+      let warDateString = (dayDate < 10 ? "0" + dayDate : dayDate) + '.'
+        + isoDate.slice(5, 7) + '.' + isoDate.slice(0, 4);
+      let bluforData = {
+        name: warDateString,
+        value: wars[i].ptBlufor
+      };
+      updateObj[0].series.push(bluforData);
+      let opforData = {
+        name: warDateString,
+        value: wars[i].ptOpfor
+      };
+      updateObj[1].series.push(opforData);
+      let bluforPlayers = {
+        name: warDateString,
+        value: 13
+      };
+      updateObj[2].series.push(bluforPlayers);
+      let opforPlayers = {
+        name: warDateString,
+        value: 13
+      };
+      updateObj[3].series.push(opforPlayers);
+    }
+    this.chartData = updateObj;
+    Object.assign(this, this.chartData)
+  }
 
   onSelect(event) {
     console.log(event);