From 97018de516b1a60427692de21dcbbdd73b196abb Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Mon, 24 Jan 2022 10:15:27 +0100
Subject: [PATCH] query filter fix in get_min_start_and_max_end_time
---
atdb/taskdatabase/services/algorithms.py | 2 +-
atdb/taskdatabase/templates/taskdatabase/index.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py
index 8f64e867..3d4c966a 100644
--- a/atdb/taskdatabase/services/algorithms.py
+++ b/atdb/taskdatabase/services/algorithms.py
@@ -52,7 +52,7 @@ def get_min_start_and_max_end_time(sas_id):
min_start_time = None
max_end_time = None
logger.info("get_min_start_and_max_end_time(" + str(sas_id) + ")")
- tasks = Task.objects.filter(sas_id=sas_id).filter(status='archived') + Task.objects.filter(sas_id=sas_id).filter(status='finished')
+ tasks = Task.objects.filter(sas_id=sas_id).filter(status__in='archived,finished')
for task in tasks:
# If more entrees are found for 'processing' task, get the latest
start_time = LogEntry.objects.filter(task=task.pk).filter(step_name='running').filter(status='processing').lastest('timestamp').timestamp
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index 0083720f..1779a853 100644
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -80,7 +80,7 @@
{% include 'taskdatabase/pagination.html' %}
</div>
</div>
- <p class="footer"> Version 1.0.0 (21 jan 2021 - 19:00)
+ <p class="footer"> Version 1.0.0 (24 jan 2021 - 10:00)
</div>
--
GitLab