Added graphs and charts; Updated a lot of the collections for security and consistency; Updated all of the page to fix bugs and propagate fixes to all templates; Added the d3 library for graphing; Added a real ui for Measures and Venues.

This commit is contained in:
Wynne Crisman
2017-02-03 09:20:29 -08:00
parent 55337521f6
commit 184ce1133f
38 changed files with 2564 additions and 641 deletions

View File

@@ -45,82 +45,75 @@ Measures.attachSchema(new SimpleSchema({
// denyInsert: true,
optional: true
},
deletedAt: {
type: Date,
label: "Deleted On",
deactivated: {
type: Boolean,
label: "Deactivated",
optional: true
},
deletedBy: {
type: String,
label: "Deleted By",
optional: true
},
restoredAt: {
type: Date,
label: "Restored On",
optional: true
},
restoredBy: {
type: String,
label: "Restored By",
hidden: {
type: Boolean,
label: "Hidden",
optional: true
}
}));
//https://github.com/zimme/meteor-collection-softremovable
Measures.attachBehaviour("softRemovable", {
removed: 'deleted',
removedAt: 'deletedAt',
removedBy: 'removedBy',
restoredAt: 'restoredAt',
restoredBy: 'restoredBy'
});
if(Meteor.isServer) Meteor.publish('measures', function() {
return Measures.find({});
});
// Requires: meteor add matb33:collection-hooks
Measures.before.insert(function(userId, doc) {
// check(userId, String);
doc.createdAt = new Date();
});
Measures.before.update(function(userId, doc, fieldNames, modifier, options) {
modifier.$set = modifier.$set || {}; //Make sure there is an object.
modifier.$set.updatedAt = new Date();
});
if(Meteor.isServer) {
Meteor.methods({
insertMeasure: function(measure) {
check(measure, {
name: String,
order: Number,
postfix: String
});
measure.createdAt = new Date();
createMeasure: function(name, postfix, order) {
check(name, String);
check(postfix, String);
check(order, Number);
if(Roles.userIsInRole(this.userId, [Meteor.UserRoles.ROLE_UPDATE])) {
Measures.insert(measure);
Measures.insert({name, postfix, order, createdAt: new Date()});
}
else throw new Meteor.Error(403, "Not authorized.");
},
deleteMeasure: function(id) {
deactivateMeasure: function(id) {
if(Roles.userIsInRole(this.userId, [Meteor.UserRoles.ROLE_UPDATE])) {
Measures.remove(id);
//Measures.remove(id);
Measures.update(id, {$set: {deactivated: true}}, {bypassCollection2: true});
}
else throw new Meteor.Error(403, "Not authorized.");
},
updateMeasure: function(measure) {
check(measure, {
name: String,
order: Number,
postfix: String
});
reactivateMeasure: function(id) {
if(Roles.userIsInRole(this.userId, [Meteor.UserRoles.ROLE_UPDATE])) {
Measures.update(id, {$set: {deactivated: false}}, {bypassCollection2: true});
}
else throw new Meteor.Error(403, "Not authorized.");
},
hideMeasure: function(id) { //One step past deactivated - will only show in the measures list if hidden measures are enabled.
if(Roles.userIsInRole(this.userId, [Meteor.UserRoles.ROLE_UPDATE])) {
//Measures.remove(id);
Measures.update(id, {$set: {hidden: true}}, {bypassCollection2: true});
}
else throw new Meteor.Error(403, "Not authorized.");
},
showMeasure: function(id) { //Returns the measure to being simply deactivated. Will again show in lists.
if(Roles.userIsInRole(this.userId, [Meteor.UserRoles.ROLE_UPDATE])) {
Measures.update(id, {$set: {hidden: false}}, {bypassCollection2: true});
}
else throw new Meteor.Error(403, "Not authorized.");
},
//deleteMeasure: function(id) {
// if(Roles.userIsInRole(this.userId, [Meteor.UserRoles.ROLE_UPDATE])) {
// //TODO: Should troll the database looking for references to remove or replace. This is currently not used.
// Measures.remove(id);
// }
// else throw new Meteor.Error(403, "Not authorized.");
//},
updateMeasure: function(id, name, postfix, order) {
check(id, String);
check(name, String);
check(postfix, String);
check(order, Number);
if(Roles.userIsInRole(this.userId, [Meteor.UserRoles.ROLE_UPDATE])) {
Products.update(id, {$set: {name: measure.name, order: measure.order, postfix: measure.postfix, updateAt: new Date()}});
Products.update(id, {$set: {name, postfix, order, updatedAt: new Date()}});
}
else throw new Meteor.Error(403, "Not authorized.");
}