sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-11-15 01:05:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

Browse Source
This commit is contained in:
Patrick Jentsch 2019-10-23 08:35:17 +02:00
commit c6341cbce6
2 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/templates/main/jobs/job.html.j2
View File

@ -238,11 +238,14 @@
</div>
<span class="card-title">Files</span>
<table>
<div style="overflow-x:auto;">
<table class="highlight">
<thead>
<tr>
<th style="width: 50%;">Inputs</th>
<th style="width: 50%;">Results</th>
<th style="width: 25%;">Inputs</th>
<th style="width: 25%;"></th>
<th style="width: 25%;">Results</th>
<th style="width: 25%;"></th>
</tr>
</thead>
<tbody id="files"></tbody>
@ -258,23 +261,51 @@
</thead>
<tbody>
{% for file in files %}
<tr>
<td rowspan="4">
{{ file }}
</td>
<td rowspan="4">
<a href="{{ url_for('main.job_download', job_id=job.id, file=files[file]['path']) }}" class="waves-effect waves-light btn-small"><i class="material-icons left">file_download</i>Download</a>
</td>
</tr>
{% if files[file]['results'] %}
{% for result in files[file]['results'] %}
<tr>
<td>
<a href="{{ url_for('main.job_download', job_id=job.id, file=files[file]['path']) }}" class="waves-effect waves-light btn-small"><i class="material-icons left">file_download</i>{{ file }}</a>
{{ result }}
</td>
<td>
{% if job.status == 'complete' %}
{% for result in files[file]['results'] %}
<a href="{{ url_for('main.job_download', job_id=job.id, file=files[file]['results'][result]['path']) }}" class="waves-effect waves-light btn-small"><i class="material-icons left">file_download</i>{{ result }}</a>
{% endfor %}
<a href="{{ url_for('main.job_download', job_id=job.id, file=files[file]['results'][result]['path']) }}" class="waves-effect waves-light btn-small"><i class="material-icons left">file_download</i>Download</a>
{% endif %}
</td>
</tr>
{% if result == 'vrt' %}
<tr>
<td></td>
<td></td>
</tr>
<tr>
<td></td>
<td></td>
</tr>
{% endif %}
{% endfor %}
{% else %}
{% for step in range(1, 4) %}
<tr>
<td>processing...</td>
<td></td>
</tr>
{% endfor %}
{% endif %}
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>
{% endblock %}

1
docker-compose.yml
View File

@ -35,6 +35,7 @@ services:
- web.env
image: gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/opaque_daemon:latest
volumes:
- storage:/mnt/opaque
- ./logs:/home/opaque_daemon/logs
- ../opaque_daemon/opaque_daemon.py:/home/opaque_daemon/opaque_daemon.py
- $HOME/.docker/config.json:/home/opaque_daemon/.docker/config.json