diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index 6571e0976fa013308964ae5ab426c4bad8bb1467..2857eeb2e153650639537df2ed676809a6cd606f 100644 --- a/atdb/taskdatabase/models.py +++ b/atdb/taskdatabase/models.py @@ -92,6 +92,7 @@ class Task(models.Model): metrics = models.JSONField(null=True, blank=True) remarks = 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_processed = models.PositiveBigIntegerField(default=0, null=True, blank=True) diff --git a/atdb/taskdatabase/serializers.py b/atdb/taskdatabase/serializers.py index a260c1d888ef2cffa1114cd55d1f8d71efae3a49..d12f0229bcae30c6e944cab4c853980b7fe6aef3 100644 --- a/atdb/taskdatabase/serializers.py +++ b/atdb/taskdatabase/serializers.py @@ -45,7 +45,7 @@ class TaskWriteSerializer(serializers.ModelSerializer): 'status','new_status','quality', 'inputs','outputs','metrics','status_history','remarks', '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): @@ -100,7 +100,7 @@ class TaskReadSerializer(serializers.ModelSerializer): 'status','new_status','quality', 'inputs','outputs','metrics','remarks','status_history', 'size_to_process', 'size_processed', 'total_processing_time', - 'log_entries','meta_scheduling','environment' + 'log_entries','meta_scheduling','environment','archive' ] read_only_fields = fields @@ -129,7 +129,7 @@ class TaskReadSerializerFast(serializers.ModelSerializer): 'workflow', 'stage_request_id', 'status','new_status','quality', - 'inputs','outputs','metrics', + 'inputs','outputs','metrics','archive', 'size_to_process', 'size_processed', 'total_processing_time', ] diff --git a/atdb/taskdatabase/templates/taskdatabase/base.html b/atdb/taskdatabase/templates/taskdatabase/base.html index 384c0fd7bb0b3ec8abc7aeada1e07463a54ea59b..f5f203bcda10d85c29c195aa69a5348fe1f3c9a5 100644 --- a/atdb/taskdatabase/templates/taskdatabase/base.html +++ b/atdb/taskdatabase/templates/taskdatabase/base.html @@ -58,7 +58,7 @@ <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 '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> diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 4e96791423d2c99a6d950ad5b5143d83548c3dcb..232fdf24de37ae7c1224fb6a2def8ec529441925 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -34,7 +34,7 @@ {% include 'taskdatabase/pagination.html' %} </div> </div> - <p class="footer"> Version 12 Januari 2022 - 14:00 + <p class="footer"> Version 12 Januari 2022 - 16:00 </div>