Merge branch 'SDC-438-filters-on-dashboard' into 'master'

failed attempt at: See merge request !201

Merge branch 'SDC-438-filters-on-dashboard' into 'master'
911b2e28 · Nico Vermaas · f1744d80 · ef0d1542 · 911b2e28 · 911b2e28
Commit 911b2e28 authored 3 years ago by Nico Vermaas
--- a/atdb/taskdatabase/templates/taskdatabase/base.html
+++ b/atdb/taskdatabase/templates/taskdatabase/base.html
 <!DOCTYPE html>
 {% load static %}
+{% load atdb_extra_tags %}
 <html lang="en">
 <head>
@@ -55,7 +55,9 @@
                <li><a class="nav-link" href="{% url 'dashboard' 'active_nores_nofilter' %}">Dashboard</a></li>
                <li><a class="nav-link" href="{% url 'query' %}">Filter</a></li>
+{% comment %}
+                <li><a class="nav-link" href="{% url 'query2' request|current_query_params %}">Filter2</a></li>
+{% endcomment %}
                <li><a class="nav-link" href="{% url 'monitoring' %}">Monitoring</a></li>
                <li><a class="nav-link" href="{% url 'diagram' %}">Diagram</a></li>

--- 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 (7 feb 2021 - 15:00)
+    <p class="footer"> Version 1.0.0 (8 feb 2021 - 15:00)
 </div>

--- a/atdb/taskdatabase/templatetags/__init__.py
+++ b/atdb/taskdatabase/templatetags/__init__.py
--- a/atdb/taskdatabase/templatetags/atdb_extra_tags.py
+++ b/atdb/taskdatabase/templatetags/atdb_extra_tags.py
+from django import template
+register = template.Library()
+@register.filter
+def expand_list(list):
+    s = ''
+    for key, value in list:
+        s = s + '&' + key + '=' + value
+    return s
+@register.filter
+def current_query_params(request):
+    # expands the current query parameters into a string like:
+    # ?id=&status__icontains=defining&sas_id=178677
+    params = "?"+request.session['current_query_params'][1:]
+    return params
\ No newline at end of file
--- a/atdb/taskdatabase/urls.py
+++ b/atdb/taskdatabase/urls.py
@@ -28,7 +28,7 @@ urlpatterns = [
    path('workflow_details/<id>/', views.WorkflowDetails, name='workflow-details'),
    path('query/', views.QueryView.as_view(), name='query'),
-    # path('dashboard/', views.DashboardView.as_view(), name='dashboard'),
+    #path('query2/<query_params>', views.QueryView.as_view(), name='query2'),
    # path('monitoring/', views.MonitoringView.as_view(), name='monitoring'),
    path('monitoring/', views.ShowMonitoring, name='monitoring'),

--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -151,7 +151,6 @@ class MonitorFilter(filters.FilterSet):
        }
 # ---------- Tables2 Views (experimental) -----------
-# implementation with tables2: http://localhost:8000/atdb/tables2
 class QueryView(SingleTableMixin, FilterView):
    table_class = TaskTable
    model = Task
@@ -165,6 +164,9 @@ class QueryView(SingleTableMixin, FilterView):
        # https://stackoverflow.com/questions/7763115/django-passing-data-between-views
        count = self.object_list.count()
+        # q: how do I apply this before getting into get_table_data?
+        # current_query_params = self.request.session['current_query_params']
        try:
            limit = int(Configuration.objects.get(key='multi_change_limit').value)
        except:
@@ -178,6 +180,7 @@ class QueryView(SingleTableMixin, FilterView):
        # store on the session
        self.request.session['filtered_tasks_as_list'] = filtered_tasks_as_list
        return self.object_list