From e5cf4bfea64a87722ac9feb7d19c5f299e890815 Mon Sep 17 00:00:00 2001
From: vermaas <vermaas@astron.nl>
Date: Thu, 8 Dec 2022 14:45:30 +0100
Subject: [PATCH] moved summary button changed summary layout bugfix in ratio
---
atdb/taskdatabase/services/algorithms.py | 30 +++++++++++--------
.../templates/taskdatabase/index.html | 2 +-
.../taskdatabase/tasks/quality_card.html | 2 +-
.../validation/inspection_plots.html | 2 --
atdb/taskdatabase/views.py | 5 ++--
5 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py
index f102a014..a0a7f00d 100644
--- a/atdb/taskdatabase/services/algorithms.py
+++ b/atdb/taskdatabase/services/algorithms.py
@@ -140,7 +140,7 @@ def convert_quality_to_html(task):
except:
pass
- results += "<tr><td><b>QA diagnostic plots</b></td><td>" + "-" + "</td></tr>"
+ #results += "<tr><td><b>QA diagnostic plots</b></td><td>" + "-" + "</td></tr>"
#results += "<tr><td><b>Workflow summary parset</b></td><td>" + "-" + "</td></tr>"
#results += "<tr><td><b>Summary logs</b></td><td>" + "-" + "</td></tr>"
#results += "<tr><td><b>QA summary.hf5</b></td><td>" + "-" + "</td></tr>"
@@ -679,7 +679,10 @@ def unique_values_for_aggregation_key(queryset, aggregation_key):
def construct_inspectionplots(task):
- results = ""
+ #results = "<h4>Inspection Plots (for SAS_ID " + task.sas_id + ")</h4>"
+ results = "<h4>Inspection Plots</h4>"
+ results += "<p>Clicking a link will redirect to SURF SARA in a new browser window. </p>"
+
# translate the path to a url
try:
@@ -705,14 +708,16 @@ def construct_inspectionplots(task):
def construct_summary(task):
+
+ title = ""
+ totals = ""
results = ""
# find the plots in the quality json structure
try:
summary = task.quality_json["summary"]
- results = "<h4>Summary File (for sas_id " + task.sas_id+ ")</h4> "
- #<h4><img src="{% static 'taskdatabase/ldvlogo_small.png' %}" height="30" alt="summary">
- # Summary File (sas_id {{ task.sas_id }}) </h4>
+ title = "<h4>Summary File (for SAS_ID " + task.sas_id+ ")</h4> "
+
total_size_input = 0
total_size_output = 0
@@ -735,7 +740,7 @@ def construct_summary(task):
line += '<td>' + str(record['output_size']) + ' (' + record['output_size_str'] + ')</td>'
line += '</tr>'
line += '<tr><td><b>Ratio</b></td>'
- line += '<td>' + str(round(record['size_ratio'],3)) + '</td>'
+ line += '<td colspan="2">' + str(round(record['size_ratio'],2)) + '</td>'
line += '</tr>'
try:
@@ -763,7 +768,7 @@ def construct_summary(task):
try:
to_add = record['to_add']
if to_add:
- line += '<th>to_add</th>'
+ line += '<th>Added</th>'
line += '<tr><td colspan="3">'
for filename in to_add:
line += filename + '\n'
@@ -774,7 +779,7 @@ def construct_summary(task):
try:
to_delete = record['to_delete']
if to_delete:
- line += '<th>to_delete</th>'
+ line += '<th>Deleted</th>'
line += '<tr><td colspan="3">'
for filename in to_delete:
line += filename + '\n'
@@ -785,14 +790,15 @@ def construct_summary(task):
results += line
try:
- results += '<th>Totals</th>'
- results += '<tr><td colspan="1"><b>Input size</b></td><td>' + str(total_size_input) + '</td></tr>'
- results += '<tr><td colspan="1"><b>Output size</b><td>' + str(total_size_output) + '</td></tr>'
- results += '<tr><td colspan="1"><b>Ratio</b></td><td>' + str(total_size_output/total_size_output) + '</td></tr>'
+ totals += '<th>Totals</th><th></th><th></th>'
+ totals += '<tr><td colspan="2"><b>Input size</b></td><td>' + str(total_size_input) + '</td></tr>'
+ totals += '<tr><td colspan="2"><b>Output size</b><td>' + str(total_size_output) + '</td></tr>'
+ totals += '<tr><td colspan="2"><b>Ratio</b></td><td>' + str(round(total_size_output/total_size_input,2)) + '</td></tr>'
except:
pass
except:
pass
+ results = title + totals + results
return results
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index 7fdf0000..4d83e625 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 8 December 2022 - 12:00
+ <p class="footer"> Version 8 December 2022 - 15:00
</div>
diff --git a/atdb/taskdatabase/templates/taskdatabase/tasks/quality_card.html b/atdb/taskdatabase/templates/taskdatabase/tasks/quality_card.html
index 3f3e7c32..cb2f48dc 100644
--- a/atdb/taskdatabase/templates/taskdatabase/tasks/quality_card.html
+++ b/atdb/taskdatabase/templates/taskdatabase/tasks/quality_card.html
@@ -6,7 +6,7 @@
</table>
<table class="table table-striped">
- {{ summary | safe }}
+ {{ plots | safe }}
</table>
</div>
</div>
\ No newline at end of file
diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/inspection_plots.html b/atdb/taskdatabase/templates/taskdatabase/validation/inspection_plots.html
index 096b8466..066c080b 100644
--- a/atdb/taskdatabase/templates/taskdatabase/validation/inspection_plots.html
+++ b/atdb/taskdatabase/templates/taskdatabase/validation/inspection_plots.html
@@ -5,8 +5,6 @@
<div class="card">
<div class="card-body">
- <h4><img src="{% static 'taskdatabase/surfsara.jpg' %}" height="30" alt="inspection plots">
- Inspection Plots (sas_id {{ task.sas_id }}) </h4>
<p>Clicking a link will redirect to SURF SARA in a new browser window. </p>
<table class="table table-striped">
{{ my_plots | safe }}
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index 965491c1..a030b977 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -522,10 +522,11 @@ def ShowTaskQuality(request, id=0, page=0):
request.session['page'] = page
quality_html = algorithms.convert_quality_to_html(task)
- summary_html = algorithms.construct_summary(task)
+ #summary_html = algorithms.construct_summary(task)
+ plots_html = algorithms.construct_inspectionplots(task)
return render(request, "taskdatabase/tasks/task_quality.html",
- {'task': task, 'quality': quality_html, 'summary' : summary_html})
+ {'task': task, 'quality': quality_html, 'plots' : plots_html})
def AnnotateQualityTaskId(request, id=0, page=0):
--
GitLab