From 4f8a4dd8c080317f2e117f0e2008a83bc8c4c41a Mon Sep 17 00:00:00 2001 From: patrick Date: Fri, 12 Jul 2019 03:54:57 +1000 Subject: [PATCH] bugbix week1 last day marker color is correct now --- js/bts_timesheet.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/bts_timesheet.js b/js/bts_timesheet.js index 91e1a51..0abb397 100644 --- a/js/bts_timesheet.js +++ b/js/bts_timesheet.js @@ -541,7 +541,8 @@ is_week1() { var w1_begin = $('span[name="w1d1"]').data().date; - var w1_end = $('span[name="w1d7"]').data().date; + var w1_end = new Date($('span[name="w1d7"]').data().date); + w1_end = new Date (w1_end.setDate(w1_end.getDate()+1)); //from 00:00 to 23:59; var me = new Date(this.data.start); return (w1_begin <= me && me <= w1_end ); } @@ -549,7 +550,8 @@ is_week2() { var w2_begin = $('span[name="w2d1"]').data().date; - var w2_end = $('span[name="w2d7"]').data().date; + var w2_end = new Date($('span[name="w2d7"]').data().date); + w2_end = new Date (w2_end.setDate(w2_end.getDate()+1)); //from 00:00 to 23:59; var me = new Date(this.data.start); return (w2_begin <= me && me <= w2_end ); }