From 3014336d6c07c64d6b0eae4bd82c9c427a1096c0 Mon Sep 17 00:00:00 2001 From: yamanq Date: Thu, 11 Feb 2016 18:10:16 -0500 Subject: [PATCH] mobile support --- scheduleac/.meteor/packages | 1 + scheduleac/.meteor/versions | 1 + scheduleac/client/client.html | 11 ++++++++++- scheduleac/client/client.js | 25 +++++++++++++++++++++++++ scheduleac/server/serve.js | 2 +- 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/scheduleac/.meteor/packages b/scheduleac/.meteor/packages index d9c80df..5d22b3a 100644 --- a/scheduleac/.meteor/packages +++ b/scheduleac/.meteor/packages @@ -26,3 +26,4 @@ ongoworks:security percolate:synced-cron momentjs:moment fortawesome:fontawesome +mystor:device-detection diff --git a/scheduleac/.meteor/versions b/scheduleac/.meteor/versions index 118a253..30713b7 100644 --- a/scheduleac/.meteor/versions +++ b/scheduleac/.meteor/versions @@ -53,6 +53,7 @@ mobile-status-bar@1.0.6 momentjs:moment@2.11.2 mongo@1.1.3 mongo-id@1.0.1 +mystor:device-detection@0.2.0 npm-mongo@1.4.39_1 oauth@1.1.6 oauth2@1.1.5 diff --git a/scheduleac/client/client.html b/scheduleac/client/client.html index 6d6da45..acd4ce0 100644 --- a/scheduleac/client/client.html +++ b/scheduleac/client/client.html @@ -3,7 +3,11 @@ - {{> client}} + {{#if isDesktop}} + {{> client}} + {{else}} + {{> phone}} + {{/if}} @@ -59,4 +63,9 @@ Github + + + \ No newline at end of file diff --git a/scheduleac/client/client.js b/scheduleac/client/client.js index 7a9cb26..297fac3 100644 --- a/scheduleac/client/client.js +++ b/scheduleac/client/client.js @@ -3,6 +3,7 @@ var clicked = false; allowedu["ybq987@gmail.com"] = true; allowedu["dweinger@bloomfield.org"] = true; allowedu["ksjdragon@gmail.com"]= true; +currentcard = 0; Meteor.subscribe('schedule'); @@ -159,5 +160,29 @@ function getScale(index, start) { } +Template.phone.helpers({ + pretext: function() { + cole = schedule.find({}, {sort: {timestamp: 1}}).fetch(); + date = moment(cole[currentcard].pretext); + date = date.calendar(null, { + sameDay: '[Today]', + nextDay: '[Tomorrow]', + nextWeek: 'dddd', + lastDay: '[Yesterday]', + lastWeek: '[Last] dddd', + sameElse: 'DD/MM/YYYY' + }); + return date + }, + aftertext: function() { + cole = schedule.find({}, {sort: {timestamp: 1}}).fetch(); + return cole[currentcard].aftertext; + } +}); +Template.phone.events({ + 'click nextb': function() { + currentcard += 1; + } +}); diff --git a/scheduleac/server/serve.js b/scheduleac/server/serve.js index 7fff191..f317408 100644 --- a/scheduleac/server/serve.js +++ b/scheduleac/server/serve.js @@ -10,7 +10,7 @@ schedule.permit(['insert', 'update', 'remove']).never().apply(); SyncedCron.add({ name: 'Remove Entries past today', schedule: function(parser) { - return parser.recur().on('07:46:00').time(); + return parser.recur().on('00:00:00').time(); }, job: function() { var today = moment().format("X");