From 55b4cf4ed09ba31826125e33e8af52e2323b5b03 Mon Sep 17 00:00:00 2001 From: Hiroaki Kobayashi Date: Wed, 2 Aug 2017 12:28:40 +0900 Subject: [PATCH] Show reservations in more detail This patch changes the template of detail view to show more detailed information of reservations. Partially Implements: blueprint climate-dashboard Change-Id: Iae34757bb870e84fb6a58eebe6b04da470d22688 --- .../templates/leases/_detail_overview.html | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/blazar_dashboard/content/leases/templates/leases/_detail_overview.html b/blazar_dashboard/content/leases/templates/leases/_detail_overview.html index be8a707..a37270a 100644 --- a/blazar_dashboard/content/leases/templates/leases/_detail_overview.html +++ b/blazar_dashboard/content/leases/templates/leases/_detail_overview.html @@ -1,9 +1,10 @@ {% load i18n sizeformat %} +

{% trans "Lease" %}


-
+
{% trans "Name" %}
{{ lease.name|default:_("None") }}
{% trans "Id" %}
@@ -26,7 +27,7 @@

{% trans "Events" %}


-
+
{% for event in lease.events %}
{{ event.event_type }}
@@ -43,22 +44,19 @@

{% trans "Reservations" %}

-
-
{% for reservation in lease.reservations %} -
{{ reservation.resource_type }}
-
-
    -
  • {% trans "Id:" %} {{ reservation.id|default:_("None") }} -
  • {% trans "Status:" %} {{ reservation.status|replace_underscores|lower|capfirst }}
  • -
  • {% trans "Resource Id:" %} {{ reservation.resource_id }}
  • -
  • {% trans "Created at:" %} {{ reservation.created_at|parse_isotime|date:"Y-m-d H:i T"|default:"-" }}
  • -
  • {% trans "Updated at:" %} {{ reservation.updated_at|parse_isotime|date:"Y-m-d H:i T"|default:"-" }}
  • -
-
- {% empty %} -
{% trans "No reservations defined." %}
+
+
+ {% for key, value in reservation.items %} + {% if 'ted_at' in key %} +
{{ key }}
+
{{ value|parse_isotime|date:"Y-m-d H:i T"|default:"-" }}
+ {% else %} +
{{ key }}
+
{{ value }}
+ {% endif %} + {% endfor %} +
{% endfor %} -