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

Date testin

Transactions
= 2017-09-19 22:52:52 -06:00
parent 28ae4b2ebe
commit bc6f96455a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,10 +27,9 @@ exports.getEvent = function(eventId, callback, includeDeleted){
} }
exports.getEvents = function(pageSize, pageNumber,callback){ exports.getEvents = function(pageSize, pageNumber, date, callback){
var cd = new Date();
var offset = (pageNumber - 1) * pageSize; 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){ if (err){
console.log(err); console.log(err);
callback(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 //Date is passed as milliseconds since 1970 so we will convert it to a date object
var startDte = new Date(+startDateOrCallbackFunction); var startDte = new Date(+startDateOrCallbackFunction);
console.log("Start Date");
console.log(startDte);
var endDte = new Date(+endDate); 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){ 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){ if (error){

6
Server/src/routes/api/events.js
View File

@ -20,10 +20,14 @@ router.get("/:id",function(req,res){
router.get("/page/:page",function(req,res){ router.get("/page/:page",function(req,res){
console.log("page"); console.log("page");
var pageSize = 5; var pageSize = 5;
var dte = new Date();
if (req.query.pageSize){ 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){ if (err){
res.status(500).json({"status":500,"message":"Error processing request","error":err}); res.status(500).json({"status":500,"message":"Error processing request","error":err});
return; return;