wcrisman/PetitTetonMeteor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

99
imports/api/Measure.js
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.");
}

2
imports/api/Product.js
View File

@@ -217,7 +217,7 @@ if(Meteor.isServer) {
if(measures) check(measures, [String]);
if(Roles.userIsInRole(this.userId, [Meteor.UserRoles.ROLE_UPDATE])) {
Products.update(id, {$set: {name: name, tags: tags, aliases: aliases, measures: measures, updateAt: new Date()}}, {bypassCollection2: true});
Products.update(id, {$set: {name: name, tags: tags, aliases: aliases, measures: measures, updatedAt: new Date()}}, {bypassCollection2: true});
}
else throw new Meteor.Error(403, "Not authorized.");
},

2
imports/api/ProductTag.js
View File

@@ -83,7 +83,7 @@ if(Meteor.isServer) {
name: String
});
if(Roles.userIsInRole(this.userId, [Meteor.UserRoles.ROLE_UPDATE])) {
ProductTags.update(tag._id, {$set: {name: tag.name, updateAt: new Date()}});
ProductTags.update(tag._id, {$set: {name: tag.name, updatedAt: new Date()}});
}
else throw new Meteor.Error(403, "Not authorized.");
}

84
imports/api/Sale.js
View File

@@ -92,6 +92,86 @@ if(Meteor.isServer) {
dbQuery = dbQuery.length > 0 ? {$and: dbQuery} : {};
return Meteor.collections.Sales.find(dbQuery, {limit: limit, sort: {date: -1, createdAt: -1}, skip: skipCount});
});
// time: expects either undefined, 'weekly', or 'monthly'
// options: expects either undefined, 'markets', or 'types'
Meteor.publish('salesTotals', function(time, options) {
let pipeline = [];
let group = {
$group: {
_id: {
year: {$dateToString: {format: '%Y', date: '$date'}}//{$year: '$date'}
},
'total': {
$sum: {
$multiply: ['$price', '$amount']
}
}
}
};
let project = {
$project: {
year: '$_id.year',
date: '$_id.year',
total: true,
_id: {$concat: ['$_id.year']}
}
};
pipeline.push(group);
pipeline.push(project);
//Annual is assumed if not week or month.
if(time === 'weekly') {
group.$group._id.week = {$dateToString: {format: '%U', date: '$date'}}; //{$week: '$date'};
project.$project.week = '$_id.week';
project.$project.date = {$concat: ['$_id.week', '-', '$_id.year']};
project.$project._id.$concat.push('$_id.week');
}
else if(time === 'monthly') {
group.$group._id.month = {$dateToString: {format: '%m', date: '$date'}}; //{$month: '$date'};
project.$project.month = '$_id.month';
project.$project.date = {$concat: ['$_id.month', '-', '$_id.year']};
project.$project._id.$concat.push('$_id.month');
}
if(options === 'markets') {
group.$group._id.venueId = '$venueId';
project.$project.venueId = '$_id.venueId';
project.$project._id.$concat.push('$_id.venueId');
pipeline.push({$lookup: {from: 'Venues', localField: 'venueId', foreignField: '_id', as: 'venue'}});
pipeline.push({$project: {year: 1, week: 1, month: 1, total: 1, venueId: 1, venue: {$arrayElemAt: ['$venue', 0]}}});
pipeline.push({$project: {year: 1, week: 1, month: 1, total: 1, venueId: 1, venue: '$venue.name'}});
}
else if(options === 'types') {
//query[0].$group.month = {$month: '$date'};
//TODO: Need to divide the sales up by:
// Sweets
// Savories
// Meats
// VAP
// Egg
// Other Produce
// Total Produce
// Jars
}
ReactiveAggregate(this, Sales, pipeline, {clientCollection: 'salesTotals'});
/*
{$sales: {
_id: Random.id(),
year: $_id.$year,
total: $total
}}
*/
//ReactiveAggregate(this, Sales, [query], {clientCollection: 'salesTotals', transform: function(doc) {
// console.log("Running transform function");
// Object.assign(doc._id, doc);
// doc._id = Random.id();
// return doc;
//}});
});
Meteor.methods({
getSalesCount: function(query) {
@@ -105,7 +185,7 @@ if(Meteor.isServer) {
if(Roles.userIsInRole(this.userId, [Meteor.UserRoles.ROLE_UPDATE])) {
Sales.insert(sale, function(err, id) {
if(err) console.log(err);
});
}, {bypassCollection2: true});
}
else throw new Meteor.Error(403, "Not authorized.");
},
@@ -113,7 +193,7 @@ if(Meteor.isServer) {
check(id, String);
if(Roles.userIsInRole(this.userId, [Meteor.UserRoles.ROLE_UPDATE])) {
Sales.remove(id);
Sales.remove(id, {bypassCollection2: true});
}
else throw new Meteor.Error(403, "Not authorized.");
}

101
imports/api/Venue.js
View File

@@ -29,38 +29,19 @@ let VenuesSchema = new SimpleSchema({
label: "Updated On",
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
}
});
Venues.attachSchema(VenuesSchema);
//https://github.com/zimme/meteor-collection-softremovable
Venues.attachBehaviour("softRemovable", {
removed: 'deleted',
removedAt: 'deletedAt',
removedBy: 'removedBy',
restoredAt: 'restoredAt',
restoredBy: 'restoredBy'
});
if(Meteor.isServer) Meteor.publish('venues', function() {
return Venues.find({});
});
@@ -77,54 +58,58 @@ if(Meteor.isServer) {
});
Meteor.methods({
insertVenue: function(venue) {
check(venue, {
name: String,
type: String
});
venue.createdAt = new Date();
createVenue: function(name, type) {
check(name, String);
check(type, String);
if(Roles.userIsInRole(this.userId, [Meteor.UserRoles.ROLE_UPDATE])) {
Venues.insert(venue);
Venues.insert({name, type, createdAt: new Date()});
}
else throw new Meteor.Error(403, "Not authorized.");
},
deleteVenue: function(id) {
deactivateVenue: function(id) {
if(Roles.userIsInRole(this.userId, [Meteor.UserRoles.ROLE_UPDATE])) {
Venues.remove(id);
//Venues.remove(id);
Venues.update(id, {$set: {deactivated: true}}, {bypassCollection2: true});
}
else throw new Meteor.Error(403, "Not authorized.");
},
updateVenue: function(venue) {
check(venue, {
name: String,
type: String
});
reactivateVenue: function(id) {
if(Roles.userIsInRole(this.userId, [Meteor.UserRoles.ROLE_UPDATE])) {
Venues.update(id, {$set: {deactivated: false}}, {bypassCollection2: true});
}
else throw new Meteor.Error(403, "Not authorized.");
},
hideVenue: function(id) { //One step past deactivated - will only show in the venues list if hidden venues are enabled.
if(Roles.userIsInRole(this.userId, [Meteor.UserRoles.ROLE_UPDATE])) {
//Venues.remove(id);
Venues.update(id, {$set: {hidden: true}}, {bypassCollection2: true});
}
else throw new Meteor.Error(403, "Not authorized.");
},
showVenue: function(id) { //Returns the venue to being simply deactivated. Will again show in lists.
if(Roles.userIsInRole(this.userId, [Meteor.UserRoles.ROLE_UPDATE])) {
Venues.update(id, {$set: {hidden: false}}, {bypassCollection2: true});
}
else throw new Meteor.Error(403, "Not authorized.");
},
//deleteVenue: function(id) {
// if(Roles.userIsInRole(this.userId, [Meteor.UserRoles.ROLE_UPDATE])) {
// Venues.remove(id); //TODO: If this is ever allowed, we should either remove or replace references to the deleted venue in the rest of the database.
// }
// else throw new Meteor.Error(403, "Not authorized.");
//},
updateVenue: function(id, name, type) {
check(id, String);
check(name, String);
check(type, String);
if(Roles.userIsInRole(this.userId, [Meteor.UserRoles.ROLE_UPDATE])) {
Venues.update(id, {$set: {name: venue.name, type: venue.type, updateAt: new Date()}});
Venues.update(id, {$set: {name, type, updatedAt: new Date()}});
}
else throw new Meteor.Error(403, "Not authorized.");
}
});
}
//Allows the client to do DB interaction without calling server side methods, while still retaining control over whether the user can make changes.
// Meteor.allow({
// insert: true,
// update: ()->{return true},
// remove: checkUser
// };
// checkUser = function(userId, doc) {
// return doc && doc.userId === userId;
// };
//Allows the client to interact with the db through the server via custom methods.
// Meteor.methods({
// deleteMeasure: function(id) {
// Measures.remove(id);
// }
// });
export default Venues;