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

add 'meta_scheduling' field to tasks table

(and to read serializer, not yet to write serializer)
parent 8541ac2f
Branches
No related tags found
3 merge requests!144add 'meta_scheduling' field to tasks table,!143Query Page:,!142add 'meta_scheduling' field to tasks table
# Generated by Django 3.1.4 on 2021-12-14 08:41
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('taskdatabase', '0006_configuration_filter'),
]
operations = [
migrations.AddField(
model_name='task',
name='meta_scheduling',
field=models.JSONField(blank=True, null=True),
),
migrations.AddField(
model_name='workflow',
name='meta_scheduling',
field=models.JSONField(blank=True, null=True),
),
migrations.AlterField(
model_name='task',
name='resume',
field=models.BooleanField(default=True, verbose_name='Resume'),
),
migrations.AlterField(
model_name='task',
name='sas_id',
field=models.CharField(blank=True, max_length=15, null=True, verbose_name='SAS_ID'),
),
]
...@@ -12,6 +12,7 @@ class Workflow(models.Model): ...@@ -12,6 +12,7 @@ class Workflow(models.Model):
commit_id = models.CharField(max_length=15, blank=True, null=True) commit_id = models.CharField(max_length=15, blank=True, null=True)
path = models.CharField(max_length=100, blank=True, null=True) path = models.CharField(max_length=100, blank=True, null=True)
oi_size_fraction = models.FloatField(blank=True, null=True) oi_size_fraction = models.FloatField(blank=True, null=True)
meta_scheduling = models.JSONField(null=True, blank=True)
def __str__(self): def __str__(self):
return str(self.id) return str(self.id)
...@@ -39,6 +40,8 @@ class Task(models.Model): ...@@ -39,6 +40,8 @@ class Task(models.Model):
outputs = models.JSONField(null=True, blank=True) outputs = models.JSONField(null=True, blank=True)
metrics = models.JSONField(null=True, blank=True) metrics = models.JSONField(null=True, blank=True)
meta_scheduling = models.JSONField(null=True, blank=True)
size_to_process = models.PositiveBigIntegerField(default=0, null=True, blank=True) size_to_process = models.PositiveBigIntegerField(default=0, null=True, blank=True)
size_processed = models.PositiveBigIntegerField(default=0, null=True, blank=True) size_processed = models.PositiveBigIntegerField(default=0, null=True, blank=True)
total_processing_time = models.IntegerField(default=0, null=True, blank=True) total_processing_time = models.IntegerField(default=0, null=True, blank=True)
......
...@@ -73,6 +73,7 @@ class TaskWriteSerializer(serializers.ModelSerializer): ...@@ -73,6 +73,7 @@ class TaskWriteSerializer(serializers.ModelSerializer):
task.save() task.save()
return task return task
class TaskReadSerializer(serializers.ModelSerializer): class TaskReadSerializer(serializers.ModelSerializer):
status_history = serializers.StringRelatedField( status_history = serializers.StringRelatedField(
...@@ -100,7 +101,7 @@ class TaskReadSerializer(serializers.ModelSerializer): ...@@ -100,7 +101,7 @@ class TaskReadSerializer(serializers.ModelSerializer):
'status','new_status', 'status','new_status',
'inputs','outputs','metrics','status_history', 'inputs','outputs','metrics','status_history',
'size_to_process', 'size_processed', 'total_processing_time', 'size_to_process', 'size_processed', 'total_processing_time',
'log_entries' 'log_entries','meta_scheduling'
] ]
read_only_fields = fields read_only_fields = fields
......
...@@ -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 (29 oct 2021 - 14:00) <p class="footer"> Version 1.0.0 (14 dec 2021 - 10:00)
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment