From 26affc4629c7f914ebbc8cb993d51db10e534d67 Mon Sep 17 00:00:00 2001
From: Tobias <tobiasschulmann@catalyst.net.nz>
Date: Thu, 17 Jan 2019 13:46:35 +1300
Subject: [PATCH] Checkin fixes

---
 .../templates/regidesk/ci_overview.html       | 135 +++++++-----------
 1 file changed, 53 insertions(+), 82 deletions(-)

diff --git a/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html b/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html
index 071c3814..a5a3e139 100644
--- a/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html
+++ b/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html
@@ -23,44 +23,44 @@
         <dl class="card-text row">
             <dt class="col-sm-3">Ticket type</dt>
             <dd class="col-sm-9">{{ ticket_type }}</dd>
-
+            
             <dt class="col-sm-3">Name</dt>
             <dd class="col-sm-9">{{ user.attendee.attendeeprofilebase.attendeeprofile.name }}</dd>
-
+            
             <dt class="col-sm-3">Company</dt>
             <dd class="col-sm-9">{% if ticket_type == "Student" or ticket_type == "Hobbyist" or "Only" in ticket_type %}{% else %}{{ user.attendee.attendeeprofilebase.attendeeprofile.company }}{% endif %}</dd>
-
+            
             <dt class="col-sm-3">Free Text 1</dt>
             <dd class="col-sm-9">{{ user.attendee.attendeeprofilebase.attendeeprofile.free_text_1 }}</dd>
-
+            
             <dt class="col-sm-3">Free Text 2</dt>
             <dd class="col-sm-9">{{ user.attendee.attendeeprofilebase.attendeeprofile.free_text_2 }}</dd>
-
+            
             <dt class="col-sm-3">Penguin Dinner Tickets</dt>
             <dd class="col-sm-9">{{ penguin_dinner_count }}</dd>
-
+            
             <dt class="col-sm-3">Spearker Dinner Tickets</dt>
             <dd class="col-sm-9">{{ speakers_dinner_count }}</dd>
-
+            
             <dt class="col-sm-3">PDNS Tickets</dt>
             <dd class="col-sm-9">{{ pdns_count }}</dd>
-
+            
             <dt class="col-sm-3">Over 18 years</dt>
             <dd class="col-sm-9">{% if user.attendee.attendeeprofilebase.attendeeprofile.of_legal_age %}yes{% else %}<strong
                 class="red">NO</strong>{% endif %}</dd>
-
+                
                 <dt class="col-sm-3">Username</dt>
                 <dd class="col-sm-9">{{ user.username }}</dd>
             </dl>
             <h4>Shirts ordered</h4>
             <table class="table card-text">
-                    {% for shirt in shirts%}
-                    <tr>
-                        <td>{{ shirt.product }}</td>
-                        <td>{{ shirt.quantity }}</td>
-                    </tr>
-                    {% endfor %}
-                </table>
+                {% for shirt in shirts%}
+                <tr>
+                    <td>{{ shirt.product }}</td>
+                    <td>{{ shirt.quantity }}</td>
+                </tr>
+                {% endfor %}
+            </table>
         </div>
     </div>
     <div class="card my-3">
@@ -69,13 +69,13 @@
         </div>
         <div class="card-body">
             <img src="{% url 'badge' user.id %}.svg">
-
+            
         </div>
     </div>
-
+    
     <!-- NOTE:
-    Workflow can be improved by using tickboxes for check-in, badge print, and swag, with a single submit button.
-     -->
+        Workflow can be improved by using tickboxes for check-in, badge print, and swag, with a single submit button.
+    -->
     <div class="card my-3">
         <div class="card-header">
             <h2 class="card-title">Check In</h2>
@@ -94,77 +94,48 @@
                 </form>
             </div>
         </div>
-
-
+        
+        
         <div class="card my-3">
             <div class="card-header">
                 <h2 class="card-title">Badge</h2>
-            </div>
-                <div class="card-body">
-                        <dl class="row card-text">
-                        <dt class="col-sm-3">Status</dt>
-                        <dd class="col-sm-9">{% if check_in.badge_printed %}Marked{% else %}Not marked{% endif %} as printed</dd>
-                    </dl>
-                    <form method="post" hidden>
-                        <input type="checkbox" name="badge" value="badge" checked hidden>
-                        <a type="button" class="btn btn-primary" href="badge">Show Badge</a>
-                        <input class="btn" type="submit" value="Submit">
-                    </form>
-                    <form method="post">
-                        <input type="checkbox" name="unbadge" value="unbadge" checked hidden>
-                        <input class="btn" type="submit" value="Force Reprint">
-                    </form>
-                </div>
-            </div>
-        </div>
-
-
-        <div class="card my-3">
-            <div class="card-header">
-                <h2 class="card-title">Schwag</h2>
             </div>
             <div class="card-body">
                 <dl class="row card-text">
                     <dt class="col-sm-3">Status</dt>
-                    <dd class="col-sm-9">{% if check_in.schwag_given %}Marked{% else %}Not marked{% endif %} as given</dd>
+                    <dd class="col-sm-9">{% if check_in.badge_printed %}Marked{% else %}Not marked{% endif %} as printed</dd>
                 </dl>
-                <form method="post">
-                    <input type="checkbox" name="schwag" value="schwag" checked hidden>
-                    <input class="btn" type="submit"
-                    value="Give Schwag">
-                </form>
-            </div>
-        </div>
-
-        <div class="card my-3">
-            <div class="card-header">
-                <h2 class="card-title">Log Exception</h2>
-            </div>
-            <div class="card-body">
-                <form method="post" class="card-text">
-                    <textarea class="form-control" rows="3" name="exception">{{ check_in.review_text }}</textarea>
-                    <p class="help-block">Reminder: Please tell attendee to email contact@lca2019.org with the details as well</p>
+                <form method="post" hidden>
+                    <input type="checkbox" name="badge" value="badge" checked hidden>
+                    <a type="button" class="btn btn-primary" href="badge">Show Badge</a>
                     <input class="btn" type="submit" value="Submit">
                 </form>
+                <form method="post">
+                    <input type="checkbox" name="unbadge" value="unbadge" checked hidden>
+                    <input class="btn" type="submit" value="Force Reprint">
+                </form>
             </div>
         </div>
-
-        <div class="card my-3 {% if check_in.checked_in_bool or check_in.schwag_given %}card-danger{% else %}card-success{% endif %}">
-            <div class="card-header">Bulk actions</div>
-            <div class="card-body">
-                <p>Mark attendee as checked in and schwag given</p>
-                <dl class="row card-text">
-                 <dt class="col-sm-3">Status</dt>
-                    <dd class="col-sm-9">{% 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>
-                    <form method="post">
-                        <input type="checkbox" name="bulk" value="bulk" checked hidden>
-                        <input class="btn pull-right" type="submit" value="Submit">
-                    </form>
-                </div>
-            </div>
-
-            <a type="button" class="btn btn-primary btn-lg" href="{% url 'regidesk:check_in_scanner' %}">Return to scanning page</a>
-
-            {% endblock %}
\ No newline at end of file
+    </div>
+    
+    
+    <div class="card my-3">
+        <div class="card-header">
+            <h2 class="card-title">Schwag</h2>
+        </div>
+        <div class="card-body">
+            <dl class="row card-text">
+                <dt class="col-sm-3">Status</dt>
+                <dd class="col-sm-9">{% if check_in.schwag_given %}Marked{% else %}Not marked{% endif %} as given</dd>
+            </dl>
+            <form method="post">
+                <input type="checkbox" name="schwag" value="schwag" checked hidden>
+                <input class="btn" type="submit"
+                value="Give Schwag">
+            </form>
+        </div>
+    </div>
+    
+    <a type="button" class="btn btn-primary btn-lg" href="{% url 'regidesk:check_in_scanner' %}">Return to scanning page</a>
+    
+    {% endblock %}
\ No newline at end of file