static/src/app/app.component.css

@@ -38,26 +38,6 @@ li {
   color: #7e7d64;
 }
 
-#scrollTopBtn {
-  position: fixed; /* Fixed/sticky position */
-  bottom: 20px;
-  right: 30px;
-  z-index: 99;
-  border: none;
-  outline: none;
-  background-color: #101010;
-  color: white;
-  font-weight: bolder;
-  cursor: pointer;
-  padding: 7px 25px 10px 25px;
-  border-radius: 20px;
-  font-size: 22px;
-}
-
-#scrollTopBtn:hover {
-  background-color: rgba(25, 142, 25, 1);
-}
-
 .unprocessed {
   -webkit-animation-name: color-blink; /* Safari 4.0 - 8.0 */
   -webkit-animation-duration: 4s; /* Safari 4.0 - 8.0 */

static/src/app/app.component.html

@@ -86,10 +86,7 @@
     </div>
   </nav>
 
-  <button (click)="scrollToTop()" *ngIf="scrollTopVisible" id="scrollTopBtn" title="Scroll to top">△</button>
-
 </div>
-
 <div>
   <span *ngIf="loading" class="load-indicator load-arrow glyphicon-refresh-animate"></span>
   <div id="left">

static/src/app/app.component.ts

@@ -1,10 +1,9 @@
-import {Component, HostListener, Inject, OnInit} 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';
 import {AwardingService} from './services/army-management/awarding.service';
 import {RouteConfig} from './app.config';
-import {DOCUMENT} from "@angular/common";
 
 declare function require(url: string);
 
@@ -19,38 +18,22 @@ export class AppComponent implements OnInit {
 
   loading = false;
 
-  scrollTopVisible = false;
-
-  scrollBtnVisibleVal = 100;
-
   version = 'v' + require('./../../../package.json').version;
 
   constructor(public loginService: LoginService,
               private promotionService: PromotionService,
               private awardingService: AwardingService,
-              private router: Router,
+              private router: Router) {
-              @Inject(DOCUMENT) private document) {
     router.events.subscribe(event => {
       if (event instanceof NavigationStart) {
         this.loading = true;
       }
       if (event instanceof NavigationEnd) {
         this.loading = false;
-        // scroll to top on route from army overview to user detail and back
-        if (router.url.includes('overview')) {
-          this.scrollToTop()
-        }
       }
     });
   }
 
-  @HostListener("window:scroll", [])
-  onWindowScroll() {
-    this.scrollTopVisible = document.body.scrollTop > this.scrollBtnVisibleVal
-      || document.documentElement.scrollTop > this.scrollBtnVisibleVal;
-  }
-
-
   ngOnInit() {
     if (this.loginService.hasPermission(2)) {
       const fraction = this.loginService.getCurrentUser().squad.fraction;
@@ -65,10 +48,5 @@ export class AppComponent implements OnInit {
     return false;
   }
 
-  scrollToTop() {
-    this.document.body.scrollTop = 0; // For Safari
-    this.document.documentElement.scrollTop = 0; // For Chrome, Firefox, IE and Opera
-  }
-
 }
 

static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts

@@ -96,13 +96,12 @@ export class CampaignPlayerDetailComponent implements OnInit {
           this.reviveData = this.assignData(this.yAxisRevive, 'revive');
           this.captureData = this.assignData(this.yAxisCapture, 'flagTouch');
 
-          const totalDeathDiv = this.totalDeath === 0 ? 1 : this.totalDeath;
+          this.kdRatio = parseFloat((this.totalKills / (this.totalDeath === 0 ? 1 : this.totalDeath)).toFixed(2));
-          this.kdRatio = parseFloat((this.totalKills / totalDeathDiv).toFixed(2));
           if (this.kdRatio > 1) {
             this.maxKd = this.kdRatio * 1.7;
           }
 
-          this.respawnDeathRatio = parseFloat((this.totalRespawn / totalDeathDiv).toFixed(2));
+          this.respawnDeathRatio = parseFloat((this.totalRespawn / (this.totalDeath === 0 ? 1 : this.totalDeath)).toFixed(2));
 
           this.sumData = [
             {