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

Fix event issue where events were not showing on page because the event_creator was looping forever due to another issue with dates

Transactions
Dan 2017-10-01 16:29:19 -06:00
parent c5f8da12cf
commit 4d0d95fd35
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Server/src/database/events.js
View File

@ -48,7 +48,6 @@ exports.getEvents = function(pageSize, pageNumber, callback){
event.timezoneOffset = rows[i].TimezoneOffset; event.timezoneOffset = rows[i].TimezoneOffset;
events.push(event); events.push(event);
} }
console.log(events);
callback(null,events); callback(null,events);
}); });
}; };

9
Server/src/routes/api/event_creator.js
View File

@ -35,6 +35,9 @@ exports.getEvents = getEvents;
function getEvents(pageNumber, pageSize, callback){ function getEvents(pageNumber, pageSize, callback){
dbEvents.getEvents(pageSize,pageNumber,function(err,events){ dbEvents.getEvents(pageSize,pageNumber,function(err,events){
console.log("Page Size",pageSize);
console.log("Page Number", pageNumber);
console.log("Events: ",events.length);
if (err){ if (err){
callback(err,null); callback(err,null);
} }
@ -75,6 +78,7 @@ function addEventsToDB(currentEvents, pageNumber, pageSize, callback){
waitForAll(function(cb){ waitForAll(function(cb){
if (config.ss.exists == false){ if (config.ss.exists == false){
console.log("Add Sunday School");
config.ss.exists = false; config.ss.exists = false;
dbEvents.insertEvent(config.ss.title,config.ss.startTime,config.ss.endTime,offset,config.ss.description,function(error, event){ dbEvents.insertEvent(config.ss.title,config.ss.startTime,config.ss.endTime,offset,config.ss.description,function(error, event){
if (error){ if (error){
@ -136,6 +140,11 @@ function nextDay(startDate, dayOfWeek, hour, minutes, offset){
startDate.setMinutes(minutes); startDate.setMinutes(minutes);
startDate.setSeconds(0); startDate.setSeconds(0);
startDate.setMilliseconds(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)); startDate.setTime(startDate.getTime() + (offset * 60000));
return startDate; return startDate;
} }

2
git-post-receive
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
BUILD_ANGULAR_ARG=$1 BUILD_ANGULAR_ARG=$1
BUILD_ANGULAR=true BUILD_ANGULAR=false
if [ "$BUILD_ANGULAR_ARG" = -ng ]; then if [ "$BUILD_ANGULAR_ARG" = -ng ]; then
BUILD_ANGULAR=true BUILD_ANGULAR=true
fi fi