diff --git a/Server/src/database/events.js b/Server/src/database/events.js index 5e7d36f..631eb8f 100644 --- a/Server/src/database/events.js +++ b/Server/src/database/events.js @@ -27,10 +27,9 @@ exports.getEvent = function(eventId, callback, includeDeleted){ } -exports.getEvents = function(pageSize, pageNumber,callback){ - var cd = new Date(); +exports.getEvents = function(pageSize, pageNumber, date, callback){ var offset = (pageNumber - 1) * pageSize; - connection.query("SELECT * FROM Events WHERE DeletedDate IS NULL AND StartDate >= ? ORDER BY StartDate ASC LIMIT ?,?;",[cd,offset,pageSize],function(err,rows,fields){ + connection.query("SELECT * FROM Events WHERE DeletedDate IS NULL AND StartDate >= ? ORDER BY StartDate ASC LIMIT ?,?;",[date,offset,pageSize],function(err,rows,fields){ if (err){ console.log(err); callback(err); @@ -58,6 +57,8 @@ exports.insertEvent = function(titleOrEventObject, startDateOrCallbackFunction, } //Date is passed as milliseconds since 1970 so we will convert it to a date object var startDte = new Date(+startDateOrCallbackFunction); + console.log("Start Date"); + console.log(startDte); var endDte = new Date(+endDate); connection.query("INSERT INTO Events (CreatedDate,ModifiedDate,Id,Title,StartDate,EndDate,Description) VALUES(CURRENT_TIMESTAMP,CURRENT_TIMESTAMP,NULL,?,?,?,?)",[titleOrEventObject,startDte,endDte,description],function(error,result){ if (error){ diff --git a/Server/src/routes/api/events.js b/Server/src/routes/api/events.js index 81234ae..82033e3 100644 --- a/Server/src/routes/api/events.js +++ b/Server/src/routes/api/events.js @@ -20,10 +20,14 @@ router.get("/:id",function(req,res){ router.get("/page/:page",function(req,res){ console.log("page"); var pageSize = 5; + var dte = new Date(); if (req.query.pageSize){ - pageSize = parseInt(req.query.pageSize); + pageSize = parseInt(req.query.pageSize); } - dbEvents.getEvents(pageSize,req.params.page,function(err,events){ + if (req.query.date){ + dte = new Date(+req.query.date); + } + dbEvents.getEvents(pageSize,req.params.page,dte,function(err,events){ if (err){ res.status(500).json({"status":500,"message":"Error processing request","error":err}); return;