-
-
- {{#each r in relatedP}}
- - {{r.firstName}} {{r.lastName}} (
{{r._id}})
- {{/each}}
-
+
-
- {{else}}
-
No related participants
- {{/if}}
- {{/if}}
-
-
-
-
-
- - _id
- - {{host._id}}
- -
- Edit
-
-
- - First name
- - {{host.firstName}}
- -
- Edit
-
-
- - Last name
- - {{host.lastName}}
- -
- Edit
-
-
- - Accommodation
- - {{host.info.accommodation}}
- -
- Edit
-
- - Room
- - {{host.info.room}}
- -
- Edit
-
-
- - Street
- - {{host.info.street}}
- -
- Edit
-
-
- - Number
- - {{host.info.number}}
- -
- Edit
-
-
- - City
- - {{host.info.city}}
- -
- Edit
-
-
- - ZIP
- - {{host.info.zip}}
- -
- Edit
-
-
- - Province
- - {{host.info.province}}
- -
- Edit
-
-
- - Country
- - {{host.info.country}}
- -
- Edit
-
-
-
-
-
-
-
-
-
-
-
-
History
- {{#if user.updatedAt}}
- Last update: {{moment user.updatedAt 'DD/MM/YY kk:mm'}}
- {{/if}}
-
-
-
-
-
- {{#if user.history}}
- {{#each entry in user.history}}
-
- - {{moment entry.date 'DD/MM/YY kk:mm'}}
- -
-
- {{#each update in (objectToArray entry.updates)}}
- - {{getKey update}}
- - {{getValue update}}
- {{/each}}
-
-
-
- {{/each}}
- {{else}}
-
No history available
- {{/if}}
-
-
\ No newline at end of file
diff --git a/imports/ui/pages/admin/admin.list.js b/imports/ui/pages/admin/admin.list.js
index e2c1ed9..71d78db 100644
--- a/imports/ui/pages/admin/admin.list.js
+++ b/imports/ui/pages/admin/admin.list.js
@@ -1,455 +1,368 @@
-import "./admin.list.html";
-import Participants from "/imports/collections/participants";
-import IDs from "/imports/collections/ids";
-import jwt from "jsonwebtoken";
-import _ from "lodash";
-import {deepFind} from "/lib/js/utilities";
-import "/node_modules/bootstrap/dist/js/bootstrap.min";
+import './admin.list.html'
+import Participants from '/imports/collections/participants'
+import Accommodations from '/imports/collections/accommodations'
+import jwt from 'jsonwebtoken'
+import _ from 'lodash'
+import {deepFlatten, deepPick, deepFind} from '/lib/js/utilities'
let fields = require('/imports/collections/db_allowed_values.json');
-const participantsIndices = {'statusComplete': 1, 'firstName': 1, 'lastName': 1};
+const participantsIndices = {'firstName': 1, 'lastName': 1};
+const accomIndices = {'name': 1, 'address':1, 'busZone':1};
const usersIndices = {'username': 1, 'profile.firstName': 1, 'profile.lastName': 1, 'roles': 1};
-// AdminListSection
-let collSub;
-
-// Modal
-let modalSubIDs, modalSub, modalSubOwner, modalSubUser, modalSubParticipant;
let raven = require('raven');
let client = new raven.Client('https://7b01834070004a4a91b5a7ed14c0b411:79de4d1bd9f24d1a93b78b18750afb54@sentry.io/126769', {
- environment: Meteor.settings.public.environment,
- server_name: 'snowdays',
- tags: {section: 'API'},
- autoBreadcrumbs: true
+ environment: Meteor.settings.public.environment,
+ server_name: 'snowdays',
+ tags: {section: 'API'}
});
// catches all exceptions on the server
-// raven.patchGlobal(client);
+raven.patchGlobal(client);
client.on('logged', function () {
- console.log('Exception handled and sent to Sentry.io');
+ console.log('Exception handled and sent to Sentry.io');
});
client.on('error', function (e) {
- // The event contains information about the failure:
- // e.reason -- raw response body
- // e.statusCode -- response status code
- // e.response -- raw http response object
+ // The event contains information about the failure:
+ // e.reason -- raw response body
+ // e.statusCode -- response status code
+ // e.response -- raw http response object
- console.log('Couldn\'t connect to Sentry.io');
+ console.log('Couldn\'t connect to Sentry.io');
});
Template.AdminListSection.onCreated(function () {
- // template instance
- let template = Template.instance();
-
- template.flattenedFields = new ReactiveVar(participantsIndices);
- template.limit = new ReactiveVar(5);
- template.skip = new ReactiveVar(0);
- template.count = new ReactiveVar(0);
-
- template.collection = new ReactiveVar({
- name: 'participants',
- instance: Participants,
- flattened: template.flattenedFields.get(),
- searchQuery: '',
- filters: []
- });
+ let template = Template.instance();
- this.autorun(() => {
- let collection = template.collection.get();
- let limit = template.limit.get();
- let skip = template.skip.get();
-
- $.when(setSubscription(collection.name, collection.filters, collection.searchQuery, collection.flattened, limit, skip)).done(function (options) {
- collSub = Meteor.subscribe(collection.name + ".all", options, function onStop(error) {
- if (error) swal('Error', error, 'error');
- console.log(collection.name + ".all STOP")
- }, function onReady() {
- console.log(collection.name + ".all START");
-
- Meteor.call(collection.name + '.count', options, function (error, count) {
- template.count.set(count);
- setTimeout(() => {
- generateTable(template, options);
- }, 300);
- });
- });
- })
- });
-});
+ template.flattenedFields = new ReactiveVar(participantsIndices);
-Template.AdminListSection.onDestroyed(function () {
- // stop main subscription
- collSub.stop()
-});
-
-Template.AdminListSection.events({
-
- 'click .sn-open-modal': function (event, template) {
- let modalId = $(event.target).attr('data-modal-id');
- let userId = $(event.target).attr('data-user-id');
- Session.set('_id', userId);
- Session.set('userModalTab', 'UserModalParticipant');
- $('#' + modalId).modal('show')
- },
-
- 'click .sn-close-modal': function (event, template) {
- let modalId = $(event.target).attr('data-modal-id');
- modalSub.stop();
- modalSubParticipant.stop();
- modalSubOwner.stop();
- modalSubUser.stop();
- Session.set('_id', '');
- $('#' + modalId).modal('hide')
- },
-
- /**
- * Switches between collections
- */
- 'change #collection_select': function (event, template) {
- let collectionName = event.target.value;
-
- if (_.isEqual(collectionName, 'users')) {
- template.collection.set({
- name: collectionName,
- instance: Meteor.users,
- flattened: usersIndices,
- searchQuery: '',
- filters: []
- });
- } else {
- template.collection.set({
- name: collectionName,
+ template.collection = new ReactiveVar({
+ name: 'participants',
instance: Participants,
- flattened: participantsIndices,
+ flattened: template.flattenedFields.get(),
searchQuery: '',
filters: []
- })
- }
-
- // reset skip and limit
- template.skip.set(0);
- template.limit.set(5);
-
- // reset search input
- $('#search').val('')
- },
-
- /**
- * When selecting filters for filtering, it regenerates
- * related allowed values' select options
- */
- 'change #select_field': function (event, template) {
- let field = event.target.value;
- let collection = template.collection.get();
- let instance = collection.instance;
-
- // TODO: everything should be set and retrieve from the website/db like this
- // if (_.isEqual(field, 'university')) {
- // retrieve all values from server
- // console.log(Meteor.call('collection.raw', instance));
- // }
-
- // deep find in object, returns values allowed
- let allowed = deepFind(fields[collection.name], field) || deepFind(fields['common'], field) || deepFind(fields['common'], 'boolean');
-
- createOptionChildren(allowed, 'select_value');
- },
-
- /**
- * Adds filters
- */
- 'submit #add_filter_form': function (event, template) {
- event.preventDefault();
-
- let newFilter;
- let collection = template.collection.get();
- let field = event.target.select_field.value;
- let operation = event.target.operation.value;
- let value = event.target.select_value.value;
- let currentFilters = collection.filters;
- let flattened = collection.flattened;
-
- if (!_.isEqual(field, 'Field') && !_.isEqual(value, 'Value')) {
-
- // _.zipObject returns an object composed from key-value pairs
- if (_.isEqual(operation, 'e')) {
- if (_.isEqual(value, 'true')) value = true;
- if (_.isEqual(value, 'false')) value = false;
-
- console.log(value);
- newFilter = _.zipObject([field], [{$eq: value}]);
- } else if (_.isEqual(operation, 'ne')) {
- newFilter = _.zipObject([field], [{$ne: value}]);
- }
-
- currentFilters.push(newFilter);
- flattened[field] = 1;
-
- // reset skip
- template.skip.set(0);
-
- template.collection.set({
- name: collection.name,
- instance: collection.instance,
- flattened: flattened,
- searchQuery: collection.searchQuery,
- filters: currentFilters
- });
-
- // Clear form
- document.getElementById('add_filter_form').reset();
- }
- },
-
- /**
- * Deletes filters
- */
- 'click #sn-delete-filter': (event, template) => {
- // get filter index
- let index = $(event.target).attr("name");
- let collection = template.collection.get();
- let currentFilters = collection.filters;
-
- // remove from array at index
- _.pullAt(currentFilters, [index]);
-
- // reset skip
- template.skip.set(0);
+ });
- // update reactive variable
- template.collection.set({
- name: collection.name,
- instance: collection.instance,
- flattened: collection.flattened,
- searchQuery: collection.searchQuery,
- filters: currentFilters
+ // subscribe as soon the template is created
+ // this.subscribe("users.current");
+ this.autorun(() => {
+ let collection = template.collection.get();
+ $.when(setSubscription(collection.filters, collection.searchQuery, collection.flattened)).done(function (options) {
+ Meteor.subscribe(collection.name + ".all", options, () => {
+ console.log(Participants.find().fetch());
+ setTimeout(() => {
+ generateTable(template, options);
+ }, 300);
+ });
+ })
});
+});
- },
+Template.AdminListSection.onRendered(function () {
- /**
- * Handles search
- */
- 'keyup [name="search"]': (event, template) => {
- let value = event.target.value.trim();
- let collection = template.collection.get();
+});
- // keyCode 13 = 'enter'
- if (event.keyCode === 13) {
- template.collection.set({
- name: collection.name,
- instance: collection.instance,
- flattened: collection.flattened,
- searchQuery: value,
- filters: collection.filters
- });
- }
- },
+Template.AdminListSection.events({
- /**
- * Updates fields in table
- */
- 'submit #fields_form': function (event, template) {
- event.preventDefault();
- let collection = template.collection.get();
+ /**
+ * Switches between collections
+ */
+ 'change #collection_select': function (event, template) {
+ let collectionName = event.target.value;
+
+ if (_.isEqual(collectionName, 'users')) {
+ template.collection.set({
+ name: collectionName,
+ instance: Meteor.users,
+ flattened: usersIndices,
+ searchQuery: '',
+ filters: []
+ })
+ }
+ if (_.isEqual(collectionName, 'accommodations')) {
+ template.collection.set({
+ name: collectionName,
+ instance: Accommodations,
+ flattened: accomIndices,
+ searchQuery: '',
+ filters: []
+ })
+ }
+ if (_.isEqual(collectionName, 'participants')) {
+ template.collection.set({
+ name: collectionName,
+ instance: Participants,
+ flattened: participantsIndices,
+ searchQuery: '',
+ filters: []
+ })
+ }
+ // reset search input
+ $('#search').val('')
+ },
+
+ /**
+ * When selecting filters for filtering, it regenerates
+ * related allowed values' select options
+ */
+ 'change #select_field': function (event, template) {
+ let value = event.target.value;
+ let collection = template.collection.get().name;
+
+ // deep find in object, returns values allowed
+ let allowed = deepFind(fields[collection], value) || deepFind(fields['common'], value) || deepFind(fields['common'], 'boolean');
+
+ console.log(value, fields[collection], deepFind(fields[collection], value.toString()));
+
+ createOptionChildren(allowed, 'select_value');
+ },
+
+ /**
+ * Adds filters
+ */
+ 'submit #add_filter_form': function (event, template) {
+ event.preventDefault();
+
+ let newFilter;
+ let collection = template.collection.get();
+ let field = event.target.select_field.value;
+ let operation = event.target.operation.value;
+ let value = event.target.select_value.value;
+ let currentFilters = collection.filters;
+
+ console.log(field, operation, value);
+
+
+ // _.zipObject returns an object composed from key-value pairs
+ if (_.isEqual(operation, 'e'))
+ newFilter = _.zipObject([field], [{$eq: value}]);
+ else
+ newFilter = _.zipObject([field], [{$ne: value}]);
+
+ currentFilters.push(newFilter);
+
+ template.collection.set({
+ name: collection.name,
+ instance: collection.instance,
+ flattened: collection.flattened,
+ searchQuery: collection.searchQuery,
+ filters: currentFilters
+ });
+ },
+
+ /**
+ * Deletes filters
+ */
+ 'click #sn-delete-filter': (event, template) => {
+ // get filter index
+ let index = $(event.target).parent().attr("value");
+ let collection = template.collection.get();
+ let currentFilters = collection.filters;
+
+ // remove from array at index
+ _.pullAt(currentFilters, [index]);
+
+ // update reactive variable
+ template.collection.set({
+ name: collection.name,
+ instance: collection.instance,
+ flattened: collection.flattened,
+ searchQuery: collection.searchQuery,
+ filters: currentFilters
+ });
+ },
+
+ /**
+ * Handles search
+ */
+ 'keyup [name="search"]': (event, template) => {
+ let value = event.target.value.trim();
+ let collection = template.collection.get();
+
+ // keyCode 13 = 'enter'
+ if (event.keyCode === 13) {
+ template.collection.set({
+ name: collection.name,
+ instance: collection.instance,
+ flattened: collection.flattened,
+ searchQuery: value,
+ filters: collection.filters
+ });
+ }
+ },
- let currentFlattenedFields = collection.flattened;
+ /**
+ * Updates fields in table
+ */
+ 'submit #fields_form': function (event, template) {
+ event.preventDefault();
+ let collection = template.collection.get();
- // replace each _ in children inputs with .
- $(event.target).find('input').each(function () {
- let replaced = this.id.replace(/_/g, '.');
+ let currentFlattenedFields = collection.flattened;
- // set value = 1
- if (this.checked) currentFlattenedFields[replaced] = 1;
+ // replace each _ in children inputs with .
+ $(event.target).find('input').each(function () {
+ let replaced = this.id.replace(/_/g, '.');
- // or delete property
- else delete currentFlattenedFields[replaced];
- });
+ // set value = 1
+ if (this.checked) currentFlattenedFields[replaced] = 1;
- // update reactive variable
- template.collection.set({
- name: collection.name,
- instance: collection.instance,
- flattened: currentFlattenedFields,
- searchQuery: collection.searchQuery,
- filters: collection.filters
- });
- },
+ // or delete property
+ else delete currentFlattenedFields[replaced];
+ });
- 'click #download_csv': function (event, template) {
- let collection = template.collection.get();
- let filename = '';
- let download = '';
+ // update reactive variable
+ template.collection.set({
+ name: collection.name,
+ instance: collection.instance,
+ flattened: currentFlattenedFields,
+ searchQuery: collection.searchQuery,
+ filters: collection.filters
+ });
+ },
+ 'click #download_csv': function (event, template) {
+ let collection = template.collection.get();
+ let filename = '';
+ let download = '';
- swal.setDefaults({
- confirmButtonText: 'Next →',
- showCancelButton: true,
- allowOutsideClick: false,
- progressSteps: ['1', '2']
- });
- let steps = [
- {
- title: 'Download ...',
- input: 'radio',
- inputOptions: {
- 'all': ' All current collection',
- 'results': ' Results shown only'
- },
- confirmButtonColor: '#008eff',
- inputValidator: function (result) {
- return new Promise(function (resolve, reject) {
- if (result) {
- download = result;
- resolve()
- } else {
- reject('You need to select something!')
- }
- })
- }
- },
- {
- title: 'Please give the file a name',
- input: 'text',
- showCancelButton: true,
- confirmButtonColor: '#008eff',
- confirmButtonText: 'Download',
- inputValidator: function (result) {
- return new Promise(function (resolve, reject) {
- if (result) {
- filename = result;
- resolve()
- } else {
- reject('You need to write something!')
+ swal.setDefaults({
+ confirmButtonText: 'Next →',
+ showCancelButton: true,
+ allowOutsideClick: false,
+ progressSteps: ['1', '2']
+ });
+
+ let steps = [
+ {
+ title: 'Download ...',
+ input: 'radio',
+ inputOptions: {
+ 'all': ' All current collection',
+ 'results': ' Results shown only'
+ },
+ confirmButtonColor: '#008eff',
+ inputValidator: function (result) {
+ return new Promise(function (resolve, reject) {
+ if (result) {
+ download = result;
+ resolve()
+ } else {
+ reject('You need to select something!')
+ }
+ })
+ }
+ },
+ {
+ title: 'Please give the file a name',
+ input: 'text',
+ showCancelButton: true,
+ confirmButtonColor: '#008eff',
+ confirmButtonText: 'Download',
+ inputValidator: function (result) {
+ return new Promise(function (resolve, reject) {
+ if (result) {
+ filename = result;
+ resolve()
+ } else {
+ reject('You need to write something!')
+ }
+ })
+ },
+ preConfirm: function () {
+ return new Promise(function (resolve) {
+ $.when(setSubscription(collection.filters, collection.searchQuery, collection.flattened)).done(function (options) {
+ options['filename'] = filename;
+ options['download'] = download;
+ let encoded = jwt.sign(options, 'secret', {expiresIn: 60});
+ Meteor.setTimeout(function () {
+ Router.go('/csv/' + encoded);
+ }, 300)
+ })
+ })
+ }
}
- })
- },
- preConfirm: function () {
- return new Promise(function (resolve) {
- swal.resetDefaults();
- // limit, skip = whatever since is not considered in the server route
- $.when(setSubscription(collection.name, collection.filters, collection.searchQuery, collection.flattened, 0, 0)).done(function (options) {
- options['collection'] = collection.name;
- options['filename'] = filename;
- options['download'] = download;
- let encoded = jwt.sign(options, 'secret', {expiresIn: 60});
- Router.go('/csv/' + encoded);
+ ];
+
+ swal.queue(steps).then(function () {
+ console.log('steps');
+ swal.resetDefaults()
+ })
+ },
+
+ 'click #sn-delete-entry': function (event, template) {
+ let _id = $(event.target).parent().attr("name");
+ let collection = template.collection.get();
+
+ swal({
+ title: 'Are you sure?',
+ text: "You won't be able to revert this!",
+ type: 'warning',
+ showCancelButton: true,
+ confirmButtonColor: '#008eff',
+ cancelButtonColor: '#e74c3c',
+ confirmButtonText: 'Yes, delete it!'
+ }).then(function () {
+ Meteor.call(collection.name + '.remove', _id, function (error, result) {
+ if (error) swal('Error', error.message, 'error');
+ else if (_.isEqual(0, result)) swal('Warning', 'Participant not removed!', 'warning');
+ else {
+ generateTable(template)
+ }
})
- })
- }
- }
- ];
+ });
+ }
- swal.queue(steps).then(function () {
- console.log('steps');
- // TODO: exit dialog before downloading
- })
- },
+});
- 'click #sn-delete-entry': function (event, template) {
- let _id = $(event.target).attr("name");
- let collection = template.collection.get();
- let limit = template.limit.get();
- let skip = template.skip.get();
-
- swal({
- title: 'Are you sure?',
- text: "You won't be able to revert this!",
- type: 'warning',
- showCancelButton: true,
- confirmButtonColor: '#008eff',
- cancelButtonColor: '#e74c3c',
- confirmButtonText: 'Yes, delete it!'
- }).then(function () {
- Meteor.call(collection.name + '.remove', _id, function (error, result) {
- if (error) swal('Error', error.message, 'error');
- else if (_.isEqual(0, result)) swal('Warning', 'Object in ' + collection.name + ' not removed!', 'warning');
- else {
- $.when(setSubscription(collection.name, collection.filters, collection.searchQuery, collection.flattened, limit, skip)).done(function (options) {
- generateTable(template, options);
- })
+Template.AdminListSection.helpers({
+ count: function (selector) {
+ let collection = Template.instance().collection.get();
+ let options = setSubscription(collection.filters, collection.searchQuery, collection.flattened);
+
+ switch (selector) {
+ case 'results':
+ let query = collection.instance.find(options.query, options.query).count();
+ return query + (query > 1 ? ' '+collection.name : ' '+ collection.name.substr(0, collection.name.length -1 ));
+ break;
+ case 'filters':
+ return _.size(collection.filters) || '0';
+ break;
+ case 'fields':
+ return _.size(collection.flattened) || '0';
+ break;
+ default:
+ return '@'
}
- })
- });
- },
-
- 'change #limit_field': function (event, template) {
- let value = event.target.value;
+ },
- // update reactive variable
- template.limit.set(value);
-
- // reset skip
- template.skip.set(0)
- },
+ listIsEmpty: function () {
+ let collection = Template.instance().collection.get();
+ $.when(setSubscription(collection.filters, collection.searchQuery, collection.flattened)).done(function (options) {
+ return _.isEqual(collection.instance.find(options.query, {fields: options.fields}).count(), 0)
+ });
+ },
- 'click .pagination_item': function (event, template) {
- let value = event.target.name;
- let limit = template.limit.get();
+ filtersList: function () {
+ return Template.instance().collection.get().filters
+ },
- template.skip.set((value - 1) * limit)
- },
+ query: function () {
+ return Template.instance().collection.get().searchQuery || 'Search first name and last name';
+ },
-});
-
-Template.AdminListSection.helpers({
- countText: function (selector) {
- let collection = Template.instance().collection.get();
- let count = Template.instance().count.get();
-
- switch (selector) {
- case 'results':
- return count + (count == 1 ? ' match' : ' matches');
- break;
- case 'filters':
- return _.size(collection.filters) || '0';
- break;
- case 'fields':
- return _.size(collection.flattened) || '0';
- break;
- default:
- return '@'
+ isCollection: function (collection) {
+ return _.isEqual(collection, Template.instance().collection.get().name)
}
- },
-
- count: function (selector) {
- let collection = Template.instance().collection.get();
- let count = Template.instance().count.get();
-
- switch (selector) {
- case 'results':
- return count;
- break;
- case 'filters':
- return _.size(collection.filters) || 0;
- break;
- case 'fields':
- return _.size(collection.flattened) || 0;
- break;
- default:
- return '@'
- }
- },
-
- filtersList: function () {
- return Template.instance().collection.get().filters
- },
-
- query: function () {
- return Template.instance().collection.get().searchQuery || 'Search first and last name';
- },
-
- isCollection: function (collection) {
- return _.isEqual(collection, Template.instance().collection.get().name)
- }
});
@@ -461,660 +374,116 @@ Template.AdminListSection.helpers({
* @param {Object} selectName
*/
function createOptionChildren(values, selectName) {
- let select = document.getElementById(selectName);
-
- // empty select input
- $(select).empty();
-
- // then append values
- if (!_.isEmpty(values)) {
- _.forEach(values, function (value, key) {
- $(select).append($('