diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index 0fe43a693ca96622af5a82684afa2bb3bbc570dd..85c2d5d7cafe4cad8b22a9593427b2e8cb2fa2f7 100644 --- a/atdb/taskdatabase/models.py +++ b/atdb/taskdatabase/models.py @@ -10,7 +10,7 @@ logger = logging.getLogger(__name__) # constants datetime_format_string = '%Y-%m-%dT%H:%M:%SZ' -verified_statusses = ['stored','validated','scrubbed','archived','finished'] +verified_statusses = ['stored','validated','scrubbed','archived','finished','suspended','discarded'] class Workflow(models.Model): description = models.CharField(max_length=500, blank=True, null=True) diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py index db9d1dbd8a3897df28250eae1f4aa25c4c7d7ec2..2c1ff41f5759acd0db5c4923199fdd1a9cf17978 100644 --- a/atdb/taskdatabase/services/algorithms.py +++ b/atdb/taskdatabase/services/algorithms.py @@ -724,6 +724,11 @@ def construct_inspectionplots(task,source='task_id'): tasks = Task.objects.filter(sas_id=sas_id) for task in tasks: + + # skip 'suspended' and 'discarded' tasks + if task.status in ['suspended','discarded']: + continue + try: results += '<tr style="background-color:#7EB1C4"><td colspan="3"><b>Task ' + str(task.id) + '</b></td></tr>' plots = task.quality_json["plots"] @@ -765,6 +770,11 @@ def construct_summary(task): tasks = Task.objects.filter(sas_id=sas_id) for task in tasks: + + # skip 'suspended' and 'discarded' tasks + if task.status in ['suspended', 'discarded']: + continue + results += '<tr style="background-color:#7EB1C4"><td colspan="3"><b>Task ' + str(task.id) + '</b></td></tr>' # find the plots in the quality json structure diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index cbf6b0fa1c4a307f1cdb52575d0c3d5c720da546..b185799794fd22de63ac7be4437e817f7246c119 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 4 April 2023 + <p class="footer"> Version 6 April 2023 </div> diff --git a/atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html b/atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html index 0878aa875935bb14030e20b179d97726bc334049..7601e2a73d3a6de06190b4d22f6302bc6bc27e76 100644 --- a/atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html +++ b/atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html @@ -9,4 +9,6 @@ <a href="{% url 'task-details-setstatus' task.pk 'archived' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> archived</a> <a href="{% url 'task-details-setstatus' task.pk 'finished' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> finished</a> <a href="{% url 'task-details-setstatus' task.pk 'suspended' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> suspended</a> +<!-- <a href="{% url 'task-details-setstatus' task.pk 'discard' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> discard</a> +--> \ No newline at end of file