bugfix:

(simply removed the filter on resume/hold) https://support.astron.nl/jira/projects/SDCH/queues/custom/80/SDCH-3649

bugfix:
12b30a7f · Nico Vermaas · 19c89256 · 12b30a7f · 12b30a7f · 12b30a7f
Commit 12b30a7f authored 2 years ago by Nico Vermaas
--- a/atdb/taskdatabase/tables.py
+++ b/atdb/taskdatabase/tables.py
@@ -15,7 +15,7 @@ class StatusColumn(tables.Column):
    def render(self, record):
        return "{}".format(record.status)

-# render the StatusColumn based on the style.css
+# render the ResumeColumn based on the style.css
 class ResumeColumn(tables.BooleanColumn):
    def render(self, record):
        return record.resume
@@ -29,7 +29,6 @@ class TaskTable(tables.Table):

    # columns that need specific rendering
    status = StatusColumn()
-    #resume = ResumeColumn()

    actions = tables.TemplateColumn(verbose_name='Details',
                                    template_name='taskdatabase/query/action_buttons_per_row.html',

--- a/atdb/taskdatabase/templates/taskdatabase/base.html
+++ b/atdb/taskdatabase/templates/taskdatabase/base.html
@@ -103,3 +103,19 @@
 {% include "taskdatabase/modal/modal.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
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -34,7 +34,7 @@
        {% include 'taskdatabase/pagination.html' %}
       </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>


--- a/atdb/taskdatabase/templates/taskdatabase/query/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/query/index.html
@@ -6,6 +6,8 @@
 {% bootstrap_css %}
 {% bootstrap_javascript %}

+{% load render_table from django_tables2 %}
+
 {% block myBlock %}

 <div class="container-fluid details-container">
@@ -21,7 +23,6 @@
    {% endif %}

    {% include "taskdatabase/query/set_multi_status_panel.html" %}
-
    {% render_table table 'django_tables2/bootstrap4.html' %}

 </div>

--- a/atdb/taskdatabase/templates/taskdatabase/query/query.html
+++ b/atdb/taskdatabase/templates/taskdatabase/query/query.html
 {% load render_table from django_tables2 %}
+{% load crispy_forms_tags %}
 <!doctype html>
 <html>
    <head>
        <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>
    <body>
+        <!-- display the filter -->
+
+        {% crispy filter.form filter.form.helper %}
        {% render_table table %}
    </body>
 </html>
\ No newline at end of file
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -73,14 +73,13 @@ class TaskFilter(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:
        model = Task

        fields = {
            'id': ['exact', 'gte', 'lte'],
-            # 'task_type': ['exact','in'],
            'workflow__id': ['exact'],
            'filter': ['exact', 'icontains'],
            'priority': ['exact', 'gte', 'lte'],
@@ -88,7 +87,6 @@ class TaskFilterQueryPage(filters.FilterSet):
            'quality': ['icontains', 'in'],
            'project': ['exact', 'icontains', 'in'],
            'sas_id': ['exact', 'icontains', 'in'],
-            # 'resume': ['exact'],
        }


@@ -472,10 +470,10 @@ def get_filtered_tasks(request, pre_filtered_tasks=None):
    return filtered_tasks.order_by(my_sort)


-class TaskTables2View(SingleTableView):
-    model = Task
-    table_class = TaskTable
-    template_name = 'taskdatabase/query/query.html'
+# class TaskTables2View(SingleTableView):
+#     model = Task
+#     table_class = TaskTable
+#     template_name = 'taskdatabase/query/query.html'


 def TaskDetails(request, id=0, page=0):