From 15e8dfc1f216943e501ced4c3b64a1d43488123b Mon Sep 17 00:00:00 2001
From: Vermaas <vermaas@astron.nl>
Date: Fri, 5 Jul 2024 16:21:06 +0200
Subject: [PATCH] small changes in summary for imaging compression pipeline
---
atdb/taskdatabase/services/algorithms.py | 6 +++++-
atdb/taskdatabase/templates/taskdatabase/index.html | 2 +-
.../templates/taskdatabase/quality/headers.html | 3 ---
atdb/taskdatabase/templates/taskdatabase/quality/tasks.html | 3 ---
.../templates/taskdatabase/validation/headers.html | 3 ---
.../templates/taskdatabase/validation/tasks.html | 3 ---
6 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py
index 744af6a9..1f4aa72e 100644
--- a/atdb/taskdatabase/services/algorithms.py
+++ b/atdb/taskdatabase/services/algorithms.py
@@ -972,6 +972,7 @@ def construct_imaging_summary(task):
total_size_to_process += task.size_to_process
total_size_processed += task.size_processed
total_total_processing_time += task.total_processing_time
+ ratio = total_size_processed / total_size_to_process
# find the summary in the quality json structure
try:
@@ -1034,7 +1035,7 @@ def construct_imaging_summary(task):
results += f'<tr><td colspan="3">{details["pointing"]}</td></tr>'
stations = details["DStDev"]
- results += '<tr style="background-color:#7EB100"><td colspan="3"><b>Stations</b></td></tr>'
+ results += '<tr style="background-color:#7EB100"><td colspan="3"><b>Stations_DStDev</b></td></tr>'
results += f'<tr><td colspan="3">{stations}</td></tr>'
antennas = details["antennas"]
@@ -1050,6 +1051,9 @@ def construct_imaging_summary(task):
totals += '<tr><td><b>Size to process</b></td colspan="2"><td>' + str(total_size_to_process) + '</td></tr>'
totals += '<tr><td><b>Size processed</b><td colspan="2">' + str(total_size_processed) + '</td></tr>'
+ totals += '<tr><td><b>Ratio</b></td>'
+ totals += '<td colspan="2">' + str(round(ratio, 3)) + '</td>'
+ totals += '</tr>'
try:
# add calculated quality per sasid (if present)
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index d35f58e5..3c94a326 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 28 Jun 2024
+ <p class="footer"> Version 5 Jul 2024
</div>
{% include 'taskdatabase/refresh.html' %}
diff --git a/atdb/taskdatabase/templates/taskdatabase/quality/headers.html b/atdb/taskdatabase/templates/taskdatabase/quality/headers.html
index 58f7ff48..8ec691ae 100644
--- a/atdb/taskdatabase/templates/taskdatabase/quality/headers.html
+++ b/atdb/taskdatabase/templates/taskdatabase/quality/headers.html
@@ -25,9 +25,6 @@
Filter
<a href="{% url 'sort-tasks' 'filter' 'quality' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
</th>
- <th>uv-coverage</th>
- <th>Sensitivity</th>
- <th>Conditions</th>
<th>Plots</th>
<th>Calc Q</th>
<th>Quality</th>
diff --git a/atdb/taskdatabase/templates/taskdatabase/quality/tasks.html b/atdb/taskdatabase/templates/taskdatabase/quality/tasks.html
index e46c587b..0763737a 100644
--- a/atdb/taskdatabase/templates/taskdatabase/quality/tasks.html
+++ b/atdb/taskdatabase/templates/taskdatabase/quality/tasks.html
@@ -38,9 +38,6 @@
<td>{{ task.filter }} </td>
{% if task.has_quality %}
- {% for value in task.quality_as_list %}
- <td>{{value}}</td>
- {% endfor %}
<td>
<a class="open-modal btn btn-primary btn-sm"
href="{% url 'inspection-plots' task.id my_tasks.number %}"
diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/headers.html b/atdb/taskdatabase/templates/taskdatabase/validation/headers.html
index 70a3e1d8..8a4c8a99 100644
--- a/atdb/taskdatabase/templates/taskdatabase/validation/headers.html
+++ b/atdb/taskdatabase/templates/taskdatabase/validation/headers.html
@@ -19,9 +19,6 @@
Filter
<a href="{% url 'sort-tasks' 'filter' 'validation' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
</th>
- <th>uv-coverage</th>
- <th>Sensitivity</th>
- <th>Conditions</th>
<th>Plots</th>
<th>Summary</th>
<th>Annotate</th>
diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/tasks.html b/atdb/taskdatabase/templates/taskdatabase/validation/tasks.html
index c0d65878..85b5007c 100644
--- a/atdb/taskdatabase/templates/taskdatabase/validation/tasks.html
+++ b/atdb/taskdatabase/templates/taskdatabase/validation/tasks.html
@@ -18,9 +18,6 @@
<td>{{ task.filter }} </td>
{% if task.has_quality %}
- {% for value in task.quality_as_list %}
- <td>{{value}}</td>
- {% endfor %}
{% if task.has_plots %}
<td>
--
GitLab