almet/copanier
1
0
Fork 0
mirror of https://github.com/almet/copanier.git synced 2025-04-28 19:42:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reorder descriptive info for deliveries. Fix #20.

Browse source
This commit is contained in:
Alexis MÃtaireau 2020-06-07 17:12:54 +02:00
parent 831edea41b
commit 7c381ca992
4 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
copanier/templates/delivery/list_deliveries.html
View file

@ -3,13 +3,6 @@
<div class="header"> <div class="header">
<h1>Distributions</h1> <h1>Distributions</h1>
<div class="pure-menu pure-menu-horizontal">
<ul class="pure-menu-list">
<li class="pure-menu-item">
<a class="pure-menu-link" href="{{ url_for('list_archives') }}"><i class="icon-telescope"></i>&nbsp;Voir les distributions archivées</a>&nbsp;
</li>
</ul>
</div>
</div> </div>
{% with deliveries=incoming %} {% with deliveries=incoming %}
@ -27,4 +20,11 @@
<a href="/archives">Voir les distributions archivées</a> <a href="/archives">Voir les distributions archivées</a>
<hr> <hr>
{% endif %} {% endif %}
<div class="pure-menu pure-menu-horizontal">
<ul class="pure-menu-list">
<li class="pure-menu-item">
<a class="pure-menu-link" href="{{ url_for('list_archives') }}"><i class="icon-telescope"></i>&nbsp;Aller aux distributions archivées</a>&nbsp;
</li>
</ul>
</div>
{% endblock body %} {% endblock body %}

8
copanier/templates/delivery/show_delivery.html
View file

@ -5,12 +5,8 @@
<div class="header"> <div class="header">
<h1>{{ delivery.name }}</h1> <h1>{{ delivery.name }}</h1>
<h4>{% if delivery.products %} <h4>{% if delivery.products %}
{% if delivery.status == delivery.OPEN %}Commandes ouvertes jusqu'au {{ delivery.order_before|date }} {% include "includes/delivery_status.html" %}
{% elif delivery.status == delivery.ADJUSTMENT %}Ajustements en cours {% endif %}
{% elif delivery.status == delivery.CLOSED %}Fermée
{% elif delivery.status == delivery.ARCHIVED %}Archivée
{% elif delivery.status == delivery.NEED_PRICE_UPDATE %}Mise à jour des prix*
{% endif %}{% endif %}
{% include "includes/order_button.html" %} {% include "includes/order_button.html" %}
</h4> </h4>
<h4> <h4>

7
copanier/templates/includes/delivery_head.html
View file

@ -1,12 +1,15 @@
<ul class="delivery-head"> <ul class="delivery-head">
{% if delivery.description %}<li><i class="icon-basket"></i> <strong>Produits</strong> {{ delivery.description }}</li>{% endif %} {% if delivery.description %}<li><i class="icon-basket"></i> <strong>Produits</strong> {{ delivery.description }}</li>{% endif %}
<li><i class="icon-clock"></i> <strong>Distribution le</strong> <time datetime="{{ delivery.from_date }}">{{ delivery.from_date|date }} ({{ delivery.from_date|time }} à {{ delivery.to_date|time }}</time></li>
<li><i class="icon-hourglass"></i> <strong>Commandes avant le</strong> <time datetime="{{ delivery.order_before }}">{{ delivery.order_before|date }}</time></li>
<li class="hide-on-print"><i class="icon-calendar"></i>
{% include "includes/delivery_status.html" %}
</li>
{% if display_counts %} {% if display_counts %}
<li><i class="icon-lightbulb"></i> <strong>{{ delivery.orders|length }}</strong> colocs</strong>, <strong>{{ delivery.products|length }}</strong> produits et <strong>{{ delivery.producers | length}}</strong> product⋅eurs⋅rices, <strong>{{ delivery.total }}€</strong></li> <li><i class="icon-lightbulb"></i> <strong>{{ delivery.orders|length }}</strong> colocs</strong>, <strong>{{ delivery.products|length }}</strong> produits et <strong>{{ delivery.producers | length}}</strong> product⋅eurs⋅rices, <strong>{{ delivery.total }}€</strong></li>
{% else %} {% else %}
<li class="hide-on-print"><i class="icon-strategy"></i> <strong>Référent⋅e</strong> <a href="mailto:{{ delivery.contact }}">{{ delivery.contact }}</a></li> <li class="hide-on-print"><i class="icon-strategy"></i> <strong>Référent⋅e</strong> <a href="mailto:{{ delivery.contact }}">{{ delivery.contact }}</a></li>
{% endif %} {% endif %}
<li><i class="icon-clock"></i> <strong>Date de distribution</strong> <time datetime="{{ delivery.from_date }}">{{ delivery.from_date|date|capitalize }} de {{ delivery.from_date|time }} à {{ delivery.to_date|time }}</time></li>
<li class="hide-on-print"><i class="icon-hourglass"></i> {% if delivery.status == delivery.OPEN %}<strong>Date limite de commande</strong> <time datetime="{{ delivery.order_before.date() }}">{{ delivery.order_before|date|capitalize }}</time>{% elif delivery.status == delivery.ADJUSTMENT %}<strong>Ajustement en cours</strong>{% elif delivery.status == delivery.CLOSED %}<strong>Fermée</strong>{% else %}<strong>Archivée</strong>{% endif %}</li>
{% if delivery.instructions %}<li><i class="icon-lightbulb"></i> <strong>À savoir</strong> {{ delivery.instructions }}</li>{% endif %} {% if delivery.instructions %}<li><i class="icon-lightbulb"></i> <strong>À savoir</strong> {{ delivery.instructions }}</li>{% endif %}
{% if delivery.infos_url %}<li><i class="icon-global"></i><strong>Plus d'infos</strong> <a href="{{ delivery.infos_url }}" title="{{ delivery.infos_url }}">{{ delivery.infos_url|truncate(20)}}</a></li>{% endif %} {% if delivery.infos_url %}<li><i class="icon-global"></i><strong>Plus d'infos</strong> <a href="{{ delivery.infos_url }}" title="{{ delivery.infos_url }}">{{ delivery.infos_url|truncate(20)}}</a></li>{% endif %}
</ul> </ul>

6
copanier/templates/includes/delivery_status.html Normal file
View file

@ -0,0 +1,6 @@
{% if delivery.status == delivery.OPEN %}Commandes ouvertes jusqu'au {{ delivery.order_before|date }}
{% elif delivery.status == delivery.ADJUSTMENT %}Ajustements en cours
{% elif delivery.status == delivery.CLOSED %}Fermée
{% elif delivery.status == delivery.ARCHIVED %}Archivée
{% elif delivery.status == delivery.NEED_PRICE_UPDATE %}Mise à jour des prix*
{% endif %}