Merge branch 'release/v1.6.6' of hardi/opt-cc into master

api/pm2-start.json

@@ -0,0 +1,12 @@
+{
+  "apps": [
+    {
+      "name": "opt-cc",
+      "script": "./api/server.js",
+      "watch": false,
+      "env": {
+        "TZ": "Europe/Berlin"
+      }
+    }
+  ]
+}

api/server.js

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

api/tools/log-parse-tool.js

@@ -59,15 +59,15 @@ const parseWarLog = (lineArray, war) => {
     else if (line.includes('Budget')) {
       stats.clean.push(line);
       const budg = line.split(' ');
-      if (line.includes('Endbudget')) {
-        stats.war['endBudgetBlufor'] = transformMoneyString(budg[11]);
-        stats.war['endBudgetOpfor'] = transformMoneyString(budg[14]);
-        stats.war.endDate = new Date(budg[0].substr(0, budg[0].length - 1).split('/').join('-') + 'T0' + budg[5]);
-      } else if (line.includes('Startbudget')) {
+      if (line.includes('Startbudget')) {
         stats.war['budgetBlufor'] = transformMoneyString(budg[11]);
         stats.war['budgetOpfor'] = transformMoneyString(budg[14]);
         // this date needs to be assigned in first place !important
-        stats.war.date = new Date(budg[0].substr(0, budg[0].length - 1).split('/').join('-') + 'T22:00:00');
+        stats.war.date = new Date(budg[0].substr(0, budg[0].length - 1).split('/').join('-'));
+      } else if (line.includes('Endbudget')) {
+        stats.war['endBudgetBlufor'] = transformMoneyString(budg[11]);
+        stats.war['endBudgetOpfor'] = transformMoneyString(budg[14]);
+        stats.war.endDate = getFullTimeDate(war.date, budg[5]);
       } else {
         stats.budget.push(getBudgetEntry(budg, war._id, war.date));
       }

backup/backup.sh

@@ -23,6 +23,7 @@ do
   # provide date for restore process, if data import is needed
   if [ -z "$1" ]
     then
+      echo "table ${i}"
       mongoexport --db cc --collection $i --out ${DATE}/collections/${i}.json;
     else
       mongoimport --db cc --collection $i --drop --file ${1}/collections/${i}.json

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opt-cc",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "license": "MIT",
   "author": "Florian Hartwich <hardi@noarch.de>",
   "private": true,

static/src/app/statistic/war-detail/war-detail.component.css

@@ -39,3 +39,18 @@
 .nav-tabs > li.deactivated > a.nav-link {
   cursor: not-allowed !important;
 }
+
+:host /deep/ .ngx-datatable.scroll-vertical .datatable-body::-webkit-scrollbar {
+  width: 12px;
+}
+
+:host /deep/ .ngx-datatable.scroll-vertical .datatable-body::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+  border-radius: 10px;
+}
+
+:host /deep/ .ngx-datatable.scroll-vertical .datatable-body::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background: #4b4b4b;
+  -webkit-box-shadow: inset 0 0 6px rgba(255, 255, 255, 0.5);
+}