From 9426b815469a14e9d5b4a6d21ab741cdd2c6d4e2 Mon Sep 17 00:00:00 2001
From: Dan <admin@ofbbutte.com>
Date: Thu, 28 Sep 2017 22:07:21 -0600
Subject: [PATCH] Test dates

---
 Server/src/routes/api/events.js | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/Server/src/routes/api/events.js b/Server/src/routes/api/events.js
index 2b92aab..5d46fac 100644
--- a/Server/src/routes/api/events.js
+++ b/Server/src/routes/api/events.js
@@ -30,39 +30,40 @@ router.get("/page/:page",function(req,res){
             return;
         }
         if (req.params.page < 2 && events.length < 23){ 
+            var now = new Date();
             var offset = moment.tz.zone("America/Denver").offset(new Date());       
-            var sundaySchool = nextDay(new Date(), 0, 19, offset);            
-            var nextSundayMorning = nextDay(new Date(), 0, 7);
-            var nextSundayMorning2 = nextDay(new Date(), 0, 11);
-            var nextSundayEvening = nextDay(new Date(), 0, 19);
-            var nextWednesday = nextDay(new Date(), 3, 7, 19);
-            if (nextWednesday < sundaySchool){
-                nextWednesday.setHours(19);
-                nextWednesday.setMinutes(0);
-                nextWednesday.setSeconds(0);
+            var sundaySchool = nextDay(now, 0, 10, offset);          
+            var sundayMorning = nextDay(now, 0, 11, offset);
+            var sundayMorningEnd = (new Date).setTime(sundayMorning.getTime + (90 * 60000));
+            var sundayEvening = nextDay(now, 0, 19, offset);
+            var sundayEveningEnd = (new Date).setTime(sundayEvening.getTime + (90 * 60000));
+
+            var wednesday = nextDay(new Date(), 3, 7, 19);
+            var wednesdayEnd = (new Date()).setTime(wednesday.getTime() + (90 * 60000));
+            if (wednesday < sundaySchool){
                 events.push({
                     title: 'Wednesday Evening',
-                    startDate: nextWednesday,
-                    endDate: new Date(nextWednesday).setHours(20),
+                    startDate: wednesday,
+                    endDate: wednesdayEnd,
                     description: 'Bible study and prayer for Wednesday evening.'
                 });
             }
             events.push({
                 title: 'Sunday School ' + offset,
                 startDate: sundaySchool,
-                endDate: new Date(sundaySchool).setHours(11),
+                endDate: sundaySchoolEnd,
                 description: 'Sunday School Service'
             });
             events.push({
                 title: 'Sunday Morning Worship',
-                startDate: nextSundayMorning2,
-                endDate: new Date(nextSundayMorning2).setHours(12),
+                startDate: sundayMorningEnd,
+                endDate: sundayMorningEnd,
                 description: 'Sunday Morning Worship Service'
             });
             events.push({
                 title: 'Sunday Evening',
-                startDate: nextSundayEvening,
-                endDate: new Date(nextSundayEvening).setHours(20),
+                startDate: sundayEvening,
+                endDate: sundayEveningEnd,
                 description: 'Sunday Evening Service'
             });
             // id: json.id,