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

added predecessor_status field to REST API

added /atdb/tasks/?predecessor__status=defining filter options to REST API
parent 21c7cf7a
No related branches found
No related tags found
3 merge requests!143Query Page:,!134added predecessor_status field to REST API,!131added predecessor_status field to REST API
...@@ -57,6 +57,9 @@ class Task(models.Model): ...@@ -57,6 +57,9 @@ class Task(models.Model):
def get_absolute_url(self): def get_absolute_url(self):
return reverse('task-detail-view-api', kwargs={'pk': self.pk}) return reverse('task-detail-view-api', kwargs={'pk': self.pk})
@property
def predecessor_status(self):
return self.predecessor.status
class LogEntry(models.Model): class LogEntry(models.Model):
cpu_cycles = models.IntegerField(null=True,blank=True) cpu_cycles = models.IntegerField(null=True,blank=True)
......
...@@ -92,7 +92,8 @@ class TaskReadSerializer(serializers.ModelSerializer): ...@@ -92,7 +92,8 @@ class TaskReadSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = Task 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', 'project','sas_id','priority','purge_policy','resume',
'workflow', 'workflow',
'stage_request_id', 'stage_request_id',
...@@ -123,7 +124,7 @@ class TaskReadSerializerFast(serializers.ModelSerializer): ...@@ -123,7 +124,7 @@ class TaskReadSerializerFast(serializers.ModelSerializer):
""" """
class Meta: class Meta:
model = Task 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', 'project','sas_id','priority','purge_policy','resume',
'workflow', 'workflow',
'stage_request_id', 'stage_request_id',
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
{% include 'taskdatabase/pagination.html' %} {% include 'taskdatabase/pagination.html' %}
</div> </div>
</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> </div>
......
...@@ -55,6 +55,7 @@ class TaskFilter(filters.FilterSet): ...@@ -55,6 +55,7 @@ class TaskFilter(filters.FilterSet):
'purge_policy': ['exact'], 'purge_policy': ['exact'],
'priority': ['exact','lte','gte'], 'priority': ['exact','lte','gte'],
'resume': ['exact'], 'resume': ['exact'],
'predecessor__status': ['exact', 'icontains', 'in', 'startswith'],
} }
class TaskFilterQueryPage(filters.FilterSet): class TaskFilterQueryPage(filters.FilterSet):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment