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

app/templates/main/jobs/job.html.j2

@@ -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: 25%;">Inputs</th>
-              <th style="width: 50%;">Results</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>Download</a>
-              <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 %}
               {% 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 %}

docker-compose.yml

@@ -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