From 4d0d95fd3576ca3ee1e133aea7791f957e9c1f9c Mon Sep 17 00:00:00 2001
From: Dan <admin@ofbbutte.com>
Date: Sun, 1 Oct 2017 16:29:19 -0600
Subject: [PATCH] Fix event issue where events were not showing on page because
 the event_creator was looping forever due to another issue with dates

---
 Server/src/database/events.js          | 1 -
 Server/src/routes/api/event_creator.js | 9 +++++++++
 git-post-receive                       | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Server/src/database/events.js b/Server/src/database/events.js
index 53e3e6b..843d409 100644
--- a/Server/src/database/events.js
+++ b/Server/src/database/events.js
@@ -48,7 +48,6 @@ exports.getEvents = function(pageSize, pageNumber, callback){
             event.timezoneOffset = rows[i].TimezoneOffset;
             events.push(event);
         }
-        console.log(events);
         callback(null,events);
     });
 };
diff --git a/Server/src/routes/api/event_creator.js b/Server/src/routes/api/event_creator.js
index eb04c71..22fc7fb 100644
--- a/Server/src/routes/api/event_creator.js
+++ b/Server/src/routes/api/event_creator.js
@@ -35,6 +35,9 @@ exports.getEvents = getEvents;
 
 function getEvents(pageNumber, pageSize, callback){
     dbEvents.getEvents(pageSize,pageNumber,function(err,events){
+        console.log("Page Size",pageSize);
+        console.log("Page Number", pageNumber);
+        console.log("Events: ",events.length);
         if (err){
             callback(err,null);
         }
@@ -75,6 +78,7 @@ function addEventsToDB(currentEvents, pageNumber, pageSize, callback){
 
     waitForAll(function(cb){
         if (config.ss.exists == false){
+            console.log("Add Sunday School");
             config.ss.exists = false;
             dbEvents.insertEvent(config.ss.title,config.ss.startTime,config.ss.endTime,offset,config.ss.description,function(error, event){
                 if (error){                    
@@ -136,6 +140,11 @@ function nextDay(startDate, dayOfWeek, hour, minutes, offset){
     startDate.setMinutes(minutes);
     startDate.setSeconds(0);
     startDate.setMilliseconds(0);
+    var dte = new Date();
+    if (startDate <= dte){
+        //Add seven days
+        startDate.setDate(startDate.getDate() + 7);
+    }
     startDate.setTime(startDate.getTime() + (offset * 60000));
     return startDate;
 }
diff --git a/git-post-receive b/git-post-receive
index 6797fc1..9c0e871 100644
--- a/git-post-receive
+++ b/git-post-receive
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 BUILD_ANGULAR_ARG=$1
-BUILD_ANGULAR=true
+BUILD_ANGULAR=false
 if [ "$BUILD_ANGULAR_ARG" = -ng ]; then
 	BUILD_ANGULAR=true
 fi