Skip to content
Snippets Groups Projects
Commit a40a7672 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

bugfix

parent ab9d249f
Branches
No related tags found
1 merge request!361SDC-1423 use aggregation strategy
Pipeline #89822 passed
...@@ -260,7 +260,7 @@ class Task(models.Model): ...@@ -260,7 +260,7 @@ class Task(models.Model):
if (self.status != State.PROCESSED.value) & (self.new_status == State.PROCESSED.value): if (self.status != State.PROCESSED.value) & (self.new_status == State.PROCESSED.value):
self.handle_aggregation() self.handle_aggregation()
if self.status in ACTIVITY_RESET_STATUSSEN: if self.new_status in ACTIVITY_RESET_STATUSSEN:
self.is_aggregated = False self.is_aggregated = False
# check in the outputs if this task should be considered to be summary task # check in the outputs if this task should be considered to be summary task
......
...@@ -34,7 +34,7 @@ class State(Enum): ...@@ -34,7 +34,7 @@ class State(Enum):
VERIFIED_STATUSSES = [State.STORED.value, State.VALIDATED.value, State.SCRUBBED.value, State.PRE_ARCHIVED.value, 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] 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] State.DISCARDED.value]
INGEST_FRACTION_STATUSSES = [State.SCRUBBED.value, State.PRE_ARCHIVING.value, State.PRE_ARCHIVED.value, INGEST_FRACTION_STATUSSES = [State.SCRUBBED.value, State.PRE_ARCHIVING.value, State.PRE_ARCHIVED.value,
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
{% include 'taskdatabase/pagination.html' %} {% include 'taskdatabase/pagination.html' %}
</div> </div>
</div> </div>
<p class="footer"> Version 30 Jul 2024 <p class="footer"> Version 1 Aug 2024
</div> </div>
{% include 'taskdatabase/refresh.html' %} {% include 'taskdatabase/refresh.html' %}
......
...@@ -95,7 +95,7 @@ class TestUpdateActivity(TestCase): ...@@ -95,7 +95,7 @@ class TestUpdateActivity(TestCase):
new_status='fetched', new_status='fetched',
workflow=self.workflow_imaging_compression, 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"}}) 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): def test_created_activity(self):
""" """
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment