diff --git a/api/tools/log-parse-tool.js b/api/tools/log-parse-tool.js
index d045c61..15a066b 100644
--- a/api/tools/log-parse-tool.js
+++ b/api/tools/log-parse-tool.js
@@ -24,7 +24,6 @@ const vehicleRegex = /(vehicle:\s(.*?)\))/;
const categoryRegex = /(category:\s(.*?)\))/;
const parseWarLog = (lineArray, war) => {
-
let flagBlufor = true;
let flagOpfor = true;
diff --git a/static/src/app/services/logs/campaign.service.ts b/static/src/app/services/logs/campaign.service.ts
index 46c10a4..04ead21 100644
--- a/static/src/app/services/logs/campaign.service.ts
+++ b/static/src/app/services/logs/campaign.service.ts
@@ -33,7 +33,7 @@ export class CampaignService {
submitCampaign(campaign: Campaign) {
let requestUrl: string;
- let requestMethod: RequestMethod
+ let requestMethod: RequestMethod;
let accessType;
if (campaign._id) {
diff --git a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.html b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.html
index 444f32b..2d808ce 100644
--- a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.html
+++ b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.html
@@ -12,7 +12,7 @@
{{'stats.campaign.title.all.time.overview' | translate}}
{{campaign.title}}
diff --git a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.ts b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.ts
index 5d00770..292896a 100644
--- a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.ts
+++ b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.ts
@@ -1,15 +1,25 @@
-import {Component, ElementRef, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewChild} from '@angular/core';
+import {
+ Component,
+ ElementRef,
+ EventEmitter,
+ Input,
+ OnInit,
+ Output,
+ ViewChild
+} from '@angular/core';
import {Campaign} from '../../../models/model-interfaces';
import {LoginService} from '../../../services/app-user-service/login-service';
+import {Observable} from 'rxjs';
+import {CampaignService} from '../../../services/logs/campaign.service';
@Component({
selector: 'campaign-navigation',
templateUrl: './campaign-navigation.component.html',
styleUrls: ['./campaign-navigation.component.css']
})
-export class CampaignNavigationComponent implements OnChanges {
+export class CampaignNavigationComponent implements OnInit {
- @Input() campaigns: Campaign[];
+ campaigns$: Observable;
@Input() selectedCampaignId;
@@ -27,13 +37,15 @@ export class CampaignNavigationComponent implements OnChanges {
repeater;
- constructor(public loginService: LoginService) {
+ constructor(public loginService: LoginService,
+ private campaignService: CampaignService) {
+ this.campaigns$ = campaignService.campaigns$;
}
- ngOnChanges(changes: SimpleChanges) {
- if (!changes.selectedCampaignId) {
- this.isRightScrollVisible = this.campaigns.length > 4;
- }
+ ngOnInit() {
+ this.campaigns$.subscribe(campaigns => {
+ this.isRightScrollVisible = campaigns.length > 4;
+ });
}
select(campaign) {
diff --git a/static/src/app/statistic/stats.component.html b/static/src/app/statistic/stats.component.html
index 61455a5..32f2c7f 100644
--- a/static/src/app/statistic/stats.component.html
+++ b/static/src/app/statistic/stats.component.html
@@ -1,5 +1,4 @@