From 7b12c266b34965133e6232f273cc35a93b02017e Mon Sep 17 00:00:00 2001 From: Jasper Janin Date: Thu, 27 Oct 2022 21:32:22 +0200 Subject: [PATCH 1/2] Add user group reference to orders --- app/templates/order.html | 108 +++++++++++++++++++++------------------ app/templates/utils.html | 9 ++-- 2 files changed, 63 insertions(+), 54 deletions(-) diff --git a/app/templates/order.html b/app/templates/order.html index fdc4948..2077f00 100644 --- a/app/templates/order.html +++ b/app/templates/order.html @@ -155,60 +155,66 @@

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 %} -
+
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 %} +
+
+ +
+ +
+
- -
-
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 6ef2cf7..ed7e2f3 100644 --- a/app/templates/utils.html +++ b/app/templates/utils.html @@ -1,14 +1,17 @@ {% macro render_order(order) -%}
-
+
{{ order.location_name }}
- {{ order.items.count() }} items ordered

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

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

-
+
+ +
+
Expand
From a29ade4773c38855b2a51fbb4c761275e9d93a6c Mon Sep 17 00:00:00 2001 From: Jasper Janin Date: Thu, 27 Oct 2022 22:12:03 +0200 Subject: [PATCH 2/2] Remove redundant class attributes --- app/templates/utils.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/utils.html b/app/templates/utils.html index ed7e2f3..781eac2 100644 --- a/app/templates/utils.html +++ b/app/templates/utils.html @@ -1,6 +1,6 @@ {% macro render_order(order) -%}
-
+
{{ order.location_name }}
{{ order.items.count() }} items ordered for {{ order.association }}

@@ -8,10 +8,10 @@ Closes {{ order.stoptime.strftime("%H:%M") }}{{ order.stoptime|countdown }} {% else %}open{% endif %}

-
+
-
+
Expand