From dc58f0b789f2e3b4d54ac52905ae7b388cf249c5 Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Tue, 15 Dec 2020 14:24:43 +0100
Subject: [PATCH] further simplifying datamodel
---
atdb/taskdatabase/models.py | 10 ++--------
atdb/taskdatabase/serializers.py | 8 ++++----
atdb/taskdatabase/templates/taskdatabase/index.html | 2 +-
atdb/taskdatabase/views.py | 3 +--
4 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py
index d6af29cb..09e591ef 100644
--- a/atdb/taskdatabase/models.py
+++ b/atdb/taskdatabase/models.py
@@ -71,11 +71,7 @@ class Observation(TaskObject):
starttime = models.DateTimeField('start time', null=True)
endtime = models.DateTimeField('end time', null=True)
- # beamPattern is used to understand how many beams (dataproducts) must be created
- beamPattern = models.CharField(max_length=50, null=True)
-
# can be used to distinguish types of observations, like for ARTS.
- process_type = models.CharField(max_length=50, default="observation")
observing_mode = models.CharField(max_length=50, default="imaging")
# json object containing unmodelled parameters that are used by the 'executor' service
@@ -84,13 +80,11 @@ class Observation(TaskObject):
field_ra = models.FloatField('field_ra', null = True)
field_dec = models.FloatField('field_dec', null = True)
- control_parameters = models.CharField(max_length=255, default="unknown", null=True)
- telescopes = models.CharField(max_length=100, default="all", null=True)
+ metadata = models.CharField(max_length=255, default="unknown", null=True)
skip_auto_ingest = models.BooleanField(default=False)
- beams = models.CharField(max_length=255, default="0..39")
quality = models.CharField(max_length=30, default="unknown")
- ingest_progress = models.CharField(max_length=40, default="", null=True)
+ progress = models.CharField(max_length=40, default="", null=True)
# 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/observations/{{ observation.id }}/" target="_blank">{{ observation.taskID }} </a> </td>
diff --git a/atdb/taskdatabase/serializers.py b/atdb/taskdatabase/serializers.py
index f3d3dbc4..bfe99b30 100644
--- a/atdb/taskdatabase/serializers.py
+++ b/atdb/taskdatabase/serializers.py
@@ -50,12 +50,12 @@ class ObservationSerializer(serializers.ModelSerializer):
class Meta:
model = Observation
- fields = ('id','task_type', 'name', 'process_type','taskID','beamPattern',
+ fields = ('id','task_type', 'name','taskID',
'field_name','field_ra','field_dec',
'creationTime','starttime','endtime', 'duration', 'size',
'my_status','new_status','status_history',
- 'generated_dataproducts','telescopes',
- 'data_location', 'node','control_parameters',
+ 'generated_dataproducts',
+ 'data_location', 'node','metadata',
'skip_auto_ingest','observing_mode','beams',
- 'quality','ingest_progress')
+ 'quality','progress')
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index 47455dd7..98fd10aa 100644
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -46,7 +46,7 @@
</div>
{% include 'taskdatabase/pagination.html' %}
</div>
- <p class="footer"> Version 2.0.0 (15 dec 2020 - 09:00)</p>
+ <p class="footer"> Version 2.0.0 (15 dec 2020 - 14:00)</p>
<script type="text/javascript">
(function(seconds) {
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index 216f38fb..0e027fc3 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -32,7 +32,6 @@ class ObservationFilter(filters.FilterSet):
model = Observation
fields = {
- 'process_type': ['exact', 'in', 'icontains'], #/atdb/observations?&process_type=observation
'observing_mode': ['exact', 'in', 'icontains', 'startswith'], # /atdb/observations/?observing_mode__icontains=arts
'field_ra': ['gt', 'lt', 'gte', 'lte', 'contains', 'exact'],
'field_dec': ['gt', 'lt', 'gte', 'lte', 'contains', 'exact'],
@@ -44,8 +43,8 @@ class ObservationFilter(filters.FilterSet):
'endtime': ['gt', 'lt', 'gte', 'lte', 'contains', 'exact'],
'data_location': ['exact', 'icontains'],
'node': ['exact', 'in'],
+ 'metadata': ['icontains'],
'skip_auto_ingest': ['exact'],
- 'beams': ['exact', 'icontains'],
'quality': ['exact', 'icontains'],
}
--
GitLab