From c3cc549785c462e5f71157183e9ff04ea6638812 Mon Sep 17 00:00:00 2001 From: yamanq Date: Wed, 10 Aug 2016 13:49:27 -0400 Subject: [PATCH 1/5] added full calendar --- hourglass/.meteor/packages | 1 + hourglass/.meteor/versions | 3 +++ 2 files changed, 4 insertions(+) diff --git a/hourglass/.meteor/packages b/hourglass/.meteor/packages index 52c02fd..caab459 100644 --- a/hourglass/.meteor/packages +++ b/hourglass/.meteor/packages @@ -29,3 +29,4 @@ iron:router ongoworks:security mizzao:autocomplete alanning:roles +gquemart:meteor-reactive-fullcalendar diff --git a/hourglass/.meteor/versions b/hourglass/.meteor/versions index d359da2..5720cca 100644 --- a/hourglass/.meteor/versions +++ b/hourglass/.meteor/versions @@ -37,6 +37,7 @@ fastclick@1.0.12 fortawesome:fontawesome@4.5.0 geojson-utils@1.0.9 google@1.1.13 +gquemart:meteor-reactive-fullcalendar@1.0.1 hot-code-push@1.0.4 html-tools@1.0.10 htmljs@1.0.10 @@ -70,6 +71,8 @@ modules@0.7.5 modules-runtime@0.7.5 mongo@1.1.10 mongo-id@1.0.5 +mrt:jquery-ui@1.9.2 +mrt:moment@2.8.1 npm-mongo@1.5.45 oauth@1.1.11 oauth2@1.1.10 From e2f4afbd1b3c339b229d761f3bf77fb84a1e4104 Mon Sep 17 00:00:00 2001 From: yamanq Date: Wed, 10 Aug 2016 13:54:34 -0400 Subject: [PATCH 2/5] add fullcalendar:fullcalendar --- hourglass/.meteor/packages | 2 +- hourglass/.meteor/versions | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hourglass/.meteor/packages b/hourglass/.meteor/packages index caab459..eba203c 100644 --- a/hourglass/.meteor/packages +++ b/hourglass/.meteor/packages @@ -29,4 +29,4 @@ iron:router ongoworks:security mizzao:autocomplete alanning:roles -gquemart:meteor-reactive-fullcalendar +fullcalendar:fullcalendar diff --git a/hourglass/.meteor/versions b/hourglass/.meteor/versions index 5720cca..a9c43bc 100644 --- a/hourglass/.meteor/versions +++ b/hourglass/.meteor/versions @@ -35,9 +35,9 @@ ejson@1.0.12 es5-shim@4.6.13 fastclick@1.0.12 fortawesome:fontawesome@4.5.0 +fullcalendar:fullcalendar@2.9.0 geojson-utils@1.0.9 google@1.1.13 -gquemart:meteor-reactive-fullcalendar@1.0.1 hot-code-push@1.0.4 html-tools@1.0.10 htmljs@1.0.10 @@ -69,10 +69,9 @@ mobile-experience@1.0.4 mobile-status-bar@1.0.12 modules@0.7.5 modules-runtime@0.7.5 +momentjs:moment@2.8.4 mongo@1.1.10 mongo-id@1.0.5 -mrt:jquery-ui@1.9.2 -mrt:moment@2.8.1 npm-mongo@1.5.45 oauth@1.1.11 oauth2@1.1.10 From 2fffc374b6888e2f9c135278b873080edba7e035 Mon Sep 17 00:00:00 2001 From: yamanq Date: Wed, 10 Aug 2016 14:05:45 -0400 Subject: [PATCH 3/5] deleteSchool, deleteClass --- hourglass/server/main.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/hourglass/server/main.js b/hourglass/server/main.js index 339279c..1e6dadf 100644 --- a/hourglass/server/main.js +++ b/hourglass/server/main.js @@ -11,13 +11,19 @@ Meteor.methods({ return 'xxxxxx'.replace(/[x]/g, _uuid4); }, 'createSchool': function(schoolname) { + // if superadmin, no need for approval if (Meteor.user() != null && schools.findOne({name:input.school}) != null && schools.findOne({status: false, creator: Meteor.userId()}) != null) { schools.insert({name: schoolname, status: false, creator: Meteor.userId()}); } + }, + 'deleteSchool': function(schoolid) { + // alanning:roles implementation here + schools.remove({_id: schoolid}) }, 'createClass': function(input) { + // if superadmin, no need for approval classes.schema.validate(input); if(Meteor.user() != null && classes.find({status:false, admin:Meteor.userId()}).fetch().length < 5 && schools.findOne({name:input.school}) != null && input.status === false) { @@ -44,6 +50,13 @@ Meteor.methods({ return 0; } }, + 'deleteClass': function(classid) { + found = classes.findOne({_id: classid}); + // Add roles + if (Meteor.user() != null && found != null && found.admin === Meteor.user()._id) { + classes.remove({_id: classid}) + } + }, 'editProfile': function(change) { current = Meteor.user().profile; current.school = change[0]; @@ -61,7 +74,7 @@ Meteor.methods({ }, 'joinClass': function(change, pass) { found = classes.findOne({_id: change, status: true}); - if (Meteor.user() != null && found.length > 0 && pass === found[0].code && Meteor.user().profile.classes.indexOf(change) === -1) { + if (Meteor.user() != null && found != null && pass === found.code && Meteor.user().profile.classes.indexOf(change) === -1) { current = Meteor.user().profile; current.classes.append(change); Meteor.users.update({_id: Meteor.userId()}, {$set: {profile: current}}); From efe80f8b45077f4ce9a2a67f87f2443c33c9735a Mon Sep 17 00:00:00 2001 From: yamanq Date: Wed, 10 Aug 2016 14:14:55 -0400 Subject: [PATCH 4/5] createClass optimization --- hourglass/server/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hourglass/server/main.js b/hourglass/server/main.js index 1e6dadf..a171424 100644 --- a/hourglass/server/main.js +++ b/hourglass/server/main.js @@ -26,8 +26,8 @@ Meteor.methods({ // if superadmin, no need for approval classes.schema.validate(input); if(Meteor.user() != null && classes.find({status:false, admin:Meteor.userId()}).fetch().length < 5 && - schools.findOne({name:input.school}) != null && input.status === false) { - + schools.findOne({name:input.school}) != null) { + input.status = false; input.subscribers = 0; input.admin = Meteor.userId() if (input.privacy) { From 157bcf33e9f8435d5decf2c9d20fbdce81a23b1c Mon Sep 17 00:00:00 2001 From: yamanq Date: Wed, 10 Aug 2016 14:34:56 -0400 Subject: [PATCH 5/5] add fullcalendar --- hourglass/.meteor/packages | 2 +- hourglass/.meteor/versions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hourglass/.meteor/packages b/hourglass/.meteor/packages index eba203c..0a3f2a6 100644 --- a/hourglass/.meteor/packages +++ b/hourglass/.meteor/packages @@ -29,4 +29,4 @@ iron:router ongoworks:security mizzao:autocomplete alanning:roles -fullcalendar:fullcalendar +rzymek:fullcalendar diff --git a/hourglass/.meteor/versions b/hourglass/.meteor/versions index a9c43bc..b10c120 100644 --- a/hourglass/.meteor/versions +++ b/hourglass/.meteor/versions @@ -35,7 +35,6 @@ ejson@1.0.12 es5-shim@4.6.13 fastclick@1.0.12 fortawesome:fontawesome@4.5.0 -fullcalendar:fullcalendar@2.9.0 geojson-utils@1.0.9 google@1.1.13 hot-code-push@1.0.4 @@ -87,6 +86,7 @@ reactive-var@1.0.10 reload@1.1.10 retry@1.0.8 routepolicy@1.0.11 +rzymek:fullcalendar@2.7.2 service-configuration@1.0.10 session@1.1.6 spacebars@1.0.12