Rework job page input file view

This commit is contained in:
Stephan Porada
2020-06-10 14:25:57 +02:00
parent 6e26e38326
commit 7e34892147
4 changed files with 76 additions and 12 deletions

27
web/app/jobs/tables.py Normal file
View File

@ -0,0 +1,27 @@
from flask_table import Table, Col, LinkCol
class JobInputTable(Table):
"""
Declares the table describing colum by column.
"""
classes = ['highlight', 'responsive-table']
filename = Col('Filename', column_html_attrs={'class': 'filename'},
th_html_attrs={'class': 'sort',
'data-sort': 'filename'})
url = LinkCol('Download', 'jobs.download_job_input',
url_kwargs=dict(job_id='job.id',
job_input_id='input_id'),
anchor_attrs={'class': 'waves-effect waves-light btn-small',
'download': ''})
class JobInputItem(object):
"""
Describes one item like one row per table.
"""
def __init__(self, filename, job, input_id):
self.filename = filename
self.job = job
self.input_id = input_id

View File

@ -3,6 +3,7 @@ from flask import (abort, current_app, flash, redirect, render_template,
from flask_login import current_user, login_required
from . import jobs
from . import tasks
from . tables import JobInputItem, JobInputTable
from ..models import Job, JobInput, JobResult
import os
@ -13,7 +14,16 @@ def job(job_id):
job = Job.query.get_or_404(job_id)
if not (job.creator == current_user or current_user.is_administrator()):
abort(403)
return render_template('jobs/job.html.j2', job=job, title='Job')
items = [JobInputItem(input.filename, job, input.id)
for input in job.inputs]
# Convert table object to html string
job_input_table = JobInputTable(items).__html__()
# Add class "list" to tbody element. Needed for "List.js"
job_input_table = job_input_table.replace('tbody', 'tbody class="list"', 1)
return render_template('jobs/job.html.j2',
job=job,
job_input_table=job_input_table,
title='Job')
@jobs.route('/<int:job_id>/delete')