symposion_app Changeset - 4162ba7c3fb0

Changeset - 4162ba7c3fb0

Parent rev.

Child rev.

[Not reviewed]

Merge

0 5 3

James Polley - 6 years ago 2018-04-17 05:54:38
jp@jamezpolley.com

Merge branch 'master' into ticket-testing

5 files changed with 28 insertions and 10 deletions:

pinaxcon/templates/symposion/schedule/_grid.html

vendor/regidesk/regidesk/models.py

vendor/regidesk/regidesk/templates/regidesk/boardingpass_overview.html

vendor/regidesk/regidesk/templates/regidesk/ci_overview.html

vendor/regidesk/regidesk/views.py

0 comments (0 inline, 0 general)

pinaxcon/templates/symposion/schedule/_grid.html

➞

Show inline comments

@@ ... / @@ -18,3 +18,3 @@ @@
               <th class="track-name">{% if track_name %}<p>{{ track_name }}{% endif %}</th>
-	        {% endwith %}
+            {% endwith %}
           {% endfor %}
@@ ... / @@ -46,2 +46,4 @@ @@
                           <a href="{% url "schedule_session_detail" session.id %}">Volunteer! 🙋</a>
                         {% else %}
                           <a href="{% url "schedule_session_detail" session.id %}">{{ session.chair.user.attendee.attendeeprofilebase.attendeeprofile.name }}</a>
                         {% endif %}</em>

vendor/regidesk/regidesk/models.py

➞

Show inline comments

@@ ... / @@ -100,2 +100,6 @@ class CheckIn(models.Model): @@
     def unset_badge(self):
         self.badge_printed = False
         self.save()
     def mark_schwag_given(self):
@@ ... / @@ -105,3 +109,3 @@ class CheckIn(models.Model): @@
     def bulk_mark_given(self):
-        self.badge_printed = True
+        self.checked_in_bool = True
         self.schwag_given = True

vendor/regidesk/regidesk/templates/regidesk/boardingpass_overview.html

➞

Show inline comments

@@ ... / @@ -70,3 +70,4 @@ @@
                         <td>{{ attendee.user.email }}</td>
                         <td><a href="{% url 'regidesk:check_in_user_view' attendee.user.checkin.code %}">{{ attendee.user.checkin.code }}</a></td>
                         <td>{% if attendee.user.checkin.code %}
                             <a href="{% url 'regidesk:check_in_user_view' attendee.user.checkin.code %}">{{ attendee.user.checkin.code }}</a>{% endif %}</td>
                         <td>

vendor/regidesk/regidesk/templates/regidesk/ci_overview.html

➞

Show inline comments

@@ ... / @@ -33,2 +33,3 @@ @@
                 <dt>Over 18 years</dt><dd>{% if user.attendee.attendeeprofilebase.attendeeprofile.of_legal_age %}yes{% else %}<strong class="red">NO</strong>{% endif %}</dd>
                 <dt>Username</dt><dd>{{ user.username }}</dd>
             </dl>
@@ ... / @@ -73,3 +74,3 @@ @@
             </dl>
             <form method="post">
+            <form method="post" hidden>
                 <input type="checkbox" name="badge" value="badge" checked hidden>
@@ ... / @@ -78,2 +79,6 @@ @@
             </form>
             <form method="post">
                 <input type="checkbox" name="unbadge" value="unbadge" checked hidden>
                 <input class="btn btn-danger pull-right" type="submit" value="Force Reprint">
             </form>
         </div>
@@ ... / @@ -105,7 +110,8 @@ @@
-    <div class="panel {% if check_in.badge_printed or check_in.schwag_given %}panel-danger{% else %}panel-success{% endif %}">
+    <div class="panel {% if check_in.checked_in_bool or check_in.schwag_given %}panel-danger{% else %}panel-success{% endif %}">
         <div class="panel-heading">Bulk actions</div>
         <div class="panel-body">
             <p>Mark attendee as checked in and schwag given</p>
             <dl class="dl-horizontal">
-                <dt>Status</dt><dd>{% if check_in.badge_printed or check_in.schwag_given %}One of the items in bulk action is marked as given already{% else %}Both items are marked as unrecived{% endif %}</dd>
+                <dt>Status</dt><dd>{% if check_in.checked_in_bool or check_in.schwag_given %}One of the items in bulk action is marked as given already{% else %}Both items are marked as unrecived{% endif %}</dd>
             </dl>
@@ ... / @@ -113,3 +119,3 @@ @@
                 <input type="checkbox" name="bulk" value="bulk" checked hidden>
-                <input class="btn  {% if check_in.badge_printed or check_in.schwag_given %}btn-danger{% else %}btn-success{% endif %} pull-right" type="submit" value="Submit">
+                <input class="btn  {% if check_in.checked_in_bool or check_in.schwag_given %}btn-danger{% else %}btn-success{% endif %} pull-right" type="submit" value="Submit">
             </form>

vendor/regidesk/regidesk/views.py

➞

Show inline comments

@@ ... / @@ -54,3 +54,4 @@ def boardingpass(request): @@
             return redirect('/tickets/review')
         prepare_boarding_pass(request, templates[0])
         prepare_boarding_pass(request.user, templates[0])
         checkin = CheckIn.objects.get_or_create(user=user)[0]
@@ ... / @@ -83,3 +84,5 @@ def boarding_overview(request, boarding_state="pending"): @@
     ticketholders = { ticket.invoice.user: ticket.product.name for ticket in tickets }
     print(datetime.now())
     ticketholders = ( ticket.invoice.user for ticket in tickets )
     print(datetime.now())
@@ ... / @@ -196,3 +199,3 @@ def prepare_boarding_pass(user, template, attendee=None): @@
     else:
-        user = request.user
         user = user
         attendee=user.attendee
@@ ... / @@ -314,2 +317,4 @@ def check_in_overview(request, access_code): @@
             check_in.set_exception(request.POST['exception'])
         elif 'unbadge' in request.POST:
             check_in.unset_badge()
         return redirect(request.path)

0 comments (0 inline, 0 general)