hardi
/
opt-cc
1
0
Fork 0
Code Pull Requests Releases 47 Activity

Fix linting, update codestyle file

pull/34/head
HardiReady 2018-04-27 09:29:30 +02:00
parent 216c19dccd
commit 2cd7541ca6
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/infra/codestyle/cc-intellij-idea-javascript-typescript-style.xml
View File

@ -1,6 +1,7 @@
<code_scheme name="OPT-CC" version="173"> <code_scheme name="OPT-CC" version="173">
<option name="FORMATTER_TAGS_ENABLED" value="true" /> <option name="FORMATTER_TAGS_ENABLED" value="true" />
<JSCodeStyleSettings> <JSCodeStyleSettings>
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
<option name="USE_CHAINED_CALLS_GROUP_INDENTS" value="true" /> <option name="USE_CHAINED_CALLS_GROUP_INDENTS" value="true" />
</JSCodeStyleSettings> </JSCodeStyleSettings>
<TypeScriptCodeStyleSettings> <TypeScriptCodeStyleSettings>
@ -10,6 +11,7 @@
<option name="RIGHT_MARGIN" value="120" /> <option name="RIGHT_MARGIN" value="120" />
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" /> <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
<option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" /> <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
<option name="SPACE_WITHIN_BRACKETS" value="true" />
<option name="CALL_PARAMETERS_WRAP" value="1" /> <option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="1" /> <option name="METHOD_PARAMETERS_WRAP" value="1" />
<option name="EXTENDS_KEYWORD_WRAP" value="1" /> <option name="EXTENDS_KEYWORD_WRAP" value="1" />
@ -21,4 +23,4 @@
<option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" /> <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
<option name="WRAP_COMMENTS" value="true" /> <option name="WRAP_COMMENTS" value="true" />
</codeStyleSettings> </codeStyleSettings>
</code_scheme> </code_scheme>

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

@ -18,7 +18,7 @@ export class CampaignPlayerDetailComponent implements OnInit {
@Output() switchTab = new EventEmitter(); @Output() switchTab = new EventEmitter();
campaignPlayer: CampaignPlayer = {campaign: {}, players: []}; campaignPlayer: CampaignPlayer = { campaign: {}, players: [] };
graphData: any[] = []; graphData: any[] = [];
sumData: any[] = []; sumData: any[] = [];
@ -60,15 +60,15 @@ export class CampaignPlayerDetailComponent implements OnInit {
this.campaignPlayer = campaignPlayer; this.campaignPlayer = campaignPlayer;
this.graphData = [ this.graphData = [
{key: 'kill', label: 'Kills',}, { key: 'kill', label: 'Kills', },
{key: 'friendlyFire', label: 'Friendly Fire',}, { key: 'friendlyFire', label: 'Friendly Fire', },
{key: 'death', label: 'Tode',}, { key: 'death', label: 'Tode', },
{key: 'respawn', label: 'Respawn',}, { key: 'respawn', label: 'Respawn', },
{key: 'revive', label: 'Revive',}, { key: 'revive', label: 'Revive', },
{key: 'flagTouch', label: 'Eroberungen',}, { key: 'flagTouch', label: 'Eroberungen', },
{key: 'vehicleLight', label: 'Fahrzeug (Leicht)',}, { key: 'vehicleLight', label: 'Fahrzeug (Leicht)', },
{key: 'vehicleHeavy', label: 'Fahrzeug (Schwer)',}, { key: 'vehicleHeavy', label: 'Fahrzeug (Schwer)', },
{key: 'vehicleAir', label: 'Fahrzeug (Luft)',}, { key: 'vehicleAir', label: 'Fahrzeug (Luft)', },
]; ];
this.initDataArray(); this.initDataArray();
@ -84,7 +84,7 @@ export class CampaignPlayerDetailComponent implements OnInit {
// we can not directly push to target array, since only full reference changes trigger the refresh of data // we can not directly push to target array, since only full reference changes trigger the refresh of data
const tmpSumData = []; const tmpSumData = [];
this.graphData.forEach(dataSet => { this.graphData.forEach(dataSet => {
tmpSumData.push({name: dataSet.label, value: dataSet.total}) tmpSumData.push({ name: dataSet.label, value: dataSet.total });
}); });
this.sumData = tmpSumData; this.sumData = tmpSumData;
}); });
@ -110,9 +110,9 @@ export class CampaignPlayerDetailComponent implements OnInit {
} }
dataSet.data = [killObj]; dataSet.data = [killObj];
dataSet.refLine = [{value: total / playerLength, name: this.avgLabel}] dataSet.refLine = [{ value: total / playerLength, name: this.avgLabel }];
dataSet.total = total; dataSet.total = total;
}) });
} }
navigateBack() { navigateBack() {