From 1c97c8a74fa350a42b0bc53b4408ad5f07112e35 Mon Sep 17 00:00:00 2001
From: klmp200 <klmp200@klmp200.net>
Date: Sun, 16 Oct 2016 02:47:21 +0200
Subject: [PATCH] Swag dropdown on user account + autofocus for refillings on
 counters

---
 core/templates/core/user_account.jinja        | 92 +++++++++++--------
 core/templates/core/user_account_detail.jinja | 58 ++++++------
 counter/templates/counter/counter_click.jinja |  5 +-
 counter/views.py                              |  3 +
 4 files changed, 89 insertions(+), 69 deletions(-)

diff --git a/core/templates/core/user_account.jinja b/core/templates/core/user_account.jinja
index 3b459fc1..1ecaa8d9 100644
--- a/core/templates/core/user_account.jinja
+++ b/core/templates/core/user_account.jinja
@@ -1,29 +1,31 @@
 {% extends "core/base.jinja" %}
 
 {% macro monthly(obj) %}
-<table>
-    <thead>
-        <tr>
-            <td>{% trans %}Year{% endtrans %}</td>
-            <td>{% trans %}Month{% endtrans %}</td>
-            <td>{% trans %}Total{% endtrans %}</td>
-        </tr>
-    </thead>
-    <tbody>
-    {% for array in obj %}
-        {% for tuple in array %}
-            {% if tuple[0] != 0 %}
-            {% set link=url('core:user_account_detail', user_id=profile.id, year=tuple[1].year, month=tuple[1].month) %}
+<div>
+    <table>
+        <thead>
             <tr>
-                <td><a href="{{ link }}">{{ tuple[1].year }}</a></td>
-                <td><a href="{{ link }}">{{ tuple[1]|date("E") }}</a></td>
-                <td><a href="{{ link }}">{{ tuple[0] }} €</a></td>
+                <td>{% trans %}Year{% endtrans %}</td>
+                <td>{% trans %}Month{% endtrans %}</td>
+                <td>{% trans %}Total{% endtrans %}</td>
             </tr>
-            {% endif %}
+        </thead>
+        <tbody>
+        {% for array in obj %}
+            {% for tuple in array %}
+                {% if tuple[0] != 0 %}
+                {% set link=url('core:user_account_detail', user_id=profile.id, year=tuple[1].year, month=tuple[1].month) %}
+                <tr>
+                    <td><a href="{{ link }}">{{ tuple[1].year }}</a></td>
+                    <td><a href="{{ link }}">{{ tuple[1]|date("E") }}</a></td>
+                    <td><a href="{{ link }}">{{ tuple[0] }} €</a></td>
+                </tr>
+                {% endif %}
+            {% endfor %}
         {% endfor %}
-    {% endfor %}
-    </tbody>
-</table>
+        </tbody>
+    </table>
+</div>
 {% endmacro %}
 
 {% block title %}
@@ -34,30 +36,42 @@
 {% if customer %}
 <h3>{% trans %}User account{% endtrans %}</h3>
 <p>{% trans %}Amount: {% endtrans %}{{ customer.amount }} €</p>
+<div id="drop">
 {% if customer.refillings.exists() %}
-<h4>{% trans %}Refillings{% endtrans %}</h4>
-    {{ monthly(refilling_month) }}
-{% endif %}
-{% if customer.buyings.exists() %}
-<h4>{% trans %}Account buyings{% endtrans %}</h4>
-    {{ monthly(buyings_month) }}
-{% endif %}
-{% if customer.user.invoices.exists() %}
-<h4>{% trans %}Eboutic invoices{% endtrans %}</h4>
-    {{ monthly(invoices_month) }}
-{% endif %}
-{% if etickets %}
-<h4>{% trans %}Etickets{% endtrans %}</h4>
-    <ul>
-    {% for s in etickets %}
-    <li><a href="{{ url('counter:eticket_pdf', selling_id=s.id) }}">{{ s.quantity }} x {{ s.product.eticket }}</a></li>
-    {% endfor %}
-    </ul>
-{% endif %}
+    {% if customer.buyings.exists() %}
+    <h5>{% trans %}Account buyings{% endtrans %}</h5>
+        {{ monthly(buyings_month) }}
+    {% endif %}
+    <h5>{% trans %}Refillings{% endtrans %}</h5>
+        {{ monthly(refilling_month) }}
+    {% endif %}
+    {% if customer.user.invoices.exists() %}
+    <h5>{% trans %}Eboutic invoices{% endtrans %}</h5>
+        {{ monthly(invoices_month) }}
+    {% endif %}
+    {% if etickets %}
+    <h4>{% trans %}Etickets{% endtrans %}</h4>
+    <div>
+        <ul>
+        {% for s in etickets %}
+        <li><a href="{{ url('counter:eticket_pdf', selling_id=s.id) }}">{{ s.quantity }} x {{ s.product.eticket }}</a></li>
+        {% endfor %}
+        </ul>
+    </div>
+    {% endif %}
+</div>
 {% else %}
 <p>{% trans %}User has no account{% endtrans %}</p>
 {% endif %}
 {% endblock %}
 
+{% block script %}
+{{ super() }}
+<script>
+$(function(){
+    $("#drop").accordion();
+});
+</script>
+{% endblock %}
 
 
diff --git a/core/templates/core/user_account_detail.jinja b/core/templates/core/user_account_detail.jinja
index 5c74579d..e73c346f 100644
--- a/core/templates/core/user_account_detail.jinja
+++ b/core/templates/core/user_account_detail.jinja
@@ -9,35 +9,6 @@
 <h3>{% trans %}User account{% endtrans %}</h3>
 <p>{% trans %}Amount: {% endtrans %}{{ customer.amount }} €</p>
 <p><a href="{{ url('core:user_account', user_id=profile.id) }}">{% trans %}Back{% endtrans %}</a></p>
-{% if customer.refillings.exists() %}
-<h4>{% trans %}Refillings{% endtrans %}</h4>
-<table>
-    <thead>
-        <tr>
-            <td>{% trans %}Date{% endtrans %}</td>
-            <td>{% trans %}Counter{% endtrans %}</td>
-            <td>{% trans %}Barman{% endtrans %}</td>
-            <td>{% trans %}Amount{% endtrans %}</td>
-            <td>{% trans %}Payment method{% endtrans %}</td>
-        </tr>
-    </thead>
-    <tbody>
-    {% for i in customer.refillings.order_by('-date').filter(
-        date__year=year, date__month=month) %}
-        <tr>
-        <td>{{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}</td>
-        <td>{{ i.counter }}</td>
-        <td><a href="{{ i.operator.get_absolute_url() }}">{{ i.operator.get_display_name() }}</a></td>
-        <td>{{ i.amount }} €</td>
-        <td>{{ i.get_payment_method_display() }}</td>
-        {% if i.is_owned_by(user) %}
-            <td><a href="{{ url('counter:refilling_delete', refilling_id=i.id) }}">Delete</a></td>
-        {% endif %}
-    </tr>
-{% endfor %}
-    </tbody>
-</table>
-{% endif %}
 {% if customer.buyings.exists() %}
 <h4>{% trans %}Account buyings{% endtrans %}</h4>
 <table>
@@ -71,6 +42,35 @@
     </tbody>
 </table>
 {% endif %}
+{% if customer.refillings.exists() %}
+<h4>{% trans %}Refillings{% endtrans %}</h4>
+<table>
+    <thead>
+        <tr>
+            <td>{% trans %}Date{% endtrans %}</td>
+            <td>{% trans %}Counter{% endtrans %}</td>
+            <td>{% trans %}Barman{% endtrans %}</td>
+            <td>{% trans %}Amount{% endtrans %}</td>
+            <td>{% trans %}Payment method{% endtrans %}</td>
+        </tr>
+    </thead>
+    <tbody>
+    {% for i in customer.refillings.order_by('-date').filter(
+        date__year=year, date__month=month) %}
+        <tr>
+        <td>{{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}</td>
+        <td>{{ i.counter }}</td>
+        <td><a href="{{ i.operator.get_absolute_url() }}">{{ i.operator.get_display_name() }}</a></td>
+        <td>{{ i.amount }} €</td>
+        <td>{{ i.get_payment_method_display() }}</td>
+        {% if i.is_owned_by(user) %}
+            <td><a href="{{ url('counter:refilling_delete', refilling_id=i.id) }}">Delete</a></td>
+        {% endif %}
+    </tr>
+{% endfor %}
+    </tbody>
+</table>
+{% endif %}
 {% if customer.user.invoices.exists() %}
 <h4>{% trans %}Eboutic invoices{% endtrans %}</h4>
 <table>
diff --git a/counter/templates/counter/counter_click.jinja b/counter/templates/counter/counter_click.jinja
index a086aa6a..0026bf1c 100644
--- a/counter/templates/counter/counter_click.jinja
+++ b/counter/templates/counter/counter_click.jinja
@@ -51,7 +51,7 @@
         <form method="post" action="{{ url('counter:click', counter_id=counter.id, user_id=customer.user.id) }}">
             {% csrf_token %}
             <input type="hidden" name="action" value="code">
-            <input type="input" name="code" value="" autofocus id="code_field"/>
+            <input type="input" name="code" value="" autofocus class="focus" id="code_field"/>
             <input type="submit" value="{% trans %}Go{% endtrans %}" />
         </form>
         <p>{% trans %}Basket: {% endtrans %}</p>
@@ -174,6 +174,9 @@ $( function() {
 $( function() {
     $("#bar_ui").accordion({
         heightStyle: "content",
+        activate: function(event, ui){
+            $(".focus").focus();
+        }
         });
     $("#products").tabs();
 });
diff --git a/counter/views.py b/counter/views.py
index d2d8bbfe..303c47ff 100644
--- a/counter/views.py
+++ b/counter/views.py
@@ -63,6 +63,9 @@ class RefillForm(forms.ModelForm):
     class Meta:
         model = Refilling
         fields = ['amount', 'payment_method', 'bank']
+        widgets = {
+            'amount': forms.NumberInput(attrs={'class':'focus'},)
+        }
 
 class CounterTabsMixin(TabedViewMixin):
     def get_tabs_title(self):