From 4497fd7cb2d7c50f34463da5ffbb4862ba87f332 Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Thu, 17 Dec 2020 11:35:37 +0100
Subject: [PATCH] remove starttime check
---
atdb/taskdatabase/static/taskdatabase/style.css | 12 +++++-------
atdb/taskdatabase/templates/taskdatabase/index.html | 2 +-
.../templates/taskdatabase/observations.html | 4 ++--
atdb/taskdatabase/views.py | 3 +--
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/atdb/taskdatabase/static/taskdatabase/style.css b/atdb/taskdatabase/static/taskdatabase/style.css
index 8a2a52ca..c738d2e7 100644
--- a/atdb/taskdatabase/static/taskdatabase/style.css
+++ b/atdb/taskdatabase/static/taskdatabase/style.css
@@ -3,7 +3,7 @@ TD {
font-size: 12pt;
}
-.defined, .completed, .complete, .defined_ldv {
+.defined, .completed, .complete, {
background-color: lemonchiffon;
color: blue;
}
@@ -15,19 +15,17 @@ TD {
color: green;
font-weight: bold;
}
-.created {
+.submitted {
background-color: lemonchiffon;
color: blue;
}
.valid_priority {
color: green;
}
-.valid, .combining{
+.valid, .ingested{
color: green;
}
-.copied {
- color: black;
-}
+
.archived {
color: black;
}
@@ -44,7 +42,7 @@ TD {
color: green;
font-weight: bold;
}
-.checking,.starting,.removing,.cleanup {
+.staging,.submitting,.running,.ingesting {
font-style: italic;
}
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index 461211b2..cf720fdd 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 - 16:00)</p>
+ <p class="footer"> Version 2.0.0 (17 dec 2020 - 11:30)</p>
<script type="text/javascript">
(function(seconds) {
diff --git a/atdb/taskdatabase/templates/taskdatabase/observations.html b/atdb/taskdatabase/templates/taskdatabase/observations.html
index 8564e3f5..1f4e8411 100644
--- a/atdb/taskdatabase/templates/taskdatabase/observations.html
+++ b/atdb/taskdatabase/templates/taskdatabase/observations.html
@@ -62,12 +62,12 @@
{% endif %}
{% if observation.my_status == "ingesting" %}
- <a href="https://alta.astron.nl/science/monitor" class="btn btn-primary btn-sm" target="_blank" role="button">ALTA View</a>
+ <a href="https://alta.astron.nl/science/monitor" class="btn btn-primary btn-sm" target="_blank" role="button">Monitor</a>
{% endif %}
{% if not "bad" in observation.quality %}
{% if observation.my_status == "archived" or observation.my_status == "removed" %}
- <a href="https://alta.astron.nl/science/details/{{ observation.taskID }}" class="btn btn-primary btn-sm" target="_blank" role="button">ALTA View</a>
+ <a href="https://alta.astron.nl/science/details/{{ observation.taskID }}" class="btn btn-primary btn-sm" target="_blank" role="button">Monitor</a>
{% endif %}
{% endif %}
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index 15a3be69..b9d809e6 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -73,7 +73,7 @@ class DataProductFilter(filters.FilterSet):
class StatusFilter(filters.FilterSet):
# A direct filter on a @property field is not possible, this simulates that behaviour
- # taskID = filters.Filter(field_name="taskObject__taskID",lookup_expr='exact')
+ taskID = filters.Filter(field_name="taskObject__taskID",lookup_expr='exact')
class Meta:
model = Status
@@ -86,7 +86,6 @@ class StatusFilter(filters.FilterSet):
'taskObject__taskID': ['exact', 'in'],
# 'taskID': ['exact', 'in'],
- #'derived_taskid' : ['exact', 'in']
}
# this uses a form
--
GitLab