jketreno/ketr.photos
1
0
Fork 0
Code Issues 1 Activity

Add Sat and Sun to Memorial Day

Browse Source 
Signed-off-by: James Ketrenos <james.p.ketrenos@intel.com>
This commit is contained in:
James Ketrenos 2019-05-23 17:27:08 -07:00
parent 9805cef821
commit 8428e1c06d
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
server/routes/photos.js
View File

@ -545,12 +545,14 @@ router.get("/holiday/:holiday", function(req, res/*, next*/) {
dayIsHoliday = "", dayIsHoliday = "",
holidayName; holidayName;
/* Find the holiday in the list of holidays */
let lookup = moment().holidays([req.params.holiday]); let lookup = moment().holidays([req.params.holiday]);
if (!lookup) { if (!lookup) {
return res.status(404).send(req.params.holiday + " holiday not found."); return res.status(404).send(req.params.holiday + " holiday not found.");
} }
holidayName = Object.getOwnPropertyNames(lookup)[0]; holidayName = Object.getOwnPropertyNames(lookup)[0];
/* Lookup the date for the holiday on every year from 'startYear' (1990) to today */
for (let year = startYear; year <= moment().year(); year++) { for (let year = startYear; year <= moment().year(); year++) {
let holiday = moment(year + "-01-01", "YYYY-MM-DD").holiday(req.params.holiday); let holiday = moment(year + "-01-01", "YYYY-MM-DD").holiday(req.params.holiday);
if (!holiday) { if (!holiday) {
@ -558,11 +560,29 @@ router.get("/holiday/:holiday", function(req, res/*, next*/) {
continue; continue;
} }
let comparison = "strftime('%Y-%m-%d',taken)='" + holiday.format("YYYY-MM-DD") + "'" /*
if (!dayIsHoliday) { * NOTE: Memorial Day and Labor Day are two special cases -- the holiday is a Monday,
dayIsHoliday = comparison; * however the entire weekend typically is holidy-esque. Account for that below.
} else { * We (should) could expand this to account for Fri or Mon on the 4th of July, Christmas,
dayIsHoliday += " OR " + comparison; * or New Years as well. */
let extraDays = 0;
if (req.params.holiday.toLowerCase() == 'memorial day') {
extraDays = -2; /* Include two days prior */
}
let direction = extraDays < 0 ? -1 : 1;
for (let i = 0; i <= Math.abs(extraDays); i++) {
let comparison = "strftime('%Y-%m-%d',taken)='" + holiday.format("YYYY-MM-DD") + "'";
/* If no holiday has been set yet, start the comparison function passed to WHERE
* otherwise append it with OR. */
if (!dayIsHoliday) {
dayIsHoliday = comparison;
} else {
dayIsHoliday += " OR " + comparison;
}
holiday.date(holiday.date() + direction);
} }
} }