From 13ceee415eb81a4d72f63df013eca2a442865d81 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Thu, 15 Dec 2016 12:46:44 +0100 Subject: use next week if sunday --- public/javascripts/weekSelector.js | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) (limited to 'public/javascripts/weekSelector.js') diff --git a/public/javascripts/weekSelector.js b/public/javascripts/weekSelector.js index 1cf5b56..f0b00ad 100644 --- a/public/javascripts/weekSelector.js +++ b/public/javascripts/weekSelector.js @@ -27,7 +27,8 @@ self.getCurrentWeek = function (target) { self.getSelectedWeek = function () { const now = new Date() - const targetDate = new Date(now.getTime() + self._weekOffset * 604800 * 1000) + const targetDate = new Date(now.getTime() + + self._weekOffset * 604800 * 1000 + 86400 * 1000) return self.getCurrentWeek(targetDate) } @@ -44,17 +45,32 @@ self.updateCurrentWeek = function () { self.updateDom = function () { const selectedWeekNumber = self.getSelectedWeek() + const isSunday = new Date().getDay() === 0 let humanReadableWeek = null - switch (self._weekOffset) { - case 0: - humanReadableWeek = 'Huidige week' - break - case 1: - humanReadableWeek = 'Volgende week' - break - case -1: - humanReadableWeek = 'Vorige week' - break + if (isSunday) { + switch (self._weekOffset) { + case 0: + humanReadableWeek = 'Aanstaande week' + break + case 1: + humanReadableWeek = 'Volgende week' + break + case -1: + humanReadableWeek = 'Afgelopen week' + break + } + } else { + switch (self._weekOffset) { + case 0: + humanReadableWeek = 'Huidige week' + break + case 1: + humanReadableWeek = 'Volgende week' + break + case -1: + humanReadableWeek = 'Vorige week' + break + } } if (humanReadableWeek != null) { self._nodes.currentWeekText.textContent = `${humanReadableWeek} • ${selectedWeekNumber}` -- cgit v1.1