api/routes/players.js

@@ -14,9 +14,6 @@ const CampaignModel = require('../models/campaign');
 const PlayerModel = require('../models/player');
 const WarModel = require('../models/war');
 
-// Util
-const isSteamUUID = require('../tools/util').isSteamUUID;
-
 const campaignPlayer = express.Router();
 
 // routes **********************
@@ -89,7 +86,7 @@ campaignPlayer.route('/ranking/:campaignId')
                 routerHandling.httpMethodNotAllowed
               );
 
-campaignPlayer.route('/single/:campaignId/:playerId')
+campaignPlayer.route('/single/:campaignId/:playerName')
               .get((req, res, next) => {
                 CampaignModel.findById(req.params.campaignId, (err, campaign) => {
                   if (err) return next(err);
@@ -98,24 +95,17 @@ campaignPlayer.route('/single/:campaignId/:playerId')
                     const warIds = wars.map((obj) => {
                       return obj._id;
                     });
-
-                    // find by player name until v1.6.12, afterwards by SteamUUID
-                    const playerId = req.params.playerId;
-                    const filter = {};
-                    filter[isSteamUUID(playerId) ? 'steamUUID' : 'name'] = playerId;
-                    filter['warId'] = {"$in": warIds};
-
-                    PlayerModel.find(filter)
+                    PlayerModel.find({name: req.params.playerName, warId: {"$in": warIds}})
                                .populate('warId')
                                .exec((err, items) => {
                                  if (err) return next(err);
                                  if (!items || items.length === 0) {
-                                   const err = new Error('Unknown player id');
+                                   const err = new Error('Unknown player name');
                                    err.status = codes.notfound;
                                    return next(err)
                                  }
                                  res.locals.items = {
-                                   name: items[items.length - 1].name,
+                                   name: req.params.playerName,
                                    campaign: campaign,
                                    players: items
                                  };

api/tools/util.js

@@ -1,11 +1,5 @@
 "use strict";
 
-const isSteamUUID = (input) => {
-  const steamUIDPattern = new RegExp("[0-9]{17}");
-  return steamUIDPattern.test(input)
-};
-
-
 const sortCollectionBy = (collection, key) => {
   collection.sort((a, b) => {
     a = a[key].toLowerCase();
@@ -54,4 +48,3 @@ exports.sortCollection = sortCollectionBy;
 exports.playerArrayContains = playerArrayContains;
 exports.timeStringToDecimal = timeStringToDecimal;
 exports.decimalToTimeString = decimalToTimeString;
-exports.isSteamUUID = isSteamUUID;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opt-cc",
-  "version": "1.7.0",
+  "version": "1.6.13",
   "author": "Florian Hartwich <hardi@noarch.de>",
   "private": true,
   "scripts": {

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

@@ -72,4 +72,5 @@ ngx-datatable {
   background: #4b4b4b;
   -webkit-box-shadow: inset 0 0 6px rgba(255, 255, 255, 0.5);
 }
+
 /* Table Scrollbar END */

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

@@ -35,12 +35,9 @@
         <!--<span class="btn btn-sm btn-default in-table-btn disabled">Detail</span>-->
       <!--</ng-template>-->
     <!--</ngx-datatable-column>-->
-    <ngx-datatable-column [width]="80">
-      <ng-template ngx-datatable-cell-template let-row="row">
-        <span class="btn btn-sm btn-default in-table-btn"
-              (click)="selectPlayerDetail(1, isSteamUUID(row['steamUUID']) ? row['steamUUID'] : row['name'])">
-          Gesamt
-        </span>
+    <ngx-datatable-column [width]="80" name="" prop="name">
+      <ng-template ngx-datatable-cell-template let-value="value">
+        <span class="btn btn-sm btn-default in-table-btn" (click)="selectPlayerDetail(1, value)">Gesamt</span>
       </ng-template>
     </ngx-datatable-column>
   </ngx-datatable>

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

@@ -1,7 +1,6 @@
 import {Component, ElementRef, EventEmitter, SimpleChanges} from "@angular/core";
 import {War} from "../../../models/model-interfaces";
 import {Fraction} from "../../../utils/fraction.enum";
-import {PlayerUtils} from "../../../utils/player-utils";
 
 @Component({
   selector: 'scoreboard',
@@ -18,8 +17,6 @@ export class ScoreboardComponent {
 
   war: War;
 
-  isSteamUUID = PlayerUtils.isSteamUUID;
-
   fractionFilterSelected: string;
 
   cellHeight = 40;
@@ -36,11 +33,8 @@ export class ScoreboardComponent {
   constructor(private elRef: ElementRef) {
   }
 
-  selectPlayerDetail(view: number, player) {
-    this.playerTabSwitch.emit({
-      view: view,
-      player: player
-    })
+  selectPlayerDetail(view: number, playerName: string) {
+    this.playerTabSwitch.emit({view: view, player: playerName})
   }
 
   ngOnChanges(changes: SimpleChanges) {

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

@@ -1,7 +0,0 @@
-export class PlayerUtils {
-
-  public static isSteamUUID(input: string): boolean {
-    const steamUIDPattern = new RegExp("[0-9]{17}");
-    return steamUIDPattern.test(input)
-  }
-}