diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index c2abfdc2b7bb20cb41260db87bd8c19f79863591..6571e0976fa013308964ae5ab426c4bad8bb1467 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 d99d241256941bbdf8d35dd24783f7fd891a3d35..eac27b83e0408e84cac5218642078e43fb559aee 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 a865ec60de57a36dbda102d3a1f540fc62aeb8a0..fa19ee1728bddb9ba294236a5ecdc6ea7d8d64be 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> {% else %} - diff --git a/atdb/taskdatabase/templates/taskdatabase/filter/clear_filter_button.html b/atdb/taskdatabase/templates/taskdatabase/filter/clear_filter_button.html index 1edd75caf439b454e86bef1a24e496a18583dfc0..bb693fd973aa544584691c7fc8fbd11301bce383 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 dfb1d18c5636283831bffba8c417d7e62baa774f..4e96791423d2c99a6d950ad5b5143d83548c3dcb 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 3c9def89cb39b07a16b6a6b2bac8a191d00c91c3..a42b2965ee723659c1dadc0f65f6e043bed6c454 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 20e253bed44a685d05e5cbea35a05faefb3b3e47..499db094c9cbf2d5c5f27c5d9683b52503ea198e 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