static/src/app/statistic/stats.module.ts

@@ -9,12 +9,12 @@ 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 {MatButtonToggleModule, MatExpansionModule, MatFormFieldModule} from '@angular/material';
+import {MatExpansionModule, MatFormFieldModule} from '@angular/material';
 
 @NgModule({
   declarations: statsRoutingComponents,
-  imports: [CommonModule, SharedModule, statsRouterModule, NgxChartsModule, NgxDatatableModule, MatExpansionModule,
-    MatButtonToggleModule],
+  imports: [CommonModule, SharedModule, statsRouterModule, NgxChartsModule, ButtonsModule.forRoot(), NgxDatatableModule,
+    MatExpansionModule, MatFormFieldModule],
   providers: [WarService, CampaignService, PlayerService, LogsService]
 })
 export class StatsModule {

static/src/app/statistic/war/fraction-stats/fraction-stats.component.css

@@ -1,32 +1,16 @@
-.chart-select-group {
-  display: flex;
-  width: 945px;
-  margin: auto;
-}
-
-.chart-select-group > mat-button-toggle {
+.btn-dark {
   background: #4b4b4b;
   color: #f5f5f5;
-  border: 1px solid #000;
+  border-color: #000;
 }
 
-.chart-select-group > mat-button-toggle:hover {
+.btn-dark:hover {
   background: #afafaf;
   color: #f5f5f5;
 }
 
-mat-button-toggle.mat-button-toggle-checked {
-  background: #222222 !important;
-}
-
-:host /deep/ label.mat-button-toggle-label {
-  margin: 2px 0 !important;
-}
-
-:host /deep/ div.mat-button-toggle-label-content {
-  line-height: 25px !important;
-  margin-bottom: 0 !important;
-  font-weight: normal !important;
+.btn-dark.active {
+  background: #222222;
 }
 
 .chart-container {
@@ -37,3 +21,12 @@ mat-button-toggle.mat-button-toggle-checked {
   padding: 15px;
   float: left;
 }
+
+.chart-select-group {
+  width: 980px;
+  margin: auto;
+}
+
+/*.dropdown-menu > li > a {*/
+/*cursor: pointer;*/
+/*}*/

static/src/app/statistic/war/fraction-stats/fraction-stats.component.html

@@ -1,38 +1,45 @@
-<div class="fade-in" xmlns="http://www.w3.org/1999/html">
+<!--<div class="btn-group" style="position: absolute; margin-left: 5%;" dropdown>-->
+<!--<button dropdownToggle type="button" class="btn btn-default dropdown-toggle dropdown-toggle-split">-->
+<!--{{dataMode}} <span class="caret"></span>-->
+<!--</button>-->
+<!--<ul *dropdownMenu class="dropdown-menu" role="menu">-->
+<!--<li role="menuitem"><a class="dropdown-item" (click)="toggleDataMode(0, 'Summe')">Summe</a></li>-->
+<!--<li class="divider dropdown-divider"></li>-->
+<!--<li class="disabled" role="menuitem">-->
+<!--<a class="dropdown-item" style="cursor: default!important;">Interval:</a>-->
+<!--</li>-->
+<!--<li role="menuitem"><a class="dropdown-item" (click)="toggleDataMode(1, '1 Minute')">1 Minute</a></li>-->
+<!--<li role="menuitem"><a class="dropdown-item" (click)="toggleDataMode(5, '5 Minuten')">5 Minuten</a></li>-->
+<!--<li role="menuitem"><a class="dropdown-item" (click)="toggleDataMode(10, '10 Minuten')">10 Minuten</a>-->
+<!--<li role="menuitem"><a class="dropdown-item" (click)="toggleDataMode(20, '20 Minuten')">20 Minuten</a>-->
+<!--<li role="menuitem"><a class="dropdown-item" (click)="toggleDataMode(40, '40 Minuten')">40 Minuten</a>-->
+<!--</li>-->
+<!--</ul>-->
+<!--</div>-->
 
-  <mat-button-toggle-group class="chart-select-group"
-                           #group="matButtonToggleGroup"
-                           [(ngModel)]="activeChartSelect"
-                           (change)="selectChart(group.value)">
-    <!--this does not work with ngFor due to deselect bug of ng-material-->
-    <mat-button-toggle value="{{labels.points}}">
-      {{labels.points}}
-    </mat-button-toggle>
-    <mat-button-toggle value="{{labels.budget}}">
-      {{labels.budget}}
-    </mat-button-toggle>
-    <mat-button-toggle value="{{labels.kill}}">
-      {{labels.kill}}
-    </mat-button-toggle>
-    <mat-button-toggle value="{{labels.friendlyFire}}">
-      {{labels.friendlyFire}}
-    </mat-button-toggle>
-    <mat-button-toggle value="{{labels.vehicle}}">
-      {{labels.vehicle}}
-    </mat-button-toggle>
-    <mat-button-toggle value="{{labels.revive}}">
-      {{labels.revive}}
-    </mat-button-toggle>
-    <mat-button-toggle value="{{labels.stabilize}}">
-      {{labels.stabilize}}
-    </mat-button-toggle>
-    <mat-button-toggle value="{{labels.transport}}">
-      {{labels.transport}}
-    </mat-button-toggle>
-    <mat-button-toggle value="{{labels.flag}}">
-      {{labels.flag}}
-    </mat-button-toggle>
-  </mat-button-toggle-group>
+<div class="fade-in" xmlns="http://www.w3.org/1999/html">
+  <div class="chart-select-group">
+    <div class="btn-group" (click)="selectChart()">
+      <label class="btn btn-default btn-dark" [(ngModel)]="chartSelectModel"
+             btnRadio="{{labelPoints}}">{{labelPoints}}</label>
+      <label class="btn btn-default btn-dark" [(ngModel)]="chartSelectModel"
+             btnRadio="{{labelBudget}}">{{labelBudget}}</label>
+      <label class="btn btn-default btn-dark" [(ngModel)]="chartSelectModel"
+             btnRadio="{{labelKill}}">{{labelKill}}</label>
+      <label class="btn btn-default btn-dark" [(ngModel)]="chartSelectModel"
+             btnRadio="{{labelFriendlyFire}}">{{labelFriendlyFire}}</label>
+      <label class="btn btn-default btn-dark" [(ngModel)]="chartSelectModel"
+             btnRadio="{{labelVehicle}}">{{labelVehicle}}</label>
+      <label class="btn btn-default btn-dark" [(ngModel)]="chartSelectModel"
+             btnRadio="{{labelRevive}}">{{labelRevive}}</label>
+      <label class="btn btn-default btn-dark" [(ngModel)]="chartSelectModel"
+             btnRadio="{{labelStabilize}}">{{labelStabilize}}</label>
+      <label class="btn btn-default btn-dark" [(ngModel)]="chartSelectModel"
+             btnRadio="{{labelTransport}}">{{labelTransport}}</label>
+      <label class="btn btn-default btn-dark" [(ngModel)]="chartSelectModel"
+             btnRadio="{{labelFlag}}">{{labelFlag}}</label>
+    </div>
+  </div>
 
   <div *ngIf="showLineChart" class="chart-container">
     <ngx-charts-line-chart

static/src/app/statistic/war/fraction-stats/fraction-stats.component.ts

@@ -24,7 +24,7 @@ export class FractionStatsComponent implements OnInit, OnChanges {
 
   initialized: any;
 
-  public activeChartSelect: string;
+  public chartSelectModel: string;
 
   lineChartData: any[] = [];
   areaChartData: any[] = [];
@@ -44,19 +44,16 @@ export class FractionStatsComponent implements OnInit, OnChanges {
       Fraction.COLOR_BLUFOR_DARK, Fraction.COLOR_OPFOR_DARK, Fraction.COLOR_BLUFOR_GREY, Fraction.COLOR_OPFOR_GREY]
   };
 
-  readonly labels = {
-    points: 'Punkte',
-    budget: 'Budget',
-    kill: 'Abschüsse',
-    friendlyFire: 'Friendly Fire',
-    vehicle: 'Fahrzeug Abschüsse',
-    transport: 'Lufttransport',
-    revive: 'Revive',
-    stabilize: 'Stabilisiert',
-    flag: 'Flaggenbesitz'
-  };
-
-  lineChartLabel: string = this.labels.points;
+  labelPoints = 'Punkte';
+  labelBudget = 'Budget';
+  labelKill = 'Abschüsse';
+  labelFriendlyFire = 'Friendly Fire';
+  labelVehicle = 'Fahrzeug Abschüsse';
+  labelTransport = 'Lufttransport';
+  labelRevive = 'Revive';
+  labelStabilize = 'Stabilisiert';
+  labelFlag = 'Flaggenbesitz';
+  lineChartLabel: string = this.labelPoints;
 
   showLineChart = true;
   stepCurve = d3.curveStepAfter;
@@ -87,7 +84,7 @@ export class FractionStatsComponent implements OnInit, OnChanges {
         flag: false
       };
       Object.assign(this, [this.lineChartData, this.areaChartData]);
-      this.activeChartSelect = this.labels.points;
+      this.chartSelectModel = this.labelPoints;
 
       this.startDateObj = new Date(this.war.date);
       this.startDateObj.setHours(0);
@@ -96,40 +93,39 @@ export class FractionStatsComponent implements OnInit, OnChanges {
     }
   }
 
-  selectChart(newSelection) {
-    this.activeChartSelect = newSelection;
-    if (this.activeChartSelect !== this.labels.flag) {
+  selectChart() {
+    if (this.chartSelectModel !== this.labelFlag) {
       this.showLineChart = true;
-      this.lineChartLabel = this.activeChartSelect;
-      switch (this.activeChartSelect) {
-        case this.labels.points:
+      this.lineChartLabel = this.chartSelectModel;
+      switch (this.chartSelectModel) {
+        case this.labelPoints:
           this.lineChartData = this.tmpPointData;
           break;
-        case this.labels.budget:
+        case this.labelBudget:
           this.initBudgetData();
           this.lineChartData = this.tmpBudgetData;
           break;
-        case this.labels.kill:
+        case this.labelKill:
           this.initKillData();
           this.lineChartData = this.tmpKillData;
           break;
-        case this.labels.friendlyFire:
+        case this.labelFriendlyFire:
           this.initKillData();
           this.lineChartData = this.tmpFrienlyFireData;
           break;
-        case this.labels.vehicle:
+        case this.labelVehicle:
           this.initVehicleData();
           this.lineChartData = this.tmpVehicleData;
           break;
-        case this.labels.revive:
+        case this.labelRevive:
           this.initRevive();
           this.lineChartData = this.tmpReviveData;
           break;
-        case this.labels.stabilize:
+        case this.labelStabilize:
           this.initRevive();
           this.lineChartData = this.tmpStabilizeData;
           break;
-        case this.labels.transport:
+        case this.labelTransport:
           this.initTransportData();
           this.lineChartData = this.tmpTransportData;
           break;
@@ -145,7 +141,7 @@ export class FractionStatsComponent implements OnInit, OnChanges {
     this.initializeTempCollections();
     this.initPointData();
     this.showLineChart = true;
-    this.lineChartLabel = this.labels.points;
+    this.lineChartLabel = this.labelPoints;
     this.lineChartData = this.tmpPointData;
   }
 

static/src/app/statistic/war/war-list/war-item.component.html

@@ -3,7 +3,7 @@
   <div class="row">
     <div [ngClass]="[loginService.hasPermission(3) ? 'col-xs-9' : 'col-xs-11']">
       <span>
-        <a>{{war.title}}</a>
+        <a style="font-size: 20px;">{{war.title}}</a>
       </span>
       <br>
       <small>vom {{war.date | date: 'dd.MM.yyyy'}}</small>

static/src/app/statistic/war/war-list/war-item.component.ts

@@ -3,7 +3,7 @@ import {War} from '../../../models/model-interfaces';
 import {LoginService} from '../../../services/app-user-service/login-service';
 
 @Component({
-  selector: 'cc-war-item',
+  selector: 'pjm-war-item',
   templateUrl: './war-item.component.html',
   styleUrls: ['./war-item.component.css', '../../../style/list-entry.css'],
   changeDetection: ChangeDetectionStrategy.OnPush

static/src/app/statistic/war/war-list/war-list.component.css

@@ -1,5 +1,5 @@
 span > a {
-  font-weight: 600 !important;
+  font-size: 20px !important;
 }
 
 mat-expansion-panel {
@@ -8,7 +8,7 @@ mat-expansion-panel {
 
 mat-panel-title {
   font-size: 18px;
-  color: #ffffff;
+  color: #FFFFFF;
 }
 
 mat-expansion-panel-header {
@@ -44,7 +44,7 @@ mat-expansion-panel-header.mat-expansion-panel-header:focus {
 }
 
 .war-interaction-panel > span {
-  color: rgba(255, 255, 255, 0.64);
+  color: #4b4b4b;
   padding: 0 3px;
 }
 
@@ -53,9 +53,9 @@ mat-expansion-panel-header.mat-expansion-panel-header:focus {
 }
 
 .select-list > mat-accordion:first-child .mat-expansion-panel {
-  border-radius: 6px 6px 0 0;
+  border-radius: 10px 10px 0 0;
 }
 
 .select-list > mat-accordion:first-child .mat-expansion-panel-header {
-  border-radius: 4px 4px 0 0;
+  border-radius: 8px 8px 0 0;
 }

static/src/app/statistic/war/war-list/war-list.component.html

@@ -15,12 +15,11 @@
           {{campaign.title}}
         </mat-panel-title>
         <mat-panel-description class="war-interaction-panel" *ngIf="loginService.hasPermission(3)">
-                    <span (click)="deleteCampaign(campaign); $event.stopPropagation()" title="Löschen"
-                          class="glyphicon glyphicon-trash trash">
-          </span>
           <span (click)="editCampaign(campaign); $event.stopPropagation()" title="Bearbeiten"
-                class="glyphicon glyphicon-edit trash"
-                style="padding-right: 10px;">
+                class="glyphicon glyphicon-edit trash">
+          </span>
+          <span (click)="deleteCampaign(campaign); $event.stopPropagation()" title="Löschen"
+                class="glyphicon glyphicon-trash trash">
           </span>
         </mat-panel-description>
       </mat-expansion-panel-header>
@@ -43,13 +42,13 @@
         </div>
       </div>
       <div *ngFor="let war of campaign.wars">
-        <cc-war-item
+        <pjm-war-item
           [war]="war"
           (warEdit)="editWar($event)"
           (warDelete)="deleteWar(war)"
           (warSelected)="selectWar($event)"
           [selected]="war._id == selectedWarId">
-        </cc-war-item>
+        </pjm-war-item>
       </div>
     </mat-expansion-panel>
   </mat-accordion>

static/src/app/style/list-entry.css

@@ -1,13 +1,20 @@
-div.list-entry, a.list-entry {
+div.list-entry, a.list-entry,
+div.user-list-entry, a.user-list-entry {
   padding: 8px;
   border-radius: 2px;
   border: lightgrey solid 1px;
-  cursor: pointer;
+  cursor: cell;
   margin-bottom: -1px;
 }
 
-div.list-entry:hover, a.list-entry:hover {
-  background-color: #f9f9f9;
+.user-list-entry a {
+  font-size: large;
+  font-weight: 600;
+}
+
+.user-list-entry small {
+  color: grey;
+  font-size: x-small;
 }
 
 .decoration-list-preview, .squad-list-preview {
@@ -24,8 +31,8 @@ span > a, span.glyphicon, span.icon-award {
 }
 
 .list-entry a {
-  font-size: 20px;
-  text-decoration: none;
+  font-size: x-large;
+  font-weight: 700;
 }
 
 .list-entry small {

static/src/app/users/user-list/user-item.component.html

@@ -1,4 +1,4 @@
-<div class="fade-in list-entry" [ngClass]="{selected : selected}" (click)="select()">
+<div class="fade-in user-list-entry" [ngClass]="{selected : selected}" (click)="select()">
 
   <div class="row">
     <div class="col-sm-8">