diff --git a/api/tools/log-parse-tool.js b/api/tools/log-parse-tool.js
index b65e3db..ed02616 100644
--- a/api/tools/log-parse-tool.js
+++ b/api/tools/log-parse-tool.js
@@ -102,10 +102,12 @@ const parseWarLog = (lineArray, war) => {
// this date needs to be assigned in first place !important
const dateString = budg[0].slice(0, -1).split('/').map((s) => parseInt(s));
stats.war.date = new Date(dateString[0], dateString[1] - 1, dateString[2]);
+ console.log(war.date);
} else if (line.includes('Endbudget')) {
stats.war['endBudgetBlufor'] = transformMoneyString(budg[9].substr(1));
stats.war['endBudgetOpfor'] = transformMoneyString(budg[12].slice(0, -1));
stats.war.endDate = getFullTimeDate(war.date, budg[5]);
+ console.log(war.endDate);
} else {
stats.budget.push(getBudgetEntry(budg, war._id, war.date));
}
@@ -314,6 +316,10 @@ const transformMoneyString = (budgetString) => {
};
const getFullTimeDate = (date, timeString) => {
+
+ console.log(date)
+ console.log(timeString)
+
const returnDate = new Date(date);
const time = timeString.split(':');
returnDate.setHours(time[0]);
diff --git a/static/src/app/app.component.html b/static/src/app/app.component.html
index 045a2a6..a6bdc0e 100644
--- a/static/src/app/app.component.html
+++ b/static/src/app/app.component.html
@@ -86,7 +86,7 @@
-
+
diff --git a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html
index 4e5ecab..2e682c5 100644
--- a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html
+++ b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html
@@ -81,66 +81,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts
index 241b5b1..acecd7d 100644
--- a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts
+++ b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts
@@ -33,9 +33,9 @@ export class CampaignPlayerDetailComponent implements OnInit {
yAxisKill = 'Kills';
yAxisFriendlyFire = 'FriendlyFire';
- yAxisVehicleLight = 'Fahrzeug (Leicht)';
- yAxisVehicleHeavy = 'Fahrzeug (Schwer)';
- yAxisVehicleAir = 'Fahrzeug (Luft)';
+ yAxisVehicleLight = 'Fahrzeug (Light)';
+ yAxisVehicleHeavy = 'Fahrzeug (Heavy)';
+ yAxisVehicleAir = 'Fahrzeug (Air)';
yAxisDeath = 'Tode';
yAxisRespawn = 'Respawn';
yAxisRevive = 'Revive';
@@ -97,14 +97,14 @@ export class CampaignPlayerDetailComponent implements OnInit {
.subscribe(campaignPlayer => {
this.campaignPlayer = campaignPlayer;
this.killData = this.assignData(this.yAxisKill, 'kill');
- this.vehicleLightData = this.assignData(this.yAxisVehicleLight, 'vehicleLight');
- this.vehicleHeavyData = this.assignData(this.yAxisVehicleHeavy, 'vehicleHeavy');
- this.vehicleAirData = this.assignData(this.yAxisVehicleAir, 'vehicleAir');
this.friendlyFireData = this.assignData(this.yAxisFriendlyFire, 'friendlyFire');
this.deathData = this.assignData(this.yAxisDeath, 'death');
this.respawnData = this.assignData(this.yAxisRespawn, 'respawn');
this.reviveData = this.assignData(this.yAxisRevive, 'revive');
this.captureData = this.assignData(this.yAxisCapture, 'flagTouch');
+ this.vehicleLightData = this.assignData(this.yAxisVehicleLight, 'vehicleLight');
+ this.vehicleHeavyData = this.assignData(this.yAxisVehicleHeavy, 'vehicleHeavy');
+ this.vehicleAirData = this.assignData(this.yAxisVehicleAir, 'vehicleAir');
const totalDeathDiv = this.totalDeath === 0 ? 1 : this.totalDeath;
this.kdRatio = parseFloat((this.totalKills / totalDeathDiv).toFixed(2));
@@ -123,18 +123,6 @@ export class CampaignPlayerDetailComponent implements OnInit {
name: this.yAxisFriendlyFire,
value: this.totalFriendlyFire
},
- {
- name: this.yAxisVehicleLight,
- value: this.totalVehicleLight
- },
- {
- name: this.yAxisVehicleHeavy,
- value: this.totalVehicleHeavy
- },
- {
- name: this.yAxisVehicleAir,
- value: this.totalVehicleAir
- },
{
name: this.yAxisDeath,
value: this.totalDeath
@@ -150,7 +138,19 @@ export class CampaignPlayerDetailComponent implements OnInit {
{
name: this.yAxisCapture,
value: this.totalCapture
- }
+ },
+ {
+ name: this.yAxisVehicleLight,
+ value: this.totalVehicleLight
+ },
+ {
+ name: this.yAxisVehicleHeavy,
+ value: this.totalVehicleHeavy
+ },
+ {
+ name: this.yAxisVehicleAir,
+ value: this.totalVehicleAir
+ },
];
Object.assign(this, [this.sumData, this.killData, this.friendlyFireData, this.vehicleLightData,
@@ -184,18 +184,6 @@ export class CampaignPlayerDetailComponent implements OnInit {
this.friendlyFireRefLines.push({value: total / playerLength, name: this.avgLabel});
this.totalFriendlyFire = total;
break;
- case 'vehicleLight':
- this.vehicleLightRefLines.push({value: total / playerLength, name: this.avgLabel});
- this.totalVehicleLight = total;
- break;
- case 'vehicleHeavy':
- this.vehicleHeavyRefLines.push({value: total / playerLength, name: this.avgLabel});
- this.totalVehicleHeavy = total;
- break;
- case 'vehicleAir':
- this.vehicleAirRefLines.push({value: total / playerLength, name: this.avgLabel});
- this.totalVehicleAir = total;
- break;
case 'death':
this.deathRefLines.push({value: total / playerLength, name: this.avgLabel});
this.totalDeath = total;
@@ -212,6 +200,18 @@ export class CampaignPlayerDetailComponent implements OnInit {
this.captureRefLines.push({value: total / playerLength, name: this.avgLabel});
this.totalCapture = total;
break;
+ case 'vehicleLight':
+ this.vehicleLightRefLines.push({value: total / playerLength, name: this.avgLabel});
+ this.totalVehicleLight = total;
+ break;
+ case 'vehicleHeavy':
+ this.vehicleHeavyRefLines.push({value: total / playerLength, name: this.avgLabel});
+ this.totalVehicleHeavy = total;
+ break;
+ case 'vehicleAir':
+ this.vehicleAirRefLines.push({value: total / playerLength, name: this.avgLabel});
+ this.totalVehicleAir = total;
+ break;
}
return [killObj];
}
diff --git a/static/src/app/statistic/highscore/highscore.component.html b/static/src/app/statistic/highscore/highscore.component.html
index d869b4a..a62c187 100644
--- a/static/src/app/statistic/highscore/highscore.component.html
+++ b/static/src/app/statistic/highscore/highscore.component.html
@@ -57,69 +57,6 @@
-
-
-
-
-
- {{value}}
-
-
-
-
-
-
-
-
-
-
-
- {{value}}
-
-
-
-
-
-
-
-
-
-
-
- {{value}}
-
-
-
-
-
-
+
+
+
+
+
+ {{value}}
+
+
+
+
+
+
+
+
+
+
+
+ {{value}}
+
+
+
+
+
+
+
+
+
+
+
+ {{value}}
+
+
+
+
+
+
diff --git a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.css b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.css
index 5d682ba..741bd71 100644
--- a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.css
+++ b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.css
@@ -5,7 +5,7 @@
/* ########### DATATABLE ########### */
ngx-datatable {
- width: 1030px;
+ width: 1040px;
margin: auto;
height: 68vh;
}
diff --git a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html
index 57356d1..061f789 100644
--- a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html
+++ b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html
@@ -23,15 +23,15 @@
{{value === 'BLUFOR' ? fraction.BLUFOR : fraction.OPFOR}}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
diff --git a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts
index 25e35ae..a1dbfa6 100644
--- a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts
+++ b/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts
@@ -19,8 +19,8 @@ export class ScoreboardComponent implements OnChanges {
@Output() playerTabSwitch = new EventEmitter();
- tableHead = ['Spieler', 'Fraktion', 'Kills', 'FriendlyFire', 'Fzg(L)', 'Fzg(S)', 'Fzg(A)',
- 'Revive', 'Eroberung', 'Tod', 'Respawn'];
+ tableHead = ['Spieler', 'Fraktion', 'Kills', 'FF', 'Fzg(L)', 'Fzg(H)', 'Fzg(A)',
+ 'Revive', 'Flagge', 'Tod', 'Respawn'];
isSteamUUID = PlayerUtils.isSteamUUID;