From 202d5d3e7a6d43116ad70bdc778d306637aba6b4 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 27 Oct 2022 21:23:13 +0200 Subject: [PATCH] Revert "Merge branch 'master' of github.com:ZeusWPI/Haldis" This reverts commit 28fa1b75921c045754ed1c860996e1e9d511f8d2, reversing changes made to b14671413c5734c66503aae32f1f51f2dd4059ec. --- app/templates/order.html | 108 ++++++++++++++++++--------------------- app/templates/utils.html | 9 ++-- 2 files changed, 54 insertions(+), 63 deletions(-) diff --git a/app/templates/order.html b/app/templates/order.html index 2077f00..fdc4948 100644 --- a/app/templates/order.html +++ b/app/templates/order.html @@ -155,66 +155,60 @@

Order information

-
-
-
-
Order opens
-
{{ order.starttime.strftime("%Y-%m-%d, %H:%M") }}
+
+
+
Order opens
+
{{ order.starttime.strftime("%Y-%m-%d, %H:%M") }}
-
Order closes
-
- {% if order.stoptime %} - {% set stoptimefmt = ( - "%H:%M" if order.stoptime.date() == order.starttime.date() - else "%Y-%m-%d, %H:%M" - ) %} - {{ order.stoptime.strftime(stoptimefmt) }} ({{ order.stoptime|countdown }}) - {% else %} - Never - {% endif %} -
-
- -
-
Location
-
- {% if order.location %} - {{ order.location_name }} - {% else %} - {{ order.location_name }} - {% endif %} -
- -
Courier
-
- {% if order.courier == None %} - {% if not current_user.is_anonymous() %} -
- -
- {% else %}No-one yet{% endif %} - {% else %} - {{ order.courier.username }} - {% endif %} -
-
- -
- -
- +
Order closes
+
+ {% if order.stoptime %} + {% set stoptimefmt = ( + "%H:%M" if order.stoptime.date() == order.starttime.date() + else "%Y-%m-%d, %H:%M" + ) %} + {{ order.stoptime.strftime(stoptimefmt) }} ({{ order.stoptime|countdown }}) + {% else %} + Never + {% endif %} +
+ +
+
Location
+
+ {% if order.location %} + {{ order.location_name }} + {% else %} + {{ order.location_name }} + {% endif %} +
+ +
Courier
+
+ {% if order.courier == None %} + {% if not current_user.is_anonymous() %} +
+ +
+ {% else %}No-one yet{% endif %} + {% else %} + {{ order.courier.username }} + {% endif %} +
+
+
+ +
+ {% if order.can_close(current_user.id) -%} +
+ +
+ {% endif %} + {% if courier_or_admin %} + Edit + {%- endif %}
- - {% if order.can_close(current_user.id) -%} -
- -
- {% endif %} - {% if courier_or_admin %} - Edit - {%- endif %} -
diff --git a/app/templates/utils.html b/app/templates/utils.html index ed7e2f3..6ef2cf7 100644 --- a/app/templates/utils.html +++ b/app/templates/utils.html @@ -1,17 +1,14 @@ {% macro render_order(order) -%}
-
+
{{ order.location_name }}
- {{ order.items.count() }} items ordered for {{ order.association }}

+ {{ order.items.count() }} items ordered

{% if order.stoptime %} Closes {{ order.stoptime.strftime("%H:%M") }}{{ order.stoptime|countdown }} {% else %}open{% endif %}

-
- -
-
+
Expand