diff --git a/copanier/__init__.py b/copanier/__init__.py
index eaddbaa..376703a 100644
--- a/copanier/__init__.py
+++ b/copanier/__init__.py
@@ -425,7 +425,8 @@ async def create_product(request, response, delivery_id, producer_id):
async def manage_delivery(request, response, id):
delivery = Delivery.load(id)
response.html("manage_delivery.html",{
- 'delivery': delivery
+ 'delivery': delivery,
+ 'referents': [p.referent for p in delivery.producers.values()]
})
@app.route("/livraison/{id}/envoi-email-referentes", methods=['GET', 'POST'])
diff --git a/copanier/static/app.css b/copanier/static/app.css
index 8b8d024..d1ba7b9 100644
--- a/copanier/static/app.css
+++ b/copanier/static/app.css
@@ -255,10 +255,6 @@ textarea {
box-sizing: border-box;
}
-textarea {
- min-height: 13.2rem;
-}
-
select {
-webkit-appearance: none;
-moz-appearance: none;
@@ -552,4 +548,14 @@ details summary {
.rupture {
background-color: #ff000083;
+}
+
+.list-emails {
+ display: block;
+ width: 700px;
+ max-width: 100%;
+ height: 150px;
+ border: 1px solid #ddd;
+ padding: 10px 15px;
+ resize: vertical;
}
\ No newline at end of file
diff --git a/copanier/templates/includes/delivery_head.html b/copanier/templates/includes/delivery_head.html
index a95a9a0..e81ab30 100644
--- a/copanier/templates/includes/delivery_head.html
+++ b/copanier/templates/includes/delivery_head.html
@@ -1,9 +1,14 @@
{% if delivery.description %}- Produits {{ delivery.description }}
{% endif %}
- Lieu {{ delivery.where }}
+ {% if display_counts %}
+ - {{ delivery.orders|length }} colocs, {{ delivery.products|length }} produits et {{ delivery.producers | length}} product⋅eurs⋅rices, {{ delivery.total }}€
+ {% else %}
- Référent⋅e {{ delivery.contact }}
+ {% endif %}
- Date de livraison
- {% if delivery.status == delivery.OPEN %}Date limite de commande {% elif delivery.status == delivery.ADJUSTMENT %}Ajustement en cours{% elif delivery.status == delivery.CLOSED %}Fermée{% else %}Archivée{% endif %}
{% if delivery.instructions %}- À savoir {{ delivery.instructions }}
{% endif %}
{% if delivery.infos_url %}- Plus d'infos {{ delivery.infos_url|truncate(20)}}
{% endif %}
+
diff --git a/copanier/templates/manage_delivery.html b/copanier/templates/manage_delivery.html
index 2cb2451..3c6ba3d 100644
--- a/copanier/templates/manage_delivery.html
+++ b/copanier/templates/manage_delivery.html
@@ -3,12 +3,20 @@
{% block body %}
Gérer « {{ delivery.name }} »
+{% set display_counts = True %}
+{% include "includes/delivery_head.html" %}
+
+Emails des référent⋅e⋅s
+Au cas où, quoi.
+
+
Avant et pendant la distribution
Modifier la commande (dates, lieu, référent⋅e, etc)
Modifier les produits, les product⋅rices⋅eurs
Gérer les groupes / colocs
Une fois les commandes passées (après le {{ delivery.order_before|date }})
+ Télécharger le bon de commande global
Télécharger le récap (global) des commandes
Envoyer les infos de commande aux référent⋅e⋅s