From 132884385e41c2c425d52da85ffdba1c40bd1efd Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Wed, 1 May 2019 17:58:09 +0200 Subject: [PATCH] Simpler home page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - remove category titles - we still show first open deliveries, ordered by dead line - passed but non archived delivery status label is "À solder" --- copanier/models.py | 4 +++- copanier/templates/delivery.html | 2 +- copanier/templates/edit_delivery.html | 2 +- copanier/templates/home.html | 4 +--- copanier/templates/includes/delivery_head.html | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/copanier/models.py b/copanier/models.py index ec6987d..8d9a123 100644 --- a/copanier/models.py +++ b/copanier/models.py @@ -239,7 +239,9 @@ class Delivery(Base): @classmethod def incoming(cls): - return [d for d in cls.all() if d.is_foreseen] + return sorted( + [d for d in cls.all() if d.is_foreseen], key=lambda d: d.order_before + ) @classmethod def former(cls): diff --git a/copanier/templates/delivery.html b/copanier/templates/delivery.html index bd0f07b..f2be5fa 100644 --- a/copanier/templates/delivery.html +++ b/copanier/templates/delivery.html @@ -70,7 +70,7 @@ {% if request.user and request.user.is_staff %}
  • - Télécharger les produits + Télécharger les produits
  • Modifier la livraison diff --git a/copanier/templates/edit_delivery.html b/copanier/templates/edit_delivery.html index 2955081..efeb375 100644 --- a/copanier/templates/edit_delivery.html +++ b/copanier/templates/edit_delivery.html @@ -48,7 +48,7 @@