From 82cc3e1e50323a0e6b34055aa7e7693b08751d08 Mon Sep 17 00:00:00 2001 From: Florian Hartwich Date: Wed, 7 Mar 2018 11:56:50 +0100 Subject: [PATCH 01/12] Optimize code style --- static/e2e/test.e2e-spec.ts | 8 ++-- static/src/app/admin/admin.component.ts | 22 ++++----- static/src/app/admin/admin.module.ts | 14 +++--- static/src/app/app.component.ts | 6 +-- static/src/app/app.module.ts | 38 +++++++-------- static/src/app/app.routing.ts | 14 +++--- static/src/app/army/army-member.component.ts | 20 ++++---- static/src/app/army/army.component.ts | 16 +++---- static/src/app/army/army.routing.ts | 6 +-- .../decoration-item.component.ts | 12 ++--- .../decoration-list.component.ts | 16 +++---- .../src/app/decorations/decoration.module.ts | 14 +++--- .../src/app/decorations/decoration.routing.ts | 12 ++--- .../edit-decoration.component.ts | 20 ++++---- static/src/app/filter/filter.pipe.ts | 7 ++- static/src/app/login/login.component.ts | 8 ++-- static/src/app/login/login.guard.ts | 2 +- static/src/app/login/signup.component.ts | 8 ++-- static/src/app/models/model-interfaces.ts | 18 +++---- .../ranks/edit-rank/edit-rank.component.ts | 22 ++++----- .../ranks/rank-list/rank-item.component.ts | 8 ++-- .../ranks/rank-list/rank-list.component.ts | 18 +++---- static/src/app/ranks/ranks.module.ts | 14 +++--- static/src/app/ranks/ranks.routing.ts | 12 ++--- .../app/request/award/req-award.component.ts | 24 +++++----- .../confirm-award/confirm-award.component.ts | 8 ++-- .../confirm-promotion.component.ts | 10 ++-- .../promotion/req-promotion.component.ts | 32 ++++++------- static/src/app/request/request.module.ts | 20 ++++---- static/src/app/request/request.routing.ts | 18 +++---- .../app-user-service/app-user.service.ts | 14 +++--- .../app-user-service/login-service.ts | 16 +++---- .../army-management/awarding.service.ts | 24 +++++----- .../army-management/decoration.service.ts | 14 +++--- .../army-management/promotion.service.ts | 22 ++++----- .../services/army-management/rank.service.ts | 18 +++---- .../services/army-management/squad.service.ts | 14 +++--- .../services/army-management/user.service.ts | 14 +++--- static/src/app/services/http-client.ts | 26 +++++----- .../src/app/services/logs/campaign.service.ts | 14 +++--- static/src/app/services/logs/logs.service.ts | 24 +++++----- .../src/app/services/logs/player.service.ts | 10 ++-- static/src/app/services/logs/war.service.ts | 14 +++--- .../src/app/services/stores/app-user.store.ts | 4 +- .../app/services/stores/decoration.store.ts | 4 +- static/src/app/services/stores/rank.store.ts | 4 +- static/src/app/services/stores/squad.store.ts | 4 +- static/src/app/services/stores/user.store.ts | 4 +- .../squads/edit-squad/edit-squad.component.ts | 18 +++---- .../squads/squad-list/squad-item.component.ts | 8 ++-- .../squads/squad-list/squad-list.component.ts | 16 +++---- static/src/app/squads/squads.component.ts | 2 +- static/src/app/squads/squads.module.ts | 12 ++--- static/src/app/squads/squads.routing.ts | 12 ++--- .../campaign-player-detail.component.ts | 34 +++++++------- .../campaign-submit.component.ts | 10 ++-- .../highscore/highscore.component.ts | 28 +++++------ .../overview/stats-overview.component.ts | 47 ++++++++++--------- static/src/app/statistic/stats.module.ts | 20 ++++---- static/src/app/statistic/stats.routing.ts | 26 +++++----- .../fraction-stats.component.ts | 41 ++++++++-------- .../scoreboard/scoreboard.component.ts | 24 +++++----- .../war-detail/war-detail.component.ts | 18 +++---- .../statistic/war-list/war-item.component.ts | 6 +-- .../statistic/war-list/war-list.component.ts | 28 +++++------ .../war-submit/war-submit.component.ts | 12 ++--- .../users/award-user/award-user.component.ts | 36 +++++++------- .../users/edit-user/edit-user.component.ts | 34 +++++++------- .../users/user-list/user-item.component.ts | 25 +++++----- .../users/user-list/user-list.component.ts | 24 +++++----- static/src/app/users/users.module.ts | 8 ++-- static/src/app/users/users.routing.ts | 14 +++--- static/src/app/utils/chart-utils.ts | 18 +++---- 73 files changed, 605 insertions(+), 607 deletions(-) diff --git a/static/e2e/test.e2e-spec.ts b/static/e2e/test.e2e-spec.ts index 1ba9a7a..fc63414 100644 --- a/static/e2e/test.e2e-spec.ts +++ b/static/e2e/test.e2e-spec.ts @@ -4,13 +4,13 @@ import {browser, by, element} from 'protractor'; describe('Main Page Access', function () { beforeEach(() => { - browser.get('/') + browser.get('/'); }); it('should open army overview initially', async () => { - let elem = element(by.css('h1')); - let text = elem.getText(); - expect(text).toBe("Übersicht über alle Spieler, Squads und Armeen"); + const elem = element(by.css('h1')); + const text = elem.getText(); + expect(text).toBe('Übersicht über alle Spieler, Squads und Armeen'); }); }); diff --git a/static/src/app/admin/admin.component.ts b/static/src/app/admin/admin.component.ts index 780d446..de90e33 100644 --- a/static/src/app/admin/admin.component.ts +++ b/static/src/app/admin/admin.component.ts @@ -1,9 +1,9 @@ -import {Component} from "@angular/core"; -import {AppUser, Squad} from "../models/model-interfaces"; -import {Observable} from "rxjs/Observable"; -import {AppUserService} from "../services/app-user-service/app-user.service"; -import {SquadService} from "../services/army-management/squad.service"; -import {Fraction} from "../utils/fraction.enum"; +import {Component} from '@angular/core'; +import {AppUser, Squad} from '../models/model-interfaces'; +import {Observable} from 'rxjs/Observable'; +import {AppUserService} from '../services/app-user-service/app-user.service'; +import {SquadService} from '../services/army-management/squad.service'; +import {Fraction} from '../utils/fraction.enum'; @Component({ @@ -33,14 +33,14 @@ export class AdminComponent { } updateAppUser(user) { - let updateObject = { + const updateObject = { _id: user._id, squad: user.squad, activated: user.activated, permission: user.permission }; - if (updateObject.squad === "0") { + if (updateObject.squad === '0') { updateObject.squad = null; } @@ -49,15 +49,15 @@ export class AdminComponent { this.showSuccessLabel = true; setTimeout(() => { this.showSuccessLabel = false; - }, 2000) - }) + }, 2000); + }); } deleteUser(user) { if (confirm('Soll der Nutzer "' + user.username + '" wirklich gelöscht werden?')) { this.appUserService.deleteUser(user) .subscribe((res) => { - }) + }); } } diff --git a/static/src/app/admin/admin.module.ts b/static/src/app/admin/admin.module.ts index d8b597f..94fbef5 100644 --- a/static/src/app/admin/admin.module.ts +++ b/static/src/app/admin/admin.module.ts @@ -1,10 +1,10 @@ -import {NgModule} from "@angular/core"; -import {AdminComponent} from "./admin.component"; -import {SharedModule} from "../shared.module"; -import {AppUserStore} from "../services/stores/app-user.store"; -import {AppUserService} from "../services/app-user-service/app-user.service"; -import {CommonModule} from "@angular/common"; -import {RouterModule} from "@angular/router"; +import {NgModule} from '@angular/core'; +import {AdminComponent} from './admin.component'; +import {SharedModule} from '../shared.module'; +import {AppUserStore} from '../services/stores/app-user.store'; +import {AppUserService} from '../services/app-user-service/app-user.service'; +import {CommonModule} from '@angular/common'; +import {RouterModule} from '@angular/router'; @NgModule({ declarations: [AdminComponent], diff --git a/static/src/app/app.component.ts b/static/src/app/app.component.ts index 7d4cd99..938c7f4 100644 --- a/static/src/app/app.component.ts +++ b/static/src/app/app.component.ts @@ -1,9 +1,9 @@ import {Component} from '@angular/core'; import {NavigationEnd, NavigationStart, Router} from '@angular/router'; import {LoginService} from './services/app-user-service/login-service'; -import {PromotionService} from "./services/army-management/promotion.service"; -import {AwardingService} from "./services/army-management/awarding.service"; -import {RouteConfig} from "./app.config"; +import {PromotionService} from './services/army-management/promotion.service'; +import {AwardingService} from './services/army-management/awarding.service'; +import {RouteConfig} from './app.config'; declare function require(url: string); diff --git a/static/src/app/app.module.ts b/static/src/app/app.module.ts index 936c413..e8cfb5d 100644 --- a/static/src/app/app.module.ts +++ b/static/src/app/app.module.ts @@ -1,27 +1,27 @@ import {NgModule} from '@angular/core'; -import {BrowserModule} from "@angular/platform-browser"; +import {BrowserModule} from '@angular/platform-browser'; import {HttpModule} from '@angular/http'; import {AppComponent} from './app.component'; -import {LoginService} from "./services/app-user-service/login-service"; +import {LoginService} from './services/app-user-service/login-service'; import {appRouting, routingComponents, routingProviders} from './app.routing'; -import {SquadService} from "./services/army-management/squad.service"; -import {SquadStore} from "./services/stores/squad.store"; -import {DecorationStore} from "./services/stores/decoration.store"; -import {DecorationService} from "./services/army-management/decoration.service"; -import {RankStore} from "./services/stores/rank.store"; -import {RankService} from "./services/army-management/rank.service"; -import {AppConfig} from "./app.config"; -import {LoginGuardAdmin, LoginGuardHL, LoginGuardSQL} from "./login/login.guard"; -import {AwardingService} from "./services/army-management/awarding.service"; -import {HttpClient} from "./services/http-client"; -import {ArmyService} from "./services/army-service/army.service"; +import {SquadService} from './services/army-management/squad.service'; +import {SquadStore} from './services/stores/squad.store'; +import {DecorationStore} from './services/stores/decoration.store'; +import {DecorationService} from './services/army-management/decoration.service'; +import {RankStore} from './services/stores/rank.store'; +import {RankService} from './services/army-management/rank.service'; +import {AppConfig} from './app.config'; +import {LoginGuardAdmin, LoginGuardHL, LoginGuardSQL} from './login/login.guard'; +import {AwardingService} from './services/army-management/awarding.service'; +import {HttpClient} from './services/http-client'; +import {ArmyService} from './services/army-service/army.service'; import {ClipboardModule} from 'ngx-clipboard'; -import {PromotionService} from "./services/army-management/promotion.service"; -import {SharedModule} from "./shared.module"; -import {BrowserAnimationsModule} from "@angular/platform-browser/animations"; -import {UserService} from "./services/army-management/user.service"; -import {UserStore} from "./services/stores/user.store"; -import {CookieService} from "ngx-cookie-service"; +import {PromotionService} from './services/army-management/promotion.service'; +import {SharedModule} from './shared.module'; +import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; +import {UserService} from './services/army-management/user.service'; +import {UserStore} from './services/stores/user.store'; +import {CookieService} from 'ngx-cookie-service'; @NgModule({ imports: [SharedModule, BrowserModule, BrowserAnimationsModule, appRouting, HttpModule, ClipboardModule], diff --git a/static/src/app/app.routing.ts b/static/src/app/app.routing.ts index c9ed43c..1f7ac03 100644 --- a/static/src/app/app.routing.ts +++ b/static/src/app/app.routing.ts @@ -1,10 +1,10 @@ -import {RouterModule, Routes} from "@angular/router"; -import {LoginComponent} from "./login/index"; -import {NotFoundComponent} from "./common/not-found/not-found.component"; -import {LoginGuardAdmin, LoginGuardHL} from "./login/login.guard"; -import {armyRoutes, armyRoutingComponents} from "./army/army.routing"; -import {SignupComponent} from "./login/signup.component"; -import {RouteConfig} from "./app.config"; +import {RouterModule, Routes} from '@angular/router'; +import {LoginComponent} from './login/index'; +import {NotFoundComponent} from './common/not-found/not-found.component'; +import {LoginGuardAdmin, LoginGuardHL} from './login/login.guard'; +import {armyRoutes, armyRoutingComponents} from './army/army.routing'; +import {SignupComponent} from './login/signup.component'; +import {RouteConfig} from './app.config'; export const appRoutes: Routes = [ { diff --git a/static/src/app/army/army-member.component.ts b/static/src/app/army/army-member.component.ts index 98f62de..c79f8b4 100644 --- a/static/src/app/army/army-member.component.ts +++ b/static/src/app/army/army-member.component.ts @@ -1,13 +1,13 @@ -import {Component, Inject} from "@angular/core"; -import {Award, User} from "../models/model-interfaces"; -import {ActivatedRoute, Router} from "@angular/router"; -import {UserService} from "../services/army-management/user.service"; -import {Subscription} from "rxjs/Subscription"; -import {RouteConfig} from "../app.config"; -import {AwardingService} from "../services/army-management/awarding.service"; -import {Fraction} from "../utils/fraction.enum"; -import {DOCUMENT} from "@angular/common"; -import {CSSHelpers} from "../global.helpers"; +import {Component, Inject} from '@angular/core'; +import {Award, User} from '../models/model-interfaces'; +import {ActivatedRoute, Router} from '@angular/router'; +import {UserService} from '../services/army-management/user.service'; +import {Subscription} from 'rxjs/Subscription'; +import {RouteConfig} from '../app.config'; +import {AwardingService} from '../services/army-management/awarding.service'; +import {Fraction} from '../utils/fraction.enum'; +import {DOCUMENT} from '@angular/common'; +import {CSSHelpers} from '../global.helpers'; @Component({ diff --git a/static/src/app/army/army.component.ts b/static/src/app/army/army.component.ts index 252f688..87c927a 100644 --- a/static/src/app/army/army.component.ts +++ b/static/src/app/army/army.component.ts @@ -1,11 +1,11 @@ -import {Component, Inject} from "@angular/core"; -import {Army} from "../models/model-interfaces"; -import {ArmyService} from "../services/army-service/army.service"; -import {ActivatedRoute, Router} from "@angular/router"; -import {Fraction} from "../utils/fraction.enum"; -import {DOCUMENT} from "@angular/common"; -import {RouteConfig} from "../app.config"; -import {CSSHelpers} from "../global.helpers"; +import {Component, Inject} from '@angular/core'; +import {Army} from '../models/model-interfaces'; +import {ArmyService} from '../services/army-service/army.service'; +import {ActivatedRoute, Router} from '@angular/router'; +import {Fraction} from '../utils/fraction.enum'; +import {DOCUMENT} from '@angular/common'; +import {RouteConfig} from '../app.config'; +import {CSSHelpers} from '../global.helpers'; @Component({ diff --git a/static/src/app/army/army.routing.ts b/static/src/app/army/army.routing.ts index d530b6b..58d9876 100644 --- a/static/src/app/army/army.routing.ts +++ b/static/src/app/army/army.routing.ts @@ -1,6 +1,6 @@ -import {Routes} from "@angular/router"; -import {ArmyComponent} from "./army.component"; -import {ArmyMemberComponent} from "./army-member.component"; +import {Routes} from '@angular/router'; +import {ArmyComponent} from './army.component'; +import {ArmyMemberComponent} from './army-member.component'; export const armyRoutes: Routes = [ diff --git a/static/src/app/decorations/decoration-list/decoration-item.component.ts b/static/src/app/decorations/decoration-list/decoration-item.component.ts index 810fda1..6e48836 100644 --- a/static/src/app/decorations/decoration-list/decoration-item.component.ts +++ b/static/src/app/decorations/decoration-list/decoration-item.component.ts @@ -1,6 +1,6 @@ -import {ChangeDetectionStrategy, Component, EventEmitter} from "@angular/core"; -import {Decoration} from "../../models/model-interfaces"; -import {Fraction} from "../../utils/fraction.enum"; +import {ChangeDetectionStrategy, Component, EventEmitter} from '@angular/core'; +import {Decoration} from '../../models/model-interfaces'; +import {Fraction} from '../../utils/fraction.enum'; @Component({ selector: 'decoration-item', @@ -29,15 +29,15 @@ export class DecorationItemComponent { this.imageSrc = 'resource/decoration/' + this.decoration._id + '.png?' + Date.now(); if (!this.decoration.isMedal) { this.imgStyle.width = '62px'; - this.imgStyle.marginTop = '17px' + this.imgStyle.marginTop = '17px'; } else { this.imgStyle.height = '50px'; - this.imgStyle.marginTop = '3px' + this.imgStyle.marginTop = '3px'; } } select() { - this.decorationSelected.emit(this.decoration._id) + this.decorationSelected.emit(this.decoration._id); } delete() { diff --git a/static/src/app/decorations/decoration-list/decoration-list.component.ts b/static/src/app/decorations/decoration-list/decoration-list.component.ts index e1d0e0f..ba5435f 100644 --- a/static/src/app/decorations/decoration-list/decoration-list.component.ts +++ b/static/src/app/decorations/decoration-list/decoration-list.component.ts @@ -1,12 +1,12 @@ -import {Component, OnInit} from "@angular/core"; -import {Location} from "@angular/common"; +import {Component, OnInit} from '@angular/core'; +import {Location} from '@angular/common'; -import {FormControl} from "@angular/forms"; -import {ActivatedRoute, Router} from "@angular/router"; -import {Observable} from "rxjs/Observable"; -import {Decoration} from "../../models/model-interfaces"; -import {DecorationService} from "../../services/army-management/decoration.service"; -import {Fraction} from "../../utils/fraction.enum"; +import {FormControl} from '@angular/forms'; +import {ActivatedRoute, Router} from '@angular/router'; +import {Observable} from 'rxjs/Observable'; +import {Decoration} from '../../models/model-interfaces'; +import {DecorationService} from '../../services/army-management/decoration.service'; +import {Fraction} from '../../utils/fraction.enum'; @Component({ selector: 'decoration-list', diff --git a/static/src/app/decorations/decoration.module.ts b/static/src/app/decorations/decoration.module.ts index 91f2c58..a4d791d 100644 --- a/static/src/app/decorations/decoration.module.ts +++ b/static/src/app/decorations/decoration.module.ts @@ -1,10 +1,10 @@ -import {decorationRoutesModule, decorationsRoutingComponents} from "./decoration.routing"; -import {SharedModule} from "../shared.module"; -import {CommonModule} from "@angular/common"; -import {DecorationStore} from "../services/stores/decoration.store"; -import {DecorationService} from "../services/army-management/decoration.service"; -import {NgModule} from "@angular/core"; -import {ButtonsModule} from "ngx-bootstrap"; +import {decorationRoutesModule, decorationsRoutingComponents} from './decoration.routing'; +import {SharedModule} from '../shared.module'; +import {CommonModule} from '@angular/common'; +import {DecorationStore} from '../services/stores/decoration.store'; +import {DecorationService} from '../services/army-management/decoration.service'; +import {NgModule} from '@angular/core'; +import {ButtonsModule} from 'ngx-bootstrap'; @NgModule({ declarations: decorationsRoutingComponents, diff --git a/static/src/app/decorations/decoration.routing.ts b/static/src/app/decorations/decoration.routing.ts index 8f5cb04..a136159 100644 --- a/static/src/app/decorations/decoration.routing.ts +++ b/static/src/app/decorations/decoration.routing.ts @@ -1,9 +1,9 @@ -import {RouterModule, Routes} from "@angular/router"; -import {DecorationComponent} from "./decoration.component"; -import {DecorationListComponent} from "./decoration-list/decoration-list.component"; -import {EditDecorationComponent} from "./edit-decoration/edit-decoration.component"; -import {ModuleWithProviders} from "@angular/core"; -import {DecorationItemComponent} from "./decoration-list/decoration-item.component"; +import {RouterModule, Routes} from '@angular/router'; +import {DecorationComponent} from './decoration.component'; +import {DecorationListComponent} from './decoration-list/decoration-list.component'; +import {EditDecorationComponent} from './edit-decoration/edit-decoration.component'; +import {ModuleWithProviders} from '@angular/core'; +import {DecorationItemComponent} from './decoration-list/decoration-item.component'; export const decorationsRoutes: Routes = [{ path: '', component: DecorationComponent, diff --git a/static/src/app/decorations/edit-decoration/edit-decoration.component.ts b/static/src/app/decorations/edit-decoration/edit-decoration.component.ts index 69ea836..a24293b 100644 --- a/static/src/app/decorations/edit-decoration/edit-decoration.component.ts +++ b/static/src/app/decorations/edit-decoration/edit-decoration.component.ts @@ -1,10 +1,10 @@ -import {Component, ViewChild} from "@angular/core"; -import {ActivatedRoute, Router} from "@angular/router"; -import {NgForm} from "@angular/forms"; -import {Decoration} from "../../models/model-interfaces"; -import {DecorationService} from "../../services/army-management/decoration.service"; -import {Subscription} from "rxjs/Subscription"; -import {Fraction} from "../../utils/fraction.enum"; +import {Component, ViewChild} from '@angular/core'; +import {ActivatedRoute, Router} from '@angular/router'; +import {NgForm} from '@angular/forms'; +import {Decoration} from '../../models/model-interfaces'; +import {DecorationService} from '../../services/army-management/decoration.service'; +import {Subscription} from 'rxjs/Subscription'; +import {Fraction} from '../../utils/fraction.enum'; @Component({ templateUrl: './edit-decoration.component.html', @@ -66,7 +66,7 @@ export class EditDecorationComponent { this.decorationService.submitDecoration(this.decoration, file) .subscribe(rank => { this.router.navigate(['..'], {relativeTo: this.route}); - }) + }); } else { return window.alert(`Bild ist ein Pflichtfeld`); } @@ -84,8 +84,8 @@ export class EditDecorationComponent { this.showSuccessLabel = true; setTimeout(() => { this.showSuccessLabel = false; - }, 2000) - }) + }, 2000); + }); } } diff --git a/static/src/app/filter/filter.pipe.ts b/static/src/app/filter/filter.pipe.ts index 1df80f1..5e96306 100644 --- a/static/src/app/filter/filter.pipe.ts +++ b/static/src/app/filter/filter.pipe.ts @@ -1,4 +1,4 @@ -import {Pipe, PipeTransform} from "@angular/core"; +import {Pipe, PipeTransform} from '@angular/core'; /** * Filter Pipe to filter specific rank by level number in template @@ -11,11 +11,10 @@ export class FilterRankPipe implements PipeTransform { transform(items: any[], filter: any): any { // filter items array, items which match and return true will be kept, false will be filtered out - let res = items.filter(item => item.level === filter); + const res = items.filter(item => item.level === filter); if (res.length === 0) { return [{name: '-'}]; - } - else { + } else { return res } } diff --git a/static/src/app/login/login.component.ts b/static/src/app/login/login.component.ts index 8164280..c801702 100644 --- a/static/src/app/login/login.component.ts +++ b/static/src/app/login/login.component.ts @@ -1,7 +1,7 @@ -import {Component, OnInit} from "@angular/core"; -import {Router} from "@angular/router"; -import {LoginService} from "../services/app-user-service/login-service"; -import {RouteConfig} from "../app.config"; +import {Component, OnInit} from '@angular/core'; +import {Router} from '@angular/router'; +import {LoginService} from '../services/app-user-service/login-service'; +import {RouteConfig} from '../app.config'; @Component({ diff --git a/static/src/app/login/login.guard.ts b/static/src/app/login/login.guard.ts index 95a5b25..00caa99 100644 --- a/static/src/app/login/login.guard.ts +++ b/static/src/app/login/login.guard.ts @@ -1,6 +1,6 @@ import {Injectable} from '@angular/core'; import {ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot} from '@angular/router'; -import {LoginService} from "../services/app-user-service/login-service"; +import {LoginService} from '../services/app-user-service/login-service'; @Injectable() export class LoginGuardSQL implements CanActivate { diff --git a/static/src/app/login/signup.component.ts b/static/src/app/login/signup.component.ts index 52df89b..a20008e 100644 --- a/static/src/app/login/signup.component.ts +++ b/static/src/app/login/signup.component.ts @@ -1,7 +1,7 @@ -import {Component, OnInit} from "@angular/core"; -import {ActivatedRoute, Router} from "@angular/router"; -import {LoginService} from "../services/app-user-service/login-service"; -import {RouteConfig} from "../app.config"; +import {Component, OnInit} from '@angular/core'; +import {ActivatedRoute, Router} from '@angular/router'; +import {LoginService} from '../services/app-user-service/login-service'; +import {RouteConfig} from '../app.config'; @Component({ diff --git a/static/src/app/models/model-interfaces.ts b/static/src/app/models/model-interfaces.ts index 58b91e8..e6ec28d 100644 --- a/static/src/app/models/model-interfaces.ts +++ b/static/src/app/models/model-interfaces.ts @@ -11,7 +11,7 @@ export interface User { _id?: string; boardUserId?: number; username?: string; - squadId?: any; //Squad or id-string + squadId?: any; // Squad or id-string rankLvl?: number; rank?: Rank; awards?: Award[]; @@ -76,9 +76,9 @@ export interface Rank { } export interface Award { - _id?: string, - userId: string, - decorationId?: any; //Decoration or string + _id?: string; + userId: string; + decorationId?: any; // Decoration or string reason?: string; proposer?: AppUser; date?: number; // since Date.now() returns a number @@ -87,9 +87,9 @@ export interface Award { export interface Promotion { _id?: string; - userId?: string - oldRankLvl: number, - newRankLvl: number + userId?: string; + oldRankLvl: number; + newRankLvl: number; } export interface Decoration { @@ -114,7 +114,7 @@ export interface Army { }[], }[], memberCount - }, + }; OPFOR: { squads: { _id, @@ -127,6 +127,6 @@ export interface Army { }[], }[], memberCount - }, + }; } diff --git a/static/src/app/ranks/edit-rank/edit-rank.component.ts b/static/src/app/ranks/edit-rank/edit-rank.component.ts index 96d0ac8..5f312d6 100644 --- a/static/src/app/ranks/edit-rank/edit-rank.component.ts +++ b/static/src/app/ranks/edit-rank/edit-rank.component.ts @@ -1,10 +1,10 @@ -import {Component, ViewChild} from "@angular/core"; -import {ActivatedRoute, Router} from "@angular/router"; -import {NgForm} from "@angular/forms"; -import {Rank} from "../../models/model-interfaces"; -import {RankService} from "../../services/army-management/rank.service"; -import {Subscription} from "rxjs/Subscription"; -import {Fraction} from "../../utils/fraction.enum"; +import {Component, ViewChild} from '@angular/core'; +import {ActivatedRoute, Router} from '@angular/router'; +import {NgForm} from '@angular/forms'; +import {Rank} from '../../models/model-interfaces'; +import {RankService} from '../../services/army-management/rank.service'; +import {Subscription} from 'rxjs/Subscription'; +import {Fraction} from '../../utils/fraction.enum'; @Component({ @@ -39,7 +39,7 @@ export class EditRankComponent { ngOnInit() { this.subscription = this.route.params .map(params => params['id']) - .filter(id => id != undefined) + .filter(id => id !== undefined) .flatMap(id => this.rankService.getRank(id)) .subscribe(rank => { this.rank = rank; @@ -70,7 +70,7 @@ export class EditRankComponent { .subscribe(rank => { this.saved = true; this.router.navigate(['..'], {relativeTo: this.route}); - }) + }); } else { return window.alert(`Bild ist ein Pflichtfeld`); } @@ -88,8 +88,8 @@ export class EditRankComponent { this.showSuccessLabel = true; setTimeout(() => { this.showSuccessLabel = false; - }, 2000) - }) + }, 2000); + }); } } diff --git a/static/src/app/ranks/rank-list/rank-item.component.ts b/static/src/app/ranks/rank-list/rank-item.component.ts index d28eee0..2c939f4 100644 --- a/static/src/app/ranks/rank-list/rank-item.component.ts +++ b/static/src/app/ranks/rank-list/rank-item.component.ts @@ -1,6 +1,6 @@ -import {ChangeDetectionStrategy, Component, EventEmitter} from "@angular/core"; -import {Rank} from "../../models/model-interfaces"; -import {Fraction} from "../../utils/fraction.enum"; +import {ChangeDetectionStrategy, Component, EventEmitter} from '@angular/core'; +import {Rank} from '../../models/model-interfaces'; +import {Fraction} from '../../utils/fraction.enum'; @Component({ selector: 'pjm-rank-item', @@ -29,7 +29,7 @@ export class RankItemComponent { } select() { - this.rankSelected.emit(this.rank._id) + this.rankSelected.emit(this.rank._id); } delete() { diff --git a/static/src/app/ranks/rank-list/rank-list.component.ts b/static/src/app/ranks/rank-list/rank-list.component.ts index 1d2c9ca..3bb2c1c 100644 --- a/static/src/app/ranks/rank-list/rank-list.component.ts +++ b/static/src/app/ranks/rank-list/rank-list.component.ts @@ -1,12 +1,12 @@ -import {Component, OnInit} from "@angular/core"; -import {Location} from "@angular/common"; +import {Component, OnInit} from '@angular/core'; +import {Location} from '@angular/common'; -import {FormControl} from "@angular/forms"; -import {ActivatedRoute, Router} from "@angular/router"; -import {Observable} from "rxjs/Observable"; -import {Rank} from "../../models/model-interfaces"; -import {RankService} from "../../services/army-management/rank.service"; -import {Fraction} from "../../utils/fraction.enum"; +import {FormControl} from '@angular/forms'; +import {ActivatedRoute, Router} from '@angular/router'; +import {Observable} from 'rxjs/Observable'; +import {Rank} from '../../models/model-interfaces'; +import {RankService} from '../../services/army-management/rank.service'; +import {Fraction} from '../../utils/fraction.enum'; @Component({ selector: 'rank-list', @@ -69,7 +69,7 @@ export class RankListComponent implements OnInit { if (confirm('Soll der Rang ' + rank.name + ' (' + fraction + ') wirklich gelöscht werden?')) { this.rankService.deleteRank(rank) .subscribe((res) => { - }) + }); } } diff --git a/static/src/app/ranks/ranks.module.ts b/static/src/app/ranks/ranks.module.ts index ef23247..9bdba31 100644 --- a/static/src/app/ranks/ranks.module.ts +++ b/static/src/app/ranks/ranks.module.ts @@ -1,10 +1,10 @@ -import {NgModule} from "@angular/core"; -import {rankRouterModule, ranksRoutingComponents} from "./ranks.routing"; -import {SharedModule} from "../shared.module"; -import {CommonModule} from "@angular/common"; -import {RankService} from "../services/army-management/rank.service"; -import {RankStore} from "../services/stores/rank.store"; -import {ButtonsModule} from "ngx-bootstrap"; +import {NgModule} from '@angular/core'; +import {rankRouterModule, ranksRoutingComponents} from './ranks.routing'; +import {SharedModule} from '../shared.module'; +import {CommonModule} from '@angular/common'; +import {RankService} from '../services/army-management/rank.service'; +import {RankStore} from '../services/stores/rank.store'; +import {ButtonsModule} from 'ngx-bootstrap'; @NgModule({ declarations: ranksRoutingComponents, diff --git a/static/src/app/ranks/ranks.routing.ts b/static/src/app/ranks/ranks.routing.ts index fc0a6c9..a052a69 100644 --- a/static/src/app/ranks/ranks.routing.ts +++ b/static/src/app/ranks/ranks.routing.ts @@ -1,9 +1,9 @@ -import {RouterModule, Routes} from "@angular/router"; -import {RankComponent} from "./ranks.component"; -import {RankListComponent} from "./rank-list/rank-list.component"; -import {EditRankComponent} from "./edit-rank/edit-rank.component"; -import {RankItemComponent} from "./rank-list/rank-item.component"; -import {ModuleWithProviders} from "@angular/core"; +import {RouterModule, Routes} from '@angular/router'; +import {RankComponent} from './ranks.component'; +import {RankListComponent} from './rank-list/rank-list.component'; +import {EditRankComponent} from './edit-rank/edit-rank.component'; +import {RankItemComponent} from './rank-list/rank-item.component'; +import {ModuleWithProviders} from '@angular/core'; export const ranksRoutes: Routes = [{ diff --git a/static/src/app/request/award/req-award.component.ts b/static/src/app/request/award/req-award.component.ts index 8db50a4..a995fe1 100644 --- a/static/src/app/request/award/req-award.component.ts +++ b/static/src/app/request/award/req-award.component.ts @@ -1,11 +1,11 @@ -import {Component, ViewChild} from "@angular/core"; -import {ActivatedRoute, Router} from "@angular/router"; -import {Award, Decoration, User} from "../../models/model-interfaces"; -import {NgForm} from "@angular/forms"; -import {AwardingService} from "../../services/army-management/awarding.service"; -import {DecorationService} from "../../services/army-management/decoration.service"; -import {UserService} from "../../services/army-management/user.service"; -import {LoginService} from "../../services/app-user-service/login-service"; +import {Component, ViewChild} from '@angular/core'; +import {ActivatedRoute, Router} from '@angular/router'; +import {Award, Decoration, User} from '../../models/model-interfaces'; +import {NgForm} from '@angular/forms'; +import {AwardingService} from '../../services/army-management/awarding.service'; +import {DecorationService} from '../../services/army-management/decoration.service'; +import {UserService} from '../../services/army-management/user.service'; +import {LoginService} from '../../services/app-user-service/login-service'; @Component({ @@ -81,10 +81,10 @@ export class RequestAwardComponent { addAwarding(previewImage, descriptionField) { if (this.decoration._id && this.reason.length > 0) { const award: Award = { - "userId": this.user._id, - "decorationId": this.decoration._id, - "reason": this.reason, - "date": Date.now() + 'userId': this.user._id, + 'decorationId': this.decoration._id, + 'reason': this.reason, + 'date': Date.now() }; this.awardingService.requestAwarding(award).subscribe(() => { this.awardingService.getUserAwardings(this.user._id) diff --git a/static/src/app/request/confirm-award/confirm-award.component.ts b/static/src/app/request/confirm-award/confirm-award.component.ts index 751f6ab..f7e8e6d 100644 --- a/static/src/app/request/confirm-award/confirm-award.component.ts +++ b/static/src/app/request/confirm-award/confirm-award.component.ts @@ -1,7 +1,7 @@ -import {Component} from "@angular/core"; -import {Award} from "../../models/model-interfaces"; -import {AwardingService} from "../../services/army-management/awarding.service"; -import {LoginService} from "../../services/app-user-service/login-service"; +import {Component} from '@angular/core'; +import {Award} from '../../models/model-interfaces'; +import {AwardingService} from '../../services/army-management/awarding.service'; +import {LoginService} from '../../services/app-user-service/login-service'; @Component({ diff --git a/static/src/app/request/confirm-promotion/confirm-promotion.component.ts b/static/src/app/request/confirm-promotion/confirm-promotion.component.ts index 8612ced..1e4d6a4 100644 --- a/static/src/app/request/confirm-promotion/confirm-promotion.component.ts +++ b/static/src/app/request/confirm-promotion/confirm-promotion.component.ts @@ -1,8 +1,8 @@ -import {Component} from "@angular/core"; -import {Promotion, Rank} from "../../models/model-interfaces"; -import {RankService} from "../../services/army-management/rank.service"; -import {PromotionService} from "../../services/army-management/promotion.service"; -import {LoginService} from "../../services/app-user-service/login-service"; +import {Component} from '@angular/core'; +import {Promotion, Rank} from '../../models/model-interfaces'; +import {RankService} from '../../services/army-management/rank.service'; +import {PromotionService} from '../../services/army-management/promotion.service'; +import {LoginService} from '../../services/app-user-service/login-service'; @Component({ diff --git a/static/src/app/request/promotion/req-promotion.component.ts b/static/src/app/request/promotion/req-promotion.component.ts index bdd4a06..d53f685 100644 --- a/static/src/app/request/promotion/req-promotion.component.ts +++ b/static/src/app/request/promotion/req-promotion.component.ts @@ -1,11 +1,11 @@ -import {Component, ViewChild} from "@angular/core"; -import {ActivatedRoute, Router} from "@angular/router"; -import {Rank, User} from "../../models/model-interfaces"; -import {NgForm} from "@angular/forms"; -import {UserService} from "../../services/army-management/user.service"; -import {RankService} from "../../services/army-management/rank.service"; -import {PromotionService} from "../../services/army-management/promotion.service"; -import {LoginService} from "../../services/app-user-service/login-service"; +import {Component, ViewChild} from '@angular/core'; +import {ActivatedRoute, Router} from '@angular/router'; +import {Rank, User} from '../../models/model-interfaces'; +import {NgForm} from '@angular/forms'; +import {UserService} from '../../services/army-management/user.service'; +import {RankService} from '../../services/army-management/rank.service'; +import {PromotionService} from '../../services/army-management/promotion.service'; +import {LoginService} from '../../services/app-user-service/login-service'; @Component({ @@ -41,7 +41,7 @@ export class RequestPromotionComponent { } ngOnInit() { - let currentUser = this.loginService.getCurrentUser() + const currentUser = this.loginService.getCurrentUser(); // show only current users squad members this.userService.findUsers('', undefined, currentUser.squad._id).subscribe(users => { this.users = users; @@ -51,12 +51,12 @@ export class RequestPromotionComponent { }); this.promotionService.getSquadPromotions(currentUser.squad._id).subscribe(promotions => { this.uncheckedPromotions = promotions; - }) + }); } toggleUser() { - if (this.user._id != '0') { + if (this.user._id !== '0') { this.showForm = true; this.newLevel = this.user.rankLvl; this.selectedUserRank = this.ranks.filter(rank => rank.level === this.user.rankLvl).map(rank => rank.name); @@ -68,13 +68,13 @@ export class RequestPromotionComponent { addPromotion() { const promotion = { - "userId": this.user._id, - "oldRankLvl": this.user.rankLvl, - "newRankLvl": this.newLevel + 'userId': this.user._id, + 'oldRankLvl': this.user.rankLvl, + 'newRankLvl': this.newLevel }; this.promotionService.requestPromotion(promotion).subscribe(() => { - let currentUser = this.loginService.getCurrentUser(); + const currentUser = this.loginService.getCurrentUser(); this.promotionService.getSquadPromotions(currentUser.squad._id).subscribe(promotions => { this.uncheckedPromotions = promotions; this.showForm = false; @@ -83,7 +83,7 @@ export class RequestPromotionComponent { setTimeout(() => { this.showSuccessLabel = false; }, 2000); - }) + }); }); } diff --git a/static/src/app/request/request.module.ts b/static/src/app/request/request.module.ts index ef3e0c6..1173550 100644 --- a/static/src/app/request/request.module.ts +++ b/static/src/app/request/request.module.ts @@ -1,13 +1,13 @@ -import {CommonModule} from "@angular/common"; -import {SharedModule} from "../shared.module"; -import {requestRouterModule} from "./request.routing"; -import {NgModule} from "@angular/core"; -import {FilterRankPipe} from "../filter/filter.pipe"; -import {RequestComponent} from "./request.component"; -import {ConfirmAwardComponent} from "./confirm-award/confirm-award.component"; -import {ConfirmPromotionComponent} from "./confirm-promotion/confirm-promotion.component"; -import {RequestAwardComponent} from "./award/req-award.component"; -import {RequestPromotionComponent} from "./promotion/req-promotion.component"; +import {CommonModule} from '@angular/common'; +import {SharedModule} from '../shared.module'; +import {requestRouterModule} from './request.routing'; +import {NgModule} from '@angular/core'; +import {FilterRankPipe} from '../filter/filter.pipe'; +import {RequestComponent} from './request.component'; +import {ConfirmAwardComponent} from './confirm-award/confirm-award.component'; +import {ConfirmPromotionComponent} from './confirm-promotion/confirm-promotion.component'; +import {RequestAwardComponent} from './award/req-award.component'; +import {RequestPromotionComponent} from './promotion/req-promotion.component'; @NgModule({ declarations: [RequestComponent, RequestPromotionComponent, RequestAwardComponent, ConfirmPromotionComponent, diff --git a/static/src/app/request/request.routing.ts b/static/src/app/request/request.routing.ts index 33d0137..28ce09b 100644 --- a/static/src/app/request/request.routing.ts +++ b/static/src/app/request/request.routing.ts @@ -1,13 +1,13 @@ -import {RouterModule, Routes} from "@angular/router"; -import {ModuleWithProviders} from "@angular/core"; -import {ConfirmAwardComponent} from "./confirm-award/confirm-award.component"; -import {ConfirmPromotionComponent} from "./confirm-promotion/confirm-promotion.component"; -import {RequestAwardComponent} from "./award/req-award.component"; -import {RequestPromotionComponent} from "./promotion/req-promotion.component"; +import {RouterModule, Routes} from '@angular/router'; +import {ModuleWithProviders} from '@angular/core'; +import {ConfirmAwardComponent} from './confirm-award/confirm-award.component'; +import {ConfirmPromotionComponent} from './confirm-promotion/confirm-promotion.component'; +import {RequestAwardComponent} from './award/req-award.component'; +import {RequestPromotionComponent} from './promotion/req-promotion.component'; -import {RequestComponent} from "./request.component"; -import {RouteConfig} from "../app.config"; -import {LoginGuardHL, LoginGuardSQL} from "../login/login.guard"; +import {RequestComponent} from './request.component'; +import {RouteConfig} from '../app.config'; +import {LoginGuardHL, LoginGuardSQL} from '../login'; export const requestRoutes: Routes = [{ diff --git a/static/src/app/services/app-user-service/app-user.service.ts b/static/src/app/services/app-user-service/app-user.service.ts index 7817ef7..3b41aac 100644 --- a/static/src/app/services/app-user-service/app-user.service.ts +++ b/static/src/app/services/app-user-service/app-user.service.ts @@ -1,10 +1,10 @@ -import {Injectable} from "@angular/core"; -import {AppUser} from "../../models/model-interfaces"; -import {Observable} from "rxjs/Observable"; -import {EDIT, LOAD, REMOVE} from "../stores/user.store"; -import {AppConfig} from "../../app.config"; -import {HttpClient} from "../http-client"; -import {AppUserStore} from "../stores/app-user.store"; +import {Injectable} from '@angular/core'; +import {AppUser} from '../../models/model-interfaces'; +import {Observable} from 'rxjs/Observable'; +import {EDIT, LOAD, REMOVE} from '../stores/user.store'; +import {AppConfig} from '../../app.config'; +import {HttpClient} from '../http-client'; +import {AppUserStore} from '../stores/app-user.store'; @Injectable() export class AppUserService { diff --git a/static/src/app/services/app-user-service/login-service.ts b/static/src/app/services/app-user-service/login-service.ts index 1cfc12c..c35eb12 100644 --- a/static/src/app/services/app-user-service/login-service.ts +++ b/static/src/app/services/app-user-service/login-service.ts @@ -1,11 +1,11 @@ -import {Injectable} from "@angular/core"; -import {Http, Response} from "@angular/http"; -import "rxjs/add/operator/map"; +import {Injectable} from '@angular/core'; +import {Http, Response} from '@angular/http'; +import 'rxjs/add/operator/map'; -import {AppConfig} from "../../app.config"; -import {AwardingService} from "../army-management/awarding.service"; -import {PromotionService} from "../army-management/promotion.service"; -import {CookieService} from "ngx-cookie-service"; +import {AppConfig} from '../../app.config'; +import {AwardingService} from '../army-management/awarding.service'; +import {PromotionService} from '../army-management/promotion.service'; +import {CookieService} from 'ngx-cookie-service'; @Injectable() export class LoginService { @@ -20,7 +20,7 @@ export class LoginService { return this.http.post(this.config.apiAuthenticationPath, {username: username, password: password}) .map((response: Response) => { // login successful if there's a jwt token in the response - let user = response.json(); + const user = response.json(); if (user && user.token) { // store user details and jwt token in cookie this.cookieService.set('currentUser', JSON.stringify(user)); diff --git a/static/src/app/services/army-management/awarding.service.ts b/static/src/app/services/army-management/awarding.service.ts index aa2d6a8..e58e124 100644 --- a/static/src/app/services/army-management/awarding.service.ts +++ b/static/src/app/services/army-management/awarding.service.ts @@ -1,7 +1,7 @@ -import {Injectable} from "@angular/core"; -import {Award} from "../../models/model-interfaces"; -import {AppConfig} from "../../app.config"; -import {HttpClient} from "../http-client"; +import {Injectable} from '@angular/core'; +import {Award} from '../../models/model-interfaces'; +import {AppConfig} from '../../app.config'; +import {HttpClient} from '../http-client'; @Injectable() export class AwardingService { @@ -14,15 +14,15 @@ export class AwardingService { getUnconfirmedAwards(fraction?: string) { return this.http.get(this.config.apiAwardPath + '?inProgress=true&fractFilter=' + fraction) - .map(res => res.json()) + .map(res => res.json()); } checkUnprocessedAwards(fraction?: string) { this.getUnconfirmedAwards(fraction).subscribe((items) => { if (items.length > 0) { - this.hasUnprocessedAwards = true + this.hasUnprocessedAwards = true; } - }) + }); } /** @@ -30,24 +30,24 @@ export class AwardingService { */ getUserAwardings(userId: string) { return this.http.get(this.config.apiAwardPath + '?userId=' + userId) - .map(res => res.json()) + .map(res => res.json()); } addAwarding(award: Award) { - return this.http.post(this.config.apiAwardPath, award) + return this.http.post(this.config.apiAwardPath, award); } updateAward(award) { return this.http.patch(this.config.apiAwardPath + '/' + award._id, award) - .map(res => res.json()) + .map(res => res.json()); } requestAwarding(award: Award) { - return this.http.post(this.config.apiRequestAwardPath, award) + return this.http.post(this.config.apiRequestAwardPath, award); } deleteAwarding(awardingId) { - return this.http.delete(this.config.apiAwardPath + '/' + awardingId) + return this.http.delete(this.config.apiAwardPath + '/' + awardingId); } } diff --git a/static/src/app/services/army-management/decoration.service.ts b/static/src/app/services/army-management/decoration.service.ts index f7dae4a..2ee21d4 100644 --- a/static/src/app/services/army-management/decoration.service.ts +++ b/static/src/app/services/army-management/decoration.service.ts @@ -1,10 +1,10 @@ -import {Injectable} from "@angular/core"; -import {Decoration} from "../../models/model-interfaces"; -import {RequestMethod, RequestOptions, URLSearchParams} from "@angular/http"; -import {Observable} from "rxjs/Observable"; -import {ADD, DecorationStore, EDIT, LOAD, REMOVE} from "../stores/decoration.store"; -import {AppConfig} from "../../app.config"; -import {HttpClient} from "../http-client"; +import {Injectable} from '@angular/core'; +import {Decoration} from '../../models/model-interfaces'; +import {RequestMethod, RequestOptions, URLSearchParams} from '@angular/http'; +import {Observable} from 'rxjs/Observable'; +import {ADD, DecorationStore, EDIT, LOAD, REMOVE} from '../stores/decoration.store'; +import {AppConfig} from '../../app.config'; +import {HttpClient} from '../http-client'; @Injectable() diff --git a/static/src/app/services/army-management/promotion.service.ts b/static/src/app/services/army-management/promotion.service.ts index 0fd9a23..82f7206 100644 --- a/static/src/app/services/army-management/promotion.service.ts +++ b/static/src/app/services/army-management/promotion.service.ts @@ -1,7 +1,7 @@ -import {Injectable} from "@angular/core"; -import {AppConfig} from "../../app.config"; -import {HttpClient} from "../http-client"; -import {Promotion} from "../../models/model-interfaces"; +import {Injectable} from '@angular/core'; +import {AppConfig} from '../../app.config'; +import {HttpClient} from '../http-client'; +import {Promotion} from '../../models/model-interfaces'; @Injectable() export class PromotionService { @@ -14,33 +14,33 @@ export class PromotionService { getUnconfirmedPromotions(fraction?: string) { return this.http.get(this.config.apiPromotionPath + '?inProgress=true&fractFilter=' + fraction) - .map(res => res.json()) + .map(res => res.json()); } checkUnconfirmedPromotions(fraction?: string) { this.getUnconfirmedPromotions(fraction).subscribe((items) => { if (items.length > 0) { - this.hasUnprocessedPromotion = true + this.hasUnprocessedPromotion = true; } - }) + }); } getSquadPromotions(squadId: string) { return this.http.get(this.config.apiPromotionPath + '?squadId=' + squadId) - .map(res => res.json()) + .map(res => res.json()); } requestPromotion(promotion: Promotion) { - return this.http.post(this.config.apiPromotionPath, promotion) + return this.http.post(this.config.apiPromotionPath, promotion); } updatePromotion(promotion) { return this.http.patch(this.config.apiPromotionPath + '/' + promotion._id, promotion) - .map(res => res.json()) + .map(res => res.json()); } deletePromotion(promotionId) { - return this.http.delete(this.config.apiPromotionPath + promotionId) + return this.http.delete(this.config.apiPromotionPath + promotionId); } } diff --git a/static/src/app/services/army-management/rank.service.ts b/static/src/app/services/army-management/rank.service.ts index 05994f2..595f7f1 100644 --- a/static/src/app/services/army-management/rank.service.ts +++ b/static/src/app/services/army-management/rank.service.ts @@ -1,11 +1,11 @@ -import {Injectable} from "@angular/core"; -import {Decoration, Rank} from "../../models/model-interfaces"; -import {RequestMethod, RequestOptions, URLSearchParams} from "@angular/http"; -import {Observable} from "rxjs/Observable"; -import {LOAD} from "../stores/decoration.store"; -import {ADD, EDIT, RankStore, REMOVE} from "../stores/rank.store"; -import {AppConfig} from "../../app.config"; -import {HttpClient} from "../http-client"; +import {Injectable} from '@angular/core'; +import {Decoration, Rank} from '../../models/model-interfaces'; +import {RequestMethod, RequestOptions, URLSearchParams} from '@angular/http'; +import {Observable} from 'rxjs/Observable'; +import {LOAD} from '../stores/decoration.store'; +import {ADD, EDIT, RankStore, REMOVE} from '../stores/rank.store'; +import {AppConfig} from '../../app.config'; +import {HttpClient} from '../http-client'; @Injectable() @@ -118,7 +118,7 @@ export class RankService { * @param imageFile - new image file to upload */ updateRankGraphic(rankId: string, imageFile: File) { - let formData: FormData = new FormData(); + const formData: FormData = new FormData(); formData.append('_id', rankId); formData.append('image', imageFile, imageFile.name); diff --git a/static/src/app/services/army-management/squad.service.ts b/static/src/app/services/army-management/squad.service.ts index f1d20aa..75a7ae6 100644 --- a/static/src/app/services/army-management/squad.service.ts +++ b/static/src/app/services/army-management/squad.service.ts @@ -1,11 +1,11 @@ -import {Injectable} from "@angular/core"; -import {Squad} from "../../models/model-interfaces"; -import {RequestMethod, RequestOptions, URLSearchParams} from "@angular/http"; -import {Observable} from "rxjs/Observable"; +import {Injectable} from '@angular/core'; +import {Squad} from '../../models/model-interfaces'; +import {RequestMethod, RequestOptions, URLSearchParams} from '@angular/http'; +import {Observable} from 'rxjs/Observable'; -import {ADD, EDIT, LOAD, REMOVE, SquadStore} from "../stores/squad.store"; -import {AppConfig} from "../../app.config"; -import {HttpClient} from "../http-client"; +import {ADD, EDIT, LOAD, REMOVE, SquadStore} from '../stores/squad.store'; +import {AppConfig} from '../../app.config'; +import {HttpClient} from '../http-client'; @Injectable() export class SquadService { diff --git a/static/src/app/services/army-management/user.service.ts b/static/src/app/services/army-management/user.service.ts index af907b3..cb5b1fb 100644 --- a/static/src/app/services/army-management/user.service.ts +++ b/static/src/app/services/army-management/user.service.ts @@ -1,10 +1,10 @@ -import {Injectable} from "@angular/core"; -import {User} from "../../models/model-interfaces"; -import {URLSearchParams} from "@angular/http"; -import {Observable} from "rxjs/Observable"; -import {ADD, EDIT, LOAD, REMOVE, UserStore} from "../stores/user.store"; -import {AppConfig} from "../../app.config"; -import {HttpClient} from "../http-client"; +import {Injectable} from '@angular/core'; +import {User} from '../../models/model-interfaces'; +import {URLSearchParams} from '@angular/http'; +import {Observable} from 'rxjs/Observable'; +import {ADD, EDIT, LOAD, REMOVE, UserStore} from '../stores/user.store'; +import {AppConfig} from '../../app.config'; +import {HttpClient} from '../http-client'; @Injectable() export class UserService { diff --git a/static/src/app/services/http-client.ts b/static/src/app/services/http-client.ts index 91a68fe..ad77701 100644 --- a/static/src/app/services/http-client.ts +++ b/static/src/app/services/http-client.ts @@ -1,7 +1,7 @@ -import {Injectable} from "@angular/core"; -import {Headers, Http, RequestMethod} from "@angular/http"; -import {Router} from "@angular/router"; -import {CookieService} from "ngx-cookie-service"; +import {Injectable} from '@angular/core'; +import {Headers, Http, RequestMethod} from '@angular/http'; +import {Router} from '@angular/router'; +import {CookieService} from 'ngx-cookie-service'; @Injectable() export class HttpClient { @@ -16,21 +16,21 @@ export class HttpClient { if (cookieField) { const currentUser = JSON.parse(cookieField); if (new Date().getTime() <= Date.parse(currentUser.tokenExpireDate)) { - let headers = new Headers(); + const headers = new Headers(); headers.append('x-access-token', currentUser.token); return headers; } else { - //logout + // logout localStorage.removeItem('currentUser'); - this.router.navigate(['/login']) + this.router.navigate(['/login']); } } } get(url, searchParams?) { - let headers = this.createAuthorizationHeader(); - let options: any = {headers: headers}; + const headers = this.createAuthorizationHeader(); + const options: any = {headers: headers}; if (searchParams) { options.search = searchParams; } @@ -38,28 +38,28 @@ export class HttpClient { } post(url, data) { - let headers = this.createAuthorizationHeader(); + const headers = this.createAuthorizationHeader(); return this.http.post(url, data, { headers: headers }); } put(url, data) { - let headers = this.createAuthorizationHeader(); + const headers = this.createAuthorizationHeader(); return this.http.put(url, data, { headers: headers }); } patch(url, data) { - let headers = this.createAuthorizationHeader(); + const headers = this.createAuthorizationHeader(); return this.http.patch(url, data, { headers: headers }); } delete(url) { - let headers = this.createAuthorizationHeader(); + const headers = this.createAuthorizationHeader(); return this.http.delete(url, { headers: headers }); diff --git a/static/src/app/services/logs/campaign.service.ts b/static/src/app/services/logs/campaign.service.ts index 151dbaf..0b5ae55 100644 --- a/static/src/app/services/logs/campaign.service.ts +++ b/static/src/app/services/logs/campaign.service.ts @@ -1,7 +1,7 @@ -import {Injectable} from "@angular/core"; -import {Campaign} from "../../models/model-interfaces"; -import {AppConfig} from "../../app.config"; -import {HttpClient} from "../http-client"; +import {Injectable} from '@angular/core'; +import {Campaign} from '../../models/model-interfaces'; +import {AppConfig} from '../../app.config'; +import {HttpClient} from '../http-client'; @Injectable() export class CampaignService { @@ -14,17 +14,17 @@ export class CampaignService { getAllCampaigns() { return this.http.get(this.config.apiWarPath) - .map(res => res.json()) + .map(res => res.json()); } submitCampaign(campaign: Campaign) { return this.http.post(this.config.apiCampaignPath, campaign) - .map(res => res.json()) + .map(res => res.json()); } deleteCampaign(id: string) { return this.http.delete(this.config.apiCampaignPath + '/' + id) - .map(res => res.json()) + .map(res => res.json()); } } diff --git a/static/src/app/services/logs/logs.service.ts b/static/src/app/services/logs/logs.service.ts index 92ea958..0a7c431 100644 --- a/static/src/app/services/logs/logs.service.ts +++ b/static/src/app/services/logs/logs.service.ts @@ -1,7 +1,7 @@ -import {Injectable} from "@angular/core"; -import {AppConfig} from "../../app.config"; -import {HttpClient} from "../http-client"; -import {URLSearchParams} from "@angular/http"; +import {Injectable} from '@angular/core'; +import {AppConfig} from '../../app.config'; +import {HttpClient} from '../http-client'; +import {URLSearchParams} from '@angular/http'; @Injectable() export class LogsService { @@ -12,28 +12,28 @@ export class LogsService { getFullLog(warId: string) { return this.http.get(this.config.apiLogsPath + '/' + warId) - .map(res => res.json()) + .map(res => res.json()); } getBudgetLogs(warId: string, fraction = '') { const params = new URLSearchParams(); params.append('fraction', fraction); return this.http.get(this.config.apiLogsPath + '/' + warId + '/budget', params) - .map(res => res.json()) + .map(res => res.json()); } getRespawnLogs(warId: string, playerName = '') { const params = new URLSearchParams(); params.append('player', playerName); return this.http.get(this.config.apiLogsPath + '/' + warId + '/respawn', params) - .map(res => res.json()) + .map(res => res.json()); } getPointsLogs(warId: string, fraction = '') { const params = new URLSearchParams(); params.append('fraction', fraction); return this.http.get(this.config.apiLogsPath + '/' + warId + '/points', params) - .map(res => res.json()) + .map(res => res.json()); } getReviveLogs(warId: string, medicName = '', patientName = '', fraction = '', stabilizedOnly = false, reviveOnly = false) { @@ -44,7 +44,7 @@ export class LogsService { params.append('stabilized', stabilizedOnly ? 'true' : ''); params.append('revive', reviveOnly ? 'true' : ''); return this.http.get(this.config.apiLogsPath + '/' + warId + '/revive', params) - .map(res => res.json()) + .map(res => res.json()); } getKillLogs(warId: string, shooterName = '', targetName = '', fraction = '', friendlyFireOnly = false, notFriendlyFireOnly = false) { @@ -55,7 +55,7 @@ export class LogsService { params.append('friendlyFire', friendlyFireOnly ? 'true' : ''); params.append('noFriendlyFire', notFriendlyFireOnly ? 'true' : ''); return this.http.get(this.config.apiLogsPath + '/' + warId + '/kills', params) - .map(res => res.json()) + .map(res => res.json()); } getTransportLogs(warId: string, driverName = '', passengerName = '', fraction = '') { @@ -64,7 +64,7 @@ export class LogsService { params.append('passenger', passengerName); params.append('fraction', fraction); return this.http.get(this.config.apiLogsPath + '/' + warId + '/transport', params) - .map(res => res.json()) + .map(res => res.json()); } getFlagLogs(warId: string, playerName = '', fraction = '', captureOnly = false, defendOnly = false) { @@ -74,7 +74,7 @@ export class LogsService { params.append('capture', captureOnly ? 'true' : ''); params.append('defend', defendOnly ? 'true' : ''); return this.http.get(this.config.apiLogsPath + '/' + warId + '/flag', params) - .map(res => res.json()) + .map(res => res.json()); } } diff --git a/static/src/app/services/logs/player.service.ts b/static/src/app/services/logs/player.service.ts index a7dbf91..1540dd7 100644 --- a/static/src/app/services/logs/player.service.ts +++ b/static/src/app/services/logs/player.service.ts @@ -1,6 +1,6 @@ -import {Injectable} from "@angular/core"; -import {AppConfig} from "../../app.config"; -import {HttpClient} from "../http-client"; +import {Injectable} from '@angular/core'; +import {AppConfig} from '../../app.config'; +import {HttpClient} from '../http-client'; @Injectable() export class PlayerService { @@ -11,12 +11,12 @@ export class PlayerService { getCampaignPlayer(campaignId: string, playerName: string) { return this.http.get(this.config.apiPlayersPath + '/single/' + campaignId + '/' + playerName) - .map(res => res.json()) + .map(res => res.json()); } getCampaignHighscore(campaignId: string) { return this.http.get(this.config.apiPlayersPath + '/ranking/' + campaignId) - .map(res => res.json()) + .map(res => res.json()); } } diff --git a/static/src/app/services/logs/war.service.ts b/static/src/app/services/logs/war.service.ts index e3e9696..fb6d5d6 100644 --- a/static/src/app/services/logs/war.service.ts +++ b/static/src/app/services/logs/war.service.ts @@ -1,7 +1,7 @@ -import {Injectable} from "@angular/core"; -import {War} from "../../models/model-interfaces"; -import {AppConfig} from "../../app.config"; -import {HttpClient} from "../http-client"; +import {Injectable} from '@angular/core'; +import {War} from '../../models/model-interfaces'; +import {AppConfig} from '../../app.config'; +import {HttpClient} from '../http-client'; @Injectable() export class WarService { @@ -12,7 +12,7 @@ export class WarService { getWar(warId: string) { return this.http.get(this.config.apiWarPath + '/' + warId) - .map(res => res.json()) + .map(res => res.json()); } @@ -30,12 +30,12 @@ export class WarService { } return this.http.post(this.config.apiWarPath, body) - .map(res => res.json()) + .map(res => res.json()); } deleteWar(id: string) { return this.http.delete(this.config.apiWarPath + '/' + id) - .map(res => res.json()) + .map(res => res.json()); } } diff --git a/static/src/app/services/stores/app-user.store.ts b/static/src/app/services/stores/app-user.store.ts index 0045bd9..54a4638 100644 --- a/static/src/app/services/stores/app-user.store.ts +++ b/static/src/app/services/stores/app-user.store.ts @@ -1,5 +1,5 @@ -import {BehaviorSubject} from "rxjs/BehaviorSubject"; -import {AppUser} from "../../models/model-interfaces"; +import {BehaviorSubject} from 'rxjs/BehaviorSubject'; +import {AppUser} from '../../models/model-interfaces'; export const LOAD = 'LOAD'; export const ADD = 'ADD'; diff --git a/static/src/app/services/stores/decoration.store.ts b/static/src/app/services/stores/decoration.store.ts index ad70e43..3bdde1d 100644 --- a/static/src/app/services/stores/decoration.store.ts +++ b/static/src/app/services/stores/decoration.store.ts @@ -1,5 +1,5 @@ -import {BehaviorSubject} from "rxjs/BehaviorSubject"; -import {Decoration} from "../../models/model-interfaces"; +import {BehaviorSubject} from 'rxjs/BehaviorSubject'; +import {Decoration} from '../../models/model-interfaces'; export const LOAD = 'LOAD'; export const ADD = 'ADD'; diff --git a/static/src/app/services/stores/rank.store.ts b/static/src/app/services/stores/rank.store.ts index d78b8aa..bcca9b5 100644 --- a/static/src/app/services/stores/rank.store.ts +++ b/static/src/app/services/stores/rank.store.ts @@ -1,5 +1,5 @@ -import {BehaviorSubject} from "rxjs/BehaviorSubject"; -import {Rank} from "../../models/model-interfaces"; +import {BehaviorSubject} from 'rxjs/BehaviorSubject'; +import {Rank} from '../../models/model-interfaces'; export const LOAD = 'LOAD'; export const ADD = 'ADD'; diff --git a/static/src/app/services/stores/squad.store.ts b/static/src/app/services/stores/squad.store.ts index 6ba7180..558beee 100644 --- a/static/src/app/services/stores/squad.store.ts +++ b/static/src/app/services/stores/squad.store.ts @@ -1,5 +1,5 @@ -import {BehaviorSubject} from "rxjs/BehaviorSubject"; -import {Squad} from "../../models/model-interfaces"; +import {BehaviorSubject} from 'rxjs/BehaviorSubject'; +import {Squad} from '../../models/model-interfaces'; export const LOAD = 'LOAD'; export const ADD = 'ADD'; diff --git a/static/src/app/services/stores/user.store.ts b/static/src/app/services/stores/user.store.ts index ce8ac10..7af7a94 100644 --- a/static/src/app/services/stores/user.store.ts +++ b/static/src/app/services/stores/user.store.ts @@ -1,5 +1,5 @@ -import {BehaviorSubject} from "rxjs/BehaviorSubject"; -import {User} from "../../models/model-interfaces"; +import {BehaviorSubject} from 'rxjs/BehaviorSubject'; +import {User} from '../../models/model-interfaces'; export const LOAD = 'LOAD'; export const ADD = 'ADD'; diff --git a/static/src/app/squads/edit-squad/edit-squad.component.ts b/static/src/app/squads/edit-squad/edit-squad.component.ts index 89e792a..f874286 100644 --- a/static/src/app/squads/edit-squad/edit-squad.component.ts +++ b/static/src/app/squads/edit-squad/edit-squad.component.ts @@ -1,10 +1,10 @@ -import {Component, ViewChild} from "@angular/core"; -import {ActivatedRoute, Router} from "@angular/router"; -import {NgForm} from "@angular/forms"; -import {Squad} from "../../models/model-interfaces"; -import {SquadService} from "../../services/army-management/squad.service"; -import {Subscription} from "rxjs/Subscription"; -import {Fraction} from "../../utils/fraction.enum"; +import {Component, ViewChild} from '@angular/core'; +import {ActivatedRoute, Router} from '@angular/router'; +import {NgForm} from '@angular/forms'; +import {Squad} from '../../models/model-interfaces'; +import {SquadService} from '../../services/army-management/squad.service'; +import {Subscription} from 'rxjs/Subscription'; +import {Fraction} from '../../utils/fraction.enum'; @Component({ @@ -39,7 +39,7 @@ export class EditSquadComponent { ngOnInit() { this.subscription = this.route.params .map(params => params['id']) - .filter(id => id != undefined) + .filter(id => id !== undefined) .flatMap(id => this.squadService.getSquad(id)) .subscribe(squad => { this.squad = squad; @@ -70,7 +70,7 @@ export class EditSquadComponent { .subscribe(rank => { this.saved = true; this.router.navigate(['..'], {relativeTo: this.route}); - }) + }); } else { return window.alert(`Bild ist ein Pflichtfeld`); } diff --git a/static/src/app/squads/squad-list/squad-item.component.ts b/static/src/app/squads/squad-list/squad-item.component.ts index b44ffa7..c12ebbb 100644 --- a/static/src/app/squads/squad-list/squad-item.component.ts +++ b/static/src/app/squads/squad-list/squad-item.component.ts @@ -1,6 +1,6 @@ -import {ChangeDetectionStrategy, Component, EventEmitter} from "@angular/core"; -import {Squad} from "../../models/model-interfaces"; -import {Fraction} from "../../utils/fraction.enum"; +import {ChangeDetectionStrategy, Component, EventEmitter} from '@angular/core'; +import {Squad} from '../../models/model-interfaces'; +import {Fraction} from '../../utils/fraction.enum'; @Component({ selector: 'pjm-squad-item', @@ -30,7 +30,7 @@ export class SquadItemComponent { } select() { - this.squadSelected.emit(this.squad._id) + this.squadSelected.emit(this.squad._id); } delete() { diff --git a/static/src/app/squads/squad-list/squad-list.component.ts b/static/src/app/squads/squad-list/squad-list.component.ts index 31ae8cb..4b8da52 100644 --- a/static/src/app/squads/squad-list/squad-list.component.ts +++ b/static/src/app/squads/squad-list/squad-list.component.ts @@ -1,12 +1,12 @@ -import {Component, OnInit} from "@angular/core"; -import {Location} from "@angular/common"; +import {Component, OnInit} from '@angular/core'; +import {Location} from '@angular/common'; -import {FormControl} from "@angular/forms"; -import {ActivatedRoute, Router} from "@angular/router"; -import {Observable} from "rxjs/Observable"; -import {Squad} from "../../models/model-interfaces"; -import {SquadService} from "../../services/army-management/squad.service"; -import {Fraction} from "../../utils/fraction.enum"; +import {FormControl} from '@angular/forms'; +import {ActivatedRoute, Router} from '@angular/router'; +import {Observable} from 'rxjs/Observable'; +import {Squad} from '../../models/model-interfaces'; +import {SquadService} from '../../services/army-management/squad.service'; +import {Fraction} from '../../utils/fraction.enum'; @Component({ selector: 'squad-list', diff --git a/static/src/app/squads/squads.component.ts b/static/src/app/squads/squads.component.ts index c2fc5e6..7fecd3e 100644 --- a/static/src/app/squads/squads.component.ts +++ b/static/src/app/squads/squads.component.ts @@ -1,4 +1,4 @@ -import {Component} from "@angular/core"; +import {Component} from '@angular/core'; @Component({ selector: 'users', diff --git a/static/src/app/squads/squads.module.ts b/static/src/app/squads/squads.module.ts index 919b3a9..43cfbd9 100644 --- a/static/src/app/squads/squads.module.ts +++ b/static/src/app/squads/squads.module.ts @@ -1,10 +1,10 @@ import {NgModule} from '@angular/core'; -import {CommonModule} from "@angular/common"; -import {SharedModule} from "../shared.module"; -import {squadRouterModule, squadsRoutingComponents} from "./squads.routing"; -import {SquadStore} from "../services/stores/squad.store"; -import {SquadService} from "../services/army-management/squad.service"; -import {ButtonsModule} from "ngx-bootstrap"; +import {CommonModule} from '@angular/common'; +import {SharedModule} from '../shared.module'; +import {squadRouterModule, squadsRoutingComponents} from './squads.routing'; +import {SquadStore} from '../services/stores/squad.store'; +import {SquadService} from '../services/army-management/squad.service'; +import {ButtonsModule} from 'ngx-bootstrap'; @NgModule({ declarations: squadsRoutingComponents, diff --git a/static/src/app/squads/squads.routing.ts b/static/src/app/squads/squads.routing.ts index ef29775..d6585aa 100644 --- a/static/src/app/squads/squads.routing.ts +++ b/static/src/app/squads/squads.routing.ts @@ -1,9 +1,9 @@ -import {RouterModule, Routes} from "@angular/router"; -import {SquadComponent} from "./squads.component"; -import {SquadListComponent} from "./squad-list/squad-list.component"; -import {EditSquadComponent} from "./edit-squad/edit-squad.component"; -import {ModuleWithProviders} from "@angular/core"; -import {SquadItemComponent} from "./squad-list/squad-item.component"; +import {RouterModule, Routes} from '@angular/router'; +import {SquadComponent} from './squads.component'; +import {SquadListComponent} from './squad-list/squad-list.component'; +import {EditSquadComponent} from './edit-squad/edit-squad.component'; +import {ModuleWithProviders} from '@angular/core'; +import {SquadItemComponent} from './squad-list/squad-item.component'; export const squadsRoutes: Routes = [{ path: '', component: SquadComponent, diff --git a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts index cb315a8..8a64077 100644 --- a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts +++ b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts @@ -1,24 +1,22 @@ -import {Component, EventEmitter} from "@angular/core"; -import {CampaignPlayer} from "../../models/model-interfaces"; -import {PlayerService} from "../../services/logs/player.service"; -import {ChartUtils} from "../../utils/chart-utils"; +import {Component, EventEmitter, Input, Output} from '@angular/core'; +import {CampaignPlayer} from '../../models/model-interfaces'; +import {PlayerService} from '../../services/logs/player.service'; +import {ChartUtils} from '../../utils/chart-utils'; @Component({ selector: 'campaign-player-detail', templateUrl: './campaign-player-detail.component.html', - inputs: ['campaignId', 'playerName'], - outputs: ['switchTab'], styleUrls: ['./campaign-player-detail.component.css', '../../style/list-entry.css', '../../style/hide-scrollbar.css', '../../style/overview.css'] }) export class CampaignPlayerDetailComponent { - campaignId: string; + @Input() campaignId: string; - playerName: string; + @Input() playerName: string; - switchTab = new EventEmitter(); + @Output() switchTab = new EventEmitter(); campaignPlayer: CampaignPlayer = {campaign: {}, players: []}; @@ -90,16 +88,16 @@ export class CampaignPlayerDetailComponent { this.playerService.getCampaignPlayer(this.campaignId, encodeURIComponent(this.playerName)) .subscribe(campaignPlayer => { this.campaignPlayer = campaignPlayer; - this.killData = this.assignData(this.yAxisKill, "kill"); - this.vehicleKillData = this.assignData(this.yAxisVehicleKill, "vehicle"); - this.friendlyFireData = this.assignData(this.yAxisFriendlyFire, "friendlyFire"); - this.deathData = this.assignData(this.yAxisDeath, "death"); - this.respawnData = this.assignData(this.yAxisRespawn, "respawn"); - this.reviveData = this.assignData(this.yAxisRevive, "revive"); - this.captureData = this.assignData(this.yAxisCapture, "flagTouch"); + this.killData = this.assignData(this.yAxisKill, 'kill'); + this.vehicleKillData = this.assignData(this.yAxisVehicleKill, 'vehicle'); + this.friendlyFireData = this.assignData(this.yAxisFriendlyFire, 'friendlyFire'); + this.deathData = this.assignData(this.yAxisDeath, 'death'); + this.respawnData = this.assignData(this.yAxisRespawn, 'respawn'); + this.reviveData = this.assignData(this.yAxisRevive, 'revive'); + this.captureData = this.assignData(this.yAxisCapture, 'flagTouch'); this.kdRatio = parseFloat((this.totalKills / (this.totalDeath === 0 ? 1 : this.totalDeath)).toFixed(2)); - if (this.kdRatio > 1) this.maxKd = this.kdRatio * 1.7; + if (this.kdRatio > 1) { this.maxKd = this.kdRatio * 1.7; } this.respawnDeathRatio = parseFloat((this.totalRespawn / (this.totalDeath === 0 ? 1 : this.totalDeath)).toFixed(2)); @@ -139,7 +137,7 @@ export class CampaignPlayerDetailComponent { } private assignData(label, field) { - let killObj = { + const killObj = { name: label, series: [] }; diff --git a/static/src/app/statistic/campaign-submit/campaign-submit.component.ts b/static/src/app/statistic/campaign-submit/campaign-submit.component.ts index 45c5453..34a9561 100644 --- a/static/src/app/statistic/campaign-submit/campaign-submit.component.ts +++ b/static/src/app/statistic/campaign-submit/campaign-submit.component.ts @@ -1,8 +1,8 @@ -import {Component, ViewChild} from "@angular/core"; -import {ActivatedRoute, Router} from "@angular/router"; -import {NgForm} from "@angular/forms"; -import {Campaign} from "../../models/model-interfaces"; -import {CampaignService} from "../../services/logs/campaign.service"; +import {Component, ViewChild} from '@angular/core'; +import {ActivatedRoute, Router} from '@angular/router'; +import {NgForm} from '@angular/forms'; +import {Campaign} from '../../models/model-interfaces'; +import {CampaignService} from '../../services/logs/campaign.service'; @Component({ diff --git a/static/src/app/statistic/highscore/highscore.component.ts b/static/src/app/statistic/highscore/highscore.component.ts index aa416f0..ae1d64d 100644 --- a/static/src/app/statistic/highscore/highscore.component.ts +++ b/static/src/app/statistic/highscore/highscore.component.ts @@ -1,11 +1,11 @@ -import {Component} from "@angular/core"; -import {ActivatedRoute} from "@angular/router"; -import {PlayerService} from "../../services/logs/player.service"; -import {CampaignService} from "../../services/logs/campaign.service"; -import {Fraction} from "../../utils/fraction.enum"; -import {FormControl} from "@angular/forms"; -import {Observable} from "rxjs/Observable"; -import {Player} from "../../models/model-interfaces"; +import {Component} from '@angular/core'; +import {ActivatedRoute} from '@angular/router'; +import {PlayerService} from '../../services/logs/player.service'; +import {CampaignService} from '../../services/logs/campaign.service'; +import {Fraction} from '../../utils/fraction.enum'; +import {FormControl} from '@angular/forms'; +import {Observable} from 'rxjs/Observable'; +import {Player} from '../../models/model-interfaces'; @Component({ @@ -57,8 +57,8 @@ export class StatisticHighScoreComponent { this.initData(); } else { this.campaignService.getAllCampaigns().subscribe(campaigns => { - this.initData() - }) + this.initData(); + }); } }); @@ -76,7 +76,7 @@ export class StatisticHighScoreComponent { this.playerService.getCampaignHighscore(this.id).subscribe(players => { this.players = players; this.playersStored = players; - }) + }); } filterPlayers() { @@ -91,7 +91,7 @@ export class StatisticHighScoreComponent { respawn: this.filterPlayerAttribute('respawn'), revive: this.filterPlayerAttribute('revive'), flagTouch: this.filterPlayerAttribute('flagTouch') - } + }; } } @@ -100,12 +100,12 @@ export class StatisticHighScoreComponent { return this.playersStored[attribute].filter(player => { for (let i = 0; i < query.length; i++) { - if (query[i].trim() != '' && player.name.toLowerCase().includes(query[i].trim())) { + if (query[i].trim() !== '' && player.name.toLowerCase().includes(query[i].trim())) { return true; } } return false; - }) + }); } } diff --git a/static/src/app/statistic/overview/stats-overview.component.ts b/static/src/app/statistic/overview/stats-overview.component.ts index c7430d0..369bc58 100644 --- a/static/src/app/statistic/overview/stats-overview.component.ts +++ b/static/src/app/statistic/overview/stats-overview.component.ts @@ -1,20 +1,21 @@ -import {Component} from "@angular/core"; -import {ActivatedRoute} from "@angular/router"; -import {CampaignService} from "../../services/logs/campaign.service"; -import {ChartUtils} from "../../utils/chart-utils"; -import {Fraction} from "../../utils/fraction.enum"; +import {Component, Input} from '@angular/core'; +import {ActivatedRoute} from '@angular/router'; +import {CampaignService} from '../../services/logs/campaign.service'; +import {ChartUtils} from '../../utils/chart-utils'; +import {Fraction} from '../../utils/fraction.enum'; @Component({ selector: 'stats-overview', templateUrl: './stats-overview.component.html', - styleUrls: ['./stats-overview.component.css', '../../style/list-entry.css', '../../style/overview.css'], - inputs: ['campaigns'] + styleUrls: ['./stats-overview.component.css', '../../style/list-entry.css', '../../style/overview.css'] }) export class StatisticOverviewComponent { - id = ""; - title = ""; + @Input() campaigns; + + id = ''; + title = ''; pointData: any[] = []; pointSumData: any[] = []; @@ -33,7 +34,7 @@ export class StatisticOverviewComponent { legendTitle = ''; showXAxisLabel = true; showYAxisLabel = true; - yAxisLabel = ""; + yAxisLabel = ''; autoscale = true; timeline = false; @@ -51,7 +52,7 @@ export class StatisticOverviewComponent { } else { this.campaignService.getAllCampaigns().subscribe(campaigns => { this.initWars(campaigns); - }) + }); } }); } @@ -65,34 +66,38 @@ export class StatisticOverviewComponent { itemsProcessed++; if (itemsProcessed === campaigns.length) { if (this.id === 'all') { - this.title = "Gesamtübersicht"; + this.title = 'Gesamtübersicht'; wars.sort((a, b) => { // sort by dates, because older campaign can contain newer war - if (a['date'] > (b['date'])) return -1; - if (a['date'] < (b['date'])) return 1; + if (a['date'] > (b['date'])) { + return -1; + } + if (a['date'] < (b['date'])) { + return 1; + } return 0; - }) + }); } else { this.title = campaign.title; } this.initChart(wars); } - }) + }); } goToSlide(index: number) { switch (index) { case 0: this.currentData = this.pointSumData; - this.yAxisLabel = "Gesamtpunkte"; + this.yAxisLabel = 'Gesamtpunkte'; break; case 1: this.currentData = this.pointData; - this.yAxisLabel = "Punkte"; + this.yAxisLabel = 'Punkte'; break; case 2: this.currentData = this.playerData; - this.yAxisLabel = "Anzahl Spieler"; + this.yAxisLabel = 'Anzahl Spieler'; break; } this.activeSlideIndex = index; @@ -140,7 +145,7 @@ export class StatisticOverviewComponent { this.pointData = pointsObj; this.pointSumData = pointsSumObj; this.playerData = playersObj; - if (this.id != 'all') { + if (this.id !== 'all') { this.goToSlide(0); } else { this.goToSlide(1); @@ -149,7 +154,7 @@ export class StatisticOverviewComponent { } isActiveSlide(index) { - return this.activeSlideIndex === index ? '#d9edf7' : 'white' + return this.activeSlideIndex === index ? '#d9edf7' : 'white'; } } diff --git a/static/src/app/statistic/stats.module.ts b/static/src/app/statistic/stats.module.ts index 27c7bb5..1060671 100644 --- a/static/src/app/statistic/stats.module.ts +++ b/static/src/app/statistic/stats.module.ts @@ -1,14 +1,14 @@ import {NgModule} from '@angular/core'; -import {CommonModule} from "@angular/common"; -import {SharedModule} from "../shared.module"; -import {statsRouterModule, statsRoutingComponents} from "./stats.routing"; -import {WarService} from "../services/logs/war.service"; -import {NgxChartsModule} from "@swimlane/ngx-charts"; -import {AccordionModule, ButtonsModule} from "ngx-bootstrap"; -import {CampaignService} from "../services/logs/campaign.service"; -import {NgxDatatableModule} from "@swimlane/ngx-datatable"; -import {PlayerService} from "../services/logs/player.service"; -import {LogsService} from "../services/logs/logs.service"; +import {CommonModule} from '@angular/common'; +import {SharedModule} from '../shared.module'; +import {statsRouterModule, statsRoutingComponents} from './stats.routing'; +import {WarService} from '../services/logs/war.service'; +import {NgxChartsModule} from '@swimlane/ngx-charts'; +import {AccordionModule, ButtonsModule} from 'ngx-bootstrap'; +import {CampaignService} from '../services/logs/campaign.service'; +import {NgxDatatableModule} from '@swimlane/ngx-datatable'; +import {PlayerService} from '../services/logs/player.service'; +import {LogsService} from '../services/logs/logs.service'; @NgModule({ declarations: statsRoutingComponents, diff --git a/static/src/app/statistic/stats.routing.ts b/static/src/app/statistic/stats.routing.ts index dba063b..308c28e 100644 --- a/static/src/app/statistic/stats.routing.ts +++ b/static/src/app/statistic/stats.routing.ts @@ -1,16 +1,16 @@ -import {RouterModule, Routes} from "@angular/router"; -import {StatisticComponent} from "./stats.component"; -import {WarListComponent} from "./war-list/war-list.component"; -import {StatisticOverviewComponent} from "./overview/stats-overview.component"; -import {WarItemComponent} from "./war-list/war-item.component"; -import {ModuleWithProviders} from "@angular/core"; -import {CampaignSubmitComponent} from "./campaign-submit/campaign-submit.component"; -import {CampaignPlayerDetailComponent} from "./campaign-player-detail/campaign-player-detail.component"; -import {WarDetailComponent} from "./war-detail/war-detail.component"; -import {ScoreboardComponent} from "./war-detail/scoreboard/scoreboard.component"; -import {WarSubmitComponent} from "./war-submit/war-submit.component"; -import {FractionStatsComponent} from "./war-detail/fraction-stats/fraction-stats.component"; -import {StatisticHighScoreComponent} from "./highscore/highscore.component"; +import {RouterModule, Routes} from '@angular/router'; +import {StatisticComponent} from './stats.component'; +import {WarListComponent} from './war-list/war-list.component'; +import {StatisticOverviewComponent} from './overview/stats-overview.component'; +import {WarItemComponent} from './war-list/war-item.component'; +import {ModuleWithProviders} from '@angular/core'; +import {CampaignSubmitComponent} from './campaign-submit/campaign-submit.component'; +import {CampaignPlayerDetailComponent} from './campaign-player-detail/campaign-player-detail.component'; +import {WarDetailComponent} from './war-detail/war-detail.component'; +import {ScoreboardComponent} from './war-detail/scoreboard/scoreboard.component'; +import {WarSubmitComponent} from './war-submit/war-submit.component'; +import {FractionStatsComponent} from './war-detail/fraction-stats/fraction-stats.component'; +import {StatisticHighScoreComponent} from './highscore/highscore.component'; export const statsRoutes: Routes = [{ diff --git a/static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.ts b/static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.ts index c8f8708..77a4d57 100644 --- a/static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.ts +++ b/static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.ts @@ -1,14 +1,13 @@ -import {Component, ElementRef, 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"; +import {Component, ElementRef, Input, 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'; @Component({ selector: 'war-detail-fraction', templateUrl: './fraction-stats.component.html', - inputs: ['war', 'logData'], styleUrls: ['./fraction-stats.component.css', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css'] }) export class FractionStatsComponent { @@ -17,9 +16,9 @@ export class FractionStatsComponent { @ViewChild('overview') private overviewContainer: ElementRef; - war: War; + @Input() war: War; - logData: any; + @Input() logData: any; startDateObj: Date; @@ -162,7 +161,7 @@ export class FractionStatsComponent { const fractionChange = budgetEntry.fraction === 'BLUFOR' ? 0 : 1; const fractionOld = budgetEntry.fraction !== 'BLUFOR' ? 0 : 1; - if (this.isTwoMinutesAhead(budgetEntryDate, this.tmpBudgetData)) { + if (FractionStatsComponent.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)); @@ -187,7 +186,7 @@ export class FractionStatsComponent { if (killEntry.fraction === 'OPFOR') { killCountOpfor++; } - if (this.isTwoMinutesAhead(killEntryDate, this.tmpKillData)) { + if (FractionStatsComponent.isTwoMinutesAhead(killEntryDate, this.tmpKillData)) { this.tmpKillData[0].series.push(ChartUtils.getSeriesEntry(killEntryDate, killCountBlufor)); this.tmpKillData[1].series.push(ChartUtils.getSeriesEntry(killEntryDate, killCountOpfor)); } @@ -198,7 +197,7 @@ export class FractionStatsComponent { if (killEntry.fraction === 'OPFOR') { ffKillCountOpfor++; } - if (this.isTwoMinutesAhead(killEntryDate, this.tmpFrienlyFireData)) { + if (FractionStatsComponent.isTwoMinutesAhead(killEntryDate, this.tmpFrienlyFireData)) { this.tmpFrienlyFireData[0].series.push(ChartUtils.getSeriesEntry(killEntryDate, ffKillCountBlufor)); this.tmpFrienlyFireData[1].series.push(ChartUtils.getSeriesEntry(killEntryDate, ffKillCountOpfor)); } @@ -212,7 +211,7 @@ export class FractionStatsComponent { } this.addFinalTimeData(this.tmpKillData); - this.addFinalTimeData(this.tmpFrienlyFireData) + this.addFinalTimeData(this.tmpFrienlyFireData); this.initialized.kill = true; } @@ -229,7 +228,7 @@ export class FractionStatsComponent { } else { reviveCountOpfor++; } - if (this.isTwoMinutesAhead(reviveEntryDate, this.tmpReviveData)) { + if (FractionStatsComponent.isTwoMinutesAhead(reviveEntryDate, this.tmpReviveData)) { this.tmpReviveData[0].series.push(ChartUtils.getSeriesEntry(reviveEntryDate, reviveCountBlufor)); this.tmpReviveData[1].series.push(ChartUtils.getSeriesEntry(reviveEntryDate, reviveCountOpfor)); } @@ -239,7 +238,7 @@ export class FractionStatsComponent { } else { stabilizeCountOpfor++; } - if (this.isTwoMinutesAhead(reviveEntryDate, this.tmpStabilizeData)) { + if (FractionStatsComponent.isTwoMinutesAhead(reviveEntryDate, this.tmpStabilizeData)) { this.tmpStabilizeData[0].series.push(ChartUtils.getSeriesEntry(reviveEntryDate, stabilizeCountBlufor)); this.tmpStabilizeData[1].series.push(ChartUtils.getSeriesEntry(reviveEntryDate, stabilizeCountOpfor)); } @@ -271,7 +270,7 @@ export class FractionStatsComponent { } else { vehicleKillCountOpfor++; } - if (this.isTwoMinutesAhead(vehicleEntryDate, this.tmpVehicleData) || index === this.logData.vehicle.length - 1) { + if (FractionStatsComponent.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)); } @@ -295,7 +294,7 @@ export class FractionStatsComponent { } else { transportCountOpfor++; } - if (this.isTwoMinutesAhead(transportEntryDate, this.tmpTransportData) || index === this.logData.transport.length - 1) { + if (FractionStatsComponent.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)); } @@ -321,15 +320,15 @@ export class FractionStatsComponent { } this.tmpFlagCaptureData[flagEntry.flagFraction === 'BLUFOR' ? 0 : 1].series.push( ChartUtils.getSeriesEntry(new Date(flagEntry.time), flagEntry.flagFraction === 'BLUFOR' ? flagStatusBlufor : flagStatusOpfor) - ) + ); }); this.addFinalTimeData(this.tmpFlagCaptureData); 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) + protected static isTwoMinutesAhead(entryDate: Date, tmpData: any): boolean { + return entryDate.getTime() >= tmpData[0].series[tmpData[0].series.length - 1].name.getTime() + (1.5 * 60000); } initializeTempCollections() { @@ -346,7 +345,7 @@ export class FractionStatsComponent { [this.tmpKillData, this.tmpFrienlyFireData, this.tmpVehicleData, this.tmpReviveData, this.tmpStabilizeData, this.tmpTransportData].forEach(tmp => { [0, 1].forEach(index => { tmp[index].series.push(ChartUtils.getSeriesEntry(this.startDateObj, 0)); - }) + }); }); this.tmpBudgetData[0].series.push(ChartUtils.getSeriesEntry(this.startDateObj, this.war.budgetBlufor)); this.tmpBudgetData[1].series.push(ChartUtils.getSeriesEntry(this.startDateObj, this.war.budgetOpfor)); @@ -358,7 +357,7 @@ export class FractionStatsComponent { this.tmpBudgetData[0].series.push(ChartUtils.getSeriesEntry(endDate, this.war.endBudgetBlufor)); this.tmpBudgetData[1].series.push(ChartUtils.getSeriesEntry(endDate, this.war.endBudgetOpfor)); } else { - for (let j in [0, 1]) { + for (const j in [0, 1]) { if (tmpCollection[j].series[tmpCollection[j].series.length - 1].name < endDate) { tmpCollection[j].series.push(ChartUtils.getSeriesEntry(endDate, tmpCollection[j].series[tmpCollection[j].series.length - 1].value)); } diff --git a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts index 2f2676c..4475a13 100644 --- a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts +++ b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts @@ -1,27 +1,25 @@ -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"; +import {Component, ElementRef, EventEmitter, Input, Output, 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', templateUrl: './scoreboard.component.html', - inputs: ['war', 'fractionFilterSelected'], - outputs: ['playerTabSwitch'], styleUrls: ['./scoreboard.component.css', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css'] }) export class ScoreboardComponent { readonly fraction = Fraction; - playerTabSwitch = new EventEmitter(); + @Input() war: War; - war: War; + @Input() fractionFilterSelected: string; + + @Output() playerTabSwitch = new EventEmitter(); isSteamUUID = PlayerUtils.isSteamUUID; - fractionFilterSelected: string; - cellHeight = 40; rows = []; @@ -40,7 +38,7 @@ export class ScoreboardComponent { this.playerTabSwitch.emit({ view: view, player: player - }) + }); } ngOnChanges(changes: SimpleChanges) { @@ -51,7 +49,7 @@ export class ScoreboardComponent { .scrollTo(0, 0); } if (changes.fractionFilterSelected) { - this.filterPlayersByFraction(this.fractionFilterSelected) + this.filterPlayersByFraction(this.fractionFilterSelected); } } @@ -59,7 +57,7 @@ export class ScoreboardComponent { if (fraction) { this.rows = this.war.players.filter((player) => { return player.fraction === fraction; - }) + }); } else { this.rows = this.war.players; } diff --git a/static/src/app/statistic/war-detail/war-detail.component.ts b/static/src/app/statistic/war-detail/war-detail.component.ts index b3b96ad..8d7b1cc 100644 --- a/static/src/app/statistic/war-detail/war-detail.component.ts +++ b/static/src/app/statistic/war-detail/war-detail.component.ts @@ -1,10 +1,10 @@ -import {Component} from "@angular/core"; -import {ActivatedRoute} from "@angular/router"; -import {WarService} from "../../services/logs/war.service"; -import {War} from "../../models/model-interfaces"; -import {ChartUtils} from "../../utils/chart-utils"; -import {Fraction} from "../../utils/fraction.enum"; -import {LogsService} from "../../services/logs/logs.service"; +import {Component} from '@angular/core'; +import {ActivatedRoute} from '@angular/router'; +import {WarService} from '../../services/logs/war.service'; +import {War} from '../../models/model-interfaces'; +import {ChartUtils} from '../../utils/chart-utils'; +import {Fraction} from '../../utils/fraction.enum'; +import {LogsService} from '../../services/logs/logs.service'; @Component({ @@ -44,7 +44,7 @@ export class WarDetailComponent { ngOnInit() { this.route.params .map(params => params['id']) - .filter(id => id != undefined) + .filter(id => id !== undefined) .flatMap(id => this.warService.getWar(id)) .subscribe(war => { this.war = war; @@ -55,7 +55,7 @@ export class WarDetailComponent { this.playerChart = ChartUtils.getSingleDataArray(Fraction.OPFOR, war.playersOpfor, Fraction.BLUFOR, war.playersBlufor); Object.assign(this, [this.playerChart]); - }) + }); } switchTab(index: number) { diff --git a/static/src/app/statistic/war-list/war-item.component.ts b/static/src/app/statistic/war-list/war-item.component.ts index cbb63b4..6f9d0bc 100644 --- a/static/src/app/statistic/war-list/war-item.component.ts +++ b/static/src/app/statistic/war-list/war-item.component.ts @@ -1,6 +1,6 @@ -import {ChangeDetectionStrategy, Component, EventEmitter} from "@angular/core"; -import {War} from "../../models/model-interfaces"; -import {LoginService} from "../../services/app-user-service/login-service"; +import {ChangeDetectionStrategy, Component, EventEmitter} from '@angular/core'; +import {War} from '../../models/model-interfaces'; +import {LoginService} from '../../services/app-user-service/login-service'; @Component({ selector: 'pjm-war-item', diff --git a/static/src/app/statistic/war-list/war-list.component.ts b/static/src/app/statistic/war-list/war-list.component.ts index 399fbce..68c3d10 100644 --- a/static/src/app/statistic/war-list/war-list.component.ts +++ b/static/src/app/statistic/war-list/war-list.component.ts @@ -1,10 +1,10 @@ -import {Component, OnInit} from "@angular/core"; -import {ActivatedRoute, Router} from "@angular/router"; -import {Campaign, War} from "../../models/model-interfaces"; -import {WarService} from "../../services/logs/war.service"; -import {LoginService} from "../../services/app-user-service/login-service"; -import {CampaignService} from "../../services/logs/campaign.service"; -import {RouteConfig} from "../../app.config"; +import {Component, OnInit} from '@angular/core'; +import {ActivatedRoute, Router} from '@angular/router'; +import {Campaign, War} from '../../models/model-interfaces'; +import {WarService} from '../../services/logs/war.service'; +import {LoginService} from '../../services/app-user-service/login-service'; +import {CampaignService} from '../../services/logs/campaign.service'; +import {RouteConfig} from '../../app.config'; @Component({ selector: 'war-list', @@ -37,9 +37,9 @@ export class WarListComponent implements OnInit { if (url.endsWith(RouteConfig.statsPath)) { this.selectOverview(this.campaigns[0]._id); } else if (url.indexOf(subPathWar) !== -1) { - this.selectedWarId = url.substring(url.lastIndexOf(subPathWar) + subPathWar.length, url.lastIndexOf(")")); + this.selectedWarId = url.substring(url.lastIndexOf(subPathWar) + subPathWar.length, url.lastIndexOf(')')); } else if (url.indexOf(subPathOverview) !== -1) { - this.selectedWarId = url.substring(url.lastIndexOf(subPathOverview) + subPathOverview.length, url.lastIndexOf(")")); + this.selectedWarId = url.substring(url.lastIndexOf(subPathOverview) + subPathOverview.length, url.lastIndexOf(')')); } }); } @@ -55,21 +55,21 @@ export class WarListComponent implements OnInit { } selectWar(warId) { - if (this.selectedWarId != warId) { + if (this.selectedWarId !== warId) { this.selectedWarId = warId; this.router.navigate([{outlets: {'right': ['war', warId]}}], {relativeTo: this.route}); } } selectOverview(campaignId) { - if (this.selectedWarId != campaignId) { + if (this.selectedWarId !== campaignId) { this.selectedWarId = campaignId; this.router.navigate([{outlets: {'right': ['overview', campaignId]}}], {relativeTo: this.route}); } } selectHighscore(campaignId) { - if (this.selectedWarId != campaignId + this.highscore) { + if (this.selectedWarId !== campaignId + this.highscore) { this.selectedWarId = campaignId + this.highscore; this.router.navigate([{outlets: {'right': ['highscore', campaignId]}}], {relativeTo: this.route}); } @@ -83,7 +83,7 @@ export class WarListComponent implements OnInit { this.selectOverview('all'); } this.campaigns.splice(this.campaigns.indexOf(war), 1); - }) + }); } } @@ -95,7 +95,7 @@ export class WarListComponent implements OnInit { this.selectOverview('all'); } this.campaigns.splice(this.campaigns.indexOf(campaign), 1); - }) + }); } } diff --git a/static/src/app/statistic/war-submit/war-submit.component.ts b/static/src/app/statistic/war-submit/war-submit.component.ts index 7327d3d..74b3525 100644 --- a/static/src/app/statistic/war-submit/war-submit.component.ts +++ b/static/src/app/statistic/war-submit/war-submit.component.ts @@ -1,9 +1,9 @@ -import {Component, ViewChild} from "@angular/core"; -import {ActivatedRoute, Router} from "@angular/router"; -import {NgForm} from "@angular/forms"; -import {WarService} from "../../services/logs/war.service"; -import {War} from "../../models/model-interfaces"; -import {CampaignService} from "../../services/logs/campaign.service"; +import {Component, ViewChild} from '@angular/core'; +import {ActivatedRoute, Router} from '@angular/router'; +import {NgForm} from '@angular/forms'; +import {WarService} from '../../services/logs/war.service'; +import {War} from '../../models/model-interfaces'; +import {CampaignService} from '../../services/logs/campaign.service'; @Component({ diff --git a/static/src/app/users/award-user/award-user.component.ts b/static/src/app/users/award-user/award-user.component.ts index b3d3737..dc7bc2d 100644 --- a/static/src/app/users/award-user/award-user.component.ts +++ b/static/src/app/users/award-user/award-user.component.ts @@ -1,10 +1,10 @@ -import {Component, ViewChild} from "@angular/core"; -import {ActivatedRoute, Router} from "@angular/router"; -import {Award, Decoration} from "../../models/model-interfaces"; -import {NgForm} from "@angular/forms"; -import {AwardingService} from "../../services/army-management/awarding.service"; -import {DecorationService} from "../../services/army-management/decoration.service"; -import {Fraction} from "../../utils/fraction.enum"; +import {Component, ViewChild} from '@angular/core'; +import {ActivatedRoute, Router} from '@angular/router'; +import {Award, Decoration} from '../../models/model-interfaces'; +import {NgForm} from '@angular/forms'; +import {AwardingService} from '../../services/army-management/awarding.service'; +import {DecorationService} from '../../services/army-management/decoration.service'; +import {Fraction} from '../../utils/fraction.enum'; @Component({ @@ -48,7 +48,7 @@ export class AwardUserComponent { this.route.params .map(params => params['id']) - .subscribe(id => this.userId = id) + .subscribe(id => this.userId = id); } @@ -72,10 +72,10 @@ export class AwardUserComponent { const reason = reasonField.value; if (decorationId && reason.length > 0) { const award = { - "userId": this.userId, - "decorationId": decorationId, - "reason": reason, - "date": Date.now() + 'userId': this.userId, + 'decorationId': decorationId, + 'reason': reason, + 'date': Date.now() }; this.awardingService.addAwarding(award).subscribe(() => { this.awardingService.getUserAwardings(this.userId) @@ -87,9 +87,9 @@ export class AwardUserComponent { this.showSuccessLabel = true; setTimeout(() => { this.showSuccessLabel = false; - }, 2000) - }) - }) + }, 2000); + }); + }); } } @@ -101,9 +101,9 @@ export class AwardUserComponent { this.showSuccessLabel = true; setTimeout(() => { this.showSuccessLabel = false; - }, 2000) - }) - }) + }, 2000); + }); + }); } cancel() { diff --git a/static/src/app/users/edit-user/edit-user.component.ts b/static/src/app/users/edit-user/edit-user.component.ts index 5fec2d6..9534983 100644 --- a/static/src/app/users/edit-user/edit-user.component.ts +++ b/static/src/app/users/edit-user/edit-user.component.ts @@ -1,12 +1,12 @@ -import {Component, ViewChild} from "@angular/core"; -import {ActivatedRoute, Router} from "@angular/router"; -import {Rank, Squad, User} from "../../models/model-interfaces"; -import {UserService} from "../../services/army-management/user.service"; -import {SquadService} from "../../services/army-management/squad.service"; -import {RankService} from "../../services/army-management/rank.service"; -import {Subscription} from "rxjs"; -import {NgForm} from "@angular/forms"; -import {Fraction} from "../../utils/fraction.enum"; +import {Component, ViewChild} from '@angular/core'; +import {ActivatedRoute, Router} from '@angular/router'; +import {Rank, Squad, User} from '../../models/model-interfaces'; +import {UserService} from '../../services/army-management/user.service'; +import {SquadService} from '../../services/army-management/squad.service'; +import {RankService} from '../../services/army-management/rank.service'; +import {Subscription} from 'rxjs'; +import {NgForm} from '@angular/forms'; +import {Fraction} from '../../utils/fraction.enum'; @Component({ @@ -46,11 +46,11 @@ export class EditUserComponent { this.subscription = this.route.params .map(params => params['id']) - .filter(id => id != undefined) + .filter(id => id !== undefined) .flatMap(id => this.userService.getUser(id)) .subscribe(user => { if (!user.squadId) { - user.squadId = "0"; + user.squadId = '0'; this.ranksDisplay = 'none'; } else { this.rankService.findRanks('', user.squadId.fraction).subscribe(ranks => { @@ -67,7 +67,7 @@ export class EditUserComponent { } toggleRanks() { - if (this.user.squadId != '0') { + if (this.user.squadId !== '0') { this.rankService.findRanks('', this.user.squadId.fraction).subscribe( ranks => { this.ranks = ranks; @@ -87,7 +87,7 @@ export class EditUserComponent { squadId: null }; if (this.user.squadId._id !== '0') { - updateObject.squadId = this.user.squadId._id + updateObject.squadId = this.user.squadId._id; } if (this.user._id) { @@ -100,8 +100,8 @@ export class EditUserComponent { this.showSuccessLabel = true; setTimeout(() => { this.showSuccessLabel = false; - }, 2000) - }) + }, 2000); + }); } else { this.userService.submitUser(updateObject) .subscribe(user => { @@ -111,13 +111,13 @@ export class EditUserComponent { error => { // duplicated user error message if (error._body.includes('duplicate')) { - this.error = "Benutzername existiert bereits"; + this.error = 'Benutzername existiert bereits'; this.showErrorLabel = true; setTimeout(() => { this.showErrorLabel = false; }, 5000); } - }) + }); } } diff --git a/static/src/app/users/user-list/user-item.component.ts b/static/src/app/users/user-list/user-item.component.ts index f433f57..122afa7 100644 --- a/static/src/app/users/user-list/user-item.component.ts +++ b/static/src/app/users/user-list/user-item.component.ts @@ -1,23 +1,22 @@ -import {ChangeDetectionStrategy, Component, EventEmitter} from "@angular/core"; -import {User} from "../../models/model-interfaces"; -import {Fraction} from "../../utils/fraction.enum"; +import {ChangeDetectionStrategy, Component, EventEmitter, Input, Output} from '@angular/core'; +import {User} from '../../models/model-interfaces'; +import {Fraction} from '../../utils/fraction.enum'; @Component({ selector: 'pjm-user-item', templateUrl: './user-item.component.html', styleUrls: ['./user-item.component.css', '../../style/list-entry.css'], - changeDetection: ChangeDetectionStrategy.OnPush, - inputs: ['user', 'selected'], - outputs: ['userSelected', 'userAward', 'userDelete'] + changeDetection: ChangeDetectionStrategy.OnPush }) export class UserItemComponent { - selected: boolean; - user: User; + @Input() user: User; - userSelected = new EventEmitter(); - userAward = new EventEmitter(); - userDelete = new EventEmitter(); + @Input() selected: boolean; + + @Output() userSelected = new EventEmitter(); + @Output() userAward = new EventEmitter(); + @Output() userDelete = new EventEmitter(); readonly fraction = Fraction; @@ -25,11 +24,11 @@ export class UserItemComponent { } select() { - this.userSelected.emit(this.user._id) + this.userSelected.emit(this.user._id); } award() { - this.userAward.emit(this.user._id) + this.userAward.emit(this.user._id); } delete() { diff --git a/static/src/app/users/user-list/user-list.component.ts b/static/src/app/users/user-list/user-list.component.ts index e3721e2..3f4aec7 100644 --- a/static/src/app/users/user-list/user-list.component.ts +++ b/static/src/app/users/user-list/user-list.component.ts @@ -1,13 +1,13 @@ -import {Component, OnInit} from "@angular/core"; -import {Location} from "@angular/common"; +import {Component, OnInit} from '@angular/core'; +import {Location} from '@angular/common'; -import {FormControl} from "@angular/forms"; -import {ActivatedRoute, Router} from "@angular/router"; -import {Observable} from "rxjs/Observable"; -import {UserService} from "../../services/army-management/user.service"; -import {User} from "../../models/model-interfaces"; -import {ADD, LOAD} from "../../services/stores/user.store"; -import {Fraction} from "../../utils/fraction.enum"; +import {FormControl} from '@angular/forms'; +import {ActivatedRoute, Router} from '@angular/router'; +import {Observable} from 'rxjs/Observable'; +import {UserService} from '../../services/army-management/user.service'; +import {User} from '../../models/model-interfaces'; +import {ADD, LOAD} from '../../services/stores/user.store'; +import {Fraction} from '../../utils/fraction.enum'; @Component({ selector: 'squad-list', @@ -77,7 +77,7 @@ export class UserListComponent implements OnInit { if (confirm('Soll der Teilnehmer "' + user.username + '" wirklich gelöscht werden?')) { this.userService.deleteUser(user) .subscribe((res) => { - }) + }); } } @@ -94,7 +94,7 @@ export class UserListComponent implements OnInit { if (this.offset + this.limit > this.userService.totalCount) { this.limit = this.userService.totalCount - this.offset; } - if (this.limit != 0) { + if (this.limit !== 0) { this.offset += this.limit; this.filterUsers(ADD); } @@ -102,7 +102,7 @@ export class UserListComponent implements OnInit { adjustBrowserUrl(queryString = '') { const absoluteUrl = this.location.path().split('?')[0]; - const queryPart = queryString !== '' ? `query=${queryString}` : ''; + const queryPart = queryString !== '' ? 'query=${queryString}' : ''; this.location.replaceState(absoluteUrl, queryPart); } diff --git a/static/src/app/users/users.module.ts b/static/src/app/users/users.module.ts index 9e3a8bb..60c612d 100644 --- a/static/src/app/users/users.module.ts +++ b/static/src/app/users/users.module.ts @@ -1,9 +1,9 @@ import {NgModule} from '@angular/core'; import {usersRouterModule, usersRoutingComponents} from './users.routing'; -import {CommonModule} from "@angular/common"; -import {SharedModule} from "../shared.module"; -import {ButtonsModule} from "ngx-bootstrap"; -import {InfiniteScrollModule} from "ngx-infinite-scroll"; +import {CommonModule} from '@angular/common'; +import {SharedModule} from '../shared.module'; +import {ButtonsModule} from 'ngx-bootstrap'; +import {InfiniteScrollModule} from 'ngx-infinite-scroll'; @NgModule({ declarations: usersRoutingComponents, diff --git a/static/src/app/users/users.routing.ts b/static/src/app/users/users.routing.ts index d63efcb..a356adc 100644 --- a/static/src/app/users/users.routing.ts +++ b/static/src/app/users/users.routing.ts @@ -1,10 +1,10 @@ -import {RouterModule, Routes} from "@angular/router"; -import {UsersComponent} from "./users.component"; -import {EditUserComponent} from "./edit-user/edit-user.component"; -import {UserListComponent} from "./user-list/user-list.component"; -import {AwardUserComponent} from "./award-user/award-user.component"; -import {ModuleWithProviders} from "@angular/core"; -import {UserItemComponent} from "./user-list/user-item.component"; +import {RouterModule, Routes} from '@angular/router'; +import {UsersComponent} from './users.component'; +import {EditUserComponent} from './edit-user/edit-user.component'; +import {UserListComponent} from './user-list/user-list.component'; +import {AwardUserComponent} from './award-user/award-user.component'; +import {ModuleWithProviders} from '@angular/core'; +import {UserItemComponent} from './user-list/user-item.component'; export const usersRoutes: Routes = [{ path: '', component: UsersComponent, diff --git a/static/src/app/utils/chart-utils.ts b/static/src/app/utils/chart-utils.ts index 7f027d7..6aefd74 100644 --- a/static/src/app/utils/chart-utils.ts +++ b/static/src/app/utils/chart-utils.ts @@ -3,14 +3,14 @@ export class ChartUtils { public static getShortDateString(date): string { const isoDate = date.slice(0, 10); const dayDate = parseInt(isoDate.slice(8, 10)); - return (dayDate < 10 ? "0" + dayDate : dayDate) + '.' + return (dayDate < 10 ? '0' + dayDate : dayDate) + '.' + isoDate.slice(5, 7) + '.' + isoDate.slice(2, 4); } public static getSeriesEntry(name, value) { return { - "name": name, - "value": value + 'name': name, + 'value': value }; } @@ -18,8 +18,8 @@ export class ChartUtils { const obj = []; for (let i = 0, arg; arg = args[i]; i++) { obj.push({ - "name": arg, - "series": [] + 'name': arg, + 'series': [] }) } return obj; @@ -27,11 +27,11 @@ export class ChartUtils { public static getSingleDataArray(name1, value1, name2, value2): any[] { return [{ - "name": name1, - "value": value1 + 'name': name1, + 'value': value1 }, { - "name": name2, - "value": value2 + 'name': name2, + 'value': value2 }]; } } From 996ea41224e16e464740f65632168ea2549ebb8c Mon Sep 17 00:00:00 2001 From: Florian Hartwich Date: Wed, 7 Mar 2018 14:07:38 +0100 Subject: [PATCH 02/12] remove app-prefix rule for component linting --- static/tslint.json | 1 - 1 file changed, 1 deletion(-) diff --git a/static/tslint.json b/static/tslint.json index 3bbe964..0deb642 100644 --- a/static/tslint.json +++ b/static/tslint.json @@ -109,7 +109,6 @@ "component-selector": [ true, "element", - "app", "kebab-case" ], "use-input-property-decorator": true, From f764bd52d50c7f9970f58a15215c829371a0ccc7 Mon Sep 17 00:00:00 2001 From: Florian Hartwich Date: Thu, 8 Mar 2018 09:44:35 +0100 Subject: [PATCH 03/12] clean up code according to lint --- static/src/app/admin/admin.component.ts | 6 +-- static/src/app/app.component.ts | 6 +-- static/src/app/army/army-member.component.ts | 6 +-- static/src/app/army/army.component.ts | 4 +- .../common/show-error/show-error.component.ts | 1 + .../decoration-item.component.ts | 22 +++++----- .../decoration-list.component.ts | 9 +++-- .../app/decorations/decoration.component.ts | 2 +- .../src/app/decorations/decoration.routing.ts | 3 +- .../edit-decoration.component.ts | 6 +-- static/src/app/filter/filter.pipe.ts | 2 +- static/src/app/login/index.ts | 2 +- .../ranks/edit-rank/edit-rank.component.ts | 4 +- .../ranks/rank-list/rank-item.component.ts | 21 +++++----- static/src/app/ranks/ranks.component.ts | 2 +- .../app/request/award/req-award.component.ts | 12 +++--- .../confirm-award/confirm-award.component.ts | 8 ++-- .../confirm-promotion.component.ts | 11 +++-- .../promotion/req-promotion.component.ts | 4 +- static/src/app/request/request.component.ts | 2 +- .../services/army-management/user.service.ts | 2 +- .../app/services/army-service/army.service.ts | 6 +-- .../src/app/services/stores/generic-store.ts | 4 +- static/src/app/shared.module.ts | 4 +- .../squads/edit-squad/edit-squad.component.ts | 8 ++-- .../squads/squad-list/squad-item.component.ts | 18 ++++----- .../squads/squad-list/squad-list.component.ts | 2 +- .../campaign-player-detail.component.ts | 7 ++-- .../highscore/highscore.component.ts | 9 +++-- .../overview/stats-overview.component.ts | 4 +- static/src/app/statistic/stats.component.ts | 2 +- static/src/app/statistic/stats.routing.ts | 2 +- .../fraction-stats.component.ts | 40 ++++++++++--------- .../scoreboard/scoreboard.component.ts | 6 +-- .../war-detail/war-detail.component.ts | 4 +- .../statistic/war-list/war-item.component.ts | 18 ++++----- .../users/award-user/award-user.component.ts | 4 +- .../users/edit-user/edit-user.component.ts | 6 +-- static/src/app/users/users.component.ts | 2 +- static/src/app/utils/chart-utils.ts | 4 +- static/src/app/utils/player-utils.ts | 4 +- static/tslint.json | 1 + 42 files changed, 150 insertions(+), 140 deletions(-) diff --git a/static/src/app/admin/admin.component.ts b/static/src/app/admin/admin.component.ts index de90e33..ee58436 100644 --- a/static/src/app/admin/admin.component.ts +++ b/static/src/app/admin/admin.component.ts @@ -1,4 +1,4 @@ -import {Component} from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {AppUser, Squad} from '../models/model-interfaces'; import {Observable} from 'rxjs/Observable'; import {AppUserService} from '../services/app-user-service/app-user.service'; @@ -11,7 +11,7 @@ import {Fraction} from '../utils/fraction.enum'; templateUrl: './admin.component.html', styleUrls: ['./admin.component.css', '../style/overview.css'] }) -export class AdminComponent { +export class AdminComponent implements OnInit { users$: Observable; @@ -45,7 +45,7 @@ export class AdminComponent { } this.appUserService.updateUser(updateObject) - .subscribe(user => { + .subscribe(resUser => { this.showSuccessLabel = true; setTimeout(() => { this.showSuccessLabel = false; diff --git a/static/src/app/app.component.ts b/static/src/app/app.component.ts index 938c7f4..4e520f0 100644 --- a/static/src/app/app.component.ts +++ b/static/src/app/app.component.ts @@ -1,4 +1,4 @@ -import {Component} from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {NavigationEnd, NavigationStart, Router} from '@angular/router'; import {LoginService} from './services/app-user-service/login-service'; import {PromotionService} from './services/army-management/promotion.service'; @@ -12,11 +12,11 @@ declare function require(url: string); templateUrl: 'app.component.html', styleUrls: ['app.component.css', 'style/load-indicator.css'] }) -export class AppComponent { +export class AppComponent implements OnInit { config = RouteConfig; - loading: boolean = false; + loading = false; version = 'v' + require('./../../../package.json').version; diff --git a/static/src/app/army/army-member.component.ts b/static/src/app/army/army-member.component.ts index c79f8b4..46fa54f 100644 --- a/static/src/app/army/army-member.component.ts +++ b/static/src/app/army/army-member.component.ts @@ -1,4 +1,4 @@ -import {Component, Inject} from '@angular/core'; +import {Component, Inject, OnDestroy, OnInit} from '@angular/core'; import {Award, User} from '../models/model-interfaces'; import {ActivatedRoute, Router} from '@angular/router'; import {UserService} from '../services/army-management/user.service'; @@ -15,7 +15,7 @@ import {CSSHelpers} from '../global.helpers'; templateUrl: './army-member.component.html', styleUrls: ['./army-member.component.css'] }) -export class ArmyMemberComponent { +export class ArmyMemberComponent implements OnInit, OnDestroy { subscription: Subscription; @@ -42,7 +42,7 @@ export class ArmyMemberComponent { this.subscription = this.route.params .map(params => params['id']) - .filter(id => id != undefined) + .filter(id => id !== undefined) .flatMap(id => this.userService.getUser(id)) .subscribe(user => { this.user = user; diff --git a/static/src/app/army/army.component.ts b/static/src/app/army/army.component.ts index 87c927a..c0c3e00 100644 --- a/static/src/app/army/army.component.ts +++ b/static/src/app/army/army.component.ts @@ -1,4 +1,4 @@ -import {Component, Inject} from '@angular/core'; +import {Component, Inject, OnDestroy, OnInit} from '@angular/core'; import {Army} from '../models/model-interfaces'; import {ArmyService} from '../services/army-service/army.service'; import {ActivatedRoute, Router} from '@angular/router'; @@ -13,7 +13,7 @@ import {CSSHelpers} from '../global.helpers'; templateUrl: './army.component.html', styleUrls: ['./army.component.css'] }) -export class ArmyComponent { +export class ArmyComponent implements OnInit, OnDestroy { army: Army = {BLUFOR: {squads: [], memberCount: 0}, OPFOR: {squads: [], memberCount: 0}}; diff --git a/static/src/app/common/show-error/show-error.component.ts b/static/src/app/common/show-error/show-error.component.ts index 31f08a5..833f9e0 100644 --- a/static/src/app/common/show-error/show-error.component.ts +++ b/static/src/app/common/show-error/show-error.component.ts @@ -13,6 +13,7 @@ import {FormGroup, NgForm} from '@angular/forms'; export class ShowErrorComponent { @Input('path') controlPath; + @Input('text') displayName = ''; private form: FormGroup; diff --git a/static/src/app/decorations/decoration-list/decoration-item.component.ts b/static/src/app/decorations/decoration-list/decoration-item.component.ts index 6e48836..edaf472 100644 --- a/static/src/app/decorations/decoration-list/decoration-item.component.ts +++ b/static/src/app/decorations/decoration-list/decoration-item.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectionStrategy, Component, EventEmitter} from '@angular/core'; +import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; import {Decoration} from '../../models/model-interfaces'; import {Fraction} from '../../utils/fraction.enum'; @@ -6,19 +6,21 @@ import {Fraction} from '../../utils/fraction.enum'; selector: 'decoration-item', templateUrl: './decoration-item.component.html', styleUrls: ['./decoration-item.component.css', '../../style/list-entry.css'], - changeDetection: ChangeDetectionStrategy.OnPush, - inputs: ['decoration', 'selected'], - outputs: ['decorationDelete', 'decorationSelected'], + changeDetection: ChangeDetectionStrategy.OnPush }) -export class DecorationItemComponent { +export class DecorationItemComponent implements OnInit { + + @Input() selected: boolean; + + @Input() decoration: Decoration; + + @Output() decorationSelected = new EventEmitter(); + + @Output() decorationDelete = new EventEmitter(); - selected: boolean; - decoration: Decoration; imageSrc; - imgStyle = {width: '', height: '', marginTop: ''}; - decorationSelected = new EventEmitter(); - decorationDelete = new EventEmitter(); + imgStyle = {width: '', height: '', marginTop: ''}; readonly fraction = Fraction; diff --git a/static/src/app/decorations/decoration-list/decoration-list.component.ts b/static/src/app/decorations/decoration-list/decoration-list.component.ts index ba5435f..195a9fc 100644 --- a/static/src/app/decorations/decoration-list/decoration-list.component.ts +++ b/static/src/app/decorations/decoration-list/decoration-list.component.ts @@ -60,13 +60,16 @@ export class DecorationListComponent implements OnInit { deleteDecoration(decoration) { let fraction = 'Global'; - if (decoration.fraction === 'BLUFOR') fraction = Fraction.BLUFOR; - else if (decoration.fraction === 'OPFOR') fraction = Fraction.OPFOR; + if (decoration.fraction === 'BLUFOR') { + fraction = Fraction.BLUFOR; + } else if (decoration.fraction === 'OPFOR') { + fraction = Fraction.OPFOR; + } if (confirm('Soll die Auszeichnung "' + decoration.name + '" (' + fraction + ') wirklich gelöscht werden?')) { this.decorationService.deleteDecoration(decoration) .subscribe((res) => { - }) + }); } } diff --git a/static/src/app/decorations/decoration.component.ts b/static/src/app/decorations/decoration.component.ts index 6a412e5..1847c31 100644 --- a/static/src/app/decorations/decoration.component.ts +++ b/static/src/app/decorations/decoration.component.ts @@ -1,4 +1,4 @@ -import {Component} from "@angular/core"; +import {Component} from '@angular/core'; @Component({ selector: 'decorations', diff --git a/static/src/app/decorations/decoration.routing.ts b/static/src/app/decorations/decoration.routing.ts index a136159..ad7ea52 100644 --- a/static/src/app/decorations/decoration.routing.ts +++ b/static/src/app/decorations/decoration.routing.ts @@ -27,5 +27,6 @@ export const decorationsRoutes: Routes = [{ export const decorationRoutesModule: ModuleWithProviders = RouterModule.forChild(decorationsRoutes); -export const decorationsRoutingComponents = [DecorationItemComponent, DecorationComponent, DecorationListComponent, EditDecorationComponent]; +export const decorationsRoutingComponents = [DecorationItemComponent, DecorationComponent, DecorationListComponent, + EditDecorationComponent]; diff --git a/static/src/app/decorations/edit-decoration/edit-decoration.component.ts b/static/src/app/decorations/edit-decoration/edit-decoration.component.ts index a24293b..acca0de 100644 --- a/static/src/app/decorations/edit-decoration/edit-decoration.component.ts +++ b/static/src/app/decorations/edit-decoration/edit-decoration.component.ts @@ -1,4 +1,4 @@ -import {Component, ViewChild} from '@angular/core'; +import {Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {NgForm} from '@angular/forms'; import {Decoration} from '../../models/model-interfaces'; @@ -10,7 +10,7 @@ import {Fraction} from '../../utils/fraction.enum'; templateUrl: './edit-decoration.component.html', styleUrls: ['./edit-decoration.component.css', '../../style/entry-form.css', '../../style/overview.css'] }) -export class EditDecorationComponent { +export class EditDecorationComponent implements OnInit, OnDestroy { subscription: Subscription; @@ -36,7 +36,7 @@ export class EditDecorationComponent { ngOnInit() { this.subscription = this.route.params .map(params => params['id']) - .filter(id => id != undefined) + .filter(id => id !== undefined) .flatMap(id => this.decorationService.getDecoration(id)) .subscribe(decoration => { this.decoration = decoration; diff --git a/static/src/app/filter/filter.pipe.ts b/static/src/app/filter/filter.pipe.ts index 5e96306..1f46d4b 100644 --- a/static/src/app/filter/filter.pipe.ts +++ b/static/src/app/filter/filter.pipe.ts @@ -15,7 +15,7 @@ export class FilterRankPipe implements PipeTransform { if (res.length === 0) { return [{name: '-'}]; } else { - return res + return res; } } diff --git a/static/src/app/login/index.ts b/static/src/app/login/index.ts index dce4d0a..0557c8b 100644 --- a/static/src/app/login/index.ts +++ b/static/src/app/login/index.ts @@ -1,2 +1,2 @@ export * from './login.component'; -export * from './login.guard'; \ No newline at end of file +export * from './login.guard'; diff --git a/static/src/app/ranks/edit-rank/edit-rank.component.ts b/static/src/app/ranks/edit-rank/edit-rank.component.ts index 5f312d6..5be2bbb 100644 --- a/static/src/app/ranks/edit-rank/edit-rank.component.ts +++ b/static/src/app/ranks/edit-rank/edit-rank.component.ts @@ -1,4 +1,4 @@ -import {Component, ViewChild} from '@angular/core'; +import {Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {NgForm} from '@angular/forms'; import {Rank} from '../../models/model-interfaces'; @@ -11,7 +11,7 @@ import {Fraction} from '../../utils/fraction.enum'; templateUrl: './edit-rank.component.html', styleUrls: ['./edit-rank.component.css', '../../style/entry-form.css', '../../style/overview.css'] }) -export class EditRankComponent { +export class EditRankComponent implements OnInit, OnDestroy { subscription: Subscription; diff --git a/static/src/app/ranks/rank-list/rank-item.component.ts b/static/src/app/ranks/rank-list/rank-item.component.ts index 2c939f4..80fb37a 100644 --- a/static/src/app/ranks/rank-list/rank-item.component.ts +++ b/static/src/app/ranks/rank-list/rank-item.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectionStrategy, Component, EventEmitter} from '@angular/core'; +import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; import {Rank} from '../../models/model-interfaces'; import {Fraction} from '../../utils/fraction.enum'; @@ -6,19 +6,20 @@ import {Fraction} from '../../utils/fraction.enum'; selector: 'pjm-rank-item', templateUrl: './rank-item.component.html', styleUrls: ['./rank-item.component.css', '../../style/list-entry.css'], - changeDetection: ChangeDetectionStrategy.OnPush, - inputs: ['rank', 'selected'], - outputs: ['rankSelected', 'rankDelete'], + changeDetection: ChangeDetectionStrategy.OnPush }) -export class RankItemComponent { +export class RankItemComponent implements OnInit { + + @Input() selected: boolean; + + @Input() rank: Rank; + + @Output() rankSelected = new EventEmitter(); + + @Output() rankDelete = new EventEmitter(); - selected: boolean; - rank: Rank; imageSrc; - rankSelected = new EventEmitter(); - rankDelete = new EventEmitter(); - readonly fraction = Fraction; constructor() { diff --git a/static/src/app/ranks/ranks.component.ts b/static/src/app/ranks/ranks.component.ts index b199411..b5c31ed 100644 --- a/static/src/app/ranks/ranks.component.ts +++ b/static/src/app/ranks/ranks.component.ts @@ -1,4 +1,4 @@ -import {Component} from "@angular/core"; +import {Component} from '@angular/core'; @Component({ selector: 'ranks', diff --git a/static/src/app/request/award/req-award.component.ts b/static/src/app/request/award/req-award.component.ts index a995fe1..efab43d 100644 --- a/static/src/app/request/award/req-award.component.ts +++ b/static/src/app/request/award/req-award.component.ts @@ -1,4 +1,4 @@ -import {Component, ViewChild} from '@angular/core'; +import {Component, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {Award, Decoration, User} from '../../models/model-interfaces'; import {NgForm} from '@angular/forms'; @@ -12,7 +12,7 @@ import {LoginService} from '../../services/app-user-service/login-service'; templateUrl: './req-award.component.html', styleUrls: ['./req-award.component.css', '../../style/overview.css'], }) -export class RequestAwardComponent { +export class RequestAwardComponent implements OnInit { @ViewChild(NgForm) form: NgForm; @@ -24,7 +24,7 @@ export class RequestAwardComponent { decoration: Decoration = {_id: '0'}; - reason: string = ''; + reason = ''; decorations: Decoration[]; @@ -96,9 +96,9 @@ export class RequestAwardComponent { this.showSuccessLabel = true; setTimeout(() => { this.showSuccessLabel = false; - }, 2000) - }) - }) + }, 2000); + }); + }); } } diff --git a/static/src/app/request/confirm-award/confirm-award.component.ts b/static/src/app/request/confirm-award/confirm-award.component.ts index f7e8e6d..835efbf 100644 --- a/static/src/app/request/confirm-award/confirm-award.component.ts +++ b/static/src/app/request/confirm-award/confirm-award.component.ts @@ -1,4 +1,4 @@ -import {Component} from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {Award} from '../../models/model-interfaces'; import {AwardingService} from '../../services/army-management/awarding.service'; import {LoginService} from '../../services/app-user-service/login-service'; @@ -8,7 +8,7 @@ import {LoginService} from '../../services/app-user-service/login-service'; templateUrl: './confirm-award.component.html', styleUrls: ['./confirm-award.component.css', '../../style/overview.css'], }) -export class ConfirmAwardComponent { +export class ConfirmAwardComponent implements OnInit { awards: Award[]; @@ -19,7 +19,7 @@ export class ConfirmAwardComponent { } ngOnInit() { - let currentUser = this.loginService.getCurrentUser(); + const currentUser = this.loginService.getCurrentUser(); this.awardingService.getUnconfirmedAwards(currentUser.squad.fraction).subscribe(awards => { this.awards = awards; }); @@ -32,7 +32,7 @@ export class ConfirmAwardComponent { }; this.awardingService.updateAward(updateObject).subscribe(res => { - let currentUser = this.loginService.getCurrentUser(); + const currentUser = this.loginService.getCurrentUser(); this.awardingService.getUnconfirmedAwards(currentUser.squad.fraction).subscribe(awards => { this.awards = awards; if (awards.length < 1) { diff --git a/static/src/app/request/confirm-promotion/confirm-promotion.component.ts b/static/src/app/request/confirm-promotion/confirm-promotion.component.ts index 1e4d6a4..c95b6b2 100644 --- a/static/src/app/request/confirm-promotion/confirm-promotion.component.ts +++ b/static/src/app/request/confirm-promotion/confirm-promotion.component.ts @@ -1,4 +1,4 @@ -import {Component} from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {Promotion, Rank} from '../../models/model-interfaces'; import {RankService} from '../../services/army-management/rank.service'; import {PromotionService} from '../../services/army-management/promotion.service'; @@ -9,7 +9,7 @@ import {LoginService} from '../../services/app-user-service/login-service'; templateUrl: './confirm-promotion.component.html', styleUrls: ['./confirm-promotion.component.css', '../../style/overview.css'], }) -export class ConfirmPromotionComponent { +export class ConfirmPromotionComponent implements OnInit { showSuccessLabel = false; @@ -23,15 +23,14 @@ export class ConfirmPromotionComponent { } ngOnInit() { - let currentUser = this.loginService.getCurrentUser(); + const currentUser = this.loginService.getCurrentUser(); // show only current users fraction promotions this.rankService.findRanks('', currentUser.squad.fraction).subscribe(ranks => { this.ranks = ranks; }); this.promotionService.getUnconfirmedPromotions(currentUser.squad.fraction).subscribe(promotions => { this.promotions = promotions; - }) - + }); } confirm(promotion: Promotion, decision: boolean) { @@ -41,7 +40,7 @@ export class ConfirmPromotionComponent { }; this.promotionService.updatePromotion(updateObject).subscribe(res => { - let currentUser = this.loginService.getCurrentUser(); + const currentUser = this.loginService.getCurrentUser(); this.promotionService.getUnconfirmedPromotions(currentUser.squad.fraction).subscribe(promotions => { this.promotions = promotions; if (promotions.length < 1) { diff --git a/static/src/app/request/promotion/req-promotion.component.ts b/static/src/app/request/promotion/req-promotion.component.ts index d53f685..963fcb0 100644 --- a/static/src/app/request/promotion/req-promotion.component.ts +++ b/static/src/app/request/promotion/req-promotion.component.ts @@ -1,4 +1,4 @@ -import {Component, ViewChild} from '@angular/core'; +import {Component, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {Rank, User} from '../../models/model-interfaces'; import {NgForm} from '@angular/forms'; @@ -12,7 +12,7 @@ import {LoginService} from '../../services/app-user-service/login-service'; templateUrl: './req-promotion.component.html', styleUrls: ['./req-promotion.component.css', '../../style/overview.css'], }) -export class RequestPromotionComponent { +export class RequestPromotionComponent implements OnInit { @ViewChild(NgForm) form: NgForm; diff --git a/static/src/app/request/request.component.ts b/static/src/app/request/request.component.ts index eab67db..3978613 100644 --- a/static/src/app/request/request.component.ts +++ b/static/src/app/request/request.component.ts @@ -1,4 +1,4 @@ -import {Component} from "@angular/core"; +import {Component} from '@angular/core'; @Component({ selector: 'request', diff --git a/static/src/app/services/army-management/user.service.ts b/static/src/app/services/army-management/user.service.ts index cb5b1fb..71cd488 100644 --- a/static/src/app/services/army-management/user.service.ts +++ b/static/src/app/services/army-management/user.service.ts @@ -32,7 +32,7 @@ export class UserService { searchParams.append('offset', offset); this.http.get(this.config.apiUserPath, searchParams) .do((res) => { - let headerCount = parseInt(res.headers.get('x-total-count')); + const headerCount = parseInt(res.headers.get('x-total-count'), 10); if (headerCount) { this.totalCount = headerCount; } diff --git a/static/src/app/services/army-service/army.service.ts b/static/src/app/services/army-service/army.service.ts index 5cb0c3a..cba89a5 100644 --- a/static/src/app/services/army-service/army.service.ts +++ b/static/src/app/services/army-service/army.service.ts @@ -1,6 +1,6 @@ -import {Injectable} from "@angular/core"; -import {AppConfig} from "../../app.config"; -import {Http} from "@angular/http"; +import {Injectable} from '@angular/core'; +import {AppConfig} from '../../app.config'; +import {Http} from '@angular/http'; @Injectable() diff --git a/static/src/app/services/stores/generic-store.ts b/static/src/app/services/stores/generic-store.ts index 1f6dce5..6271879 100644 --- a/static/src/app/services/stores/generic-store.ts +++ b/static/src/app/services/stores/generic-store.ts @@ -1,4 +1,4 @@ -import {BehaviorSubject} from "rxjs/BehaviorSubject"; +import {BehaviorSubject} from 'rxjs/BehaviorSubject'; export const LOAD = 'LOAD'; export const ADD = 'ADD'; @@ -29,7 +29,7 @@ export class Store { return [...items, action.data]; case EDIT: return items.map(task => { - var editedTask = action.data; + const editedTask = action.data; if (task.id !== editedTask.id) { return task; } diff --git a/static/src/app/shared.module.ts b/static/src/app/shared.module.ts index 8fa9bba..81f00d7 100644 --- a/static/src/app/shared.module.ts +++ b/static/src/app/shared.module.ts @@ -1,7 +1,7 @@ import {NgModule} from '@angular/core'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; -import {ShowErrorComponent} from "./common/show-error/show-error.component"; -import {CommonModule} from "@angular/common"; +import {ShowErrorComponent} from './common/show-error/show-error.component'; +import {CommonModule} from '@angular/common'; @NgModule({ declarations: [ShowErrorComponent], diff --git a/static/src/app/squads/edit-squad/edit-squad.component.ts b/static/src/app/squads/edit-squad/edit-squad.component.ts index f874286..8189c39 100644 --- a/static/src/app/squads/edit-squad/edit-squad.component.ts +++ b/static/src/app/squads/edit-squad/edit-squad.component.ts @@ -1,4 +1,4 @@ -import {Component, ViewChild} from '@angular/core'; +import {Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {NgForm} from '@angular/forms'; import {Squad} from '../../models/model-interfaces'; @@ -11,7 +11,7 @@ import {Fraction} from '../../utils/fraction.enum'; templateUrl: './edit-squad.component.html', styleUrls: ['./edit-squad.component.css', '../../style/entry-form.css', '../../style/overview.css'] }) -export class EditSquadComponent { +export class EditSquadComponent implements OnInit, OnDestroy { subscription: Subscription; @@ -88,8 +88,8 @@ export class EditSquadComponent { this.showSuccessLabel = true; setTimeout(() => { this.showSuccessLabel = false; - }, 2000) - }) + }, 2000); + }); } } diff --git a/static/src/app/squads/squad-list/squad-item.component.ts b/static/src/app/squads/squad-list/squad-item.component.ts index c12ebbb..02851a6 100644 --- a/static/src/app/squads/squad-list/squad-item.component.ts +++ b/static/src/app/squads/squad-list/squad-item.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectionStrategy, Component, EventEmitter} from '@angular/core'; +import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; import {Squad} from '../../models/model-interfaces'; import {Fraction} from '../../utils/fraction.enum'; @@ -6,17 +6,17 @@ import {Fraction} from '../../utils/fraction.enum'; selector: 'pjm-squad-item', templateUrl: './squad-item.component.html', styleUrls: ['./squad-item.component.css', '../../style/list-entry.css'], - changeDetection: ChangeDetectionStrategy.OnPush, - inputs: ['squad', 'selected'], - outputs: ['squadSelected', 'squadDelete'], + changeDetection: ChangeDetectionStrategy.OnPush }) -export class SquadItemComponent { +export class SquadItemComponent implements OnInit { - selected: boolean; - squad: Squad; + @Input() selected: boolean; - squadSelected = new EventEmitter(); - squadDelete = new EventEmitter(); + @Input() squad: Squad; + + @Output() squadSelected = new EventEmitter(); + + @Output() squadDelete = new EventEmitter(); imageSrc; diff --git a/static/src/app/squads/squad-list/squad-list.component.ts b/static/src/app/squads/squad-list/squad-list.component.ts index 4b8da52..c423549 100644 --- a/static/src/app/squads/squad-list/squad-list.component.ts +++ b/static/src/app/squads/squad-list/squad-list.component.ts @@ -65,7 +65,7 @@ export class SquadListComponent implements OnInit { if (confirm('Soll das Squad "' + squad.name + '" (' + fraction + ') wirklich gelöscht werden?')) { this.squadService.deleteSquad(squad) .subscribe((res) => { - }) + }); } } diff --git a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts index 8a64077..b443e20 100644 --- a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts +++ b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts @@ -1,4 +1,4 @@ -import {Component, EventEmitter, Input, Output} from '@angular/core'; +import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; import {CampaignPlayer} from '../../models/model-interfaces'; import {PlayerService} from '../../services/logs/player.service'; import {ChartUtils} from '../../utils/chart-utils'; @@ -10,7 +10,7 @@ import {ChartUtils} from '../../utils/chart-utils'; styleUrls: ['./campaign-player-detail.component.css', '../../style/list-entry.css', '../../style/hide-scrollbar.css', '../../style/overview.css'] }) -export class CampaignPlayerDetailComponent { +export class CampaignPlayerDetailComponent implements OnInit { @Input() campaignId: string; @@ -132,7 +132,8 @@ export class CampaignPlayerDetailComponent { } ]; - Object.assign(this, [this.sumData, this.killData, this.friendlyFireData, this.vehicleKillData, this.deathData, this.respawnData, this.reviveData, this.captureData]); + Object.assign(this, [this.sumData, this.killData, this.friendlyFireData, this.vehicleKillData, + this.deathData, this.respawnData, this.reviveData, this.captureData]); }); } diff --git a/static/src/app/statistic/highscore/highscore.component.ts b/static/src/app/statistic/highscore/highscore.component.ts index ae1d64d..94bd477 100644 --- a/static/src/app/statistic/highscore/highscore.component.ts +++ b/static/src/app/statistic/highscore/highscore.component.ts @@ -1,4 +1,4 @@ -import {Component} from '@angular/core'; +import {Component, Input, OnInit} from '@angular/core'; import {ActivatedRoute} from '@angular/router'; import {PlayerService} from '../../services/logs/player.service'; import {CampaignService} from '../../services/logs/campaign.service'; @@ -11,10 +11,11 @@ import {Player} from '../../models/model-interfaces'; @Component({ selector: 'stats-highscore', templateUrl: './highscore.component.html', - styleUrls: ['./highscore.component.css', '../../style/list-entry.css', '../../style/overview.css'], - inputs: ['campaigns'] + styleUrls: ['./highscore.component.css', '../../style/list-entry.css', '../../style/overview.css'] }) -export class StatisticHighScoreComponent { +export class StatisticHighScoreComponent implements OnInit { + + @Input() campaigns; id = ''; diff --git a/static/src/app/statistic/overview/stats-overview.component.ts b/static/src/app/statistic/overview/stats-overview.component.ts index 369bc58..0359ba1 100644 --- a/static/src/app/statistic/overview/stats-overview.component.ts +++ b/static/src/app/statistic/overview/stats-overview.component.ts @@ -1,4 +1,4 @@ -import {Component, Input} from '@angular/core'; +import {Component, Input, OnInit} from '@angular/core'; import {ActivatedRoute} from '@angular/router'; import {CampaignService} from '../../services/logs/campaign.service'; import {ChartUtils} from '../../utils/chart-utils'; @@ -10,7 +10,7 @@ import {Fraction} from '../../utils/fraction.enum'; templateUrl: './stats-overview.component.html', styleUrls: ['./stats-overview.component.css', '../../style/list-entry.css', '../../style/overview.css'] }) -export class StatisticOverviewComponent { +export class StatisticOverviewComponent implements OnInit { @Input() campaigns; diff --git a/static/src/app/statistic/stats.component.ts b/static/src/app/statistic/stats.component.ts index b571159..c1950b9 100644 --- a/static/src/app/statistic/stats.component.ts +++ b/static/src/app/statistic/stats.component.ts @@ -1,4 +1,4 @@ -import {Component} from "@angular/core"; +import {Component} from '@angular/core'; @Component({ selector: 'stats', diff --git a/static/src/app/statistic/stats.routing.ts b/static/src/app/statistic/stats.routing.ts index 308c28e..6e39806 100644 --- a/static/src/app/statistic/stats.routing.ts +++ b/static/src/app/statistic/stats.routing.ts @@ -51,7 +51,7 @@ export const statsRoutes: Routes = [{ path: 'campaign-player/:id/:playerName', component: CampaignPlayerDetailComponent, outlet: 'right' - },]; + }]; export const statsRouterModule: ModuleWithProviders = RouterModule.forChild(statsRoutes); diff --git a/static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.ts b/static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.ts index 77a4d57..00bcc14 100644 --- a/static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.ts +++ b/static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.ts @@ -1,4 +1,4 @@ -import {Component, ElementRef, Input, SimpleChanges, ViewChild} from '@angular/core'; +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'; @@ -10,7 +10,7 @@ import {War} from '../../../models/model-interfaces'; templateUrl: './fraction-stats.component.html', styleUrls: ['./fraction-stats.component.css', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css'] }) -export class FractionStatsComponent { +export class FractionStatsComponent implements OnInit, OnChanges { readonly fraction = Fraction; @@ -161,7 +161,7 @@ export class FractionStatsComponent { const fractionChange = budgetEntry.fraction === 'BLUFOR' ? 0 : 1; const fractionOld = budgetEntry.fraction !== 'BLUFOR' ? 0 : 1; - if (FractionStatsComponent.isTwoMinutesAhead(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)); @@ -177,7 +177,7 @@ export class FractionStatsComponent { } let killCountBlufor = 0, killCountOpfor = 0, ffKillCountBlufor = 0, ffKillCountOpfor = 0; - for (const {killEntry, index} of this.logData.kill.map((killEntry, index) => ({killEntry, index}))) { + for (const {killEntry, index} of this.logData.kill.map((entry, pos) => ({entry, pos}))) { const killEntryDate = new Date(killEntry.time); if (killEntry.friendlyFire === false) { if (killEntry.fraction === 'BLUFOR') { @@ -186,7 +186,7 @@ export class FractionStatsComponent { if (killEntry.fraction === 'OPFOR') { killCountOpfor++; } - if (FractionStatsComponent.isTwoMinutesAhead(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)); } @@ -197,7 +197,7 @@ export class FractionStatsComponent { if (killEntry.fraction === 'OPFOR') { ffKillCountOpfor++; } - if (FractionStatsComponent.isTwoMinutesAhead(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)); } @@ -220,7 +220,7 @@ export class FractionStatsComponent { return; } let reviveCountBlufor = 0, reviveCountOpfor = 0, stabilizeCountBlufor = 0, stabilizeCountOpfor = 0; - for (const {reviveEntry, index} of this.logData.revive.map((reviveEntry, index) => ({reviveEntry, index}))) { + for (const {reviveEntry, index} of this.logData.revive.map((entry, pos) => ({entry, pos}))) { const reviveEntryDate = new Date(reviveEntry.time); if (reviveEntry.stabilized === false) { if (reviveEntry.fraction === 'BLUFOR') { @@ -228,7 +228,7 @@ export class FractionStatsComponent { } else { reviveCountOpfor++; } - if (FractionStatsComponent.isTwoMinutesAhead(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)); } @@ -238,7 +238,7 @@ export class FractionStatsComponent { } else { stabilizeCountOpfor++; } - if (FractionStatsComponent.isTwoMinutesAhead(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)); } @@ -260,8 +260,8 @@ export class FractionStatsComponent { return; } let vehicleKillCountBlufor = 0, vehicleKillCountOpfor = 0; - for (const {transportEntry: vehicleEntry, index} of this.logData.vehicle.map((transportEntry, index) => ({ - transportEntry, + for (const {transportEntry: vehicleEntry, index} of this.logData.vehicle.map((entry, pos) => ({ + pos, index }))) { const vehicleEntryDate = new Date(vehicleEntry.time); @@ -270,7 +270,7 @@ export class FractionStatsComponent { } else { vehicleKillCountOpfor++; } - if (FractionStatsComponent.isTwoMinutesAhead(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)); } @@ -284,9 +284,9 @@ export class FractionStatsComponent { return; } let transportCountBlufor = 0, transportCountOpfor = 0; - for (const {transportEntry, index} of this.logData.transport.map((transportEntry, index) => ({ - transportEntry, - index + for (const {transportEntry, index} of this.logData.transport.map((entry, pos) => ({ + entry, + pos }))) { const transportEntryDate = new Date(transportEntry.time); if (transportEntry.fraction === 'BLUFOR') { @@ -294,7 +294,7 @@ export class FractionStatsComponent { } else { transportCountOpfor++; } - if (FractionStatsComponent.isTwoMinutesAhead(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)); } @@ -327,7 +327,7 @@ export class FractionStatsComponent { this.initialized.flag = true; } - protected static isTwoMinutesAhead(entryDate: Date, tmpData: any): boolean { + protected isTwoMinutesAhead(entryDate: Date, tmpData: any): boolean { return entryDate.getTime() >= tmpData[0].series[tmpData[0].series.length - 1].name.getTime() + (1.5 * 60000); } @@ -342,7 +342,8 @@ export class FractionStatsComponent { this.tmpStabilizeData = ChartUtils.getMultiDataArray(Fraction.BLUFOR, Fraction.OPFOR); this.tmpFlagCaptureData = ChartUtils.getMultiDataArray(Fraction.BLUFOR, Fraction.OPFOR); - [this.tmpKillData, this.tmpFrienlyFireData, this.tmpVehicleData, this.tmpReviveData, this.tmpStabilizeData, this.tmpTransportData].forEach(tmp => { + [this.tmpKillData, this.tmpFrienlyFireData, this.tmpVehicleData, this.tmpReviveData, this.tmpStabilizeData, + this.tmpTransportData].forEach(tmp => { [0, 1].forEach(index => { tmp[index].series.push(ChartUtils.getSeriesEntry(this.startDateObj, 0)); }); @@ -359,7 +360,8 @@ export class FractionStatsComponent { } else { for (const j in [0, 1]) { if (tmpCollection[j].series[tmpCollection[j].series.length - 1].name < endDate) { - tmpCollection[j].series.push(ChartUtils.getSeriesEntry(endDate, tmpCollection[j].series[tmpCollection[j].series.length - 1].value)); + tmpCollection[j].series.push(ChartUtils.getSeriesEntry(endDate, tmpCollection[j] + .series[tmpCollection[j].series.length - 1].value)); } } } diff --git a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts index 4475a13..f5c6056 100644 --- a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts +++ b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts @@ -1,4 +1,4 @@ -import {Component, ElementRef, EventEmitter, Input, Output, SimpleChanges} from '@angular/core'; +import {Component, ElementRef, EventEmitter, Input, OnChanges, Output, SimpleChanges} from '@angular/core'; import {War} from '../../../models/model-interfaces'; import {Fraction} from '../../../utils/fraction.enum'; import {PlayerUtils} from '../../../utils/player-utils'; @@ -8,7 +8,7 @@ import {PlayerUtils} from '../../../utils/player-utils'; templateUrl: './scoreboard.component.html', styleUrls: ['./scoreboard.component.css', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css'] }) -export class ScoreboardComponent { +export class ScoreboardComponent implements OnChanges { readonly fraction = Fraction; @@ -24,7 +24,7 @@ export class ScoreboardComponent { rows = []; - reorderable: boolean = false; + reorderable = false; customClasses = { sortAscending: 'glyphicon glyphicon-triangle-top', diff --git a/static/src/app/statistic/war-detail/war-detail.component.ts b/static/src/app/statistic/war-detail/war-detail.component.ts index 8d7b1cc..60cee6b 100644 --- a/static/src/app/statistic/war-detail/war-detail.component.ts +++ b/static/src/app/statistic/war-detail/war-detail.component.ts @@ -1,4 +1,4 @@ -import {Component} from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {ActivatedRoute} from '@angular/router'; import {WarService} from '../../services/logs/war.service'; import {War} from '../../models/model-interfaces'; @@ -12,7 +12,7 @@ import {LogsService} from '../../services/logs/logs.service'; templateUrl: './war-detail.component.html', styleUrls: ['./war-detail.component.css', '../../style/list-entry.css', '../../style/hide-scrollbar.css'] }) -export class WarDetailComponent { +export class WarDetailComponent implements OnInit { readonly fraction = Fraction; diff --git a/static/src/app/statistic/war-list/war-item.component.ts b/static/src/app/statistic/war-list/war-item.component.ts index 6f9d0bc..84890c9 100644 --- a/static/src/app/statistic/war-list/war-item.component.ts +++ b/static/src/app/statistic/war-list/war-item.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectionStrategy, Component, EventEmitter} from '@angular/core'; +import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; import {War} from '../../models/model-interfaces'; import {LoginService} from '../../services/app-user-service/login-service'; @@ -6,19 +6,17 @@ import {LoginService} from '../../services/app-user-service/login-service'; selector: 'pjm-war-item', templateUrl: './war-item.component.html', styleUrls: ['./war-item.component.css', '../../style/list-entry.css'], - changeDetection: ChangeDetectionStrategy.OnPush, - inputs: ['war', 'selected'], - outputs: ['warSelected', 'warDelete'] + changeDetection: ChangeDetectionStrategy.OnPush }) -export class WarItemComponent { +export class WarItemComponent implements OnInit { - selected: boolean; + @Input() selected: boolean; - war: War; + @Input() war: War; - warSelected = new EventEmitter(); + @Output() warSelected = new EventEmitter(); - warDelete = new EventEmitter(); + @Output() warDelete = new EventEmitter(); constructor(public loginService: LoginService) { } @@ -27,7 +25,7 @@ export class WarItemComponent { } select() { - this.warSelected.emit(this.war._id) + this.warSelected.emit(this.war._id); } delete() { diff --git a/static/src/app/users/award-user/award-user.component.ts b/static/src/app/users/award-user/award-user.component.ts index dc7bc2d..e826195 100644 --- a/static/src/app/users/award-user/award-user.component.ts +++ b/static/src/app/users/award-user/award-user.component.ts @@ -1,4 +1,4 @@ -import {Component, ViewChild} from '@angular/core'; +import {Component, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {Award, Decoration} from '../../models/model-interfaces'; import {NgForm} from '@angular/forms'; @@ -11,7 +11,7 @@ import {Fraction} from '../../utils/fraction.enum'; templateUrl: './award-user.component.html', styleUrls: ['./award-user.component.css', '../../style/overview.css', '../../style/hide-scrollbar.css'], }) -export class AwardUserComponent { +export class AwardUserComponent implements OnInit { @ViewChild(NgForm) form: NgForm; diff --git a/static/src/app/users/edit-user/edit-user.component.ts b/static/src/app/users/edit-user/edit-user.component.ts index 9534983..733c5b9 100644 --- a/static/src/app/users/edit-user/edit-user.component.ts +++ b/static/src/app/users/edit-user/edit-user.component.ts @@ -1,10 +1,10 @@ -import {Component, ViewChild} from '@angular/core'; +import {Component, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {Rank, Squad, User} from '../../models/model-interfaces'; import {UserService} from '../../services/army-management/user.service'; import {SquadService} from '../../services/army-management/squad.service'; import {RankService} from '../../services/army-management/rank.service'; -import {Subscription} from 'rxjs'; +import {Subscription} from 'rxjs/Subscription'; import {NgForm} from '@angular/forms'; import {Fraction} from '../../utils/fraction.enum'; @@ -13,7 +13,7 @@ import {Fraction} from '../../utils/fraction.enum'; templateUrl: './edit-user.component.html', styleUrls: ['./edit-user.component.css', '../../style/entry-form.css', '../../style/overview.css'], }) -export class EditUserComponent { +export class EditUserComponent implements OnInit { @ViewChild(NgForm) form: NgForm; diff --git a/static/src/app/users/users.component.ts b/static/src/app/users/users.component.ts index ea06f7c..f1bfc3b 100644 --- a/static/src/app/users/users.component.ts +++ b/static/src/app/users/users.component.ts @@ -1,4 +1,4 @@ -import {Component} from "@angular/core"; +import {Component} from '@angular/core'; @Component({ selector: 'users', diff --git a/static/src/app/utils/chart-utils.ts b/static/src/app/utils/chart-utils.ts index 6aefd74..10cf40b 100644 --- a/static/src/app/utils/chart-utils.ts +++ b/static/src/app/utils/chart-utils.ts @@ -2,7 +2,7 @@ export class ChartUtils { public static getShortDateString(date): string { const isoDate = date.slice(0, 10); - const dayDate = parseInt(isoDate.slice(8, 10)); + const dayDate = parseInt(isoDate.slice(8, 10), 10); return (dayDate < 10 ? '0' + dayDate : dayDate) + '.' + isoDate.slice(5, 7) + '.' + isoDate.slice(2, 4); } @@ -20,7 +20,7 @@ export class ChartUtils { obj.push({ 'name': arg, 'series': [] - }) + }); } return obj; } diff --git a/static/src/app/utils/player-utils.ts b/static/src/app/utils/player-utils.ts index 94b0f79..9a192df 100644 --- a/static/src/app/utils/player-utils.ts +++ b/static/src/app/utils/player-utils.ts @@ -1,7 +1,7 @@ export class PlayerUtils { public static isSteamUUID(input: string): boolean { - const steamUIDPattern = new RegExp("[0-9]{17}"); - return steamUIDPattern.test(input) + const steamUIDPattern = new RegExp('[0-9]{17}'); + return steamUIDPattern.test(input); } } diff --git a/static/tslint.json b/static/tslint.json index 0deb642..dbe1794 100644 --- a/static/tslint.json +++ b/static/tslint.json @@ -109,6 +109,7 @@ "component-selector": [ true, "element", + "cc", "kebab-case" ], "use-input-property-decorator": true, From 084edaa53c47027ad6e95bce56dc4ee67aec744f Mon Sep 17 00:00:00 2001 From: Florian Hartwich Date: Thu, 8 Mar 2018 10:11:05 +0100 Subject: [PATCH 04/12] Update angular lint config --- static/.angular-cli.json | 3 +++ static/tslint.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/static/.angular-cli.json b/static/.angular-cli.json index 1d81268..70f4787 100644 --- a/static/.angular-cli.json +++ b/static/.angular-cli.json @@ -42,12 +42,15 @@ }, "lint": [ { + "files": "src/**/*.ts", "project": "src/tsconfig.app.json" }, { + "files": "src/**/*.ts", "project": "src/tsconfig.spec.json" }, { + "files": "src/**/*.ts", "project": "e2e/tsconfig.e2e.json" } ], diff --git a/static/tslint.json b/static/tslint.json index dbe1794..030f95e 100644 --- a/static/tslint.json +++ b/static/tslint.json @@ -109,7 +109,7 @@ "component-selector": [ true, "element", - "cc", + "", "kebab-case" ], "use-input-property-decorator": true, From 8859287c51a9d7ba75db8507cbbbd5f0d136a0a3 Mon Sep 17 00:00:00 2001 From: Florian Hartwich Date: Thu, 8 Mar 2018 10:17:10 +0100 Subject: [PATCH 05/12] Resolve TS Lint errors --- static/src/app/army/army.component.ts | 2 +- .../src/app/common/show-error/show-error.component.ts | 4 ++-- static/src/app/decorations/decoration.component.ts | 2 +- .../edit-decoration/edit-decoration.component.html | 10 +++++----- .../src/app/ranks/edit-rank/edit-rank.component.html | 6 +++--- static/src/app/ranks/ranks.component.ts | 2 +- static/src/app/request/request.component.ts | 2 +- .../app/squads/edit-squad/edit-squad.component.html | 6 +++--- static/src/app/squads/squads.component.ts | 2 +- .../campaign-submit/campaign-submit.component.html | 2 +- static/src/app/statistic/stats.component.ts | 2 +- .../war-detail/scoreboard/scoreboard.component.ts | 2 +- .../app/statistic/war-detail/war-detail.component.html | 4 ++-- .../app/statistic/war-submit/war-submit.component.html | 2 +- .../src/app/users/award-user/award-user.component.html | 4 ++-- .../src/app/users/edit-user/edit-user.component.html | 6 +++--- static/src/app/users/users.component.ts | 2 +- 17 files changed, 30 insertions(+), 30 deletions(-) diff --git a/static/src/app/army/army.component.ts b/static/src/app/army/army.component.ts index c0c3e00..e22ef7d 100644 --- a/static/src/app/army/army.component.ts +++ b/static/src/app/army/army.component.ts @@ -9,7 +9,7 @@ import {CSSHelpers} from '../global.helpers'; @Component({ - selector: 'army', + selector: 'cc-army', templateUrl: './army.component.html', styleUrls: ['./army.component.css'] }) diff --git a/static/src/app/common/show-error/show-error.component.ts b/static/src/app/common/show-error/show-error.component.ts index 833f9e0..9e4a6f5 100644 --- a/static/src/app/common/show-error/show-error.component.ts +++ b/static/src/app/common/show-error/show-error.component.ts @@ -12,9 +12,9 @@ import {FormGroup, NgForm} from '@angular/forms'; }) export class ShowErrorComponent { - @Input('path') controlPath; + @Input('controlPath') controlPath; - @Input('text') displayName = ''; + @Input('displayName') displayName = ''; private form: FormGroup; diff --git a/static/src/app/decorations/decoration.component.ts b/static/src/app/decorations/decoration.component.ts index 1847c31..4583001 100644 --- a/static/src/app/decorations/decoration.component.ts +++ b/static/src/app/decorations/decoration.component.ts @@ -1,7 +1,7 @@ import {Component} from '@angular/core'; @Component({ - selector: 'decorations', + selector: 'cc-decorations', templateUrl: './decoration.component.html', styleUrls: ['./decoration.component.css'] }) diff --git a/static/src/app/decorations/edit-decoration/edit-decoration.component.html b/static/src/app/decorations/edit-decoration/edit-decoration.component.html index c97369b..3852ca3 100644 --- a/static/src/app/decorations/edit-decoration/edit-decoration.component.html +++ b/static/src/app/decorations/edit-decoration/edit-decoration.component.html @@ -9,7 +9,7 @@ name="title" id="title" required maxlength="50"/> - +
@@ -21,7 +21,7 @@ - +
@@ -32,14 +32,14 @@ - +
- +
@@ -47,7 +47,7 @@ - +
diff --git a/static/src/app/ranks/edit-rank/edit-rank.component.html b/static/src/app/ranks/edit-rank/edit-rank.component.html index 2b8884e..eee7a19 100644 --- a/static/src/app/ranks/edit-rank/edit-rank.component.html +++ b/static/src/app/ranks/edit-rank/edit-rank.component.html @@ -10,7 +10,7 @@ id="title" required maxlength="50"/> - +
@@ -21,14 +21,14 @@ - +
- +
diff --git a/static/src/app/ranks/ranks.component.ts b/static/src/app/ranks/ranks.component.ts index b5c31ed..33d3b23 100644 --- a/static/src/app/ranks/ranks.component.ts +++ b/static/src/app/ranks/ranks.component.ts @@ -1,7 +1,7 @@ import {Component} from '@angular/core'; @Component({ - selector: 'ranks', + selector: 'cc-ranks', templateUrl: './ranks.component.html', styleUrls: ['./ranks.component.css'] }) diff --git a/static/src/app/request/request.component.ts b/static/src/app/request/request.component.ts index 3978613..162bce1 100644 --- a/static/src/app/request/request.component.ts +++ b/static/src/app/request/request.component.ts @@ -1,7 +1,7 @@ import {Component} from '@angular/core'; @Component({ - selector: 'request', + selector: 'cc-request', templateUrl: 'request.component.html', styleUrls: ['request.component.css'] }) diff --git a/static/src/app/squads/edit-squad/edit-squad.component.html b/static/src/app/squads/edit-squad/edit-squad.component.html index c230836..964cb42 100644 --- a/static/src/app/squads/edit-squad/edit-squad.component.html +++ b/static/src/app/squads/edit-squad/edit-squad.component.html @@ -10,7 +10,7 @@ id="title" required maxlength="50"/> - +
@@ -21,14 +21,14 @@ - +
- +
diff --git a/static/src/app/squads/squads.component.ts b/static/src/app/squads/squads.component.ts index 7fecd3e..3fc7469 100644 --- a/static/src/app/squads/squads.component.ts +++ b/static/src/app/squads/squads.component.ts @@ -1,7 +1,7 @@ import {Component} from '@angular/core'; @Component({ - selector: 'users', + selector: 'cc-users', templateUrl: './squads.component.html', styleUrls: ['./squads.component.css'] }) diff --git a/static/src/app/statistic/campaign-submit/campaign-submit.component.html b/static/src/app/statistic/campaign-submit/campaign-submit.component.html index c4b0880..771736b 100644 --- a/static/src/app/statistic/campaign-submit/campaign-submit.component.html +++ b/static/src/app/statistic/campaign-submit/campaign-submit.component.html @@ -9,7 +9,7 @@ id="title" required maxlength="50"/> - +