Merge branch 'SDC-438-filters-on-dashboard' into 'master'

added environment JSON to task

See merge request !190

atdb/taskdatabase/models.py

@@ -23,6 +23,7 @@ class Task(models.Model):
     # Task control properties
     task_type = models.CharField(max_length=20, default="regular")
     filter = models.CharField(max_length=30, blank=True, null=True)
+    environment = models.JSONField(null=True, blank=True)
     new_status = models.CharField(max_length=50, default="defining", null=True)
     status = models.CharField(db_index=True, default="unknown", max_length=50,blank=True, null=True)
 
@@ -52,7 +53,8 @@ class Task(models.Model):
     predecessor = models.ForeignKey('self', related_name='successors', on_delete=models.SET_NULL, null=True, blank=True)
 
     def __str__(self):
-        return str(self.id) + ' - ' + str(self.sas_id)
+
+        return str(self.id) + ' - (' + self.task_type + ') - ' + str(self.sas_id)
 
     # this translates a view-name (from urls.py) back to a url, to avoid hardcoded url's in the html templates
     # bad : <td><a href="/atdb/taaks/{{ task.id }}/" target="_blank">{{ task.taskID }} </a> </td>

atdb/taskdatabase/serializers.py

@@ -45,7 +45,7 @@ class TaskWriteSerializer(serializers.ModelSerializer):
                   'status','new_status',
                   'inputs','outputs','metrics','status_history',
                   'size_to_process','size_processed','total_processing_time',
-                  'log_entries','meta_scheduling'
+                  'log_entries','meta_scheduling','environment'
                   )
 
     def get_new_workflow_id(self, instance):
@@ -100,7 +100,7 @@ class TaskReadSerializer(serializers.ModelSerializer):
                   'status','new_status',
                   'inputs','outputs','metrics','status_history',
                   'size_to_process', 'size_processed', 'total_processing_time',
-                  'log_entries','meta_scheduling'
+                  'log_entries','meta_scheduling','environment'
                   ]
         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 (1 feb 2021 - 8:00)
+    <p class="footer"> Version 1.0.0 (1 feb 2021 - 14:00)
 
 </div>
 

atdb/taskdatabase/views.py

@@ -352,14 +352,13 @@ class DiagramView(ListView):
 # ---------- REST API views -----------
 
 # example: /atdb/tasks/
-# this shows only 'regular' tasks and not 'postprocessing' tasks
-# the endpoint it kept 'tasks' for backward compatibility reasons.
+# show all tasks (regular and postprocessing)
 class TaskListViewAPI(generics.ListCreateAPIView):
     """
     A pagination list of tasks, unsorted.
     """
     model = Task
-    queryset = Task.objects.filter(task_type='regular').order_by('-priority', 'id')
+    queryset = Task.objects.all().order_by('-priority', 'id')
     # serializer_class = TaskSerializer
 
     # using the Django Filter Backend - https://django-filter.readthedocs.io/en/latest/index.html