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

Test dates

Transactions
Dan 2017-09-28 21:55:02 -06:00
parent 3fb4f69de3
commit 04457eaca6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,12 +31,12 @@ router.get("/page/:page",function(req,res){
} }
if (req.params.page < 2 && events.length < 23){ if (req.params.page < 2 && events.length < 23){
var offset = moment.tz.zone("America/Denver").offset(new Date()); var offset = moment.tz.zone("America/Denver").offset(new Date());
var nowMountain = moment.tz(new Date(),"Mountain/Denver"); var sundaySchool = nextDay(new Date(), 0, 19, offset);
var nextSundayMorning = nextDay(nowMountain, 0, 7); var nextSundayMorning = nextDay(nowMountain, 0, 7);
var nextSundayMorning2 = nextDay(nowMountain, 0, 11); var nextSundayMorning2 = nextDay(nowMountain, 0, 11);
var nextSundayEvening = nextDay(nowMountain, 0, 19); var nextSundayEvening = nextDay(nowMountain, 0, 19);
var nextWednesday = nextDay(nowMountain, 3, 7, 19); var nextWednesday = nextDay(nowMountain, 3, 7, 19);
if (nextWednesday < nextSundayMorning){ if (nextWednesday < sundaySchool){
nextWednesday.setHours(19); nextWednesday.setHours(19);
nextWednesday.setMinutes(0); nextWednesday.setMinutes(0);
nextWednesday.setSeconds(0); nextWednesday.setSeconds(0);
@ -49,8 +49,8 @@ router.get("/page/:page",function(req,res){
} }
events.push({ events.push({
title: 'Sunday School ' + offset, title: 'Sunday School ' + offset,
startDate: moment.tz(nextSundayMorning,"America/Denver").format(), startDate: sundaySchool,
endDate: new Date(nextSundayMorning).setHours(11), endDate: new Date(sundaySchool).setHours(11),
description: 'Sunday School Service' description: 'Sunday School Service'
}); });
events.push({ events.push({
@ -113,13 +113,14 @@ router.delete("/a/",function(req,res){
}); });
}); });
function nextDay(startDate, dayOfWeek, hour){ function nextDay(startDate, dayOfWeek, hour, 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(0);
startDate.setSeconds(0); startDate.setSeconds(0);
startDate.setMilliseconds(0); startDate.setMilliseconds(0);
startDate.setOffset(offst);
return startDate; return startDate;
} }