From 61308a7d19c2b519b9679f5e93b7cc41ce84a31a Mon Sep 17 00:00:00 2001
From: Vermaas <vermaas@astron.nl>
Date: Thu, 30 Jan 2025 10:26:17 +0100
Subject: [PATCH] SDC-1664 add task_type to plots
---
atdb/taskdatabase/services/algorithms.py | 9 +++++++--
atdb/taskdatabase/templates/taskdatabase/index.html | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py
index abcf447f..f0495646 100644
--- a/atdb/taskdatabase/services/algorithms.py
+++ b/atdb/taskdatabase/services/algorithms.py
@@ -774,7 +774,7 @@ def construct_inspectionplots(task, expand_image=False, source='task_id'):
results = "<h4>(Unique) Inspection Plots and Summary Logs for SAS_ID " + str(sas_id) + "</h4>"
results += "<p>Clicking a link will redirect to SURF SARA in a new browser window. </p>"
- tasks = Task.objects.filter(sas_id=sas_id)
+ tasks = Task.objects.filter(sas_id=sas_id).order_by('task_type','id')
for task in tasks:
@@ -783,7 +783,12 @@ def construct_inspectionplots(task, expand_image=False, source='task_id'):
continue
try:
- results += '<tr style="background-color:#7EB1C4"><td colspan="3"><b>Task ' + str(task.id) + '</b></td></tr>'
+
+ if task.task_type == 'regular':
+ results += f'<tr style="background-color:#7EB1C4"><td colspan="3"><b>Task {task.id}</b></td></tr>'
+ else:
+ results += f'<tr style="background-color:#7EB1C4"><td colspan="3"><b>Task {task.id}</b> ({task.task_type})</td></tr>'
+
results = add_plots(task, results, expand_image)
except Exception as error:
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index 3d6ccb91..370d1dbb 100644
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -31,7 +31,7 @@
{% include 'taskdatabase/pagination.html' %}
</div>
</div>
- <p class="footer"> Version 24 Jan 2025</p>
+ <p class="footer"> Version 30 Jan 2025</p>
</div>
{% include 'taskdatabase/refresh.html' %}
--
GitLab