diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py index 744af6a9c9c38603ad597dbef7da53196a1d5dc0..1f4aa72e3f9d04cc2be25c18cc81b51acd97acdc 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 d35f58e5906614917255772bc065a3205e75a8f2..3c94a326a5032257b453f2f76bc987b5682e226e 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 58f7ff480bc05e1610902addf5d127db5d9855e2..8ec691aef579ff1797b964059727649ead4f07fc 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 e46c587bb37c15007e184efabc654cb1268651db..0763737a6306002fb619f53758d862b7f1da2b52 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 70a3e1d8fbbc23bcf030f723c1bacfff344fd748..8a4c8a99625537b38a1663c32d677e45ac4286d0 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 c0d65878f8ef2e760696366db7a437123ec25791..85b5007cef9df74b1976f5b9bec1980148e9b2b5 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>