klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-22 22:23:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'performances' into 'master'

Browse Source 
Speed up counter click interface and auto scroll

See merge request ae/Sith!233
This commit is contained in:
Antoine Bartuccio 2019-09-10 15:50:38 +02:00
commit eb975f4de1
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
counter/templates/counter/counter_click.jinja
View File

@ -23,7 +23,7 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h4>{{ counter }}</h4> <h4 id="click_interface">{{ counter }}</h4>
<div id="user_info"> <div id="user_info">
<h5>{% trans %}Customer{% endtrans %}</h5> <h5>{% trans %}Customer{% endtrans %}</h5>
@ -127,17 +127,14 @@
</div> </div>
<div id="products"> <div id="products">
<ul> <ul>
{% for t in categories -%} {% for category in categories.keys() -%}
{%- if counter.products.filter(product_type=t).exists() -%} <li><a href="#cat_{{ category|slugify }}">{{ category }}</a></li>
<li><a href="#cat_{{ t|slugify }}">{{ t }}</a></li>
{%- endif -%}
{%- endfor %} {%- endfor %}
</ul> </ul>
{% for t in categories -%} {% for category in categories.keys() -%}
{%- if counter.products.filter(product_type=t).exists() -%} <div id="cat_{{ category|slugify }}">
<div id="cat_{{ t|slugify }}"> <h5>{{ category }}</h5>
<h5>{{ t }}</h5> {% for p in categories[category] -%}
{% for p in counter.products.filter(product_type=t).all() -%}
{% set file = None %} {% set file = None %}
{% if p.icon %} {% if p.icon %}
{% set file = p.icon.url %} {% set file = p.icon.url %}
@ -148,18 +145,20 @@
{{ add_product(p.id, prod, "form_button") }} {{ add_product(p.id, prod, "form_button") }}
{%- endfor %} {%- endfor %}
</div> </div>
{%- endif -%}
{%- endfor %} {%- endfor %}
</div> </div>
{% endblock %} {% endblock %}
{% block script %} {% block script %}
<script>
document.getElementById("click_interface").scrollIntoView();
</script>
{{ super() }} {{ super() }}
<script> <script>
$( function() { $( function() {
var products = [ var products = [
{% for p in counter.products.all() -%} {% for p in products -%}
{ {
value: "{{ p.code }}", value: "{{ p.code }}",
label: "{{ p.name }}", label: "{{ p.name }}",
@ -203,6 +202,3 @@ $( function() {
}); });
</script> </script>
{% endblock %} {% endblock %}

8
counter/views.py
View File

@ -708,10 +708,16 @@ class CounterClick(CounterTabsMixin, CanViewMixin, DetailView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
""" Add customer to the context """ """ Add customer to the context """
kwargs = super(CounterClick, self).get_context_data(**kwargs) kwargs = super(CounterClick, self).get_context_data(**kwargs)
kwargs["products"] = self.object.products.select_related("product_type")
kwargs["categories"] = {}
for product in kwargs["products"]:
if product.product_type:
kwargs["categories"].setdefault(product.product_type, []).append(
product
)
kwargs["customer"] = self.customer kwargs["customer"] = self.customer
kwargs["basket_total"] = self.sum_basket(self.request) kwargs["basket_total"] = self.sum_basket(self.request)
kwargs["refill_form"] = self.refill_form or RefillForm() kwargs["refill_form"] = self.refill_form or RefillForm()
kwargs["categories"] = ProductType.objects.all()
kwargs["student_card_max_uid_size"] = StudentCard.UID_SIZE kwargs["student_card_max_uid_size"] = StudentCard.UID_SIZE
return kwargs return kwargs