diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index 8e305b9cd579081570fb99f94ec72c6d6b2080f2..db40f2d74c8e09c424d92d41a3e28b68223decdc 100644 --- a/atdb/taskdatabase/models.py +++ b/atdb/taskdatabase/models.py @@ -57,6 +57,9 @@ class Task(models.Model): def get_absolute_url(self): return reverse('task-detail-view-api', kwargs={'pk': self.pk}) + @property + def predecessor_status(self): + return self.predecessor.status class LogEntry(models.Model): cpu_cycles = models.IntegerField(null=True,blank=True) diff --git a/atdb/taskdatabase/serializers.py b/atdb/taskdatabase/serializers.py index 538c1de5d0aa573e5f13e2ca5081c54a812f5013..5fc918aa26c0c9d3efe2d3c751c1b632fb085f48 100644 --- a/atdb/taskdatabase/serializers.py +++ b/atdb/taskdatabase/serializers.py @@ -92,7 +92,8 @@ class TaskReadSerializer(serializers.ModelSerializer): class Meta: model = Task - fields = ['id','task_type','creationTime','filter','predecessor','successors', + fields = ['id','task_type','creationTime','filter', + 'predecessor','predecessor_status','successors', 'project','sas_id','priority','purge_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', + fields = ['id','task_type','creationTime','filter','predecessor','predecessor_status', 'project','sas_id','priority','purge_policy','resume', 'workflow', 'stage_request_id', diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index effd31e3d97b5edcfcd2842ee57ec3d99f477ba9..5ba715b66f88e2b5a232332d4eff3a4d864e9ea4 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -80,7 +80,7 @@ {% include 'taskdatabase/pagination.html' %} </div> </div> - <p class="footer"> Version 1.0.0 (12 aug 2021 - 13:10) + <p class="footer"> Version 1.0.0 (28 oct 2021 - 11:00) </div> diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index 41532b78a38c503cbf443876aee0bb3272b38ec1..977f0088e5b643a76d0cf4653f1f92a3f291bcfe 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -55,6 +55,7 @@ class TaskFilter(filters.FilterSet): 'purge_policy': ['exact'], 'priority': ['exact','lte','gte'], 'resume': ['exact'], + 'predecessor__status': ['exact', 'icontains', 'in', 'startswith'], } class TaskFilterQueryPage(filters.FilterSet):