Offline checkin feature for a smooth registration workflow during internet outage at events.

.travis.yml

@@ -1,12 +1,25 @@
 language: python
 python:
-  - "2.7"
-# command to install dependencies
+  - 2.7
+cache:
+  directories:
+    - $HOME/.cache/pip
+before_script:
+  - sudo -- sh -c "echo '127.0.0.1  funnel.travis.dev' >> /etc/hosts"
+  - psql -c 'create database funnel_testing;' -U postgres
 install:
-  - pip install -r requirements.txt --use-mirrors
-  - pip install nose coverage
-# command to run tests
-script: nosetests funnel tests
+  - pip install -U pip wheel
+  - pip install -r requirements.txt
+script:
+  - nosetests -v tests
+  - nohup python runtestserver.py &
+  - sleep 10
+addons:
+  postgresql: "9.4"
+services:
+  - redis-server
 notifications:
   email: false
-  irc: "irc.freenode.net#hasgeek-dev"
+  slack:
+    - hasgeek:HDCoMDj3T4ICB59qFFVorCG8
+    - friendsofhasgeek:3bLViYSzhfaThJovFYCVD3fX

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011-13, HasGeek Media LLP
+Copyright (c) 2010-16, HasGeek
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

funnel/__init__.py

@@ -4,9 +4,10 @@
 from __future__ import absolute_import
 import coaster.app
 from flask import Flask
-from flask.ext.mail import Mail
-from flask.ext.lastuser import Lastuser
-from flask.ext.lastuser.sqlalchemy import UserManager
+from flask_migrate import Migrate
+from flask_mail import Mail
+from flask_lastuser import Lastuser
+from flask_lastuser.sqlalchemy import UserManager
 from baseframe import baseframe, assets, Version, Bundle
 from ._version import __version__
 
@@ -26,6 +27,8 @@
 assets['schedules.css'][version] = 'css/schedules.css'
 assets['schedules.js'][version] = 'js/schedules.js'
 assets['screens.css'][version] = 'css/screens.css'
+assets['html5-qrcode.js'][version] = 'js/libs/html5-qrcode.js'
+assets['jsqrcode-combined.js'][version] = 'js/libs/jsqrcode-combined.js'
 
 
 # --- Import rest of the app --------------------------------------------------
@@ -35,27 +38,28 @@
 
 
 # --- Configuration------------------------------------------------------------
-
-def init_for(env):
-    coaster.app.init_app(app, env)
-    db.init_app(app)
-    db.app = app
-
-    mail.init_app(app)
-    lastuser.init_app(app)
-    lastuser.init_usermanager(UserManager(db, models.User, models.Team))
-    baseframe.init_app(app, requires=['funnel'], ext_requires=[
-        ('codemirror-markdown', 'pygments'), 'toastr', 'baseframe-bs3', 'fontawesome>=4.0.0', 
-        'footable'])
-    app.assets.register('js_fullcalendar',
-        Bundle(assets.require('!jquery.js', 'jquery.fullcalendar.js', 'spectrum.js'),
-            output='js/fullcalendar.packed.js', filters='uglipyjs'))
-    app.assets.register('css_fullcalendar',
-        Bundle(assets.require('jquery.fullcalendar.css', 'spectrum.css', 'schedules.css'),
-            output='css/fullcalendar.packed.css', filters='cssmin'))
-    app.assets.register('js_schedules',
-        Bundle(assets.require('schedules.js'),
-            output='js/schedules.packed.js', filters='uglipyjs'))
-    app.assets.register('css_screens',
-        Bundle(assets.require('screens.css'),
-            output='css/screens.packed.css', filters='cssmin'))
+coaster.app.init_app(app)
+db.init_app(app)
+db.app = app
+migrate = Migrate(app, db)
+mail.init_app(app)
+lastuser.init_app(app)
+lastuser.init_usermanager(UserManager(db, models.User, models.Team))
+baseframe.init_app(app, requires=['funnel'], ext_requires=[
+    ('codemirror-markdown', 'pygments'), 'toastr', 'baseframe-bs3', 'fontawesome>=4.0.0',
+    'baseframe-footable', 'ractive'])
+app.assets.register('js_fullcalendar',
+    Bundle(assets.require('!jquery.js', 'jquery.fullcalendar.js', 'spectrum.js'),
+        output='js/fullcalendar.packed.js', filters='uglipyjs'))
+app.assets.register('css_fullcalendar',
+    Bundle(assets.require('jquery.fullcalendar.css', 'spectrum.css', 'schedules.css'),
+        output='css/fullcalendar.packed.css', filters='cssmin'))
+app.assets.register('js_schedules',
+    Bundle(assets.require('schedules.js'),
+        output='js/schedules.packed.js', filters='uglipyjs'))
+app.assets.register('css_screens',
+    Bundle(assets.require('screens.css'),
+        output='css/screens.packed.css', filters='cssmin'))
+app.assets.register('js_html5-qrcode',
+    Bundle(assets.require('html5-qrcode.js', 'jsqrcode-combined.js'),
+        output='js/html5-qrcode.packed.js', filters='uglipyjs'))

funnel/extapi/boxoffice.py

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+
+import requests
+from ..util import extract_twitter_handle
+from .. import app
+
+__all__ = ['Boxoffice']
+
+
+class Boxoffice(object):
+    """
+    An interface that enables data retrieval from Boxoffice.
+    """
+    def __init__(self, access_token):
+        self.access_token = access_token
+        self.base_url = app.config['BOXOFFICE_SERVER']
+
+    def url_for(self, endpoint):
+        return self.base_url.format(endpoint)
+
+    def get_orders(self, ic):
+        resp = requests.get(self.base_url + '/ic/{ic}/orders?access_token={token}'.format(ic=ic, token=self.access_token))
+        return resp.json().get('orders')
+
+    def get_tickets(self, ic):
+        tickets = []
+        for order in self.get_orders(ic):
+            for line_item in order.get('line_items'):
+                if line_item.get('assignee'):
+                    if line_item.get('line_item_status') == u'confirmed':
+                        status = u'confirmed'
+                    elif line_item.get('line_item_status') == u'cancelled':
+                        status = u'cancelled'
+                    else:
+                        status = unicode(line_item.get('line_item_status'))
+                    tickets.append({
+                        'fullname': line_item.get('assignee').get('fullname', ''),
+                        'email': line_item.get('assignee').get('email'),
+                        'phone': line_item.get('assignee').get('phone', ''),
+                        'twitter': extract_twitter_handle(line_item.get('assignee').get('twitter', '')),
+                        'company': line_item.get('assignee').get('company'),
+                        'city': line_item.get('assignee').get('city', ''),
+                        'job_title': line_item.get('assignee').get('jobtitle', ''),
+                        'ticket_no': unicode(line_item.get('line_item_seq')),
+                        'ticket_type': line_item.get('item', {}).get('title', '')[:80],
+                        'order_no': unicode(order.get('invoice_no')),
+                        'status': status
+                        })
+
+        return tickets

funnel/extapi/explara.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import requests
-from ..util import format_twitter_handle
+from ..util import extract_twitter_handle
 
 __all__ = ['ExplaraAPI']
 
@@ -55,18 +55,24 @@ def get_tickets(self, explara_eventid):
             for attendee in order.get('attendee'):
                 # cancelled tickets are in this list too, hence the check
                 if attendee.get('status') == 'attending':
-                    # we sometimes get an empty array for details
-                    details = attendee.get('details') or {}
-                    tickets.append({
-                        'fullname': strip_or_empty(attendee.get('name')),
-                        'email': strip_or_empty(attendee.get('email')),
-                        'phone': strip_or_empty(details.get('Phone') or order.get('phoneNo')),
-                        'twitter': format_twitter_handle(strip_or_empty(details.get('Twitter handle'))),
-                        'job_title': strip_or_empty(details.get('Job title')),
-                        'company': strip_or_empty(details.get('Company name')),
-                        'city': strip_or_empty(order.get('city')),
-                        'ticket_no': strip_or_empty(attendee.get('ticketNo')),
-                        'ticket_type': strip_or_empty(attendee.get('ticketName')),
-                        'order_no': strip_or_empty(order.get('orderNo')),
-                    })
+                    status = u'confirmed'
+                elif attendee.get('status') in [u'cancelled', u'lcancelled']:
+                    status = u'cancelled'
+                else:
+                    status = unicode(attendee.get('status'))
+                # we sometimes get an empty array for details
+                details = attendee.get('details') or {}
+                tickets.append({
+                    'fullname': strip_or_empty(attendee.get('name')),
+                    'email': strip_or_empty(attendee.get('email')),
+                    'phone': strip_or_empty(details.get('Phone') or order.get('phoneNo')),
+                    'twitter': extract_twitter_handle(strip_or_empty(details.get('Twitter handle'))),
+                    'job_title': strip_or_empty(details.get('Job title')),
+                    'company': strip_or_empty(details.get('Company name')),
+                    'city': strip_or_empty(order.get('city')),
+                    'ticket_no': strip_or_empty(attendee.get('ticketNo')),
+                    'ticket_type': strip_or_empty(attendee.get('ticketName')),
+                    'order_no': strip_or_empty(order.get('orderNo')),
+                    'status': status
+                })
         return tickets

funnel/forms/participant.py

@@ -17,6 +17,7 @@ class ParticipantForm(forms.Form):
     company = forms.StringField(__("Company"), validators=[forms.validators.Length(max=80)])
     job_title = forms.StringField(__("Job Title"), validators=[forms.validators.Length(max=80)])
     twitter = forms.StringField(__("Twitter"), validators=[forms.validators.Length(max=15)])
+    badge_printed = forms.BooleanField(__("Badge Printed"))
     events = QuerySelectMultipleField(__("Events"),
         widget=ListWidget(), option_widget=CheckboxInput(),
         get_label='title',

funnel/forms/proposal.py

@@ -60,6 +60,19 @@ class ProposalForm(forms.Form):
     location = forms.StringField(__("Your location"), validators=[forms.validators.DataRequired(), forms.validators.Length(max=80)],
         description=__("Your location, to help plan for your travel if required"))
 
+    def __init__(self, *args, **kwargs):
+        super(ProposalForm, self).__init__(*args, **kwargs)
+        space = kwargs.get('parent')
+        if space.proposal_part_a.get('title'):
+            self.objective.label.text = space.proposal_part_a.get('title')
+        if space.proposal_part_a.get('hint'):
+            self.objective.description = space.proposal_part_a.get('hint')
+        if space.proposal_part_b.get('title'):
+            self.description.label.text = space.proposal_part_b.get('title')
+        if space.proposal_part_b.get('hint'):
+            self.description.description = space.proposal_part_b.get('hint')
+
+
 
 class ProposalStatusForm(forms.Form):
     status = forms.SelectField(

funnel/forms/space.py

@@ -10,7 +10,7 @@
 from .profile import profile_teams
 from ..models import RSVP_STATUS
 
-__all__ = ['ProposalSpaceForm', 'RsvpForm', 'EventForm', 'TicketTypeForm', 'TicketClientForm']
+__all__ = ['ProposalSpaceForm', 'ProposalSubspaceForm', 'RsvpForm', 'EventForm', 'TicketTypeForm', 'TicketClientForm']
 
 
 valid_color_re = re.compile("^[a-fA-F\d]{6}|[a-fA-F\d]{3}$")
@@ -21,9 +21,9 @@ class ProposalSpaceForm(forms.Form):
     title = forms.StringField(__("Title"), validators=[forms.validators.DataRequired()])
     datelocation = forms.StringField(__("Date and Location"), validators=[forms.validators.DataRequired(), forms.validators.Length(max=50)])
     date = forms.DateField(__("Start date (for sorting)"),
-        validators=[forms.validators.DataRequired(__("Enter a valid date in YYYY-MM-DD format"))])
+        validators=[forms.validators.DataRequired(__("This is required"))])
     date_upto = forms.DateField(__("End date (for sorting)"),
-        validators=[forms.validators.DataRequired(__("Enter a valid date in YYYY-MM-DD format"))])
+        validators=[forms.validators.DataRequired(__("This is required"))])
     tagline = forms.StringField(__("Tagline"), validators=[forms.validators.DataRequired()],
         description=__("This is displayed on the card on the homepage"))
     website = forms.URLField(__("Website"),
@@ -42,6 +42,7 @@ class ProposalSpaceForm(forms.Form):
     explore_url = forms.URLField(__("Explore tab URL"),
         description=__(u"Page containing the explore tab’s contents, for the mobile app"),
         validators=[forms.validators.Optional()])
+    parent_space = QuerySelectField(__(u"Parent space"), get_label='title', allow_blank=True, blank_text=__(u"None"))
 
     status = forms.SelectField(__("Status"), coerce=int, choices=[
         (0, __("Draft")),
@@ -74,6 +75,10 @@ def validate_bg_color(self, field):
             raise forms.ValidationError("Please enter a valid color code")
 
 
+class ProposalSubspaceForm(ProposalSpaceForm):
+    inherit_sections = forms.BooleanField(__("Inherit sections from parent space?"), default=True)
+
+
 class RsvpForm(forms.Form):
     status = forms.RadioField("Status", choices=[(k, RSVP_STATUS[k].title) for k in RSVP_STATUS.USER_CHOICES])
 

funnel/jobs/jobs.py

@@ -1,16 +1,17 @@
-from ..models import (db, TicketClient, SyncTicket)
+from ..models import (db, TicketClient)
 from ..extapi.explara import ExplaraAPI
-from flask.ext.rq import job
+from ..extapi.boxoffice import Boxoffice
 from funnel import app
 
 
-@job('funnel')
 def import_tickets(ticket_client_id):
     with app.test_request_context():
         ticket_client = TicketClient.query.get(ticket_client_id)
-        if ticket_client and ticket_client.name == u'explara':
-            ticket_list = ExplaraAPI(access_token=ticket_client.client_access_token).get_tickets(ticket_client.client_eventid)
-            # cancelled tickets are excluded from the list returned by get_tickets
-            cancel_list = SyncTicket.exclude(ticket_client, [ticket.get('ticket_no') for ticket in ticket_list]).all()
-            ticket_client.import_from_list(ticket_list, cancel_list=cancel_list)
-        db.session.commit()
+        if ticket_client:
+            if ticket_client.name.lower() == u'explara':
+                ticket_list = ExplaraAPI(access_token=ticket_client.client_access_token).get_tickets(ticket_client.client_eventid)
+                ticket_client.import_from_list(ticket_list)
+            elif ticket_client.name.lower() == u'boxoffice':
+                ticket_list = Boxoffice(access_token=ticket_client.client_access_token).get_tickets(ticket_client.client_eventid)
+                ticket_client.import_from_list(ticket_list)
+            db.session.commit()

funnel/models/event.py

@@ -2,6 +2,7 @@
 import os
 import base64
 from datetime import datetime
+from sqlalchemy.sql import text
 from . import db, BaseMixin, BaseScopedNameMixin
 from .space import ProposalSpace
 from .user import User
@@ -146,9 +147,17 @@ def remove_events(self, events):
 
     @classmethod
     def checkin_list(cls, event):
-        participant_attendee_join = db.join(Participant, Attendee, Participant.id == Attendee.participant_id)
-        stmt = db.select([Participant.id, Participant.fullname, Participant.email, Participant.company, Participant.twitter, Participant.puk, Participant.key, Attendee.checked_in, Participant.badge_printed]).select_from(participant_attendee_join).where(Attendee.event_id == event.id).order_by(Participant.fullname)
-        return db.session.execute(stmt).fetchall()
+        """
+        Returns participant details along with their associated ticket types as a comma-separated string.
+        WARNING: This query uses `string_agg` and hence will only work in PostgreSQL >= 9.0
+        """
+        participant_list = db.session.query('id', 'fullname', 'email', 'company', 'twitter', 'puk', 'key', 'checked_in', 'badge_printed', 'ticket_type_titles').from_statement(text('''
+            SELECT distinct(participant.id), participant.fullname, participant.email, participant.company, participant.twitter, participant.puk, participant.key, attendee.checked_in, participant.badge_printed, (select string_agg(title, ',') from sync_ticket INNER JOIN ticket_type ON sync_ticket.ticket_type_id = ticket_type.id where sync_ticket.participant_id = participant.id) AS ticket_type_titles
+            FROM participant INNER JOIN attendee ON participant.id = attendee.participant_id LEFT OUTER JOIN sync_ticket ON participant.id = sync_ticket.participant_id
+            WHERE attendee.event_id = {event_id}
+            ORDER BY participant.fullname
+        '''.format(event_id=event.id))).all()
+        return participant_list
 
 
 class Attendee(BaseMixin, db.Model):
@@ -184,14 +193,11 @@ class TicketClient(BaseMixin, db.Model):
     proposal_space = db.relationship(ProposalSpace,
         backref=db.backref('ticket_clients', cascade='all, delete-orphan'))
 
-    def import_from_list(self, ticket_list, cancel_list=[]):
+    def import_from_list(self, ticket_list):
         """
         Batch upserts the tickets and its associated ticket types and participants.
         Cancels the tickets in cancel_list.
         """
-        for ticket in cancel_list:
-            ticket.participant.remove_events(ticket.ticket_type.events)
-
         for ticket_dict in ticket_list:
             ticket_type = TicketType.upsert(self.proposal_space, current_title=ticket_dict['ticket_type'])
 
@@ -200,19 +206,21 @@ def import_from_list(self, ticket_list, cancel_list=[]):
                              phone=ticket_dict['phone'],
                              twitter=ticket_dict['twitter'],
                              company=ticket_dict['company'],
+                             job_title=ticket_dict['job_title'],
                              city=ticket_dict['city']
                             )
 
             ticket = SyncTicket.get(self, ticket_dict.get('order_no'), ticket_dict.get('ticket_no'))
-            if ticket and ticket.participant is not participant:
-                # Ensure that the previous participant does not have access to
+            if ticket and (ticket.participant is not participant or ticket_dict.get('status') == u'cancelled'):
+                # Ensure that the participant of a transferred or cancelled ticket does not have access to
                 # this ticket's events
                 ticket.participant.remove_events(ticket_type.events)
 
-            ticket = SyncTicket.upsert(self, ticket_dict.get('order_no'), ticket_dict.get('ticket_no'),
-                participant=participant, ticket_type=ticket_type)
-            # Ensure that the new or updated participant has access to events
-            ticket.participant.add_events(ticket_type.events)
+            if ticket_dict.get('status') == u'confirmed':
+                ticket = SyncTicket.upsert(self, ticket_dict.get('order_no'), ticket_dict.get('ticket_no'),
+                    participant=participant, ticket_type=ticket_type)
+                # Ensure that the new or updated participant has access to events
+                ticket.participant.add_events(ticket_type.events)
 
 
 class SyncTicket(BaseMixin, db.Model):
@@ -253,8 +261,3 @@ def upsert(cls, ticket_client, order_no, ticket_no, **fields):
             db.session.add(ticket)
 
         return ticket
-
-    @classmethod
-    def exclude(cls, ticket_client, ticket_nos):
-        return cls.query.filter_by(ticket_client=ticket_client
-            ).filter(~cls.ticket_no.in_(ticket_nos))

funnel/models/profile.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from flask import url_for
-from flask.ext.lastuser.sqlalchemy import ProfileBase
+from flask_lastuser.sqlalchemy import ProfileBase
 from . import db, MarkdownColumn
 from .user import Team