From 3c0f709e81808cf95510b6c7dd2bbab85f5b3708 Mon Sep 17 00:00:00 2001
From: vermaas <vermaas@astron.nl>
Date: Thu, 22 Dec 2022 11:46:03 +0100
Subject: [PATCH] add unicity also to regular plot list
---
atdb/taskdatabase/services/algorithms.py | 11 ++++++++---
atdb/taskdatabase/templates/taskdatabase/index.html | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py
index 9d2b2657..482bfd61 100644
--- a/atdb/taskdatabase/services/algorithms.py
+++ b/atdb/taskdatabase/services/algorithms.py
@@ -698,12 +698,17 @@ def construct_inspectionplots(task,source='task_id'):
results += "<p>Clicking a link will redirect to SURF SARA in a new browser window. </p>"
plots = task.quality_json["plots"]
+
+ # keep a temporary list of filenames to check uniqueness
+ plot_files = []
for plot in plots:
basename = plot['basename']
- surl = plot['surl'] + "?action=show&authz=" + str(token)
+ if not basename in plot_files:
+ surl = plot['surl'] + "?action=show&authz=" + str(token)
- url = surl.replace(translation[0],translation[1])
- results += '<tr><td><a href="' + url + '" target="_blank">'+ basename + '</a></td></tr>'
+ url = surl.replace(translation[0],translation[1])
+ results += '<tr><td><a href="' + url + '" target="_blank">'+ basename + '</a></td></tr>'
+ plot_files.append(basename)
elif source == 'sas_id':
sas_id = task.sas_id
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index c49a0d01..14a50656 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 22 December 2022 - 10:00
+ <p class="footer"> Version 22 December 2022 - 11:00
</div>
--
GitLab