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

Merge branch 'SDCH-3649-bugfix-holdresume' into 'master' 

bugfix: removed 'unknown' filter from the query view

See merge request !263
parents 19c89256 12b30a7f
Branches
No related tags found
1 merge request!263bugfix: removed 'unknown' filter from the query view
Pipeline #39466 passed
Stage: build
Stage: deploy_to_test
Show whitespace changes
Inline Side-by-side
atdb/taskdatabase/tables.py
+ 1
− 2
View file @ 28022bf2
...@@ -15,7 +15,7 @@ class StatusColumn(tables.Column): ...@@ -15,7 +15,7 @@ class StatusColumn(tables.Column):
def render(self, record): def render(self, record):
return "{}".format(record.status) return "{}".format(record.status)
# render the StatusColumn based on the style.css # render the ResumeColumn based on the style.css
class ResumeColumn(tables.BooleanColumn): class ResumeColumn(tables.BooleanColumn):
def render(self, record): def render(self, record):
return record.resume return record.resume
...@@ -29,7 +29,6 @@ class TaskTable(tables.Table): ...@@ -29,7 +29,6 @@ class TaskTable(tables.Table):
# columns that need specific rendering # columns that need specific rendering
status = StatusColumn() status = StatusColumn()
#resume = ResumeColumn()
actions = tables.TemplateColumn(verbose_name='Details', actions = tables.TemplateColumn(verbose_name='Details',
template_name='taskdatabase/query/action_buttons_per_row.html', template_name='taskdatabase/query/action_buttons_per_row.html',
......
atdb/taskdatabase/templates/taskdatabase/base.html
+ 16
− 0
View file @ 28022bf2
...@@ -103,3 +103,19 @@ ...@@ -103,3 +103,19 @@
{% include "taskdatabase/modal/modal.html" %} {% include "taskdatabase/modal/modal.html" %}
</html> </html>
<script type="text/javascript">
function readFromLocalStorage(id) {
var s = localStorage.getItem(id);
if (s !== null) {
document.getElementById(id).value = s;
}
}
</script>
<script type="text/javascript">
function writeToLocalStorage(id) {
var s = document.getElementById(id).value
localStorage.setItem(id, s);
}
</script>
\ No newline at end of file
atdb/taskdatabase/templates/taskdatabase/index.html
+ 1
− 1
View file @ 28022bf2
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
{% include 'taskdatabase/pagination.html' %} {% include 'taskdatabase/pagination.html' %}
</div> </div>
</div> </div>
<p class="footer"> Version 1.0.0 (21 oct 2022 - 11:00) <p class="footer"> Version 1.0.0 (14 November 2022)
</div> </div>
......
atdb/taskdatabase/templates/taskdatabase/query/index.html
+ 2
− 1
View file @ 28022bf2
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
{% bootstrap_css %} {% bootstrap_css %}
{% bootstrap_javascript %} {% bootstrap_javascript %}
{% load render_table from django_tables2 %}
{% block myBlock %} {% block myBlock %}
<div class="container-fluid details-container"> <div class="container-fluid details-container">
...@@ -21,7 +23,6 @@ ...@@ -21,7 +23,6 @@
{% endif %} {% endif %}
{% include "taskdatabase/query/set_multi_status_panel.html" %} {% include "taskdatabase/query/set_multi_status_panel.html" %}
{% render_table table 'django_tables2/bootstrap4.html' %} {% render_table table 'django_tables2/bootstrap4.html' %}
</div> </div>
......
atdb/taskdatabase/templates/taskdatabase/query/query.html
+ 6
− 1
View file @ 28022bf2
{% load render_table from django_tables2 %} {% load render_table from django_tables2 %}
{% load crispy_forms_tags %}
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>Query </title> <title>Query </title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" /> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css">
</head> </head>
<body> <body>
<!-- display the filter -->
{% crispy filter.form filter.form.helper %}
{% render_table table %} {% render_table table %}
</body> </body>
</html> </html>
\ No newline at end of file
atdb/taskdatabase/views.py
+ 5
− 7
View file @ 28022bf2
...@@ -73,14 +73,13 @@ class TaskFilter(filters.FilterSet): ...@@ -73,14 +73,13 @@ class TaskFilter(filters.FilterSet):
class TaskFilterQueryPage(filters.FilterSet): class TaskFilterQueryPage(filters.FilterSet):
resume = django_filters.BooleanFilter(lookup_expr='exact', label='resuming') #resume = django_filters.BooleanFilter(field_name='resume',lookup_expr='exact', label='Resuming')
class Meta: class Meta:
model = Task model = Task
fields = { fields = {
'id': ['exact', 'gte', 'lte'], 'id': ['exact', 'gte', 'lte'],
# 'task_type': ['exact','in'],
'workflow__id': ['exact'], 'workflow__id': ['exact'],
'filter': ['exact', 'icontains'], 'filter': ['exact', 'icontains'],
'priority': ['exact', 'gte', 'lte'], 'priority': ['exact', 'gte', 'lte'],
...@@ -88,7 +87,6 @@ class TaskFilterQueryPage(filters.FilterSet): ...@@ -88,7 +87,6 @@ class TaskFilterQueryPage(filters.FilterSet):
'quality': ['icontains', 'in'], 'quality': ['icontains', 'in'],
'project': ['exact', 'icontains', 'in'], 'project': ['exact', 'icontains', 'in'],
'sas_id': ['exact', 'icontains', 'in'], 'sas_id': ['exact', 'icontains', 'in'],
# 'resume': ['exact'],
} }
...@@ -472,10 +470,10 @@ def get_filtered_tasks(request, pre_filtered_tasks=None): ...@@ -472,10 +470,10 @@ def get_filtered_tasks(request, pre_filtered_tasks=None):
return filtered_tasks.order_by(my_sort) return filtered_tasks.order_by(my_sort)
class TaskTables2View(SingleTableView): # class TaskTables2View(SingleTableView):
model = Task # model = Task
table_class = TaskTable # table_class = TaskTable
template_name = 'taskdatabase/query/query.html' # template_name = 'taskdatabase/query/query.html'
def TaskDetails(request, id=0, page=0): def TaskDetails(request, id=0, page=0):
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment