Fix week 2 week report when not all weekdays are selected

lib/report_plugins/weektoweek.js

@@ -91,23 +91,19 @@ weektoweek.report = function report_weektoweek(datastorage, sorteddaystoshow, op
   var carbsSum = 0;
 
   var weekstoshow = [ ];
-  weekstoshow[0] = [ ];
   var weekIdx = 0;
   var dayIdx = 0;
-  var reset_day = 0;
 
-  reset_day = moment(sorteddaystoshow[0]).day();
+  var startDay = moment(sorteddaystoshow[0]);
 
   sorteddaystoshow.forEach( function eachDay(day) {
-    if ((dayIdx > 0) && (moment(day).day() === reset_day)) {
-      weekIdx += 1;
-      weekstoshow[weekIdx] = [ ];
-      weekstoshow[weekIdx][0] = day;
-      dayIdx = 1;
-    } else {
-      weekstoshow[weekIdx][dayIdx] = day;
-      dayIdx += 1;
+    var weekNum = Math.floor(Math.abs(moment(day).subtract(startDay, 'weeks')));
+
+    if (!weekstoshow.includes(weekNum)) {
+      weekstoshow[weekNum] = [ ];
     }
+
+    weekstoshow[weekNum].push(day);
   });
 
   weekstoshow = weekstoshow.map(function orderWeek(week) {