From b026b46645286987be75835e78f3844c7fdc148f Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Fri, 18 Dec 2020 15:01:49 +0100
Subject: [PATCH] database changes
---
atdb/taskdatabase/models.py | 10 ++++++----
atdb/taskdatabase/templates/taskdatabase/index.html | 3 +--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py
index d8a80ee6..b4eb4142 100644
--- a/atdb/taskdatabase/models.py
+++ b/atdb/taskdatabase/models.py
@@ -36,12 +36,14 @@ class TaskObject(models.Model):
creationTime = models.DateTimeField(default=datetime.utcnow, blank=True)
new_status = models.CharField(max_length=50, default="defined", null=True)
- data_location = models.CharField(max_length=255, default="unknown",null=True)
+ data_location = models.CharField(max_length=255, default="unknown",null=True, blank=True)
# my_status is 'platgeslagen', because django-filters can not filter on a related property,
# and I need services to be able to filter on a status to execute their tasks.
my_status = models.CharField(db_index=True, max_length=50,default="defined")
- node = models.CharField(max_length=10, null=True)
+ node = models.CharField(max_length=10, null=True, blank=True)
+
+ quality = models.CharField(max_length=30, default="unknown")
def __str__(self):
return str(self.id)
@@ -81,7 +83,7 @@ class Observation(TaskObject):
metadata = models.CharField(max_length=255, default="unknown", null=True)
skip_auto_ingest = models.BooleanField(default=False)
- quality = models.CharField(max_length=30, default="unknown")
+
progress = models.CharField(max_length=40, default="", null=True)
@@ -116,7 +118,7 @@ class DataProduct(TaskObject):
description = models.CharField(max_length=255, default="unknown")
dataproduct_type = models.CharField('type', default=TYPE_VISIBILITY, max_length=50)
size = models.BigIntegerField(default=0)
- quality = models.CharField(max_length=30, default="unknown")
+ #quality = models.CharField(max_length=30, default="unknown")
# relationships
parent = models.ForeignKey(Observation, related_name='generated_dataproducts', on_delete=models.CASCADE, null=False)
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index 4e291ebf..1b62dd91 100644
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -46,8 +46,7 @@
</div>
{% include 'taskdatabase/pagination.html' %}
</div>
- <p class="footer"> Version 2.0.0 (18 dec 2020 - 13:00)</p>
-
+ <p class="footer"> Version 2.0.0 (18 dec 2020 - 15:00
<script type="text/javascript">
(function(seconds) {
var refresh,
--
GitLab