Skip to content
Snippets Groups Projects
Commit a792d3c4 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

working on query page

parent 73cbee8d
Branches
No related tags found
3 merge requests!74Acceptance,!73Master,!57Dev nico
......@@ -21,13 +21,13 @@ class TaskTable(tables.Table):
class Meta:
model = Task
template_name = "django_tables2/bootstrap4.html"
fields = ("id", "priority", "status", "project", "sas_id", "workflow", "creationtime", "size_to_process","buttons")
fields = ("id", "workflow","filter","priority", "status","project","sas_id","creationtime", "size_to_process","buttons")
# columns that need specific rendering
status = StatusColumn()
creationtime = tables.Column(verbose_name='CreationTime')
buttons = tables.TemplateColumn(verbose_name='Actions',
template_name='query/buttons.html',
template_name='query/status_buttons_per_row.html',
orderable=False) # orderable not sortable
......@@ -9,14 +9,18 @@
{% block myBlock %}
<div class="container-fluid details-container">
<h4>Query</h4>
{% if filter %}
<div class="card">
<form action="" method="get" class="form form-inline">
{% bootstrap_form filter.form layout='inline' %}
{% bootstrap_button 'filter' %}
</form>
</div>
{% endif %}
{% include "query/set_multi_status_panel.html" %}
{% render_table table 'django_tables2/bootstrap4.html' %}
</div>
......
<div class="row">
<div class="col-sm">
<div class="card">
<div class="card-body">
{% if user.is_superuser %}
<p>Click to change Status for all these tasks</p>
<table>
<tr>
<a href="{% url 'task-setstatus' 1 'staged' '1' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> staged</a>&nbsp;
<a href="{% url 'task-setstatus' 1 'processed' '1' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> processed</a>&nbsp;
<a href="{% url 'task-setstatus' 1 'validated' '1' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> validated</a>&nbsp;
<a href="{% url 'task-setstatus' 1 'scrubbed' '1' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> scrubbed</a>&nbsp;
<a href="{% url 'task-setstatus' 1 'archived' '1' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> archived</a>&nbsp;
<a href="{% url 'task-setstatus' 1 'finished' '1' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> finished</a>&nbsp;
</tr>
</table>
{% endif %}
</div>
</div>
</div>
</div>
{% if record.status == "defining" %}
<a href="{% url 'task-setstatus' record.pk 'defined' '1' %}" class="btn btn-success btn-sm" role="button">Stage</a>
<a href="{% url 'task-setstatus' record.pk 'defined' '1' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> defined</a>
{% endif %}
{% if record.status != "defining" %}
<a href="{% url 'task-setstatus' record.pk 'defining' '1' %}" class="btn btn-warning btn-sm" role="button">Reset</a>
<a href="{% url 'task-setstatus' record.pk 'defining' '1' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-undo"></i> defining</a>
{% endif %}
<a href="{% url 'task-setstatus' record.pk 'staged' '1' %}" class="btn btn-primary btn-sm" role="button">staged</a>
<a href="{% url 'task-setstatus' record.pk 'processed' '1' %}" class="btn btn-primary btn-sm" role="button">processed</a>
<a href="{% url 'task-setstatus' record.pk 'validated' '1' %}" class="btn btn-primary btn-sm" role="button">validated</a>
<a href="{% url 'task-setstatus' record.pk 'scrub' '1' %}" class="btn btn-warning btn-sm" role="button">scrub</a>
<a href="{% url 'task-setstatus' record.pk 'scrubbed' '1' %}" class="btn btn-primary btn-sm" role="button">scrubbed</a>
<a href="{% url 'task-setstatus' record.pk 'archived' '1' %}" class="btn btn-primary btn-sm" role="button">archived</a>
<a href="{% url 'task-setstatus' record.pk 'finished' '1' %}" class="btn btn-primary btn-sm" role="button">finished</a>
<a href="{% url 'task-setstatus' record.pk 'staged' '1' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> staged</a>&nbsp;
<a href="{% url 'task-setstatus' record.pk 'processed' '1' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> processed</a>&nbsp;
<a href="{% url 'task-setstatus' record.pk 'validated' '1' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> validated</a>&nbsp;
<a href="{% url 'task-setstatus' record.pk 'scrubbed' '1' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> scrubbed</a>&nbsp;
<a href="{% url 'task-setstatus' record.pk 'archived' '1' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> archived</a>
<a href="{% url 'task-setstatus' record.pk 'finished' '1' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> finished</a>
{% if record.status == "processed" %}
<a href="{% url 'task-setstatus' record.pk 'validated' '1' %}" class="btn btn-success btn-sm" role="button">Validate</a>
......
......@@ -2,7 +2,7 @@
{% load static %}
{% block myBlock %}
<div class="container">
<div class="container-fluid details-container">
<div class="card">
<div class="card-body">
<h3>Configuration </h3>
......@@ -12,8 +12,10 @@
</tbody>
</table>
</div>
<tr><td> <a href="/atdb/admin/taskdatabase/configuration/" class="btn btn-light btn-sm" target="_blank" role="button"><i class="fas fa-cog"></i> Edit Configuration</a>&nbsp;</td></tr>
</div>
<a href="/atdb/admin/taskdatabase/configuration/" class="btn btn-warning btn-sm" target="_blank" role="button"><i class="fas fa-cog"></i> Edit Configuration</a>&nbsp;
</div>
{% endblock %}
......@@ -6,7 +6,9 @@
<tr><td>Click to Filter</td></tr>
<tr>
<td>
<a href="{% url 'task-set-filter' 'all' %}" class="btn btn-success btn-sm" role="button">ALL</a><a href="{% url 'task-set-filter' 'defining' %}" class="btn btn-secondary btn-sm" role="button">defining</a>
<a href="{% url 'task-set-filter' 'all' %}" class="btn btn-success btn-sm" role="button">ALL</a>
<a href="{% url 'task-set-filter' 'defining' %}" class="btn btn-secondary btn-sm" role="button">defining</a>
<a href="{% url 'task-set-filter' 'defined' %}" class="btn btn-primary btn-sm" role="button">defined</a>
<a href="{% url 'task-set-filter' 'staging' %}" class="btn btn-secondary btn-sm" role="button">staging</a>
<a href="{% url 'task-set-filter' 'staged' %}" class="btn btn-primary btn-sm" role="button">staged</a>
......
......@@ -53,16 +53,20 @@ class TaskFilter(filters.FilterSet):
'resume': ['exact'],
}
class TaskFilterGUI(filters.FilterSet):
class TaskFilterQueryPage(filters.FilterSet):
class Meta:
model = Task
fields = {
'priority': ['exact'],
'workflow__id': ['exact'],
'filter': ['exact', 'icontains'],
'priority': ['exact', 'lte', 'gte'],
'status': ['icontains', 'in'],
'project': ['icontains'],
'sas_id': ['icontains'],
'project': ['exact', 'icontains'],
'sas_id': ['exact', 'icontains'],
'creationTime': ['icontains'],
'size_to_process' : ['lte', 'gte'],
}
......@@ -104,8 +108,7 @@ class QueryView(SingleTableMixin, FilterView):
table_class = TaskTable
model = Task
template_name = "query/index.html"
#filterset_class = TaskFilterGUI
filterset_class = TaskFilter
filterset_class = TaskFilterQueryPage
# ---------- GUI Views -----------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment