ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

okay this now works with bootstrap 5, I dont love the sz buttons / mixed black and white hover text needs love - probably own class with own styles, but I dont want to hard-code info color, need to work out how to do style / css using the right bs variable for info color

Browse Source
This commit is contained in:
Damien De Paoli
2021-07-20 19:03:14 +10:00
parent 44620f1e18
commit b9f05d64f8
11 changed files with 188 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
templates/joblog.html
View File

@@ -3,86 +3,67 @@
{% block main_content %}
<div class="container-fluid">
<h3>{{page_title}}</h3>
<div class="row col-lg-12">
<label class="form-control-plaintext col-lg-2">Job #:</label>
<label class="form-control-plaintext col-lg-10">{{job.id}}</label>
</div>
<div class="row col-lg-12">
<label class="form-control-plaintext col-lg-2">Name:</label>
<label class="form-control-plaintext col-lg-10">{{job.name}}</label>
</div>
<div class="row col-lg-12">
<label class="form-control-plaintext col-lg-2">Start Time:</label>
<label class="form-control-plaintext col-lg-10">{{job.start_time|vicdate}}</label>
</div>
<div class="row col-lg-12">
<label class="form-control-plaintext col-lg-2">Duration:</label>
<label class="form-control-plaintext col-lg-10">{{duration}}</label>
</div>
<div class="row col-lg-12">
<label class="form-control-plaintext col-lg-2">Last Update:</label>
<label class="form-control-plaintext col-lg-10">{{job.last_update|vicdate}}</label>
</div>
<div class="row col-lg-12">
<label class="form-control-plaintext col-lg-2">Current state:</label>
<dl class="row">
<dt class="col-2">Job #:</dt>
<dd class="col-10">{{job.id}}</dt>
<dt class="col-2">Name:</dt>
<dd class="col-10">{{job.name}}</dt>
<dt class="col-2">Start Time:</dt>
<dd class="col-10">{{job.start_time|vicdate}}</dt>
<dt class="col-2">Duration:</dt>
<dd class="col-10">{{duration}}</dd>
<dt class="col-2">Last Update:</dt>
<dd class="col-10">{{job.last_update|vicdate}}</dd>
<dt class="col-2">Current state:</dt>
{% if job.state == "Failed" %}
<label class="form-control-plaintext col-lg-10 bg-danger text-white">{{job.state}}</label>
<dd class="col-10 bg-danger text-white">{{job.state}}</dd>
{% elif job.state == "Withdrawn" %}
<label class="form-control-plaintext col-lg-10 bg-secondary text-white">{{job.state}}</label>
<dd class="col-10 bg-secondary text-white">{{job.state}}</dd>
{% else %}
<label class="form-control-plaintext col-lg-10">{{job.state}}</label>
<dd class="col-10">{{job.state}}</dd>
{% endif %}
</div>
{% if job.wait_for != None %}
<div class="row col-lg-12">
<label class="form-control-plaintext col-lg-2">Waiting on Job:</label>
<label class="form-control-plaintext col-lg-10"><a href="{{url_for('joblog', id=job.wait_for)}}">Job (id={{job.wait_for}})</a></label>
</div>
{% endif %}
<div class="row col-lg-12">
<label class="form-control-plaintext col-lg-2">Current File:</label>
<label class="form-control-plaintext col-lg-10">{{job.current_file}}</label>
</div>
<div class="row col-lg-12">
<label class="form-control-plaintext col-lg-2">Files in pass:</label>
{% if job.num_files and job.num_files > 0 %}
<div class="col-lg-10 px-0">
{% if job.wait_for != None %}
<dd class="col-2">Waiting on Job:</dd>
<dl class="col-10"><a href="{{url_for('joblog', id=job.wait_for)}}">Job (id={{job.wait_for}})</a></dl>
{% endif %}
<dt class="col-2">Current File:</dt>
<dd class="col-10">{{job.current_file}}</dd>
<dt class="col-2">Files in pass:</label>
{% if job.num_files and job.num_files > 0 %}
<dd class="col-10">
{% set prog=(job.current_file_num/job.num_files*100)|round|int %}
<div class="progress mt-2" style="height:24px">
<div class="progress my-auto h-100">
<div class="progress-bar bg-info" role="progressbar" style="width: {{prog}}%;" aria-valuenow="{{prog}}" aria-valuemin="0" aria-valuemax="100">{{job.current_file_num}} of {{job.num_files}} - {{prog}}%</div>
</div>
</dd>
{% elif job.num_files == 0 and job.current_file_num > 0 %}
<label class="form-control-plaintext
col-lg-10">{{job.current_file_num}} of Unknown Total</label>
<dd class="col-10">{{job.current_file_num}} of Unknown Total</dd>
{% else %}
<label class="form-control-plaintext col-lg-10">N/A</label>
<dd class="col-10">N/A</dd>
{% endif %}
</div>
</div>
<div class="row col-lg-12">
<table id="jobort_tbl" class="table table-striped table-sm" data-toolbar="#toolbar" data-search="true">
<thead><tr class="thead-light"><th>When</th><th>Details</th></tr></thead>
<tbody>
{% for log in logs %}
<tr><td>{{log.log_date|vicdate}}</td><td>{{log.log|safe}}</td></tr>
{% endfor %}
{% if log_cnt > logs|length %}
<tr>
<td class="align-middle">Remaining logs truncated</td>
<td>
<button type="button" class="btn btn-info my-0 py-1" onClick="document.body.innerHTML+='<form id=_fm method=POST action={{url_for('joblog', id=job.id)}}></form>';document.getElementById('_fm').submit();">Show all logs</button>
</td>
</tr>
{% endif %}
</tbody>
</table>
</div>
</dl>
<table id="jobort_tbl" class="table table-striped table-sm" data-toolbar="#toolbar" data-search="true">
<thead><tr class="table-primary"><th>When</th><th>Details</th></tr></thead>
<tbody>
{% for log in logs %}
<tr><td>{{log.log_date|vicdate}}</td><td>{{log.log|safe}}</td></tr>
{% endfor %}
{% if log_cnt > logs|length %}
<tr>
<td class="align-middle">Remaining logs truncated</td>
<td>
<button type="button" class="btn btn-outline-info my-0 py-1" onClick="document.body.innerHTML+='<form id=_fm method=POST action={{url_for('joblog', id=job.id)}}></form>';document.getElementById('_fm').submit();">Show all logs</button>
</td>
</tr>
{% endif %}
</tbody>
</table>
</div class="containter">
{% endblock main_content %}
{% block script_content %}
<script>
{% if first_logs_only and job.pa_job_state != "Completed" %}
setTimeout(function(){ window.location.reload(1); }, 3000 )
{% endif %}
</script>
<script>
{% if first_logs_only and job.pa_job_state != "Completed" %}
setTimeout(function(){ window.location.reload(1); }, 3000 )
{% endif %}
</script>
{% endblock script_content %}