Compare commits

...

2 Commits

Author SHA1 Message Date
HardiReady e19dc983cd Add intelliJ IDEA style xml for typescript & javascript 2018-03-11 09:44:37 +01:00
HardiReady 53a99020b8 reformat code 2018-03-11 09:39:05 +01:00
4 changed files with 27 additions and 4 deletions

View File

@ -0,0 +1,19 @@
<code_scheme name="Default" version="173">
<JSCodeStyleSettings>
<option name="USE_CHAINED_CALLS_GROUP_INDENTS" value="true" />
</JSCodeStyleSettings>
<TypeScriptCodeStyleSettings>
<option name="USE_CHAINED_CALLS_GROUP_INDENTS" value="true" />
</TypeScriptCodeStyleSettings>
<codeStyleSettings language="JavaScript">
<option name="RIGHT_MARGIN" value="120" />
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
<option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
<option name="WRAP_COMMENTS" value="true" />
<option name="WRAP_ON_TYPING" value="1" />
</codeStyleSettings>
<codeStyleSettings language="TypeScript">
<option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
<option name="WRAP_COMMENTS" value="true" />
</codeStyleSettings>
</code_scheme>

View File

@ -14,7 +14,7 @@ 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) {
@ -30,7 +30,7 @@ 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) {
@ -39,7 +39,7 @@ export class AwardingService {
updateAward(award) {
return this.http.patch(this.config.apiAwardPath + '/' + award._id, award)
.map(res => res.json());
.map(res => res.json());
}
requestAwarding(award: Award) {

View File

@ -97,7 +97,9 @@ export class CampaignPlayerDetailComponent implements OnInit {
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));

View File

@ -58,6 +58,7 @@ ngx-datatable {
}
/* Table Scrollbar BEGIN */
:host /deep/ .ngx-datatable.scroll-vertical .datatable-body::-webkit-scrollbar {
width: 12px;
}
@ -72,4 +73,5 @@ ngx-datatable {
background: #4b4b4b;
-webkit-box-shadow: inset 0 0 6px rgba(255, 255, 255, 0.5);
}
/* Table Scrollbar END */