Merge branch 'dev-nico' into 'master'

Dev nico

See merge request !159

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

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>