NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 18:08:38 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Closes #2250: Include stat counters on report result navigation

Browse Source
This commit is contained in:
Jeremy Stretch 2018-07-23 16:10:46 -04:00
parent a1d45023ab
commit b518258e6d
3 changed files with 57 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/project-static/css/base.css
View File

@ -372,7 +372,7 @@ table.reports td.method {
font-family: monospace; font-family: monospace;
padding-left: 30px; padding-left: 30px;
} }
table.reports td.stats label { td.report-stats label {
display: inline-block; display: inline-block;
line-height: 14px; line-height: 14px;
margin-bottom: 0; margin-bottom: 0;

104
netbox/templates/extras/report.html
View File

@ -29,67 +29,73 @@
<p class="lead">{{ report.description }}</p> <p class="lead">{{ report.description }}</p>
{% endif %} {% endif %}
{% if report.result %} {% if report.result %}
<p>Last run: {{ report.result.created }}</p> <p>Last run: <strong>{{ report.result.created }}</strong></p>
{% else %}
<p class="text-muted">Last run: Never</p>
{% endif %} {% endif %}
</div>
<div class="col-md-9">
{% if report.result %} {% if report.result %}
<table class="table table-hover report"> <div class="panel panel-default">
<thead> <div class="panel-heading">
<tr> <strong>Report Methods</strong>
<th>Time</th> </div>
<th>Level</th> <table class="table table-hover panel-body">
<th>Object</th>
<th>Message</th>
</tr>
</thead>
<tbody>
{% for method, data in report.result.data.items %} {% for method, data in report.result.data.items %}
<tr> <tr>
<th colspan="4"> <td><code><a href="#{{ method }}">{{ method }}</a></code></td>
<a name="{{ method }}"></a>{{ method }} <td class="text-right report-stats">
</th> <label class="label label-success">{{ data.success }}</label>
<label class="label label-info">{{ data.info }}</label>
<label class="label label-warning">{{ data.warning }}</label>
<label class="label label-danger">{{ data.failure }}</label>
</td>
</tr> </tr>
{% for time, level, obj, url, message in data.log %}
<tr class="{% if level == 'failure' %}danger{% elif level %}{{ level }}{% endif %}">
<td>{{ time }}</td>
<td>
<label class="label label-{% if level == 'failure' %}danger{% else %}{{ level }}{% endif %}">{{ level|title }}</label>
</td>
<td>
{% if obj and url %}
<a href="{{ url }}">{{ obj }}</a>
{% elif obj %}
{{ obj }}
{% endif %}
</td>
<td>{{ message }}</td>
</tr>
{% endfor %}
{% endfor %} {% endfor %}
</tbody> </table>
</table> </div>
<div class="panel panel-default">
<div class="panel-heading">
<strong>Report Results</strong>
</div>
<table class="table table-hover panel-body report">
<thead>
<tr class="table-headings">
<th>Time</th>
<th>Level</th>
<th>Object</th>
<th>Message</th>
</tr>
</thead>
<tbody>
{% for method, data in report.result.data.items %}
<tr>
<th colspan="4" style="font-family: monospace">
<a name="{{ method }}"></a>{{ method }}
</th>
</tr>
{% for time, level, obj, url, message in data.log %}
<tr class="{% if level == 'failure' %}danger{% elif level %}{{ level }}{% endif %}">
<td>{{ time }}</td>
<td>
<label class="label label-{% if level == 'failure' %}danger{% else %}{{ level }}{% endif %}">{{ level|title }}</label>
</td>
<td>
{% if obj and url %}
<a href="{{ url }}">{{ obj }}</a>
{% elif obj %}
{{ obj }}
{% endif %}
</td>
<td>{{ message }}</td>
</tr>
{% endfor %}
{% endfor %}
</tbody>
</table>
</div>
{% else %} {% else %}
<div class="well">No results are available for this report. Please run the report first.</div> <div class="well">No results are available for this report. Please run the report first.</div>
{% endif %} {% endif %}
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
{% if report.result %} {% if report.result %}
<div class="panel panel-default">
<div class="panel-heading">
<strong>Methods</strong>
</div>
<ul class="list-group">
{% for method, data in report.result.data.items %}
<li class="list-group-item">
<a href="#{{ method }}">{{ method }}</a>
<span class="badge">{{ data.log|length }}</span>
</li>
{% endfor %}
</ul>
</div>
{% endif %} {% endif %}
</div> </div>
</div> </div>

2
netbox/templates/extras/report_list.html
View File

@ -38,7 +38,7 @@
<td colspan="3" class="method"> <td colspan="3" class="method">
{{ method }} {{ method }}
</td> </td>
<td class="text-right stats"> <td class="text-right report-stats">
<label class="label label-success">{{ stats.success }}</label> <label class="label label-success">{{ stats.success }}</label>
<label class="label label-info">{{ stats.info }}</label> <label class="label label-info">{{ stats.info }}</label>
<label class="label label-warning">{{ stats.warning }}</label> <label class="label label-warning">{{ stats.warning }}</label>