Fix date util and log parse; Fix fract revive count
parent
c2b1b06d7b
commit
b7a0c47b32
|
@ -28,7 +28,7 @@ const parseWarLog = (lineArray, war) => {
|
|||
|
||||
lineArray.some(line => {
|
||||
/**
|
||||
* sanitize nameToLongError coming up in first line
|
||||
* sanitize nameTooLongError coming up in first line
|
||||
*/
|
||||
if (line.includes(nameToLongError)) {
|
||||
line = line.substring(line.indexOf(nameToLongError) + nameToLongError.length);
|
||||
|
@ -65,7 +65,7 @@ const parseWarLog = (lineArray, war) => {
|
|||
if (line.includes('Endbudget')) {
|
||||
stats.war['endBudgetBlufor'] = transformMoneyString(budg[11]);
|
||||
stats.war['endBudgetOpfor'] = transformMoneyString(budg[14]);
|
||||
war.endDate = new Date(budg[0].substr(0, budg[0].length - 1).split('/').join('-') + 'T0' + budg[5] +'.000+02:00');
|
||||
war.endDate = new Date(budg[0].substr(0, budg[0].length - 1).split('/').join('-') + 'T0' + budg[5]);
|
||||
} else if (line.includes('Startbudget')) {
|
||||
stats.war.date = new Date(budg[0].substr(0, budg[0].length - 1).split('/').join('-') + 'T22:00:00.000+02:00');
|
||||
stats.war['budgetBlufor'] = transformMoneyString(budg[11]);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "opt-cc",
|
||||
"version": "1.6.0",
|
||||
"version": "1.6.1",
|
||||
"license": "MIT",
|
||||
"author": "Florian Hartwich <hardi@noarch.de>",
|
||||
"private": true,
|
||||
|
|
|
@ -119,7 +119,6 @@
|
|||
[gradient]="gradient"
|
||||
[xAxis]="xAxis"
|
||||
[yAxis]="yAxis"
|
||||
[curve]="monotoneYCurve"
|
||||
[legend]="legend"
|
||||
[legendTitle]="legendTitle"
|
||||
[showXAxisLabel]="showXAxisLabel"
|
||||
|
|
|
@ -187,12 +187,22 @@ export class WarDetailComponent {
|
|||
"name": startDateObj,
|
||||
"value": this.war.budgetOpfor
|
||||
});
|
||||
data.budget.forEach(budgetEntry => {
|
||||
this.tmpBudgetData[budgetEntry.fraction === 'BLUFOR' ? 0 : 1].series.push({
|
||||
// This adds an entry for both fractions on every event
|
||||
for (let i = 0; i < data.budget.length; i++) {
|
||||
const budgetEntry = data.budget[i];
|
||||
const fractionChange = budgetEntry.fraction === 'BLUFOR' ? 0 : 1;
|
||||
const fractionOld = budgetEntry.fraction !== 'BLUFOR' ? 0 : 1;
|
||||
|
||||
this.tmpBudgetData[fractionChange].series.push({
|
||||
"name": new Date(budgetEntry.time),
|
||||
"value": budgetEntry.newBudget
|
||||
});
|
||||
|
||||
this.tmpBudgetData[fractionOld].series.push({
|
||||
"name": new Date(budgetEntry.time),
|
||||
"value": this.tmpBudgetData[fractionOld].series[this.tmpBudgetData[fractionOld].series.length-1].value
|
||||
});
|
||||
}
|
||||
|
||||
// KILLS
|
||||
let killCountBlufor = 0;
|
||||
|
@ -290,11 +300,11 @@ export class WarDetailComponent {
|
|||
if (reviveEntry.stabilized === false) {
|
||||
reviveCountBlufor++;
|
||||
} else {
|
||||
reviveCountOpfor++;
|
||||
stabilizeCountBlufor++;
|
||||
}
|
||||
} else {
|
||||
if (reviveEntry.stabilized === false) {
|
||||
stabilizeCountBlufor++;
|
||||
reviveCountOpfor++;
|
||||
} else {
|
||||
stabilizeCountOpfor++;
|
||||
}
|
||||
|
@ -344,7 +354,9 @@ export class WarDetailComponent {
|
|||
[this.tmpPointData, this.tmpBudgetData, this.tmpTransportData, this.tmpReviveData, this.tmpStabilizeData,
|
||||
this.tmpKillData, this.tmpFrienlyFireData, this.tmpFlagCaptureData].forEach(tmp => {
|
||||
for (let j in [0, 1]) {
|
||||
if (tmp[j].series[tmp[j].series.length - 1].name < endDate) {
|
||||
console.log(new Date(tmp[j].series[tmp[j].series.length - 1].name) + '... ' + endDate)
|
||||
console.log(new Date(tmp[j].series[tmp[j].series.length - 1].name) < endDate)
|
||||
if (new Date(tmp[j].series[tmp[j].series.length - 1].name) < endDate) {
|
||||
tmp[j].series.push({
|
||||
'name': endDate,
|
||||
'value': tmp[j].series[tmp[j].series.length - 1].value
|
||||
|
@ -353,6 +365,8 @@ export class WarDetailComponent {
|
|||
}
|
||||
}
|
||||
});
|
||||
// console.log(this.tmpKillData[0].series[this.tmpKillData[0].series.length-1])
|
||||
// console.log(this.tmpKillData[1].series[this.tmpKillData[1].series.length-1])
|
||||
this.pointData = this.tmpPointData;
|
||||
this.budgetData = this.tmpBudgetData;
|
||||
this.transportData = this.tmpTransportData;
|
||||
|
|
|
@ -2,9 +2,8 @@ export class ChartUtils {
|
|||
|
||||
public static getShortDateString(date): string {
|
||||
const isoDate = date.slice(0, 10);
|
||||
const dayDate = parseInt(isoDate.slice(8, 10)) + 1;
|
||||
const dayDate = parseInt(isoDate.slice(8, 10));
|
||||
return (dayDate < 10 ? "0" + dayDate : dayDate) + '.'
|
||||
+ isoDate.slice(5, 7) + '.' + isoDate.slice(2, 4);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue