server/apib/data_structures/_log.apib

@@ -3,6 +3,7 @@
 + _id: `` (string, required) - log entry id
 + war: `` (string, required) - warId
 + time: `` (string, required) - logging timestamp
++ __v: 0 (number, required) - object version number
 
 # LogPoints (Log)
 ## Properties
@@ -73,14 +74,14 @@
 #LogVehicle (Log)
 ## Properties
 + shooter: `HardiReady` (string, required) - name of player who shot the vehicle
-+ additionalShooter: `[GNC]Paolo`, `Dominik` (array[string], required) - additional crew members of shooter vehicle
++ additionalShooter: [`[GNC]Paolo`, `Dominik`] (array[string], required) - additional crew members of shooter vehicle
 + target: `T-100` (string, required) - name of the vehicle
 + fraction: `BLUFOR` (enum, required) - fraction of the shooter
         + Members
             + `BLUFOR`
             + `OPFOR`
             + `NONE`
-+ vehicleClass: `LIGHT` (enum[string], required) - class of shot vehicle
++ vehicleClass: `LIGHT` (enum, required) - class of shot vehicle
         + Members
             + `LIGHT`
             + `HEAVY`

server/models/logs/budget.js

@@ -3,8 +3,7 @@
 const mongoose = require('mongoose');
 const Schema = mongoose.Schema;
 
-const LogBudgetSchema = new Schema(
-  {
+const LogBudgetSchema = new Schema({
   war: {
     type: mongoose.Schema.Types.ObjectId,
     ref: 'War',
@@ -31,18 +30,7 @@ const LogBudgetSchema = new Schema(
     set: (v) => Math.round(v),
     required: true,
   },
-    buy: {
-      type: Boolean,
-      required: true,
-    },
-    player: {
-      type: String,
-    },
-    item: {
-      type: String,
-    },
-  },
-  {
+}, {
   collection: 'logBudget',
   versionKey: false,
 });

server/tools/log-parse-tool.js

@@ -13,12 +13,6 @@ const VehicleClasses = Object.freeze({
 
 const playerNameRegex = /(^|,\s)(.*?)\s\(/g;
 
-const budgetPlayerNameRegex = /\d*\.\s(.*)\s\(ver\)kaufte/;
-
-const budgetItemNameRegex = /\(ver\)kaufte\s(.*)\"$/;
-
-const budgetRespawnNameRegex = /Respawn\svon\s(.*)\"$/;
-
 const vehicleNameEndRegex = /\s\(\w+:/;
 
 const sideRegex = /(side:\s(.*?)\))/;
@@ -184,7 +178,7 @@ const parseWarLog = (lineArray, war) => {
           const playerName = line.substring(line.lastIndexOf('Respawn von ') + 12, line.lastIndexOf('"'));
           stats.respawn.push(getRespawnEntry(budg, playerName, war._id, war.date));
         }
-        stats.budget.push(getBudgetEntry(line, budg, war._id, war.date));
+        stats.budget.push(getBudgetEntry(budg, war._id, war.date));
       }
     } else if (line.includes('(Fahne)') && !line.includes('Dominator')) {
       /**
@@ -411,37 +405,14 @@ const getPointsEntry = (pt, line, warId, warDate) => {
   };
 };
 
-const getBudgetEntry = (line, budg, warId, warDate) => {
-  const timestamp = getFullTimeDate(warDate, budg[5]);
-  const oldBudget = transformMoneyString(budg[9]);
-  const newBudget = transformMoneyString(budg[12]);
-  const fraction = budg[7] === 'NATO' ? 'BLUFOR' : 'OPFOR';
-
-  const budgetEntry = {
+const getBudgetEntry = (budg, warId, warDate) => {
+  return {
     war: warId,
-    time: timestamp,
-    fraction: fraction,
-    oldBudget: oldBudget,
-    newBudget: newBudget,
-    buy: oldBudget <= newBudget,
+    time: getFullTimeDate(warDate, budg[5]),
+    fraction: budg[7] === 'NATO' ? 'BLUFOR' : 'OPFOR',
+    oldBudget: transformMoneyString(budg[9]),
+    newBudget: transformMoneyString(budg[12]),
   };
-
-  const budgetRespawnMatch = budgetRespawnNameRegex.exec(line);
-  if (budgetRespawnMatch && budgetRespawnMatch.length > 1) {
-    budgetEntry.player = budgetRespawnMatch[1];
-    budgetEntry.item = 'Respawn';
-  } else {
-    const itemNameMatch = budgetItemNameRegex.exec(line);
-    const playerNameMatch = budgetPlayerNameRegex.exec(line);
-    if (playerNameMatch && playerNameMatch.length > 1) {
-      budgetEntry.player = playerNameMatch[1];
-    }
-    if (itemNameMatch && itemNameMatch.length > 1) {
-      budgetEntry.item = itemNameMatch[1];
-    }
-  }
-
-  return budgetEntry;
 };
 
 const getPlayerInfoFromString = (inputString) => {

static/src/app/statistic/war/fraction-stats/fraction-stats.component.html

@@ -20,7 +20,7 @@
       [legendTitle]="legendTitle"
       [showXAxisLabel]="showXAxisLabel"
       [showYAxisLabel]="showYAxisLabel"
-      [yAxisLabel]="chartYAxisLabel"
+      [yAxisLabel]="lineChartLabel"
       [autoScale]="autoscale"
       [timeline]="timeline"
       [roundDomains]="roundDomains">
@@ -32,15 +32,15 @@
       [scheme]="colorScheme"
       [results]="barChartData"
       [xAxis]="xAxis"
-      [yAxis]="yAxis"
+      [yAxis]="barShowYAxis"
       [legend]="legend"
       [legendTitle]="legendTitle"
-      [showXAxisLabel]="showXAxisLabel"
+      [showXAxisLabel]="barShowXAxisLabel"
       [showYAxisLabel]="showYAxisLabel"
       [animations]="barAnimations"
       [barPadding]="barPadding"
-      [xAxisTickFormatting]="axisFormatX"
-      [yAxisTickFormatting]="axisFormatY">
+      [xAxisTickFormatting]="axisFormat"
+      [xAxisLabel]="'Minute'">
       <ng-template #tooltipTemplate let-model="model">
         <small>{{'stats.fraction.tooltip.flag.minute' | translate}} {{model.series}}</small>
         <div>{{model.name}} {{'stats.fraction.tooltip.flag.flag' | translate}}</div>

static/src/app/statistic/war/fraction-stats/fraction-stats.component.scss

@@ -7,25 +7,25 @@
 :host /deep/ mat-button-toggle {
   color: #666666;
   background: #e7e7e7;
+}
 
-  :hover {
+:host /deep/ mat-button-toggle:hover {
   background: #afafaf;
 }
 
-  &.mat-button-toggle-checked {
+:host /deep/ mat-button-toggle.mat-button-toggle-checked {
   background: #ffffff;
 }
 
-  label.mat-button-toggle-label {
+:host /deep/ label.mat-button-toggle-label {
   margin: 2px 0;
 }
 
-  div.mat-button-toggle-label-content {
+:host /deep/ div.mat-button-toggle-label-content {
   line-height: 25px;
   margin-bottom: 0;
   font-weight: normal;
 }
-}
 
 .chart-container {
   width: 95%;

static/src/app/statistic/war/fraction-stats/fraction-stats.component.ts

@@ -1,4 +1,5 @@
 import {Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges, ViewChild} from '@angular/core';
+import * as d3 from 'd3';
 import {ChartUtils} from '../../../utils/chart-utils';
 import {Fraction} from '../../../utils/fraction.enum';
 import {War} from '../../../models/model-interfaces';
@@ -8,7 +9,7 @@ import {TranslateService} from '@ngx-translate/core';
 @Component({
   selector: 'war-detail-fraction',
   templateUrl: './fraction-stats.component.html',
-  styleUrls: ['./fraction-stats.component.scss']
+  styleUrls: ['./fraction-stats.component.scss', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css']
 })
 export class FractionStatsComponent implements OnInit, OnChanges {
 
@@ -47,10 +48,10 @@ export class FractionStatsComponent implements OnInit, OnChanges {
   labels;
   labelsKeys;
 
-  chartYAxisLabel: string;
+  lineChartLabel: string;
 
-  // line chart
   showLineChart = true;
+  stepCurve = d3.curveStepAfter;
   gradient = false;
   yAxis = true;
   xAxis = true;
@@ -62,15 +63,16 @@ export class FractionStatsComponent implements OnInit, OnChanges {
   timeline = false;
   roundDomains = true;
 
-  // bar chart
   barPadding = 0;
   barAnimations = false;
+  barShowYAxis = false;
+  barShowXAxisLabel = true;
 
   constructor(private translate: TranslateService) {
   }
 
   ngOnInit() {
-    this.setChartYAxisLabel(this.labels.points);
+    this.setLineChartLabel(this.labels.points);
   }
 
   ngOnChanges(changes: SimpleChanges) {
@@ -136,7 +138,7 @@ export class FractionStatsComponent implements OnInit, OnChanges {
     this.activeChartSelect = newSelection;
     if (this.activeChartSelect !== this.labels.flag) {
       this.showLineChart = true;
-      this.setChartYAxisLabel(this.activeChartSelect);
+      this.setLineChartLabel(this.activeChartSelect);
       switch (this.activeChartSelect) {
         case this.labels.points:
           this.lineChartData = this.tmpPointData;
@@ -206,7 +208,7 @@ export class FractionStatsComponent implements OnInit, OnChanges {
       const fractionChange = budgetEntry.fraction === 'BLUFOR' ? 0 : 1;
       const fractionOld = budgetEntry.fraction !== 'BLUFOR' ? 0 : 1;
 
-      if (ChartUtils.isOneMinuteAhead(budgetEntryDate, this.tmpBudgetData)) {
+      if (this.isTwoMinutesAhead(budgetEntryDate, this.tmpBudgetData)) {
         this.tmpBudgetData[fractionChange].series.push(ChartUtils.getSeriesEntry(new Date(budgetEntry.time), budgetEntry.newBudget));
         this.tmpBudgetData[fractionOld].series.push(ChartUtils.getSeriesEntry(new Date(budgetEntry.time),
           this.tmpBudgetData[fractionOld].series[this.tmpBudgetData[fractionOld].series.length - 1].value));
@@ -231,7 +233,7 @@ export class FractionStatsComponent implements OnInit, OnChanges {
         if (killEntry.fraction === 'OPFOR') {
           killCountOpfor++;
         }
-        if (ChartUtils.isOneMinuteAhead(killEntryDate, this.tmpKillData)) {
+        if (this.isTwoMinutesAhead(killEntryDate, this.tmpKillData)) {
           this.tmpKillData[0].series.push(ChartUtils.getSeriesEntry(killEntryDate, killCountBlufor));
           this.tmpKillData[1].series.push(ChartUtils.getSeriesEntry(killEntryDate, killCountOpfor));
         }
@@ -242,7 +244,7 @@ export class FractionStatsComponent implements OnInit, OnChanges {
         if (killEntry.fraction === 'OPFOR') {
           ffKillCountOpfor++;
         }
-        if (ChartUtils.isOneMinuteAhead(killEntryDate, this.tmpFrienlyFireData)) {
+        if (this.isTwoMinutesAhead(killEntryDate, this.tmpFrienlyFireData)) {
           this.tmpFrienlyFireData[0].series.push(ChartUtils.getSeriesEntry(killEntryDate, ffKillCountBlufor));
           this.tmpFrienlyFireData[1].series.push(ChartUtils.getSeriesEntry(killEntryDate, ffKillCountOpfor));
         }
@@ -273,7 +275,7 @@ export class FractionStatsComponent implements OnInit, OnChanges {
         } else {
           reviveCountOpfor++;
         }
-        if (ChartUtils.isOneMinuteAhead(reviveEntryDate, this.tmpReviveData)) {
+        if (this.isTwoMinutesAhead(reviveEntryDate, this.tmpReviveData)) {
           this.tmpReviveData[0].series.push(ChartUtils.getSeriesEntry(reviveEntryDate, reviveCountBlufor));
           this.tmpReviveData[1].series.push(ChartUtils.getSeriesEntry(reviveEntryDate, reviveCountOpfor));
         }
@@ -283,7 +285,7 @@ export class FractionStatsComponent implements OnInit, OnChanges {
         } else {
           stabilizeCountOpfor++;
         }
-        if (ChartUtils.isOneMinuteAhead(reviveEntryDate, this.tmpStabilizeData)) {
+        if (this.isTwoMinutesAhead(reviveEntryDate, this.tmpStabilizeData)) {
           this.tmpStabilizeData[0].series.push(ChartUtils.getSeriesEntry(reviveEntryDate, stabilizeCountBlufor));
           this.tmpStabilizeData[1].series.push(ChartUtils.getSeriesEntry(reviveEntryDate, stabilizeCountOpfor));
         }
@@ -342,7 +344,7 @@ export class FractionStatsComponent implements OnInit, OnChanges {
           }
         }
       }
-      if (ChartUtils.isOneMinuteAhead(vehicleEntryDate, this.tmpVehicleData) || index === this.logData.vehicle.length - 1) {
+      if (this.isTwoMinutesAhead(vehicleEntryDate, this.tmpVehicleData) || index === this.logData.vehicle.length - 1) {
         this.tmpVehicleData[0].series.push(ChartUtils.getSeriesEntry(vehicleEntryDate, vehicleKillCountBlufor));
         this.tmpVehicleData[1].series.push(ChartUtils.getSeriesEntry(vehicleEntryDate, vehicleKillCountOpfor));
         if (vehicleEntry.vehicleClass) {
@@ -374,8 +376,7 @@ export class FractionStatsComponent implements OnInit, OnChanges {
       } else {
         transportCountOpfor++;
       }
-      if (ChartUtils.isOneMinuteAhead(transportEntryDate, this.tmpTransportData) ||
-        index === this.logData.transport.length - 1) {
+      if (this.isTwoMinutesAhead(transportEntryDate, this.tmpTransportData) || index === this.logData.transport.length - 1) {
         this.tmpTransportData[0].series.push(ChartUtils.getSeriesEntry(transportEntryDate, transportCountBlufor));
         this.tmpTransportData[1].series.push(ChartUtils.getSeriesEntry(transportEntryDate, transportCountOpfor));
       }
@@ -450,6 +451,10 @@ export class FractionStatsComponent implements OnInit, OnChanges {
     this.initialized.flag = true;
   }
 
+  protected isTwoMinutesAhead(entryDate: Date, tmpData: any): boolean {
+    return entryDate.getTime() >= tmpData[0].series[tmpData[0].series.length - 1].name.getTime() + (1.5 * 60000);
+  }
+
   initializeTempCollections() {
     this.tmpPointData = ChartUtils.getMultiDataArray(Fraction.BLUFOR, Fraction.OPFOR);
     this.tmpBudgetData = ChartUtils.getMultiDataArray(Fraction.BLUFOR, Fraction.OPFOR);
@@ -491,21 +496,17 @@ export class FractionStatsComponent implements OnInit, OnChanges {
     }
   }
 
-  setChartYAxisLabel(i18n: string) {
+  setLineChartLabel(i18n: string) {
     this.translate.get(i18n).subscribe((translated) => {
-      this.chartYAxisLabel = translated;
+      this.lineChartLabel = translated;
     });
   }
 
-  axisFormatX(val) {
+  axisFormat(val) {
     if (val % 10 === 0) {
-      return val;
+      return val
     } else {
-      return '';
+      return ''
     }
   }
-
-  axisFormatY(val) {
-    return '';
-  }
 }

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

@@ -7,8 +7,7 @@
          class="mat-elevation-z8">
 
     <ng-container matColumnDef="{{tableHead[0].prop}}">
-      <mat-header-cell *matHeaderCellDef
-                       mat-sort-header="{{tableHead[0].prop}}">{{tableHead[0].head | translate}}</mat-header-cell>
+      <mat-header-cell *matHeaderCellDef mat-sort-header="{{tableHead[0].prop}}">{{tableHead[0].head | translate}}</mat-header-cell>
       <mat-cell *matCellDef="let element"
           [style.color]="element['fraction'] === 'BLUFOR' ? fraction.COLOR_BLUFOR : fraction.COLOR_OPFOR">
         {{element.name}}
@@ -16,10 +15,8 @@
     </ng-container>
 
     <ng-container matColumnDef="{{tableHead[1].prop}}">
-      <mat-header-cell *matHeaderCellDef
-                       mat-sort-header="{{tableHead[1].prop}}">{{tableHead[1].head | translate}}</mat-header-cell>
-      <mat-cell *matCellDef="let element">{{element.fraction ===
-      'BLUFOR' ? fraction.BLUFOR : fraction.OPFOR}}</mat-cell>
+      <mat-header-cell *matHeaderCellDef mat-sort-header="{{tableHead[1].prop}}">{{tableHead[1].head | translate}}</mat-header-cell>
+      <mat-cell *matCellDef="let element">{{element.fraction === 'BLUFOR' ? fraction.BLUFOR : fraction.OPFOR}}</mat-cell>
     </ng-container>
 
     <ng-container *ngFor="let column of tableHead.slice(2, tableHead.length)" matColumnDef="{{column.prop}}">

static/src/app/statistic/war/server-stats/server-stats.component.css

@@ -7,15 +7,15 @@
 :host /deep/ mat-button-toggle {
   color: #666666;
   background: #e7e7e7;
+}
 
-  :hover {
+:host /deep/ mat-button-toggle:hover {
   background: #afafaf;
 }
 
-  &.mat-button-toggle-checked {
+:host /deep/ mat-button-toggle.mat-button-toggle-checked {
   background: #ffffff;
 }
-}
 
 :host /deep/ label.mat-button-toggle-label {
   margin: 2px 0;

static/src/app/statistic/war/server-stats/server-stats.component.html

@@ -21,7 +21,6 @@
       [showXAxisLabel]="showXAxisLabel"
       [showYAxisLabel]="showYAxisLabel"
       [yAxisLabel]="barChartLabel"
-      [animations]="barAnimations"
       [barPadding]="barPadding"
       [roundDomains]="roundDomains">
     </ngx-charts-bar-vertical>

static/src/app/statistic/war/server-stats/server-stats.component.ts

@@ -7,7 +7,7 @@ import {ChartUtils} from '../../../utils/chart-utils';
 @Component({
              selector: 'cc-server-statistics',
              templateUrl: './server-stats.component.html',
-  styleUrls: ['./server-stats.component.scss']
+             styleUrls: ['./server-stats.component.css', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css']
            })
 export class ServerStatsComponent implements OnInit, OnChanges {
 
@@ -54,7 +54,6 @@ export class ServerStatsComponent implements OnInit, OnChanges {
   autoscale = true;
   timeline = false;
   roundDomains = true;
-  barAnimations = false;
   barPadding = 2;
   colorScheme = {
     name: 'nightLights',

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

@@ -0,0 +1,77 @@
+.war-header-container {
+  width: 920px;
+  min-height: 165px;
+  padding-top: 12px;
+  margin: auto;
+}
+
+.head-field {
+  font-size: 22px;
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+
+form.tab-control {
+  padding: 10px;
+}
+
+span.tab-control {
+  margin: 4px 30px 4px 55px;
+  padding: 4px 16px;
+}
+
+.nav-tabs > li.active > a {
+  background: #ffffff;
+  border-bottom: none;
+}
+
+.nav-tabs > li.active {
+  position: relative;
+  top: 1px;
+  z-index: 10;
+}
+
+.nav-tabs mat-icon {
+  color: #666666;
+  height: 26px;
+  width: 26px;
+  display: inline-block;
+  vertical-align: middle;
+}
+
+:host/deep/.mat-icon-stats-performance g {
+  stroke: #666666;
+}
+
+.nav-tabs {
+  width: 1000px;
+  margin: auto;
+  clear: both;
+  border-bottom: 0;
+}
+
+.nav-tab-hidden {
+  visibility: hidden;
+}
+
+.nav-tabs > li > a {
+  background: #e7e7e7;
+  border: 1px solid #dadada;
+}
+
+.nav-tabs > li:not(.active) > a:hover {
+  background: #afafaf;
+}
+
+.nav-tabs > li:last-child {
+  margin-left: 65px;
+}
+
+.nav-link {
+  cursor: pointer !important;
+  color: #666666 !important;
+}
+
+.nav-tabs > li.deactivated > a.nav-link {
+  cursor: not-allowed !important;
+}

static/src/app/statistic/war/war-header/war-header.component.scss

@@ -1,79 +0,0 @@
-.war-header-container {
-  width: 920px;
-  min-height: 165px;
-  padding-top: 12px;
-  margin: auto;
-}
-
-.head-field {
-  font-size: 22px;
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-
-form.tab-control {
-  padding: 10px;
-}
-
-span.tab-control {
-  margin: 4px 30px 4px 55px;
-  padding: 4px 16px;
-}
-
-:host /deep/ .mat-icon-stats-performance g {
-  stroke: #666666;
-}
-
-.nav-tabs {
-  width: 1000px;
-  margin: auto;
-  clear: both;
-  border-bottom: 0;
-
-  mat-icon {
-    color: #666666;
-    height: 26px;
-    width: 26px;
-    display: inline-block;
-    vertical-align: middle;
-  }
-
-  > li {
-    > a {
-      background: #e7e7e7;
-      border: 1px solid #dadada;
-    }
-  }
-
-  > li.active {
-    position: relative;
-    top: 1px;
-    z-index: 10;
-
-    > a {
-      background: #ffffff;
-      border-bottom: none;
-    }
-  }
-
-  > li:not(.active) > a:hover {
-    background: #afafaf;
-  }
-
-  > li.deactivated > a.nav-link {
-    cursor: not-allowed !important;
-  }
-
-  > li:last-child {
-    margin-left: 65px;
-  }
-}
-
-.nav-tab-hidden {
-  visibility: hidden;
-}
-
-.nav-link {
-  cursor: pointer !important;
-  color: #666666 !important;
-}

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

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

static/src/app/utils/chart-utils.ts

@@ -34,8 +34,4 @@ export class ChartUtils {
       'value': value2
     }];
   }
-
-  public static isOneMinuteAhead(entryDate: Date, tmpData: any): boolean {
-    return entryDate.getTime() >= tmpData[0].series[tmpData[0].series.length - 1].name.getTime() + 60000;
-  }
 }