diff --git a/api/tools/log-parse-tool.js b/api/tools/log-parse-tool.js index 299016c..4ef4d99 100644 --- a/api/tools/log-parse-tool.js +++ b/api/tools/log-parse-tool.js @@ -106,6 +106,12 @@ const parseWarLog = (lineArray, war) => { stats.war['endBudgetBlufor'] = transformMoneyString(budg[9]); stats.war['endBudgetOpfor'] = transformMoneyString(budg[12].slice(0, -2)); stats.war.endDate = getFullTimeDate(war.date, budg[5]); + } else if (line.includes('Respawn von ')) { + /** + * RESPAWN + */ + const playerName = line.substring(line.lastIndexOf('Respawn von ') + 12, line.lastIndexOf('"')); + stats.respawn.push(getRespawnEntry(budg, playerName, war._id, war.date)); } else { stats.budget.push(getBudgetEntry(budg, war._id, war.date)); } @@ -140,13 +146,6 @@ const parseWarLog = (lineArray, war) => { } else { stats.points.push(getPointsEntry(pt, line, war._id, war.date)); } - } else if (line.includes('(Respawn)')) { - /** - * RESPAWN - */ - const resp = line.split(WHITESPACE); - const playerName = line.substring(line.lastIndexOf('Spieler:') + 9, line.lastIndexOf('- Kosten') - 1); - stats.respawn.push(getRespawnEntry(resp, playerName, war._id, war.date)); } else if (line.includes('(Revive)')) { /** * REVIVE diff --git a/static/src/app/statistic/war/scoreboard/scoreboard.component.html b/static/src/app/statistic/war/scoreboard/scoreboard.component.html index 5a8595b..e2559ea 100644 --- a/static/src/app/statistic/war/scoreboard/scoreboard.component.html +++ b/static/src/app/statistic/war/scoreboard/scoreboard.component.html @@ -24,7 +24,7 @@ -
+
diff --git a/static/src/app/statistic/war/war-edit/war-edit.component.html b/static/src/app/statistic/war/war-edit/war-edit.component.html index 0fb5bc1..ff08c34 100644 --- a/static/src/app/statistic/war/war-edit/war-edit.component.html +++ b/static/src/app/statistic/war/war-edit/war-edit.component.html @@ -50,7 +50,7 @@ [(ngModel)]="war.endBudgetBlufor" name="endBudgetBlufor" id="endBudgetBlufor" - required /> + required/>
@@ -60,26 +60,23 @@ [(ngModel)]="war.endBudgetOpfor" name="endBudgetOpfor" id="endBudgetOpfor" - required /> + required/>
- {{error}} diff --git a/static/src/app/statistic/war/war-edit/war-edit.component.ts b/static/src/app/statistic/war/war-edit/war-edit.component.ts index 96be8cf..e84e42b 100644 --- a/static/src/app/statistic/war/war-edit/war-edit.component.ts +++ b/static/src/app/statistic/war/war-edit/war-edit.component.ts @@ -19,8 +19,6 @@ export class WarEditComponent { subscription: Subscription; - showFileError = false; - showErrorLabel = false; error; @@ -30,7 +28,7 @@ export class WarEditComponent { constructor(private route: ActivatedRoute, private router: Router, private warService: WarService, - private campaignService: CampaignService) { + public campaignService: CampaignService) { this.subscription = this.route.params .map(params => params['id']) .filter(id => id !== undefined)