openstack
/
blazar-dashboard
Code Issues Proposed changes

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
This commit is contained in:
Hiroaki Kobayashi 2017-08-02 12:28:40 +09:00 committed by Masahito Muroi
parent 6ab330c514
commit 55b4cf4ed0
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
blazar_dashboard/content/leases/templates/leases/_detail_overview.html
View File

@ -1,9 +1,10 @@
{% load i18n sizeformat %} {% load i18n sizeformat %}
<div class="detail"> <div class="detail">
<div class="info detail"> <div class="info detail">
<h4>{% trans "Lease" %}</h4> <h4>{% trans "Lease" %}</h4>
<hr class="header_rule"> <hr class="header_rule">
<dl> <dl class="dl-horizontal">
<dt>{% trans "Name" %}</dt> <dt>{% trans "Name" %}</dt>
<dd>{{ lease.name|default:_("None") }}</dd> <dd>{{ lease.name|default:_("None") }}</dd>
<dt>{% trans "Id" %}</dt> <dt>{% trans "Id" %}</dt>
@ -26,7 +27,7 @@
<div class="info detail"> <div class="info detail">
<h4>{% trans "Events" %}</h4> <h4>{% trans "Events" %}</h4>
<hr class="header_rule"> <hr class="header_rule">
<dl> <dl class="dl-horizontal">
{% for event in lease.events %} {% for event in lease.events %}
<dt>{{ event.event_type }}</dt> <dt>{{ event.event_type }}</dt>
<dd> <dd>
@ -43,22 +44,19 @@
<div class="info detail"> <div class="info detail">
<h4>{% trans "Reservations" %}</h4> <h4>{% trans "Reservations" %}</h4>
<hr class="header_rule">
<dl>
{% for reservation in lease.reservations %} {% for reservation in lease.reservations %}
<dt>{{ reservation.resource_type }}</dt> <hr class="header_rule">
<dd> <dl class="dl-horizontal">
<ul> {% for key, value in reservation.items %}
<li><em>{% trans "Id:" %}</em>&nbsp;{{ reservation.id|default:_("None") }} {% if 'ted_at' in key %}
<li><em>{% trans "Status:" %}</em>&nbsp;{{ reservation.status|replace_underscores|lower|capfirst }}</li> <dt>{{ key }}</dt>
<li><em>{% trans "Resource Id:" %}</em>&nbsp;{{ reservation.resource_id }}</li> <dd>{{ value|parse_isotime|date:"Y-m-d H:i T"|default:"-" }}</dd>
<li><em>{% trans "Created at:" %}</em>&nbsp;{{ reservation.created_at|parse_isotime|date:"Y-m-d H:i T"|default:"-" }}</li> {% else %}
<li><em>{% trans "Updated at:" %}</em>&nbsp;{{ reservation.updated_at|parse_isotime|date:"Y-m-d H:i T"|default:"-" }}</li> <dt>{{ key }}</dt>
</ul> <dd>{{ value }}</dd>
</dd> {% endif %}
{% empty %} {% endfor %}
<dt>{% trans "No reservations defined." %}</dt> </dl>
{% endfor %} {% endfor %}
</dl>
</div> </div>
</div> </div>