Merge pull request #20 from smauer/master

Fix date ranges/navigation for reports
ayastreb · Nov 11, 2018 · f53fba3 · f53fba3
2 parents 140bd3d + 1aa3cdd
commit f53fba3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/entities/Report.js b/src/entities/Report.js
@@ -107,8 +107,10 @@ export default Report
 function dateRange(date, timespan) {
   const start = timespan === TIMESPAN_YEARLY ? startOfYear : startOfMonth
   const end = timespan === TIMESPAN_YEARLY ? endOfYear : endOfMonth
+  let tempDate = new Date(date);
+  tempDate.setDate(tempDate.getDate()+1);
   return {
-    start: toUtcTimestamp(start(date)),
-    end: toUtcTimestamp(end(date))
+    start: toUtcTimestamp(start(tempDate)),
+    end: toUtcTimestamp(end(tempDate))
   }
 }
diff --git a/src/selectors/ui/report.js b/src/selectors/ui/report.js
@@ -2,8 +2,10 @@ import Report from '../../entities/Report'
 
 export const getReport = state => state.ui.report
 export const getTimespanLabel = state => {
+  let startdate = new Date(state.ui.report.date.start);
+  startdate.setDate(startdate.getDate()+1);
   return Report.timespanLabel(
-    state.ui.report.date.start,
+    startdate,
     state.ui.report.timespan
   )
 }