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

Merge branch 'release/1.6.1'

pull/17/head
HardiReady 2017-11-02 11:50:38 +01:00
parent 6a4ea225c4 0e980aca52
commit f393b61ca6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/server.js
View File

@ -129,6 +129,7 @@ if (process.env.NODE_ENV !== config.test.env) {
useMongoClient: true useMongoClient: true
}); });
mongoosePromise.then((db) => { mongoosePromise.then((db) => {
process.env.TZ = 'Europe/Berlin';
app.listen(config.test.port); app.listen(config.test.port);
console.log('Listening on port ' + config.test.port); console.log('Listening on port ' + config.test.port);
}) })

2
api/tools/log-parse-tool.js
View File

@ -67,7 +67,7 @@ const parseWarLog = (lineArray, war) => {
stats.war['endBudgetOpfor'] = transformMoneyString(budg[14]); stats.war['endBudgetOpfor'] = transformMoneyString(budg[14]);
war.endDate = new Date(budg[0].substr(0, budg[0].length - 1).split('/').join('-') + 'T0' + budg[5]); war.endDate = new Date(budg[0].substr(0, budg[0].length - 1).split('/').join('-') + 'T0' + budg[5]);
} else if (line.includes('Startbudget')) { } 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.date = new Date(budg[0].substr(0, budg[0].length - 1).split('/').join('-') + 'T22:00:00.000');
stats.war['budgetBlufor'] = transformMoneyString(budg[11]); stats.war['budgetBlufor'] = transformMoneyString(budg[11]);
stats.war['budgetOpfor'] = transformMoneyString(budg[14]); stats.war['budgetOpfor'] = transformMoneyString(budg[14]);
} else { } else {