From c9fce51ef60603f3e8b6f0b025364a0aa19ae40c Mon Sep 17 00:00:00 2001
From: HardiReady <hardi@noarch.de>
Date: Mon, 8 Oct 2018 00:03:01 +0200
Subject: [PATCH] Fix Highscore link and overview after redirect from edit
 campaign

---
 .../campaign/highscore/highscore.component.ts |  9 ++----
 .../overview/campaign-overview.component.ts   | 28 +++++++++++--------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/static/src/app/statistic/campaign/highscore/highscore.component.ts b/static/src/app/statistic/campaign/highscore/highscore.component.ts
index 98431e7..144380b 100644
--- a/static/src/app/statistic/campaign/highscore/highscore.component.ts
+++ b/static/src/app/statistic/campaign/highscore/highscore.component.ts
@@ -16,8 +16,6 @@ import {PlayerUtils} from '../../../utils/player-utils';
 })
 export class StatisticHighScoreComponent implements OnInit {
 
-  @Input() campaigns;
-
   id = '';
 
   searchTerm = new FormControl();
@@ -31,8 +29,7 @@ export class StatisticHighScoreComponent implements OnInit {
   readonly fraction = Fraction;
 
   constructor(private route: ActivatedRoute,
-              private playerService: PlayerService,
-              private campaignService: CampaignService) {
+              private playerService: PlayerService) {
   }
 
   ngOnInit() {
@@ -40,9 +37,7 @@ export class StatisticHighScoreComponent implements OnInit {
         .map(params => params['id'])
         .subscribe((id) => {
           this.id = id;
-          this.campaignService.getAllCampaignsWithWars().subscribe(campaigns => {
-            this.initData();
-          });
+          this.initData();
         });
 
     const searchTermStream = this.searchTerm.valueChanges.debounceTime(400);
diff --git a/static/src/app/statistic/campaign/overview/campaign-overview.component.ts b/static/src/app/statistic/campaign/overview/campaign-overview.component.ts
index 40b103e..335abaa 100644
--- a/static/src/app/statistic/campaign/overview/campaign-overview.component.ts
+++ b/static/src/app/statistic/campaign/overview/campaign-overview.component.ts
@@ -46,9 +46,9 @@ export class StatisticOverviewComponent implements OnInit {
         .map(params => params['id'])
         .subscribe((id) => {
           this.id = id;
-            this.campaignService.getAllCampaignsWithWars().subscribe(campaigns => {
-              this.initWars(campaigns);
-            });
+          this.campaignService.getAllCampaignsWithWars().subscribe(campaigns => {
+            this.initWars(campaigns);
+          });
         });
   }
 
@@ -91,36 +91,40 @@ export class StatisticOverviewComponent implements OnInit {
     const playersObj = ChartUtils.getMultiDataArray(Fraction.BLUFOR, Fraction.OPFOR);
 
     for (let i = wars.length - 1; i >= 0; i--) {
+      const war = wars[i];
+      if (!war) {
+        continue;
+      }
       const j = wars.length - i - 1;
-      const warDate = (this.id === 'all') ? new Date(wars[i].date) : ChartUtils.getShortDateString(wars[i].date);
+      const warDate = (this.id === 'all') ? new Date(war.date) : ChartUtils.getShortDateString(war.date);
 
       pointsObj[0].series.push({
         name: warDate,
-        value: wars[i].ptBlufor
+        value: war.ptBlufor
       });
       pointsObj[1].series.push({
         name: warDate,
-        value: wars[i].ptOpfor
+        value: war.ptOpfor
       });
       pointsSumObj[0].series.push({
         name: warDate,
         value: pointsSumObj[0].series[j - 1] ?
-          pointsSumObj[0].series[j - 1].value + wars[i].ptBlufor :
-          wars[i].ptBlufor
+          pointsSumObj[0].series[j - 1].value + war.ptBlufor :
+          war.ptBlufor
       });
       pointsSumObj[1].series.push({
         name: warDate,
         value: pointsSumObj[1].series[j - 1]
-          ? pointsSumObj[1].series[j - 1].value + wars[i].ptOpfor :
-          wars[i].ptOpfor
+          ? pointsSumObj[1].series[j - 1].value + war.ptOpfor :
+          war.ptOpfor
       });
       playersObj[0].series.push({
         name: warDate,
-        value: wars[i].playersBlufor
+        value: war.playersBlufor
       });
       playersObj[1].series.push({
         name: warDate,
-        value: wars[i].playersOpfor
+        value: war.playersOpfor
       });
     }