Compare commits
	
		
			3 Commits 
		
	
	
		
			f764bd52d5
			...
			c4a876bbda
		
	
	| Author | SHA1 | Date | 
|---|---|---|
| 
							
							
								
								 | 
						c4a876bbda | |
| 
							
							
								
								 | 
						8859287c51 | |
| 
							
							
								
								 | 
						084edaa53c | 
| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
{
 | 
			
		||||
  "name": "opt-cc",
 | 
			
		||||
  "version": "1.7.0",
 | 
			
		||||
  "version": "1.7.1",
 | 
			
		||||
  "author": "Florian Hartwich <hardi@noarch.de>",
 | 
			
		||||
  "private": true,
 | 
			
		||||
  "scripts": {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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"
 | 
			
		||||
    }
 | 
			
		||||
  ],
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,7 +9,7 @@ import {CSSHelpers} from '../global.helpers';
 | 
			
		|||
 | 
			
		||||
 | 
			
		||||
@Component({
 | 
			
		||||
  selector: 'army',
 | 
			
		||||
  selector: 'cc-army',
 | 
			
		||||
  templateUrl: './army.component.html',
 | 
			
		||||
  styleUrls: ['./army.component.css']
 | 
			
		||||
})
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
import {Component} from '@angular/core';
 | 
			
		||||
 | 
			
		||||
@Component({
 | 
			
		||||
  selector: 'decorations',
 | 
			
		||||
  selector: 'cc-decorations',
 | 
			
		||||
  templateUrl: './decoration.component.html',
 | 
			
		||||
  styleUrls: ['./decoration.component.css']
 | 
			
		||||
})
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,7 +9,7 @@
 | 
			
		|||
           name="title"
 | 
			
		||||
           id="title"
 | 
			
		||||
           required maxlength="50"/>
 | 
			
		||||
    <show-error text="Name" path="title"></show-error>
 | 
			
		||||
    <show-error displayName="Name" controlPath="title"></show-error>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
  <div class="form-group">
 | 
			
		||||
| 
						 | 
				
			
			@ -21,7 +21,7 @@
 | 
			
		|||
      <option value="BLUFOR">{{fraction.BLUFOR}}</option>
 | 
			
		||||
      <option value="GLOBAL">Global</option>
 | 
			
		||||
    </select>
 | 
			
		||||
    <show-error text="Fraktion" path="fraction"></show-error>
 | 
			
		||||
    <show-error displayName="Fraktion" controlPath="fraction"></show-error>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
  <div class="form-group">
 | 
			
		||||
| 
						 | 
				
			
			@ -32,14 +32,14 @@
 | 
			
		|||
      <option value="true">Orden</option>
 | 
			
		||||
      <option value="false">Ribbon</option>
 | 
			
		||||
    </select>
 | 
			
		||||
    <show-error text="Art" path="type"></show-error>
 | 
			
		||||
    <show-error displayName="Art" controlPath="type"></show-error>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
  <div class="form-group">
 | 
			
		||||
    <label for="sort">Sortierung</label>
 | 
			
		||||
    <input id="sort" name="sort" type="number" class="form-control btn dropdown-toggle"
 | 
			
		||||
           [(ngModel)]="decoration.sortingNumber">
 | 
			
		||||
    <show-error text="Sortierung" path="sort"></show-error>
 | 
			
		||||
    <show-error displayName="Sortierung" controlPath="sort"></show-error>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
  <div class="form-group">
 | 
			
		||||
| 
						 | 
				
			
			@ -47,7 +47,7 @@
 | 
			
		|||
    <textarea id="description" name="description" class="form-control" rows="5"
 | 
			
		||||
              required
 | 
			
		||||
              [(ngModel)]="decoration.description"></textarea>
 | 
			
		||||
    <show-error text="Beschreibung" path="description"></show-error>
 | 
			
		||||
    <show-error displayName="Beschreibung" controlPath="description"></show-error>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
  <div class="form-group">
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,7 +10,7 @@
 | 
			
		|||
           id="title"
 | 
			
		||||
           required maxlength="50"/>
 | 
			
		||||
 | 
			
		||||
    <show-error text="Name" path="title"></show-error>
 | 
			
		||||
    <show-error displayName="Name" controlPath="title"></show-error>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
  <div class="form-group">
 | 
			
		||||
| 
						 | 
				
			
			@ -21,14 +21,14 @@
 | 
			
		|||
      <option value="OPFOR">{{fraction.OPFOR}}</option>
 | 
			
		||||
      <option value="BLUFOR">{{fraction.BLUFOR}}</option>
 | 
			
		||||
    </select>
 | 
			
		||||
    <show-error text="Fraktion" path="fraction"></show-error>
 | 
			
		||||
    <show-error displayName="Fraktion" controlPath="fraction"></show-error>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
  <div class="form-group">
 | 
			
		||||
    <label for="level">Stufe</label>
 | 
			
		||||
    <input id="level" name="level" type="number" class="form-control btn dropdown-toggle"
 | 
			
		||||
           [(ngModel)]="rank.level">
 | 
			
		||||
    <show-error text="Stufe" path="level"></show-error>
 | 
			
		||||
    <show-error displayName="Stufe" controlPath="level"></show-error>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
  <div class="form-group">
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
import {Component} from '@angular/core';
 | 
			
		||||
 | 
			
		||||
@Component({
 | 
			
		||||
  selector: 'ranks',
 | 
			
		||||
  selector: 'cc-ranks',
 | 
			
		||||
  templateUrl: './ranks.component.html',
 | 
			
		||||
  styleUrls: ['./ranks.component.css']
 | 
			
		||||
})
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
import {Component} from '@angular/core';
 | 
			
		||||
 | 
			
		||||
@Component({
 | 
			
		||||
  selector: 'request',
 | 
			
		||||
  selector: 'cc-request',
 | 
			
		||||
  templateUrl: 'request.component.html',
 | 
			
		||||
  styleUrls: ['request.component.css']
 | 
			
		||||
})
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,7 +10,7 @@
 | 
			
		|||
           id="title"
 | 
			
		||||
           required maxlength="50"/>
 | 
			
		||||
 | 
			
		||||
    <show-error text="Name" path="title"></show-error>
 | 
			
		||||
    <show-error displayName="Name" controlPath="title"></show-error>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
  <div class="form-group">
 | 
			
		||||
| 
						 | 
				
			
			@ -21,14 +21,14 @@
 | 
			
		|||
      <option value="OPFOR">{{fraction.OPFOR}}</option>
 | 
			
		||||
      <option value="BLUFOR">{{fraction.BLUFOR}}</option>
 | 
			
		||||
    </select>
 | 
			
		||||
    <show-error text="Fraktion" path="fraction"></show-error>
 | 
			
		||||
    <show-error displayName="Fraktion" controlPath="fraction"></show-error>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
  <div class="form-group">
 | 
			
		||||
    <label for="sort">Sortierung</label>
 | 
			
		||||
    <input id="sort" name="sort" type="number" class="form-control btn dropdown-toggle"
 | 
			
		||||
           [(ngModel)]="squad.sortingNumber">
 | 
			
		||||
    <show-error text="Sortierung" path="sort"></show-error>
 | 
			
		||||
    <show-error displayName="Sortierung" controlPath="sort"></show-error>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
  <div class="form-group">
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
import {Component} from '@angular/core';
 | 
			
		||||
 | 
			
		||||
@Component({
 | 
			
		||||
  selector: 'users',
 | 
			
		||||
  selector: 'cc-users',
 | 
			
		||||
  templateUrl: './squads.component.html',
 | 
			
		||||
  styleUrls: ['./squads.component.css']
 | 
			
		||||
})
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,7 +9,7 @@
 | 
			
		|||
           id="title"
 | 
			
		||||
           required maxlength="50"/>
 | 
			
		||||
 | 
			
		||||
    <show-error text="Name" path="title"></show-error>
 | 
			
		||||
    <show-error displayName="Name" controlPath="title"></show-error>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
  <button id="cancel"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
import {Component} from '@angular/core';
 | 
			
		||||
 | 
			
		||||
@Component({
 | 
			
		||||
  selector: 'stats',
 | 
			
		||||
  selector: 'cc-stats',
 | 
			
		||||
  templateUrl: './stats.component.html',
 | 
			
		||||
  styleUrls: ['./stats.component.css']
 | 
			
		||||
})
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,7 +4,7 @@ import {Fraction} from '../../../utils/fraction.enum';
 | 
			
		|||
import {PlayerUtils} from '../../../utils/player-utils';
 | 
			
		||||
 | 
			
		||||
@Component({
 | 
			
		||||
  selector: 'scoreboard',
 | 
			
		||||
  selector: 'cc-scoreboard',
 | 
			
		||||
  templateUrl: './scoreboard.component.html',
 | 
			
		||||
  styleUrls: ['./scoreboard.component.css', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css']
 | 
			
		||||
})
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -64,12 +64,12 @@
 | 
			
		|||
 | 
			
		||||
  <!--Sub-Components (=TABS)-->
 | 
			
		||||
  <div *ngIf="war">
 | 
			
		||||
    <scoreboard
 | 
			
		||||
    <cc-scoreboard
 | 
			
		||||
      *ngIf="tab === 0"
 | 
			
		||||
      [war]="war"
 | 
			
		||||
      [fractionFilterSelected]="fractionFilterSelected"
 | 
			
		||||
      (playerTabSwitch)="switchToPlayerTab($event)">
 | 
			
		||||
    </scoreboard>
 | 
			
		||||
    </cc-scoreboard>
 | 
			
		||||
    <war-detail-fraction
 | 
			
		||||
      *ngIf="tab === 1 && logData"
 | 
			
		||||
      [war]="war"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,7 +9,7 @@
 | 
			
		|||
           id="title"
 | 
			
		||||
           required maxlength="50"/>
 | 
			
		||||
 | 
			
		||||
    <show-error text="Name" path="title"></show-error>
 | 
			
		||||
    <show-error displayName="Name" controlPath="title"></show-error>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
  <div class="form-group">
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -18,7 +18,7 @@
 | 
			
		|||
      </option>
 | 
			
		||||
    </select>
 | 
			
		||||
 | 
			
		||||
    <show-error text="Auszeichnung" path="decoration"></show-error>
 | 
			
		||||
    <show-error displayName="Auszeichnung" controlPath="decoration"></show-error>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
  <div class="div-table-row" [style.display]="decoPreviewDisplay" style="margin-top: 5px; margin-bottom:10px">
 | 
			
		||||
| 
						 | 
				
			
			@ -41,7 +41,7 @@
 | 
			
		|||
    <label for="reason">Begründung</label>
 | 
			
		||||
    <textarea class="form-control center-block" name="reason" [ngModel]="undefined" required
 | 
			
		||||
              id="reason" placeholder="Begründung eingeben..." rows="3" #awardTextArea></textarea>
 | 
			
		||||
    <show-error text="Begründung" path="reason"></show-error>
 | 
			
		||||
    <show-error displayName="Begründung" controlPath="reason"></show-error>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -11,7 +11,7 @@
 | 
			
		|||
           required
 | 
			
		||||
           maxlength="50"/>
 | 
			
		||||
 | 
			
		||||
    <show-error text="Name" path="title"></show-error>
 | 
			
		||||
    <show-error displayName="Name" controlPath="title"></show-error>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
  <div class="form-group">
 | 
			
		||||
| 
						 | 
				
			
			@ -28,7 +28,7 @@
 | 
			
		|||
      </option>
 | 
			
		||||
    </select>
 | 
			
		||||
 | 
			
		||||
    <show-error text="Squad" path="squad"></show-error>
 | 
			
		||||
    <show-error displayName="Squad" controlPath="squad"></show-error>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
  <div class="form-group" [style.display]="ranksDisplay">
 | 
			
		||||
| 
						 | 
				
			
			@ -41,7 +41,7 @@
 | 
			
		|||
      <option *ngFor="let rank of ranks" [value]="rank.level">{{rank.name}}</option>
 | 
			
		||||
    </select>
 | 
			
		||||
 | 
			
		||||
    <show-error text="Squad" path="squad"></show-error>
 | 
			
		||||
    <show-error displayName="Squad" controlPath="squad"></show-error>
 | 
			
		||||
  </div>
 | 
			
		||||
 | 
			
		||||
  <button id="cancel"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
import {Component} from '@angular/core';
 | 
			
		||||
 | 
			
		||||
@Component({
 | 
			
		||||
  selector: 'users',
 | 
			
		||||
  selector: 'cc-users',
 | 
			
		||||
  templateUrl: 'users.component.html',
 | 
			
		||||
  styleUrls: ['users.component.css']
 | 
			
		||||
})
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -109,7 +109,7 @@
 | 
			
		|||
    "component-selector": [
 | 
			
		||||
      true,
 | 
			
		||||
      "element",
 | 
			
		||||
      "cc",
 | 
			
		||||
      "",
 | 
			
		||||
      "kebab-case"
 | 
			
		||||
    ],
 | 
			
		||||
    "use-input-property-decorator": true,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue