alberanid/eventman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

avoid multiple PUT calls adding a new ticket

Browse source
This commit is contained in:
Davide Alberani 2017-04-24 14:39:39 +02:00
parent 5abbfdef59
commit 80b4c595a0
2 changed files with 47 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
angular_app/js/controllers.js vendored
View file

@ -319,7 +319,7 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
$scope.info.user.username == data.username) { $scope.info.user.username == data.username) {
$scope.showAttendedMessage(data.ticket, data.ticket.attended); $scope.showAttendedMessage(data.ticket, data.ticket.attended);
} }
$scope.event.tickets[ticket_idx] = data.ticket; $scope.event.tickets.splice(ticket_idx, 1, data.ticket);
} else if (data.action == 'add' && ticket_idx == -1) { } else if (data.action == 'add' && ticket_idx == -1) {
$scope._localAddTicket(data.ticket); $scope._localAddTicket(data.ticket);
} else if (data.action == 'delete' && ticket_idx != -1) { } else if (data.action == 'delete' && ticket_idx != -1) {
@ -327,6 +327,35 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
} }
} }
); );
/* event listners; needed because otherwise, adding a ticket with the Quick add form,
* we'd be changing the $scope outside of the AngularJS's $digest. */
$scope.$on('event:ticket:new', function(evt, ticket, callback) {
$scope._localAddTicket(ticket);
if (callback) {
callback(ticket);
}
});
$scope.$on('event:ticket:update', function(evt, ticket) {
if (!$scope.event.tickets) {
$scope.event.tickets = [];
}
var ticket_idx = $scope.event.tickets.findIndex(function(el, idx, array) {
return ticket._id == el._id;
});
if (ticket_idx == -1) {
$log.debug('ticket not present: not updated');
return false;
}
$scope.event.tickets.splice(ticket_idx, 1, ticket);
});
$scope.$on('event:ticket:set-attr', function(evt, ticket, key, value, callback, hideMessage) {
$scope.setTicketAttribute(ticket, key, value, callback, hideMessage);
});
} }
} else if ($state.is('tickets')) { } else if ($state.is('tickets')) {
$scope.tickets = EventTicket.all(); $scope.tickets = EventTicket.all();
@ -401,7 +430,7 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
$log.warn('ticket not present: not updated'); $log.warn('ticket not present: not updated');
return false; return false;
} }
$scope.event.tickets[ticket_idx] = ticket; $scope.event.tickets.splice(ticket_idx, 1, ticket);
}; };
$scope._localRemoveTicket = function(ticket) { $scope._localRemoveTicket = function(ticket) {
@ -473,7 +502,7 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
return; return;
} }
if ($scope.event.tickets[ticket_idx] != data.ticket) { if ($scope.event.tickets[ticket_idx] != data.ticket) {
$scope.event.tickets[ticket_idx] = data.ticket; $scope.event.tickets.splice(ticket_idx, 1, data.ticket);
} }
if (key === 'attended' && !hideMessage) { if (key === 'attended' && !hideMessage) {
@ -517,41 +546,16 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
}); });
}; };
/* event listners; needed because otherwise, adding a ticket with the Quick add form,
* we'd be changing the $scope outside of the AngularJS's $digest. */
$rootScope.$on('event:ticket:new', function(evt, ticket, callback) {
$scope._localAddTicket(ticket);
if (callback) {
callback(ticket);
}
});
$rootScope.$on('event:ticket:update', function(evt, ticket) {
if (!$scope.event.tickets) {
$scope.event.tickets = [];
}
var ticket_idx = $scope.event.tickets.findIndex(function(el, idx, array) {
return ticket._id == el._id;
});
if (ticket_idx == -1) {
$log.debug('ticket not present: not updated');
return false;
}
$scope.event.tickets[ticket_idx] = ticket;
});
$rootScope.$on('event:ticket:set-attr', function(evt, ticket, key, value, callback, hideMessage) {
$scope.setTicketAttribute(ticket, key, value, callback, hideMessage);
});
$scope.addTicket = function(ticket, cb) { $scope.addTicket = function(ticket, cb) {
ticket.event_id = $state.params.id; ticket.event_id = $state.params.id;
if ($scope.modalInstance && $scope.modalInstance.opened) {
$scope.modalInstance.close();
}
EventTicket.add(ticket, function(ret_ticket) { EventTicket.add(ticket, function(ret_ticket) {
$log.debug('addTicket'); $log.debug('addTicket');
$log.debug(ret_ticket); $log.debug(ret_ticket);
$rootScope.$emit('event:ticket:new', ret_ticket, function() { $scope.$emit('event:ticket:new', ret_ticket, function() {
$rootScope.$emit('event:ticket:set-attr', ret_ticket, 'attended', true, null, true); $scope.$emit('event:ticket:set-attr', ret_ticket, 'attended', true, null, true);
}); });
if (cb) { if (cb) {
cb(ticket); cb(ticket);
@ -574,7 +578,7 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
$scope.updateTicket = function(ticket, cb) { $scope.updateTicket = function(ticket, cb) {
ticket.event_id = $state.params.id; ticket.event_id = $state.params.id;
EventTicket.update(ticket, function(t) { EventTicket.update(ticket, function(t) {
$rootScope.$emit('event:ticket:update', t.ticket); $scope.$emit('event:ticket:update', t.ticket);
if (cb) { if (cb) {
cb(t); cb(t);
} }
@ -592,11 +596,10 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
}; };
$scope.openQuickAddTicket = function(_id) { $scope.openQuickAddTicket = function(_id) {
var modalInstance = $uibModal.open({ $scope.modalInstance = $uibModal.open({
templateUrl: 'modal-quick-add-ticket.html', templateUrl: 'modal-quick-add-ticket.html',
controller: 'EventTicketsCtrl' scope: $scope
}); });
modalInstance.result.then(function() {});
}; };
$scope.submitForm = function(dataModelSubmitted) { $scope.submitForm = function(dataModelSubmitted) {

7
eventman_server.py
View file

@ -1108,7 +1108,14 @@ class WebSocketEventUpdatesHandler(tornado.websocket.WebSocketHandler):
logging.debug('WebSocketEventUpdatesHandler.on_message url:%s' % url) logging.debug('WebSocketEventUpdatesHandler.on_message url:%s' % url)
count = 0 count = 0
_to_delete = set() _to_delete = set()
current_uuid = None
try:
current_uuid = self.get_argument('uuid')
except:
pass
for uuid, client in _ws_clients.get(url, {}).items(): for uuid, client in _ws_clients.get(url, {}).items():
if uuid and uuid == current_uuid:
continue
try: try:
client.write_message(message) client.write_message(message)
except: except: