From bee15ca088575e6a455820f89549c46e33ea3bc8 Mon Sep 17 00:00:00 2001 From: Davide Alberani Date: Tue, 5 Jul 2016 21:30:12 +0200 Subject: [PATCH] partial implementation of an All Tickets page --- angular_app/index.html | 3 +- angular_app/js/app.js | 27 +++------------- angular_app/js/controllers.js | 3 ++ angular_app/js/services.js | 14 +++++++++ .../{persons-list.html => tickets-list.html} | 2 +- eventman_server.py | 31 ++++++++++++++++--- 6 files changed, 51 insertions(+), 29 deletions(-) rename angular_app/{persons-list.html => tickets-list.html} (98%) diff --git a/angular_app/index.html b/angular_app/index.html index 7c29a2f..32a6195 100644 --- a/angular_app/index.html +++ b/angular_app/index.html @@ -73,7 +73,8 @@
diff --git a/angular_app/js/app.js b/angular_app/js/app.js index fae6b3b..c126504 100644 --- a/angular_app/js/app.js +++ b/angular_app/js/app.js @@ -145,29 +145,10 @@ eventManApp.config(['$stateProvider', '$urlRouterProvider', templateUrl: 'ticket-edit.html', controller: 'EventTicketsCtrl' }) - .state('persons', { - url: '/persons', - templateUrl: 'persons-list.html', - controller: 'PersonsListCtrl' - }) - .state('person', { - url: '/person', - templateUrl: 'person-main.html' - }) - .state('person.new', { - url: '/new', - templateUrl: 'person-edit.html', - controller: 'PersonDetailsCtrl' - }) - .state('person.edit', { - url: '/:id/edit', - templateUrl: 'person-edit.html', - controller: 'PersonDetailsCtrl' - }) - .state('person.info', { - url: '/:id', - templateUrl: 'person-info.html', - controller: 'PersonDetailsCtrl' + .state('tickets', { + url: '/tickets', + templateUrl: 'tickets-list.html', + controller: 'EventTicketsCtrl' }) .state('import', { url: '/import', diff --git a/angular_app/js/controllers.js b/angular_app/js/controllers.js index de68acc..71fa4cc 100644 --- a/angular_app/js/controllers.js +++ b/angular_app/js/controllers.js @@ -142,6 +142,7 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event', $scope.message = {}; $scope.event = {}; $scope.ticket = {}; // current ticket, for the event.ticket.* states + $scope.tickets = []; // list of all tickets, for the 'tickets' state $scope.formSchema = {}; $scope.formData = {}; $scope.guiOptions = {dangerousActionsEnabled: false}; @@ -219,6 +220,8 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event', } ); } + } else if ($state.is('tickets')) { + $scope.tickets = EventTicket.all(); } $scope.calcAttendees = function() { diff --git a/angular_app/js/services.js b/angular_app/js/services.js index 9aee1f2..5f7b449 100644 --- a/angular_app/js/services.js +++ b/angular_app/js/services.js @@ -88,6 +88,20 @@ eventManServices.factory('EventTicket', ['$resource', '$rootScope', } }, + all: { + method: 'GET', + url: '/tickets', + interceptor : {responseError: $rootScope.errorHandler}, + isArray: true, + transformResponse: function(data, headers) { + data = angular.fromJson(data); + if (data.error) { + return data; + } + return data.persons; + } + }, + add: { method: 'POST', interceptor : {responseError: $rootScope.errorHandler}, diff --git a/angular_app/persons-list.html b/angular_app/tickets-list.html similarity index 98% rename from angular_app/persons-list.html rename to angular_app/tickets-list.html index fc4d8ae..ab4aaf2 100644 --- a/angular_app/persons-list.html +++ b/angular_app/tickets-list.html @@ -45,7 +45,7 @@ - + {{$index+1}} {{person.name}} {{person.surname}} <{{person.email}}> diff --git a/eventman_server.py b/eventman_server.py index 60b7e46..3db014c 100755 --- a/eventman_server.py +++ b/eventman_server.py @@ -522,10 +522,30 @@ class CollectionHandler(BaseHandler): self.logger.error('Error yielding WebSocket message: %s', e) +class TicketsHandler(CollectionHandler): + """Handle requests for Tickes.""" + + @gen.coroutine + @authenticated + def get(self, id_=None, resource=None, resource_id=None, acl=True, **kwargs): + query = {} + events = self.db.query('events', {}) + persons = {} + for event in events: + id_ = str(event['_id']) + title = event['title'] + for person in (event.get('persons') or []): + email = person.get('email') + if not email: + continue + if email not in persons: + persons[email] = person + persons[email].setdefault('events', {})[id_] = title + self.write({'persons': persons.values()}) + + class PersonsHandler(CollectionHandler): """Handle requests for Persons.""" - document = 'person' - collection = 'persons' def handle_get_events(self, id_, resource_id=None, **kwargs): # Get a list of events attended by this person. @@ -605,7 +625,7 @@ class EventsHandler(CollectionHandler): all_query = {'group_id': group_id} events = self.db.query('events', all_query) for event in events: - if str(event.get('_id')) == id_: + if id_ is not None and str(event.get('_id')) == id_: continue persons += [p for p in (event.get('persons') or []) if p.get('email') and p.get('email') not in this_emails] return {'persons': persons} @@ -837,7 +857,7 @@ class SettingsHandler(BaseHandler): class InfoHandler(BaseHandler): - """Handle requests for Info.""" + """Handle requests for information about the logged in user.""" @gen.coroutine @authenticated def get(self, **kwds): @@ -998,6 +1018,7 @@ def run(): _persons_path = r"/persons/?(?P[\w\d_-]+)?/?(?P[\w\d_-]+)?/?(?P[\w\d_-]+)?" _events_path = r"/events/?(?P[\w\d_-]+)?/?(?P[\w\d_-]+)?/?(?P[\w\d_-]+)?" _users_path = r"/users/?(?P[\w\d_-]+)?/?(?P[\w\d_-]+)?/?(?P[\w\d_-]+)?" + _tickets_path = r"/tickets" application = tornado.web.Application([ (_persons_path, PersonsHandler, init_params), (r'/v%s%s' % (API_VERSION, _persons_path), PersonsHandler, init_params), @@ -1005,6 +1026,8 @@ def run(): (r'/v%s%s' % (API_VERSION, _events_path), EventsHandler, init_params), (_users_path, UsersHandler, init_params), (r'/v%s%s' % (API_VERSION, _users_path), UsersHandler, init_params), + (_tickets_path, TicketsHandler, init_params), + (r'/v%s%s' % (API_VERSION, _tickets_path), TicketsHandler, init_params), (r"/(?:index.html)?", RootHandler, init_params), (r"/ebcsvpersons", EbCSVImportPersonsHandler, init_params), (r"/settings", SettingsHandler, init_params),