From a8fc4b62ac1e47344b924110babff3d4a33fa4b6 Mon Sep 17 00:00:00 2001
From: vermaas <vermaas@astron.nl>
Date: Thu, 12 Jan 2023 14:36:13 +0100
Subject: [PATCH] add some faked numbers and urls

---
 atdb/taskdatabase/models.py                               | 2 +-
 .../templates/taskdatabase/archived/headers.html          | 2 +-
 .../templates/taskdatabase/archived/tasks.html            | 2 +-
 .../taskdatabase/filter/clear_filter_button.html          | 6 +++---
 atdb/taskdatabase/templates/taskdatabase/index.html       | 2 +-
 .../templates/taskdatabase/query/clear_filter_button.html | 4 ++--
 atdb/taskdatabase/views.py                                | 8 +++-----
 7 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py
index c2abfdc2..6571e097 100644
--- a/atdb/taskdatabase/models.py
+++ b/atdb/taskdatabase/models.py
@@ -220,7 +220,7 @@ class Task(models.Model):
     def sas_id_archived(self):
         try:
             # --- temporary hack, test data ---
-            return self.sas_id
+            return int(self.sas_id)+123445
             # ---------------------------------
 
             return self.archive['sas_id_archived']
diff --git a/atdb/taskdatabase/templates/taskdatabase/archived/headers.html b/atdb/taskdatabase/templates/taskdatabase/archived/headers.html
index d99d2412..eac27b83 100644
--- a/atdb/taskdatabase/templates/taskdatabase/archived/headers.html
+++ b/atdb/taskdatabase/templates/taskdatabase/archived/headers.html
@@ -26,7 +26,7 @@
         <a href="{% url 'sort-tasks' 'sas_id' 'archived' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
     </th>
         <th>
-        SAS_ID (output)
+        SAS_ID (output) at LTA
     </th>
 
 
diff --git a/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html b/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html
index a865ec60..fa19ee17 100644
--- a/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html
+++ b/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html
@@ -41,7 +41,7 @@
                     {% if task.sas_id_archived != None %}
                       <a href={{ task.url_in_lta }} target="_blank">
                           <img src="{% static 'taskdatabase/ldvlogo_small.png' %}" height="20" alt="link to LTA">
-                          {{ task.sas_id }}
+                          {{ task.sas_id_archived }}
                       </a>&nbsp;
                     {% else %}
                     -
diff --git a/atdb/taskdatabase/templates/taskdatabase/filter/clear_filter_button.html b/atdb/taskdatabase/templates/taskdatabase/filter/clear_filter_button.html
index 1edd75ca..bb693fd9 100644
--- a/atdb/taskdatabase/templates/taskdatabase/filter/clear_filter_button.html
+++ b/atdb/taskdatabase/templates/taskdatabase/filter/clear_filter_button.html
@@ -1,3 +1,3 @@
-{% if request.session.filtered == True %}
-   <a href="{% url 'clear-filter' 'index' %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-window-close"></i> No Filter</a>
-{% endif %}
+
+   <a href="{% url 'clear-filter' 'index' %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-window-close"></i> Clear Filter</a>
+
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index dfb1d18c..4e967914 100644
--- 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 12 Januari 2022 - 7:00
+    <p class="footer"> Version 12 Januari 2022 - 14:00
 
 </div>
 
diff --git a/atdb/taskdatabase/templates/taskdatabase/query/clear_filter_button.html b/atdb/taskdatabase/templates/taskdatabase/query/clear_filter_button.html
index 3c9def89..a42b2965 100644
--- a/atdb/taskdatabase/templates/taskdatabase/query/clear_filter_button.html
+++ b/atdb/taskdatabase/templates/taskdatabase/query/clear_filter_button.html
@@ -1,5 +1,5 @@
 {% if request.session.filtered == True %}
-   <a href="{% url 'clear-filter' 'query' %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-window-close"></i> No Filter</a>
+   <a href="{% url 'clear-filter' 'query' %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-window-close"></i> Clear Filter</a>
 {% else %}
-   <a href="{% url 'clear-filter' 'query' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-window-close"></i> No Filter</a>
+   <a href="{% url 'clear-filter' 'query' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-window-close"></i> Clear Filter</a>
 {% endif %}
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index 20e253be..499db094 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -7,17 +7,15 @@ from django.contrib.auth.decorators import login_required
 from django.views.generic import ListView
 from django.contrib import messages
 
-from rest_framework import generics, pagination
-from rest_framework.response import Response
+from rest_framework import generics
 from rest_framework.views import APIView
 from rest_framework.response import Response
 from rest_framework.permissions import IsAuthenticated
 
-import django_filters
 from django_filters import rest_framework as filters
 from django_filters.views import FilterView
 from django_tables2.views import SingleTableMixin
-from django_tables2 import SingleTableView
+
 
 from django.shortcuts import render, redirect, reverse
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
@@ -1094,7 +1092,7 @@ def TaskSetOnHoldFilter(request, onhold, redirect_to_page):
 def TaskClearFilter(request, redirect_to_page):
     request.session['task_filter'] = 'all'
     request.session['task_onhold_filter'] = None
-    request.session['filtered_tasks_as_list'] = None
+    request.session['filtered_tasks_as_list'] = []
     request.session['search_box'] = ''
     request.session['filtered'] = False
 
-- 
GitLab