Merge branch 'master' of marks.kitchen:/srv/git/budget

2 files changed, 11 insertions, 5 deletions

diff --git a/src/server/index.js b/src/server/index.js
index c34e9d6..582d482 100644
--- a/src/server/index.js
+++ b/src/server/index.js
@@ -42,7 +42,7 @@ function consumeMessage(res){
     }
 }
 function dateToString(d){
-    return `${d.getFullYear().toString()}/${d.getMonth().toString()}/${d.getDate().toString()}`
+    return `${d.getFullYear().toString()}/${(d.getMonth()+1).toString()}/${d.getDate().toString()}`
 }
 
 function setUpRoutes(models, jwtFunctions, database, templates) {
diff --git a/src/server/summary.js b/src/server/summary.js
index 373e8f9..999a48c 100644
--- a/src/server/summary.js
+++ b/src/server/summary.js
@@ -126,13 +126,19 @@ async function formatSummary(database, username) {
         summary.categories[el.category] = {category: el.category, all: el.s, d30: 0, d90: 0, d365: 0 }
     })
     categories_30day.forEach(el => {
-        summary.categories[el.category].d30 = el.s
+        if(summary.categories[el.category]){
+            summary.categories[el.category].d30 = el.s
+        }
     })
     categories_90day.forEach(el => {
-        summary.categories[el.category].d90 = el.s
+        if(summary.categories[el.category]){
+            summary.categories[el.category].d90 = el.s
+        }
     })
     categories_365day.forEach(el => {
-        summary.categories[el.category].d365 = el.s
+        if(summary.categories[el.category]){
+            summary.categories[el.category].d365 = el.s
+        }
     })
 
     let subcategories = await database.query(`select subcategory, sum(amount) as s from transactions where username = '${username}' and subcategory <> '' group by subcategory`, { type: database.QueryTypes.SELECT });
@@ -183,4 +189,4 @@ function getClass(value){
 
 module.exports = {
     setUpRoutes
-}
\ No newline at end of file
+}