1 files changed, 12 insertions, 7 deletions
diff --git a/tools/dateutil.js b/tools/dateutil.js
index bf33b0e..3995e63 100644
--- a/tools/dateutil.js
+++ b/tools/dateutil.js
@@ -2,12 +2,15 @@
 var dateutil = require('./dateutil');
 
 exports.last_week = function() {
-  // we go from Mon-Mon
+  // we go from Sun-Sun
   var day = 1000*60*60*24;
-  var d = new Date();
+  var d = new Date()
+  d.setUTCHours(0)
+  d.setUTCMinutes(0)
+  d.setUTCSeconds(0)
   var today_weekday = d.getDay();
   var ret = {};
-  ret['end'] = new Date(d.getTime() - (today_weekday-1)*day);
+  ret['end'] = new Date(d.getTime() - (today_weekday + 1)*day);
   ret['start'] = new Date(ret['end'].getTime() - 7*day);
   return ret;
 }
@@ -17,12 +20,14 @@ exports.last_week_text = function() {
   var lastwk = dateutil.last_week();
   var end_day = lastwk.end;
   var start_day = lastwk.start;
-  return dateutil.isoformat(start_day) + ' to ' + dateutil.isoformat(end_day);
+  return 'since ' + dateutil.isoDate(start_day) + ' until ' + dateutil.isoDate(end_day);
 }
 
-exports.isoformat = function(d) {
-  var m = d.getMonth() + 1;
-  return d.getFullYear() + '-' + (m < 10 ? '0' : '') +  m + '-' + d.getDate();
+exports.isoDate = function(d) {
+//  var m = d.getMonth() + 1;
+//  return d.getFullYear() + '-' + (m < 10 ? '0' : '') +  m + '-' + d.getDate();
+  var e = /(.*)T/.exec(d.toISOString())
+  return e[1]
 }