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

add some faked numbers and urls

parent 3f108b58
No related branches found
No related tags found
1 merge request!273Sdc 825 archived page
Pipeline #42345 passed
...@@ -220,7 +220,7 @@ class Task(models.Model): ...@@ -220,7 +220,7 @@ class Task(models.Model):
def sas_id_archived(self): def sas_id_archived(self):
try: try:
# --- temporary hack, test data --- # --- temporary hack, test data ---
return self.sas_id return int(self.sas_id)+123445
# --------------------------------- # ---------------------------------
return self.archive['sas_id_archived'] return self.archive['sas_id_archived']
......
...@@ -26,7 +26,7 @@ ...@@ -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> <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>
<th> <th>
SAS_ID (output) SAS_ID (output) at LTA
</th> </th>
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
{% if task.sas_id_archived != None %} {% if task.sas_id_archived != None %}
<a href={{ task.url_in_lta }} target="_blank"> <a href={{ task.url_in_lta }} target="_blank">
<img src="{% static 'taskdatabase/ldvlogo_small.png' %}" height="20" alt="link to LTA"> <img src="{% static 'taskdatabase/ldvlogo_small.png' %}" height="20" alt="link to LTA">
{{ task.sas_id }} {{ task.sas_id_archived }}
</a>&nbsp; </a>&nbsp;
{% else %} {% else %}
- -
......
{% 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> <a href="{% url 'clear-filter' 'index' %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-window-close"></i> Clear Filter</a>
{% endif %}
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
{% include 'taskdatabase/pagination.html' %} {% include 'taskdatabase/pagination.html' %}
</div> </div>
</div> </div>
<p class="footer"> Version 12 Januari 2022 - 7:00 <p class="footer"> Version 12 Januari 2022 - 14:00
</div> </div>
......
{% if request.session.filtered == True %} {% 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 %} {% 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 %} {% endif %}
...@@ -7,17 +7,15 @@ from django.contrib.auth.decorators import login_required ...@@ -7,17 +7,15 @@ from django.contrib.auth.decorators import login_required
from django.views.generic import ListView from django.views.generic import ListView
from django.contrib import messages from django.contrib import messages
from rest_framework import generics, pagination from rest_framework import generics
from rest_framework.response import Response
from rest_framework.views import APIView from rest_framework.views import APIView
from rest_framework.response import Response from rest_framework.response import Response
from rest_framework.permissions import IsAuthenticated from rest_framework.permissions import IsAuthenticated
import django_filters
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from django_filters.views import FilterView from django_filters.views import FilterView
from django_tables2.views import SingleTableMixin from django_tables2.views import SingleTableMixin
from django_tables2 import SingleTableView
from django.shortcuts import render, redirect, reverse from django.shortcuts import render, redirect, reverse
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
...@@ -1094,7 +1092,7 @@ def TaskSetOnHoldFilter(request, onhold, redirect_to_page): ...@@ -1094,7 +1092,7 @@ def TaskSetOnHoldFilter(request, onhold, redirect_to_page):
def TaskClearFilter(request, redirect_to_page): def TaskClearFilter(request, redirect_to_page):
request.session['task_filter'] = 'all' request.session['task_filter'] = 'all'
request.session['task_onhold_filter'] = None 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['search_box'] = ''
request.session['filtered'] = False request.session['filtered'] = False
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment