From d179e3961685d018dd8b54e8affed7085419efc0 Mon Sep 17 00:00:00 2001
From: vermaas <vermaas@astron.nl>
Date: Thu, 12 Jan 2023 16:25:14 +0100
Subject: [PATCH] database change, adding archive JSONField
---
atdb/taskdatabase/models.py | 1 +
atdb/taskdatabase/serializers.py | 6 +++---
atdb/taskdatabase/templates/taskdatabase/base.html | 2 +-
atdb/taskdatabase/templates/taskdatabase/index.html | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py
index 6571e097..2857eeb2 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 a260c1d8..d12f0229 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 384c0fd7..f5f203bc 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 4e967914..232fdf24 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>
--
GitLab