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

database change, adding archive JSONField

parent a8fc4b62
No related branches found
No related tags found
1 merge request!273Sdc 825 archived page
Pipeline #42362 passed
...@@ -92,6 +92,7 @@ class Task(models.Model): ...@@ -92,6 +92,7 @@ class Task(models.Model):
metrics = models.JSONField(null=True, blank=True) metrics = models.JSONField(null=True, blank=True)
remarks = models.JSONField(null=True, blank=True) remarks = models.JSONField(null=True, blank=True)
meta_scheduling = models.JSONField(null=True, blank=True) meta_scheduling = models.JSONField(null=True, blank=True)
archive = 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)
......
...@@ -45,7 +45,7 @@ class TaskWriteSerializer(serializers.ModelSerializer): ...@@ -45,7 +45,7 @@ class TaskWriteSerializer(serializers.ModelSerializer):
'status','new_status','quality', 'status','new_status','quality',
'inputs','outputs','metrics','status_history','remarks', 'inputs','outputs','metrics','status_history','remarks',
'size_to_process','size_processed','total_processing_time', 'size_to_process','size_processed','total_processing_time',
'log_entries','meta_scheduling','environment' 'log_entries','meta_scheduling','environment','archive'
) )
def get_new_workflow_id(self, instance): def get_new_workflow_id(self, instance):
...@@ -100,7 +100,7 @@ class TaskReadSerializer(serializers.ModelSerializer): ...@@ -100,7 +100,7 @@ class TaskReadSerializer(serializers.ModelSerializer):
'status','new_status','quality', 'status','new_status','quality',
'inputs','outputs','metrics','remarks','status_history', 'inputs','outputs','metrics','remarks','status_history',
'size_to_process', 'size_processed', 'total_processing_time', 'size_to_process', 'size_processed', 'total_processing_time',
'log_entries','meta_scheduling','environment' 'log_entries','meta_scheduling','environment','archive'
] ]
read_only_fields = fields read_only_fields = fields
...@@ -129,7 +129,7 @@ class TaskReadSerializerFast(serializers.ModelSerializer): ...@@ -129,7 +129,7 @@ class TaskReadSerializerFast(serializers.ModelSerializer):
'workflow', 'workflow',
'stage_request_id', 'stage_request_id',
'status','new_status','quality', 'status','new_status','quality',
'inputs','outputs','metrics', 'inputs','outputs','metrics','archive',
'size_to_process', 'size_processed', 'total_processing_time', 'size_to_process', 'size_processed', 'total_processing_time',
] ]
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<li><a class="nav-link" href="{% url 'quality' %}">Quality</a></li> <li><a class="nav-link" href="{% url 'quality' %}">Quality</a></li>
<li><a class="nav-link" href="{% url 'validation' %}">Validation</a></li> <li><a class="nav-link" href="{% url 'validation' %}">Validation</a></li>
<li><a class="nav-link" href="{% url 'failures' %}">Failures</a></li> <li><a class="nav-link" href="{% url 'failures' %}">Failures</a></li>
<li><a class="nav-link" href="{% url 'archived' %}">Archived</a></li>
<li><a class="nav-link" href="{% url 'monitoring' %}">Monitoring</a></li> <li><a class="nav-link" href="{% url 'monitoring' %}">Monitoring</a></li>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
{% include 'taskdatabase/pagination.html' %} {% include 'taskdatabase/pagination.html' %}
</div> </div>
</div> </div>
<p class="footer"> Version 12 Januari 2022 - 14:00 <p class="footer"> Version 12 Januari 2022 - 16:00
</div> </div>
......
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