diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index 5aa534ab4ad808c5249357d5daf26bbe5ad1f949..24254a155ef9b322b8c47d9ec5e30cee1265c85b 100644 --- a/atdb/taskdatabase/models.py +++ b/atdb/taskdatabase/models.py @@ -260,7 +260,7 @@ class Task(models.Model): if (self.status != State.PROCESSED.value) & (self.new_status == State.PROCESSED.value): self.handle_aggregation() - if self.status in ACTIVITY_RESET_STATUSSEN: + if self.new_status in ACTIVITY_RESET_STATUSSEN: self.is_aggregated = False # check in the outputs if this task should be considered to be summary task diff --git a/atdb/taskdatabase/services/common.py b/atdb/taskdatabase/services/common.py index 444b8364dd129ab4b67ec30b19b5087b8054ada2..e3fb9ecd4b9cbfeed41626ef67d6f02c7a4b88a2 100644 --- a/atdb/taskdatabase/services/common.py +++ b/atdb/taskdatabase/services/common.py @@ -34,7 +34,7 @@ class State(Enum): VERIFIED_STATUSSES = [State.STORED.value, State.VALIDATED.value, State.SCRUBBED.value, State.PRE_ARCHIVED.value, State.ARCHIVED.value, State.FINISHED.value, State.SUSPENDED.value, State.DISCARDED.value] -PROCESSED_STATUSSES = [State.PROCESSED.value, State.AGGREGATING.value, State.AGGREGATED.value, State.STORED.value, +PROCESSED_STATUSSES = [State.PROCESSED.value, State.AGGREGATE.value, State.AGGREGATING.value, State.AGGREGATED.value, State.STORED.value, State.DISCARDED.value] INGEST_FRACTION_STATUSSES = [State.SCRUBBED.value, State.PRE_ARCHIVING.value, State.PRE_ARCHIVED.value, diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index f50f7b8fdbff69bd0575c0390df29caec4b307e6..d372ed206fab75f92bdcfe9a5db673c63e8cbc75 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 30 Jul 2024 + <p class="footer"> Version 1 Aug 2024 </div> {% include 'taskdatabase/refresh.html' %} diff --git a/atdb/taskdatabase/tests/test_update_activity.py b/atdb/taskdatabase/tests/test_update_activity.py index 2d5feced40a95452d09529fcd181b1e14a3c5ee3..4a13870029f263dafd7e99471d59c6e7ae429f70 100644 --- a/atdb/taskdatabase/tests/test_update_activity.py +++ b/atdb/taskdatabase/tests/test_update_activity.py @@ -95,7 +95,7 @@ class TestUpdateActivity(TestCase): new_status='fetched', workflow=self.workflow_imaging_compression, outputs={"inspect": {"location": "file:///project/ldv/Share/run/2023/3/26/331_30608/inspect.h5", "basename": "inspect.h5", "nameroot": "inspect"}}) - self.task10.save() + self.task11.save() def test_created_activity(self): """