diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index 1be1e5a9eb8e2f4172af34f984543de896293d9d..35ac5ff9c6c71c90a76d1906ca13847bc51e6d6c 100644 --- a/atdb/taskdatabase/models.py +++ b/atdb/taskdatabase/models.py @@ -292,6 +292,24 @@ class Task(models.Model): return False return True + @property + def joined_status(self): + # if a task has joined_input_tasks, then check their status + try: + joined_input_tasks = self.joined_input_tasks.all() + status = None + for task in joined_input_tasks: + if status and task.status != status: + return None + status = task.status + + # all statusses are the same, return it + return status + except Exception as e: + print(e) + + return "unknown" + # NV: this shows the latest status change, but because it is a derived property it cannot be sorted. # This functionality was not requested, and to avoid additional requests about 'sort' functionalty # it is currently commented out. Could be of use later though, so I leave it in for now. diff --git a/atdb/taskdatabase/serializers.py b/atdb/taskdatabase/serializers.py index 37341fdab51f2fd5bfdfc2b1ef04b9a041634152..a233c9162d7a7db700aeaa479e49ef4994dbb14d 100644 --- a/atdb/taskdatabase/serializers.py +++ b/atdb/taskdatabase/serializers.py @@ -91,7 +91,8 @@ class TaskReadSerializer(serializers.ModelSerializer): class Meta: model = Task fields = ['id','task_type','creationTime','filter', - 'predecessor','predecessor_status','successors', 'joined_input_tasks','joined_output_task', + 'predecessor','predecessor_status','successors', + 'joined_input_tasks','joined_output_task','joined_status', 'project','sas_id','priority','purge_policy','cleanup_policy','resume', 'workflow', 'stage_request_id', @@ -123,7 +124,7 @@ class TaskReadSerializerFast(serializers.ModelSerializer): class Meta: model = Task fields = ['id','task_type','creationTime','filter','predecessor','predecessor_status', - 'joined_input_tasks', 'joined_output_task', + 'joined_input_tasks', 'joined_output_task', 'joined_status' 'project','sas_id','priority','purge_policy','cleanup_policy','resume', 'workflow', 'stage_request_id',