Merge branch 'dev-nico' into 'master'

add 'meta_scheduling' field to tasks table

See merge request !142

atdb/taskdatabase/migrations/0007_auto_20211214_0941.py

+# 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'),
+        ),
+    ]

atdb/taskdatabase/models.py

@@ -12,6 +12,7 @@ class Workflow(models.Model):
     commit_id = models.CharField(max_length=15, blank=True, null=True)
     path = models.CharField(max_length=100, blank=True, null=True)
     oi_size_fraction = models.FloatField(blank=True, null=True)
+    meta_scheduling = models.JSONField(null=True, blank=True)
 
     def __str__(self):
         return str(self.id)
@@ -39,6 +40,8 @@ class Task(models.Model):
     outputs = 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_processed = models.PositiveBigIntegerField(default=0, null=True, blank=True)
     total_processing_time = models.IntegerField(default=0, null=True, blank=True)

atdb/taskdatabase/serializers.py

@@ -73,6 +73,7 @@ class TaskWriteSerializer(serializers.ModelSerializer):
             task.save()
             return task
 
+
 class TaskReadSerializer(serializers.ModelSerializer):
 
     status_history = serializers.StringRelatedField(
@@ -100,7 +101,7 @@ class TaskReadSerializer(serializers.ModelSerializer):
                   'status','new_status',
                   'inputs','outputs','metrics','status_history',
                   'size_to_process', 'size_processed', 'total_processing_time',
-                  'log_entries'
+                  'log_entries','meta_scheduling'
                   ]
         read_only_fields = fields
 

atdb/taskdatabase/templates/taskdatabase/index.html

@@ -80,7 +80,7 @@
         {% include 'taskdatabase/pagination.html' %}
        </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>