mirror of
https://github.com/ae-utbm/sith.git
synced 2025-07-13 21:39:23 +00:00
Mise à jour de mars (#586)
--------- Co-authored-by: Thomas Girod <thgirod@hotmail.com> Co-authored-by: Théo DURR <git@theodurr.fr>
This commit is contained in:
Julien Constant
GitHub
@ -5,23 +5,41 @@
|
||||
{% trans counter_name=counter %}{{ counter_name }} activity{% endtrans %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h3>{% trans counter_name=counter %}{{ counter_name }} activity{% endtrans %}</h3>
|
||||
{% if counter.type == 'BAR' %}
|
||||
<h4>{% trans %}Barmen list{% endtrans %}</h4>
|
||||
<ul>
|
||||
{% for b in counter.get_barmen_list() %}
|
||||
<li>{{ user_profile_link(b) }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
{%- block additional_css -%}
|
||||
<link rel="stylesheet" href="{{ scss('counter/activity.scss') }}">
|
||||
{%- endblock -%}
|
||||
|
||||
<h5>{% trans %}Legend{% endtrans %}</h5>
|
||||
<span style="color: green">✓</span> : {% trans %}counter is open, there's at least one barman connected{% endtrans %}
|
||||
<br>
|
||||
<span style="color: orange">?</span> : {% trans minutes=settings.SITH_COUNTER_MINUTE_INACTIVE %}counter is open but not active, the last sale was done at least {{ minutes }} minutes ago {% endtrans %}
|
||||
<br>
|
||||
<span style="color: red">✗</span> : {% trans %}counter is not open : no one is connected{% endtrans %}
|
||||
{% block content %}
|
||||
<h3>{% trans counter_name=counter %}{{ counter_name }} activity{% endtrans %}</h3>
|
||||
{% if counter.type == 'BAR' %}
|
||||
<h4>{% trans %}Barmen list{% endtrans %}</h4>
|
||||
<ul>
|
||||
{% set barmans_list = counter.get_barmen_list() %}
|
||||
{% if barmans_list | length > 0 %}
|
||||
{% for b in barmans_list %}
|
||||
<li>{{ user_profile_link(b) }}</li>
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
{% trans %}There is currently no barman connected.{% endtrans %}
|
||||
{% endif %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
|
||||
<h5>{% trans %}Legend{% endtrans %}</h5>
|
||||
<div class="activity-description">
|
||||
<div>
|
||||
<i class="fa fa-check" style="color: #2ecc71"></i>
|
||||
<span>{% trans %}counter is open, there's at least one barman connected{% endtrans %}</span>
|
||||
</div>
|
||||
<div>
|
||||
<i class="fa fa-question" style="color: #f39c12"></i>
|
||||
<span>{% trans minutes=settings.SITH_COUNTER_MINUTE_INACTIVE %}counter is open but not active, the last sale was done at least {{ minutes }} minutes ago {% endtrans %}</span>
|
||||
</div>
|
||||
<div>
|
||||
<i class="fa fa-times" style="color: #eb2f06"></i>
|
||||
<span>{% trans %}counter is not open : no one is connected{% endtrans %}</span>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
||||
|
||||
@ -2,43 +2,34 @@
|
||||
{% from 'core/macros.jinja' import user_profile_link %}
|
||||
|
||||
{% block title %}
|
||||
{% trans counter_name=counter %}{{ counter_name }} stats{% endtrans %}
|
||||
{% trans counter_name=counter %}{{ counter_name }} stats{% endtrans %}
|
||||
{% endblock %}
|
||||
|
||||
{% block jquery_css %}
|
||||
{# Remove jquery_css #}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h3>{% trans counter_name=counter %}{{ counter_name }} stats{% endtrans %}</h3>
|
||||
<h3>{% trans counter_name=counter %}{{ counter_name }} stats{% endtrans %}</h3>
|
||||
<h4>{% trans counter_name=counter.name %}Top 100 {{ counter_name }}{% endtrans %}</h4>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<td>{% trans %}Nb{% endtrans %}</td>
|
||||
<td>{% trans %}User{% endtrans %}</td>
|
||||
<td>{% trans %}Promo{% endtrans %}</td>
|
||||
<td>{% trans %}Clubs{% endtrans %}</td>
|
||||
<td>{% trans %}Total{% endtrans %}</td>
|
||||
<td>{% trans %}Percentage{% endtrans %}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>N°</td>
|
||||
<td>{% trans %}User{% endtrans %}</td>
|
||||
<td>{% trans %}Promo{% endtrans %}</td>
|
||||
<td>{% trans %}Total{% endtrans %}</td>
|
||||
<td>{% trans %}Percentage{% endtrans %}</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for r in top %}
|
||||
{% set customer=Customer.objects.filter(user__id=r.customer__user).first() %}
|
||||
{% if customer.user == user %}
|
||||
<tr class="highlight">
|
||||
{% else %}
|
||||
<tr>
|
||||
{% endif %}
|
||||
{% for customer in top_customers %}
|
||||
<tr class="{% if customer.user == request.user.id %}highlight{% endif %}">
|
||||
<td>{{ loop.index }}</td>
|
||||
<td>{{ customer.user.get_display_name() }}</td>
|
||||
<td>{{ customer.user.promo or '' }}</td>
|
||||
<td>
|
||||
{% for m in customer.user.memberships.filter(club__parent=None, end_date=None,
|
||||
role__gt=settings.SITH_MAXIMUM_FREE_ROLE).all() -%}
|
||||
{%- if loop.index>1 -%}, {% endif -%}
|
||||
{{ m.club.name }}
|
||||
{%- endfor %}
|
||||
</td>
|
||||
<td>{{ r.selling_sum }} €</td>
|
||||
<td>{{ '%.2f'|format(100 * r.selling_sum / total_sellings) }}</td>
|
||||
<td>{{ customer.name }} {% if customer.nickname %} ({{ customer.nickname }}) {% endif %}</td>
|
||||
<td>{{ customer.promo or '' }}</td>
|
||||
<td>{{ "%.2f"|format(customer.selling_sum) }} €</td>
|
||||
<td>{{ '%.2f'|format(100 * customer.selling_sum / total_sellings) }}%</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
@ -47,23 +38,20 @@
|
||||
<h4>{% trans counter_name=counter.name %}Top 100 barman {{ counter_name }}{% endtrans %}</h4>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<td>{% trans %}Nb{% endtrans %}</td>
|
||||
<td>{% trans %}User{% endtrans %}</td>
|
||||
<td>{% trans %}Time{% endtrans %}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>N°</td>
|
||||
<td>{% trans %}User{% endtrans %}</td>
|
||||
<td>{% trans %}Promo{% endtrans %}</td>
|
||||
<td>{% trans %}Time{% endtrans %}</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for r in top_barman_semester %}
|
||||
{% set u=User.objects.filter(id=r.user).first() %}
|
||||
{% if u == user %}
|
||||
<tr class="highlight">
|
||||
{% else %}
|
||||
<tr>
|
||||
{% endif %}
|
||||
{% for barman in top_barman_semester %}
|
||||
<tr {% if barman.user == request.user.id %}class="highlight"{% endif %}>
|
||||
<td>{{ loop.index }}</td>
|
||||
<td>{{ u.get_display_name() }}</td>
|
||||
<td>{{ r.perm_sum }}</td>
|
||||
<td>{{ barman.name }} {% if barman.nickname %}({{ barman.nickname }}){% endif %}</td>
|
||||
<td>{{ barman.promo or '' }}</td>
|
||||
<td>{{ barman.perm_sum|format_timedelta|truncate_time("millis") }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
@ -72,23 +60,20 @@
|
||||
<h4>{% trans counter_name=counter.name %}Top 100 barman {{ counter_name }} (all semesters){% endtrans %}</h4>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<td>{% trans %}Nb{% endtrans %}</td>
|
||||
<td>{% trans %}User{% endtrans %}</td>
|
||||
<td>{% trans %}Time{% endtrans %}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>N°</td>
|
||||
<td>{% trans %}User{% endtrans %}</td>
|
||||
<td>{% trans %}Promo{% endtrans %}</td>
|
||||
<td>{% trans %}Time{% endtrans %}</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for r in top_barman %}
|
||||
{% set u=User.objects.filter(id=r.user).first() %}
|
||||
{% if u == user %}
|
||||
<tr class="highlight">
|
||||
{% else %}
|
||||
<tr>
|
||||
{% endif %}
|
||||
{% for barman in top_barman %}
|
||||
<tr {% if barman.user == request.user.id %}class="highlight"{% endif %}>
|
||||
<td>{{ loop.index }}</td>
|
||||
<td>{{ u.get_display_name() }}</td>
|
||||
<td>{{ r.perm_sum }}</td>
|
||||
<td>{{ barman.name }} {% if barman.nickname %}({{ barman.nickname }}){% endif %}</td>
|
||||
<td>{{ barman.promo or '' }}</td>
|
||||
<td>{{ barman.perm_sum|format_timedelta|truncate_time("millis") }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
|
||||
Reference in New Issue
Block a user