diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py index e9bf47ebf2c2f7622b19de7c7868775bddc993cb..406bb17aa30c31bd2ee3ff12ba4164023fcb6fe1 100644 --- a/atdb/taskdatabase/services/algorithms.py +++ b/atdb/taskdatabase/services/algorithms.py @@ -784,8 +784,8 @@ def construct_summary(task): 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>Outtput size</b><td>' + str(total_size_output) + '</td></tr>' - results += '<tr><td colspan="1"><b>Ratioatio</b></td><td>' + str(total_size_output/total_size_output) + '</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>' except: pass diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 9e997f5a369e9c59dc50c7ab4d7dcea21a0d0804..7fdf00000060d8c17b9dc38431d61d56078cac01 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 - 7:00 + <p class="footer"> Version 8 December 2022 - 12:00 </div> diff --git a/atdb/taskdatabase/templates/taskdatabase/tasks/quality_card.html b/atdb/taskdatabase/templates/taskdatabase/tasks/quality_card.html index 2dcbc140b91d5fb18acd43c86e5025ad025670f1..853f162e5e2d002d8aea986ccb562c83e7f6dc7e 100644 --- a/atdb/taskdatabase/templates/taskdatabase/tasks/quality_card.html +++ b/atdb/taskdatabase/templates/taskdatabase/tasks/quality_card.html @@ -4,5 +4,9 @@ <table class="table table-striped"> {{ quality | safe }} </table> + <h4>Summary File</h4> + <table class="table table-striped"> + {{ summary | safe }} + </table> </div> </div> \ No newline at end of file diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index 908370b93153580473e76690094e0c1816478e99..965491c1437c95d91786800e0230ede9c2e59a36 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -522,8 +522,10 @@ 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) - return render(request, "taskdatabase/tasks/task_quality.html", {'task': task, 'quality': quality_html}) + return render(request, "taskdatabase/tasks/task_quality.html", + {'task': task, 'quality': quality_html, 'summary' : summary_html}) def AnnotateQualityTaskId(request, id=0, page=0):