Merge pull request #177 from alberanid/master

fixes #167: QR Code reader

angular_app/js/app.js

@@ -17,6 +17,7 @@
 /* Register our fantastic app. */
 var eventManApp = angular.module('eventManApp', [
     'ngRoute',
+    'ngAnimate',
     'eventManServices',
     'eventManControllers',
     'ui.bootstrap',

angular_app/js/controllers.js

@@ -293,7 +293,7 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
                             return false;
                         }
                         if (data.error && data.message) {
-                            toaster.pop({type: 'error', title: 'Error', body: data.message, timeout: 5000});
+                            toaster.pop({type: 'error', title: 'Error', body: data.message, timeout: 0, showCloseButton: true});
                             return;
                         }
                         if (!$scope.event.tickets) {
@@ -508,6 +508,9 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
                     ticket_id: ticket._id
                 }, function() {
                     $scope._localRemoveTicket(ticket);
+                    var msg = $scope.buildTicketLabel(ticket);
+                    msg += ' successfully removed from event ' + $scope.event.title;
+                    toaster.pop({type: 'error', title: msg});
             });
         };
 
@@ -545,7 +548,7 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
                 $log.debug('addTicket');
                 $log.debug(ret_ticket);
                 $rootScope.$emit('event:ticket:new', ret_ticket, function() {
-                    $rootScope.$emit('event:ticket:set-attr', ret_ticket, 'attended', true, null, false);
+                    $rootScope.$emit('event:ticket:set-attr', ret_ticket, 'attended', true, null, true);
                 });
                 if (cb) {
                     cb(ticket);
@@ -558,6 +561,9 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
                         // Close the Quick ticket modal.
                         $scope.$close();
                     }
+                    var msg = $scope.buildTicketLabel(ret_ticket);
+                    msg += ' successfully added to event ' + $scope.event.title;
+                    toaster.pop({type: 'success', title: msg});
                 }
             });
         };

eventman_server.py

@@ -793,13 +793,17 @@ class EventsHandler(CollectionHandler):
         # Update an existing entry for a ticket registered at this event.
         self._clean_dict(data)
         uuid, arguments = self.uuid_arguments
+        _errorMessage = ''
+        if '_errorMessage' in arguments:
+            _errorMessage = arguments['_errorMessage']
+            del arguments['_errorMessage']
         query = dict([('tickets.%s' % k, v) for k, v in arguments.items()])
         query['_id'] = id_
         if ticket_id is not None:
             query['tickets._id'] = ticket_id
             ticket_query = {'_id': ticket_id}
         else:
-            ticket_query = self.arguments
+            ticket_query = arguments
         old_ticket_data = {}
         current_event = self.db.query(self.collection, query)
         if current_event:
@@ -811,15 +815,19 @@ class EventsHandler(CollectionHandler):
         matching_tickets = self._get_ticket_data(ticket_query, tickets, only_one=False)
         nr_matches = len(matching_tickets)
         if nr_matches > 1:
-            ret = {'error': True, 'message': 'more than one ticket matched', 'query': query,
+            ret = {'error': True, 'message': 'more than one ticket matched. %s' % _errorMessage, 'query': query,
+                   'uuid': uuid, 'username': self.current_user_info.get('username', '')}
+            self.send_ws_message('event/%s/tickets/updates' % id_, json.dumps(ret))
+            self.set_status(400)
+            return ret
+        elif nr_matches == 0:
+            ret = {'error': True, 'message': 'no ticket matched. %s' % _errorMessage, 'query': query,
                    'uuid': uuid, 'username': self.current_user_info.get('username', '')}
             self.send_ws_message('event/%s/tickets/updates' % id_, json.dumps(ret))
             self.set_status(400)
             return ret
-        elif nr_matches == 1:
-            old_ticket_data = matching_tickets[0]
         else:
-            old_ticket_data = {}
+            old_ticket_data = matching_tickets[0]
 
         # We have changed the "cancelled" status of a ticket to False; check if we still have a ticket available
         if 'number_of_tickets' in current_event and old_ticket_data.get('cancelled') and not data.get('cancelled'):

static/css/eventman.css

@@ -103,3 +103,11 @@ input[type=text].form-control, input[type=search].form-control {
 #toast-container.toast-bottom-center>div, #toast-container.toast-center>div, #toast-container.toast-top-center>div {
     margin-bottom: 4px;
 }
+
+:not(.no-enter)#toast-container > div.ng-enter {
+    transition-duration: .1s;
+}
+
+:not(.no-leave)#toast-container > div.ng-leave {
+    transition-duration: .2s;
+}

tools/qrcode_reader.ini

@@ -1,3 +1,6 @@
+[qrcode_reader]
+debug = true
+
 [connection]
 port = /dev/ttyACM0
 

tools/qrcode_reader.py

@@ -24,8 +24,43 @@ import sys
 import time
 import serial
 import urllib
+import logging
+import argparse
 import requests
 import configparser
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
+
+
+logger = logging.getLogger('qrcode_reader')
+logging.basicConfig(level=logging.INFO)
+logging.getLogger('requests').setLevel(logging.WARNING)
+logging.getLogger('urllib3').setLevel(logging.WARNING)
+requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
+
+
+def convert_obj(obj):
+    try:
+        return int(obj)
+    except:
+        pass
+    if isinstance(obj, str):
+        obj_l = obj.lower()
+        if obj_l in ['true', 'on', 'yes']:
+            return True
+        elif obj_l in ['false', 'off', 'no']:
+            return False
+    return obj
+
+
+def convert(seq):
+    if isinstance(seq, dict):
+        d = {}
+        for key, item in seq.items():
+            d[key] = convert(item)
+        return d
+    if isinstance(seq, (list, tuple)):
+        return [convert(x) for x in seq]
+    return convert_obj(seq)
 
 
 class Connector():
@@ -56,37 +91,46 @@ class Connector():
             req.raise_for_status()
             req.connection.close()
         except requests.exceptions.ConnectionError as ex:
-            print('unable to connect to %s: %s' % (self.login_url, ex))
+            logger.error('unable to connect to %s: %s' % (self.login_url, ex))
             sys.exit(1)
 
     def checkin(self, code):
+        msg = 'scanning code %s: ' % code
         limit_field = self.cfg['event'].getint('limit_field')
         if limit_field:
             code = code[:limit_field]
-        checkin_url = self.checkin_url + '?' + urllib.parse.urlencode({cfg['event']['field']: code})
-        params = dict(self.cfg['actions'])
-        req = self.session.put(checkin_url, json=params)
+        params = {cfg['event']['field']: code, '_errorMessage': 'code: %s' % code}
+        checkin_url = self.checkin_url + '?' + urllib.parse.urlencode(params)
+        json = convert(dict(self.cfg['actions']))
+        req = self.session.put(checkin_url, json=json)
+        error = False
         try:
             req.raise_for_status()
+            msg += 'ok'
         except requests.exceptions.HTTPError as ex:
-            print('error: %s' % req.json().get('message'))
+            error = True
+            msg += 'error: %s' % req.json().get('message')
+        if not error:
+            logger.info(msg)
+        else:
+            logger.warning(msg)
         req.connection.close()
 
 
 def scan(port):
     retry = 1
     while True:
-        print('waiting for connection on port %s...' % port)
+        logger.debug('waiting for connection on port %s...' % port)
         try:
             ser = serial.Serial(port=port, timeout=1)
             break
         except serial.serialutil.SerialException as ex:
-            if retry >= 10:
-                print('unable to connect: %s' % ex)
+            if retry >= 20:
+                logger.error('unable to connect: %s' % ex)
                 sys.exit(2)
         time.sleep(1)
         retry += 1
-    print('connected to %s' % port)
+    logger.info('connected to %s' % port)
     ser_io = io.TextIOWrapper(io.BufferedRWPair(ser, ser, 1), newline='\r', line_buffering=True)
     while True:
         line = ser_io.readline().strip()
@@ -96,12 +140,22 @@ def scan(port):
 
 
 if __name__ == '__main__':
-    cfg = configparser.ConfigParser()
-    cfg.read('qrcode_reader.ini')
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-c', '--code', help='specify a single code', action='store')
+    parser.add_argument('--config', help='user a different configuration file (default: qrcode_reader.ini)',
+                        action='store', default='qrcode_reader.ini')
+    args = parser.parse_args()
+
+    cfg = configparser.ConfigParser(interpolation=configparser.ExtendedInterpolation())
+    cfg.read(args.config)
+    if cfg['qrcode_reader'].getboolean('debug'):
+        logging.basicConfig(level=logging.DEBUG)
     connector = Connector(cfg)
-    try:
-        for code in scan(port=cfg['connection']['port']):
-            print('received code %s' % code)
-            connector.checkin(code)
-    except KeyboardInterrupt:
-        print('exiting...')
+    if args.code:
+        connector.checkin(args.code)
+    else:
+        try:
+            for code in scan(port=cfg['connection']['port']):
+                connector.checkin(code)
+        except KeyboardInterrupt:
+            logger.info('exiting...')