From 04457eaca6917f12e20f2a006d4234e2f1d5cd4c Mon Sep 17 00:00:00 2001
From: Dan <admin@ofbbutte.com>
Date: Thu, 28 Sep 2017 21:55:02 -0600
Subject: [PATCH] Test dates

---
 Server/src/routes/api/events.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Server/src/routes/api/events.js b/Server/src/routes/api/events.js
index 1537ae4..9c5e181 100644
--- a/Server/src/routes/api/events.js
+++ b/Server/src/routes/api/events.js
@@ -31,12 +31,12 @@ router.get("/page/:page",function(req,res){
         }
         if (req.params.page < 2 && events.length < 23){ 
             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 nextSundayMorning2 = nextDay(nowMountain, 0, 11);
             var nextSundayEvening = nextDay(nowMountain, 0, 19);
             var nextWednesday = nextDay(nowMountain, 3, 7, 19);
-            if (nextWednesday < nextSundayMorning){
+            if (nextWednesday < sundaySchool){
                 nextWednesday.setHours(19);
                 nextWednesday.setMinutes(0);
                 nextWednesday.setSeconds(0);
@@ -49,8 +49,8 @@ router.get("/page/:page",function(req,res){
             }
             events.push({
                 title: 'Sunday School ' + offset,
-                startDate: moment.tz(nextSundayMorning,"America/Denver").format(),
-                endDate: new Date(nextSundayMorning).setHours(11),
+                startDate: sundaySchool,
+                endDate: new Date(sundaySchool).setHours(11),
                 description: 'Sunday School Service'
             });
             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.setDate(startDate.getDate() + (dayOfWeek+(7-startDate.getDay())) % 7);
     startDate.setHours(hour);
     startDate.setMinutes(0);
     startDate.setSeconds(0);
     startDate.setMilliseconds(0);
+    startDate.setOffset(offst);
     return startDate;
 }