diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py index abcf447f757f6b5663a91893a310d1850d35f11c..f0495646ea297a59984fd25f3ef3283357c1c443 100644 --- a/atdb/taskdatabase/services/algorithms.py +++ b/atdb/taskdatabase/services/algorithms.py @@ -774,7 +774,7 @@ def construct_inspectionplots(task, expand_image=False, source='task_id'): results = "<h4>(Unique) Inspection Plots and Summary Logs for SAS_ID " + str(sas_id) + "</h4>" results += "<p>Clicking a link will redirect to SURF SARA in a new browser window. </p>" - tasks = Task.objects.filter(sas_id=sas_id) + tasks = Task.objects.filter(sas_id=sas_id).order_by('task_type','id') for task in tasks: @@ -783,7 +783,12 @@ def construct_inspectionplots(task, expand_image=False, source='task_id'): continue try: - results += '<tr style="background-color:#7EB1C4"><td colspan="3"><b>Task ' + str(task.id) + '</b></td></tr>' + + if task.task_type == 'regular': + results += f'<tr style="background-color:#7EB1C4"><td colspan="3"><b>Task {task.id}</b></td></tr>' + else: + results += f'<tr style="background-color:#7EB1C4"><td colspan="3"><b>Task {task.id}</b> ({task.task_type})</td></tr>' + results = add_plots(task, results, expand_image) except Exception as error: diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 3d6ccb913e1fea07b58d0f5981349d8433e1215c..370d1dbb990984b016dc0e9134a03eb34e02e945 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 24 Jan 2025</p> + <p class="footer"> Version 30 Jan 2025</p> </div> {% include 'taskdatabase/refresh.html' %}