djabsher
/
UIAngular
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test dates

Transactions
Dan 2017-09-28 22:12:38 -06:00
parent fc170dd48f
commit 9d27fc4897
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Server/src/routes/api/events.js
View File

@ -32,14 +32,14 @@ router.get("/page/:page",function(req,res){
if (req.params.page < 2 && events.length < 23){ if (req.params.page < 2 && events.length < 23){
var now = new Date(); var now = new Date();
var offset = moment.tz.zone("America/Denver").offset(new Date()); var offset = moment.tz.zone("America/Denver").offset(new Date());
var sundaySchool = nextDay(now, 0, 10, offset); var sundaySchool = nextDay(now, 0, 10, 0, offset);
var sundayMorning = nextDay(now, 0, 11, offset); var sundayMorning = nextDay(now, 0, 11, 0, offset);
var sundayMorningEnd = sundayMorning.clone().setTime(sundayMorning.getTime + (90 * 60000)); var sundayMorningEnd = nextDay(now, 0, 12, 30, offset);
var sundayEvening = nextDay(now, 0, 19, offset); var sundayEvening = nextDay(now, 0, 19, 0, offset);
var sundayEveningEnd = (new Date()).setTime(sundayEvening.getTime + (90 * 60000)); var sundayEveningEnd = nextDay(now, 0, 20, 30, offset);
var wednesday = nextDay(new Date(), 3, 7, 19); var wednesday = nextDay(now, 3, 19, 0, offset);
var wednesdayEnd = (new Date()).setTime(wednesday.getTime() + (90 * 60000)); var wednesdayEnd = nextDay(now, 3, 20, 30, offset);
if (wednesday < sundaySchool){ if (wednesday < sundaySchool){
events.push({ events.push({
title: 'Wednesday Evening', title: 'Wednesday Evening',
@ -114,11 +114,11 @@ router.delete("/a/",function(req,res){
}); });
}); });
function nextDay(startDate, dayOfWeek, hour, offset){ function nextDay(startDate, dayOfWeek, hour, minutes, offset){
startDate = new Date(startDate); startDate = new Date(startDate);
startDate.setDate(startDate.getDate() + (dayOfWeek+(7-startDate.getDay())) % 7); startDate.setDate(startDate.getDate() + (dayOfWeek+(7-startDate.getDay())) % 7);
startDate.setHours(hour); startDate.setHours(hour);
startDate.setMinutes(0); startDate.setMinutes(minutes);
startDate.setSeconds(0); startDate.setSeconds(0);
startDate.setMilliseconds(0); startDate.setMilliseconds(0);
startDate.setTime(startDate.getTime() + (offset * 60000)); startDate.setTime(startDate.getTime() + (offset * 60000));