{{aftertext}}
{{pretext}}
+{{aftertext}}
{{pretext}}
+ {{#if allowed}} + + {{/if}}{{aftertext}}
{{pretext}}
+ {{#if allowed}} + + {{/if}} diff --git a/scheduleac/client/client.js b/scheduleac/client/client.js index c6d4ba5..fef02b7 100644 --- a/scheduleac/client/client.js +++ b/scheduleac/client/client.js @@ -6,11 +6,11 @@ allowedu["ksjdragon@gmail.com"]= true; Meteor.subscribe('schedule'); - Template.client.helpers({ sched: function() { - return schedule.find({}, {sort: {timestamp: 1}, limit: 5}).fetch(); + beforeslice = schedule.find({}, {sort: {timestamp: 1}, limit: 5}).fetch(); + return beforeslice.slice(1, beforeslice.length); }, mostrecent: function() { @@ -22,6 +22,7 @@ Template.client.helpers({ Template.client.events({ "click button": function() { pre = document.getElementById("date").value; + console.log(pre); document.getElementById("date").value = ""; post = document.getElementById('post').value; Meteor.call('add_button', this, pre, post); @@ -53,19 +54,67 @@ Template.client.events({ Template.day.helpers({ pretext: function() { - return this.pretext; + date = moment(this.pretext); + date = date.calendar(null, { + sameDay: '[Today]', + nextDay: '[Tomorrow]', + nextWeek: 'dddd', + lastDay: '[Yesterday]', + lastWeek: '[Last] dddd', + sameElse: 'DD/MM/YYYY' + }); + return date; }, + aftertext: function() { return this.aftertext; + }, + + allowed: function() { + if (!(Meteor.user() === undefined) && Meteor.user().services.google.email in allowedu) { + return true; + } else { + return false; + } } }); +Template.day.events({ + 'click .fa' : function() { + Meteor.call('remove', this); + } +}) + +Template.recent.events({ + 'click .fa' : function() { + Meteor.call('remove', this); + } +}) + Template.recent.helpers({ pretext: function() { - return this.pretext; + date = moment(this.pretext); + date = date.calendar(null, { + sameDay: '[Today]', + nextDay: '[Tomorrow]', + nextWeek: 'dddd', + lastDay: '[Yesterday]', + lastWeek: '[Last] dddd', + sameElse: 'DD/MM/YYYY' + }); + return date }, + aftertext: function() { return this.aftertext; + }, + + allowed: function() { + if (!(Meteor.user() === undefined) && Meteor.user().services.google.email in allowedu) { + return true; + } else { + return false; + } } }); diff --git a/scheduleac/server/serve.js b/scheduleac/server/serve.js index c483dc8..cc7c55e 100644 --- a/scheduleac/server/serve.js +++ b/scheduleac/server/serve.js @@ -3,9 +3,10 @@ allowed["ybq987@gmail.com"] = true; allowed["dweinger@bloomfield.org"] = true; allowed["ksjdragon@gmail.com"] = true; - schedule.permit(['insert', 'update', 'remove']).never().apply(); +// schedule.remove({}); + SyncedCron.add({ name: 'Remove Entries past today', schedule: function(parser) { @@ -26,19 +27,24 @@ Meteor.methods({ add_button: function(chrome, pre, post) { if (Meteor.user() != undefined && Meteor.user().services.google.email in allowed) { - madate = pre.split("/"); date = new Date(); date.setMonth(madate[0]); date.setDate(madate[1]); date.setFullYear(madate[2]); + mymoment = moment(pre.replace("/", "-"), "MM-DD-YYYY").toISOString().split("T")[0]; if (pre !== undefined && post !== undefined) { schedule.insert({ - "pretext": date.toDateString().slice(0,date.length), + "pretext": mymoment, "aftertext": post, "timestamp": date }); } } + }, + remove: function(chrome) { + if (Meteor.user() != undefined && Meteor.user().services.google.email in allowed) { + schedule.remove(chrome._id); + } } })