server/routes/players.js

@@ -26,100 +26,92 @@ campaignPlayer.route('/ranking/:campaignId')
                   const warIds = wars.map((obj) => {
                     return obj._id;
                   });
-                  WarModel.findOne({campaign: req.params.campaignId}, {}, {sort: {'date': -1}}, (err, latestWar) => {
+                  PlayerModel.find({warId: {'$in': warIds}}, (err, items) => {
-                    PlayerModel.find({warId: {'$in': warIds}}, (err, items) => {
+                    if (err) return next(err);
-                      if (err) return next(err);
+                    if (!items || items.length === 0) {
-                      if (!items || items.length === 0) {
+                      const err = new Error('No players for given campaignId');
-                        const err = new Error('No players for given campaignId');
+                      err.status = codes.notfound;
-                        err.status = codes.notfound;
+                      return next(err);
-                        return next(err);
+                    }
-                      }
 
-                      const rankingItems = [];
+                    const rankingItems = [];
 
-                      // check only first player to have valid steamUUID - then decide if tracked by name or by ID
+                    // check only first player to have valid steamUUID - then decide if tracked by name or by ID
-                      const usesUUID = isSteamUUID(items[0].steamUUID);
+                    const usesUUID = isSteamUUID(items[0].steamUUID);
 
-                      new Set(items.map(usesUUID ? (x) => x.steamUUID : (x) => x.name))
+                    new Set(items.map(usesUUID ? (x) => x.steamUUID : (x) => x.name))
-                        .forEach((player) => {
+                      .forEach((player) => {
-                          const playerInstances = items.filter(
+                        const playerInstances = items.filter(
-                            usesUUID ? (p) => p.steamUUID === player : (p) => p.name === player);
+                          usesUUID ? (p) => p.steamUUID === player : (p) => p.name === player);
-                          const resItem = {
+                        const resItem = {
-                            name: usesUUID ? playerInstances[playerInstances.length - 1].name : player,
+                          name: usesUUID ? playerInstances[playerInstances.length - 1].name : player,
-                            kill: 0,
+                          kill: 0,
-                            vehicleLight: 0,
+                          vehicleLight: 0,
-                            vehicleHeavy: 0,
+                          vehicleHeavy: 0,
-                            vehicleAir: 0,
+                          vehicleAir: 0,
-                            death: 0,
+                          death: 0,
-                            friendlyFire: 0,
+                          friendlyFire: 0,
-                            revive: 0,
+                          revive: 0,
-                            respawn: 0,
+                          respawn: 0,
-                            flagTouch: 0,
+                          flagTouch: 0,
-                            travelDistance: 0,
+                          travelDistance: 0,
-                            driverDistance: 0,
+                          driverDistance: 0,
-                          };
+                        };
-                          for (let i = 0; i < playerInstances.length; i++) {
+                        for (let i = 0; i < playerInstances.length; i++) {
-                            const player = playerInstances[i];
+                          const player = playerInstances[i];
-                            resItem.kill += player.kill;
+                          resItem.kill += player.kill;
-                            resItem.death += player.death;
+                          resItem.death += player.death;
-                            resItem.friendlyFire += player.friendlyFire;
+                          resItem.friendlyFire += player.friendlyFire;
-                            resItem.vehicleLight += player.vehicleLight;
+                          resItem.vehicleLight += player.vehicleLight;
-                            resItem.vehicleHeavy += player.vehicleHeavy;
+                          resItem.vehicleHeavy += player.vehicleHeavy;
-                            resItem.vehicleAir += player.vehicleAir;
+                          resItem.vehicleAir += player.vehicleAir;
-                            resItem.revive += player.revive;
+                          resItem.revive += player.revive;
-                            resItem.respawn += player.respawn;
+                          resItem.respawn += player.respawn;
-                            resItem.flagTouch += player.flagTouch;
+                          resItem.flagTouch += player.flagTouch;
-                            if (player.travelDistance) {
+                          if (player.travelDistance) {
-                              resItem.travelDistance += Math.round(player.travelDistance / 1000); // meters -> km
+                            resItem.travelDistance += Math.round(player.travelDistance / 1000); // meters -> km
-                            }
+                          }
-                            if (player.driverDistance) {
+                          if (player.driverDistance) {
-                              resItem.driverDistance += Math.round(player.driverDistance / 1000); // meters -> km
+                            resItem.driverDistance += Math.round(player.driverDistance / 1000); // meters -> km
-                            }
                           }
-                          resItem.warCount = playerInstances.length;
-
-                          const latestPlayerFraction = playerInstances[playerInstances.length - 1].fraction;
-                          resItem.fraction =
-                            (latestPlayerFraction === 'OPFOR') ?
-                              latestWar.fractionMappingOpfor :
-                              latestWar.fractionMappingBlufor;
-
-                          rankingItems.push(resItem);
-                        });
-
-                      const getSortedField = (fieldName) => {
-                        let num = 1;
-                        const filteredSortResult = rankingItems.map((item) => {
-                                                                 return {
-                                                                   name: item.name,
-                                                                   fraction: item.fraction,
-                                                                   [fieldName]: item[fieldName],
-                                                                 };
-                                                               })
-                                                               .sort((a, b) => b[fieldName] - a[fieldName]);
-                        const res = JSON.parse(JSON.stringify(filteredSortResult));
-                        for (const entity of res) {
-                          entity.num = num++;
                         }
-                        return res;
+                        resItem.warCount = playerInstances.length;
-                      };
+                        resItem.fraction = playerInstances[playerInstances.length - 1].fraction;
+                        rankingItems.push(resItem);
+                      });
 
-                      res.locals.items = {
+                    const getSortedField = (fieldName) => {
-                        kill: getSortedField('kill'),
+                      let num = 1;
-                        death: getSortedField('death'),
+                      const filteredSortResult = rankingItems.map((item) => {
-                        friendlyFire: getSortedField('friendlyFire'),
+                                                               return {
-                        vehicleLight: getSortedField('vehicleLight'),
+                                                                 name: item.name,
-                        vehicleHeavy: getSortedField('vehicleHeavy'),
+                                                                 fraction: item.fraction,
-                        vehicleAir: getSortedField('vehicleAir'),
+                                                                 [fieldName]: item[fieldName],
-                        revive: getSortedField('revive'),
+                                                               };
-                        respawn: getSortedField('respawn'),
+                                                             })
-                        flagTouch: getSortedField('flagTouch'),
+                                                             .sort((a, b) => b[fieldName] - a[fieldName]);
-                        travelDistance: getSortedField('travelDistance'),
+                      const res = JSON.parse(JSON.stringify(filteredSortResult));
-                        driverDistance: getSortedField('driverDistance'),
+                      for (const entity of res) {
-                        warCount: getSortedField('warCount'),
+                        entity.num = num++;
-                      };
+                      }
-                      next();
+                      return res;
-                    });
+                    };
+
+                    res.locals.items = {
+                      kill: getSortedField('kill'),
+                      death: getSortedField('death'),
+                      friendlyFire: getSortedField('friendlyFire'),
+                      vehicleLight: getSortedField('vehicleLight'),
+                      vehicleHeavy: getSortedField('vehicleHeavy'),
+                      vehicleAir: getSortedField('vehicleAir'),
+                      revive: getSortedField('revive'),
+                      respawn: getSortedField('respawn'),
+                      flagTouch: getSortedField('flagTouch'),
+                      travelDistance: getSortedField('travelDistance'),
+                      driverDistance: getSortedField('driverDistance'),
+                      warCount: getSortedField('warCount'),
+                    };
+                    next();
                   });
                 });
               })

static/src/app/models/model-interfaces.ts

@@ -60,8 +60,8 @@ export interface War {
   endDate?: string;
   ptBlufor?: number;
   ptOpfor?: number;
-  fractionMappingBlufor?: Fraction.SWORD | Fraction.ARF | 'BLUFOR' | 'OPFOR';
+  fractionMappingBlufor?: Fraction.SWORD | Fraction.ARF | "BLUFOR" | "OPFOR";
-  fractionMappingOpfor?: Fraction.SWORD | Fraction.ARF | 'BLUFOR' | 'OPFOR';
+  fractionMappingOpfor?: Fraction.SWORD | Fraction.ARF | "BLUFOR" | "OPFOR";
   playersBlufor?: number;
   playersOpfor?: number;
   budgetBlufor?: number;

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

@@ -28,7 +28,7 @@
         <ng-container matColumnDef="name">
           <th mat-header-cell *matHeaderCellDef>{{'stats.highscore.header.name' | translate}}</th>
           <td mat-cell *matCellDef="let element"
-              [style.color]="fractionHelpers.getFractionColor(element['fraction'])">
+              [style.color]="element['fraction'] === 'BLUFOR' ? fraction.COLOR_BLUFOR : fraction.COLOR_OPFOR">
             {{element.name}}
           </td>
         </ng-container>

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

@@ -1,11 +1,11 @@
 import {Component, OnInit} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
 import {PlayerService} from '../../../services/logs/player.service';
+import {Fraction} from '../../../utils/fraction.enum';
 import {FormControl} from '@angular/forms';
 import {Observable} from 'rxjs/Observable';
 import {Player} from '../../../models/model-interfaces';
 import {PlayerUtils} from '../../../utils/player-utils';
-import {FractionHelpers} from '../../../utils/global.helpers';
 
 
 @Component({
@@ -25,7 +25,7 @@ export class StatisticHighScoreComponent implements OnInit {
 
   playerAttributeDisplayNames = PlayerUtils.attributeDisplayNames.slice(2, PlayerUtils.attributeDisplayNames.length);
 
-  readonly fractionHelpers = FractionHelpers;
+  readonly fraction = Fraction;
 
   constructor(private route: ActivatedRoute,
               private playerService: PlayerService) {

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

@@ -1,5 +1,6 @@
 import {Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges, ViewChild} from '@angular/core';
 import {ChartUtils} from '../../../utils/chart-utils';
+import {Fraction} from '../../../utils/fraction.enum';
 import {War} from '../../../models/model-interfaces';
 import {TranslateService} from '@ngx-translate/core';
 import {FractionHelpers} from '../../../utils/global.helpers';
@@ -74,18 +75,18 @@ export class FractionStatsComponent implements OnInit, OnChanges {
 
   ngOnChanges(changes: SimpleChanges) {
     if (changes.war || changes.logData) {
-      this.fractionNameBlufor = FractionHelpers.getFractionName(this.war, 'BLUFOR');
+      this.fractionNameBlufor = FractionHelpers.getFractionName(this.war, "BLUFOR");
-      this.fractionNameOpfor = FractionHelpers.getFractionName(this.war, 'OPFOR');
+      this.fractionNameOpfor = FractionHelpers.getFractionName(this.war, "OPFOR");
       this.colorScheme = {
         domain: [
-          FractionHelpers.getFractionColor('BLUFOR', this.war),
+          FractionHelpers.getFractionColor(this.war, "BLUFOR"),
-          FractionHelpers.getFractionColor('OPFOR', this.war),
+          FractionHelpers.getFractionColor(this.war, "OPFOR"),
-          FractionHelpers.getFractionColor('BLUFOR', this.war, 'LIGHT'),
+          FractionHelpers.getFractionColor(this.war, "BLUFOR", 'LIGHT'),
-          FractionHelpers.getFractionColor('OPFOR', this.war, 'LIGHT'),
+          FractionHelpers.getFractionColor(this.war, "OPFOR", 'LIGHT'),
-          FractionHelpers.getFractionColor('BLUFOR', this.war, 'DARK'),
+          FractionHelpers.getFractionColor(this.war, "BLUFOR", 'DARK'),
-          FractionHelpers.getFractionColor('OPFOR', this.war, 'DARK'),
+          FractionHelpers.getFractionColor(this.war, "OPFOR", 'DARK'),
-          FractionHelpers.getFractionColor('BLUFOR', this.war, 'GREY'),
+          FractionHelpers.getFractionColor(this.war, "BLUFOR", 'GREY'),
-          FractionHelpers.getFractionColor('OPFOR', this.war, 'GREY'),
+          FractionHelpers.getFractionColor(this.war, "OPFOR", 'GREY'),
         ]
       };
 

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

@@ -8,7 +8,7 @@
     <mat-header-cell *matHeaderCellDef
                      mat-sort-header="{{tableHead[0].prop}}">{{tableHead[0].head | translate}}</mat-header-cell>
     <mat-cell *matCellDef="let element"
-              [style.color]="fractionHelpers.getFractionColor(element['fraction'],war)">
+              [style.color]="fractionHelpers.getFractionColor(war, element['fraction'])">
       {{element.name}}
     </mat-cell>
   </ng-container>

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

@@ -2,12 +2,12 @@
   <div class="war-header-container">
     <div class="pull-left head-field">
       <h4>{{'stats.scoreboard.standings' | translate}}</h4>
-      <span [style.color]="fractionHelpers.getFractionColor('BLUFOR',war)"
+      <span [style.color]="fractionHelpers.getFractionColor(war, 'BLUFOR')"
             style="font-weight: bold; margin-right: 10px">
         {{fractionHelpers.getFractionName(war, 'BLUFOR')}} {{war.ptBlufor}}
       </span>
       <span style="font-size: x-large">|</span>
-      <span [style.color]="fractionHelpers.getFractionColor('OPFOR',war)"
+      <span [style.color]="fractionHelpers.getFractionColor(war, 'OPFOR')"
             style="font-weight: bold; margin-left: 10px;">
         {{war.ptOpfor}} {{fractionHelpers.getFractionName(war, 'OPFOR')}}
       </span>
@@ -15,12 +15,12 @@
 
     <div class="pull-left head-field" style="margin-top:0" *ngIf="isSmallLayout">
       <h4>{{'stats.scoreboard.participants' | translate}}</h4>
-      <span [style.color]="fractionHelpers.getFractionColor('BLUFOR',war)"
+      <span [style.color]="fractionHelpers.getFractionColor(war, 'BLUFOR')"
             style="font-weight: bold; margin-right: 10px">
         {{fractionHelpers.getFractionName(war, 'BLUFOR')}} {{war.playersBlufor}}
       </span>
       <span style="font-size: 13px;font-weight: bold;">vs</span>
-      <span [style.color]="fractionHelpers.getFractionColor('OPFOR',war)"
+      <span [style.color]="fractionHelpers.getFractionColor(war, 'OPFOR')"
             style="font-weight: bold; margin-left: 10px;">
         {{war.playersOpfor}} {{fractionHelpers.getFractionName(war, 'OPFOR')}}
       </span>

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

@@ -67,8 +67,8 @@ export class WarHeaderComponent implements OnInit {
 
           this.colorScheme = {
             domain: [
-              FractionHelpers.getFractionColor('OPFOR', war),
+              FractionHelpers.getFractionColor(war, 'OPFOR'),
-              FractionHelpers.getFractionColor('BLUFOR', war)
+              FractionHelpers.getFractionColor(war, 'BLUFOR')
             ]
           };
 

static/src/app/utils/global.helpers.ts

@@ -13,15 +13,8 @@ export const CSSHelpers = {
 };
 
 export const FractionHelpers = {
-  getFractionColor: (fraction, war?: War, style?) => {
+  getFractionColor: (war: War, fraction, style?) => {
-    let switchInput;
+    switch (fraction === 'BLUFOR' ? war.fractionMappingBlufor : war.fractionMappingOpfor) {
-    if (war) {
-      switchInput = (fraction === 'BLUFOR' ? war.fractionMappingBlufor : war.fractionMappingOpfor);
-    } else {
-      switchInput = fraction;
-    }
-
-    switch (switchInput) {
       case Fraction.ARF:
         switch (style) {
           case 'LIGHT':
@@ -33,7 +26,7 @@ export const FractionHelpers = {
           default:
             return Fraction.COLOR_ARF;
         }
-      case 'BLUFOR':
+      case "BLUFOR":
         switch (style) {
           case 'LIGHT':
             return Fraction.COLOR_BLUFOR_LIGHT;
@@ -44,7 +37,7 @@ export const FractionHelpers = {
           default:
             return Fraction.COLOR_BLUFOR;
         }
-      case 'OPFOR':
+      case "OPFOR":
         switch (style) {
           case 'LIGHT':
             return Fraction.COLOR_OPFOR_LIGHT;
@@ -73,9 +66,9 @@ export const FractionHelpers = {
     switch (fraction === 'BLUFOR' ? war.fractionMappingBlufor : war.fractionMappingOpfor) {
       case Fraction.ARF:
         return Fraction.COLOR_ARF;
-      case 'BLUFOR':
+      case "BLUFOR":
         return Fraction.COLOR_BLUFOR;
-      case 'OPFOR':
+      case "OPFOR":
         return Fraction.COLOR_OPFOR;
       case Fraction.SWORD:
         return Fraction.COLOR_SWORD;
@@ -86,9 +79,9 @@ export const FractionHelpers = {
     switch (fraction === 'BLUFOR' ? war.fractionMappingBlufor : war.fractionMappingOpfor) {
       case Fraction.ARF:
         return Fraction.ARF;
-      case 'BLUFOR':
+      case "BLUFOR":
         return Fraction.BLUFOR;
-      case 'OPFOR':
+      case "OPFOR":
         return Fraction.OPFOR;
       case Fraction.SWORD:
         return Fraction.SWORD;