GUI changes

atdb/taskdatabase/templates/taskdatabase/index.html

@@ -21,9 +21,8 @@
                         <th width="10%">Observing Mode</th>
                         <th>Name</th>
                         <th>Status</th>
-                        <th>Start Time</th>
+                        <th>Created</th>
                         <th>Stop Time</th>
-                        <th>DW</th>
                         <th>Size</th>
                         <th>Quality</th>
                         <th>Details</th>
@@ -46,7 +45,7 @@
     </div>
     {% include 'taskdatabase/pagination.html' %}
 </div>
-    <p class="footer"> Version 1.0.0 (23 dec 2020 - 08:00)
+    <p class="footer"> Version 1.0.0 (23 dec 2020 - 14:00)
     <script type="text/javascript">
         (function(seconds) {
             var refresh,

atdb/taskdatabase/templates/taskdatabase/observations.html

@@ -30,22 +30,9 @@
                 {% endif %}
             {% endif %}
             </td>
-            <td>{{ observation.starttime|date:"Y-m-d H:i:s" }} </td>
+            <td>{{ observation.creationTime|date:"Y-m-d H:i:s" }} </td>
             <td>{{ observation.endtime|date:"Y-m-d H:i:s" }} </td>
-            <td>
-                {% if 'wcudata1:' in observation.data_location %}
-                    1
-                    {% if observation.my_status == "scheduled" %}
-                        &nbsp;<a href="{% url 'observation-setdatawriter-view' observation.pk 'wcudata2' my_observations.number %}" class="btn btn-primary btn-sm" role="button">switch</a>
-                    {% endif %}
-                {% endif %}
-                {% if 'wcudata2:' in observation.data_location %}
-                    2
-                    {% if observation.my_status == "scheduled" %}
-                        &nbsp;<a href="{% url 'observation-setdatawriter-view' observation.pk 'wcudata1' my_observations.number %}" class="btn btn-primary btn-sm" role="button">switch</a>
-                    {% endif %}
-                {% endif %}
-            </td>
+
             <td>{{ observation.size|filesizeformat }} </td>
             <td>
                 {% if "removed" in observation.my_status and observation.quality != "unknown" %}
@@ -78,10 +65,6 @@
                     <a href="{% url 'observation-setstatus-view' observation.pk 'scheduled' my_observations.number %}" class="btn btn-primary btn-sm" role="button">Schedule</a>
                 {% endif %}
 
-                {% if observation.my_status == "defined_ldv" %}
-                    <a href="{% url 'observation-setstatus-view' observation.pk 'scheduled_ldv' my_observations.number %}" class="btn btn-primary btn-sm" role="button">Schedule</a>
-                {% endif %}
-
                 {% if observation.my_status == "scheduled" %}
                     <a href="{% url 'observation-setstatus-view' observation.pk 'defined' my_observations.number %}" class="btn btn-primary btn-sm" role="button">Unschedule</a>
                     {% if not observation.skip_auto_ingest %}
@@ -103,7 +86,7 @@
                 {% endif %}
 
                 {% if observation.my_status == "ingest error" or observation.my_status == "ingest aborted" %}
-                   <a href="{% url 'observation-dps-setstatus-view' observation.pk 'valid' 'valid' my_observations.number %}" class="btn btn-primary btn-sm" role="button">Retry Ingest</a>
+                   <a href="{% url 'observation-dps-setstatus-view' observation.pk 'defined' 'defined' my_observations.number %}" class="btn btn-primary btn-sm" role="button">Retry Ingest</a>
                 {% endif %}
 
 
@@ -126,10 +109,6 @@
                    <a href="{% url 'observation-setstatus-view' observation.pk 'completed' my_observations.number %}" class="btn btn-primary btn-sm" role="button">Cancel Ingest</a>
                 {% endif %}
 
-                {% if observation.my_status == "combining" %}
-                   <a href="{% url 'observation-setstatus-view' observation.pk 'combine' my_observations.number %}" class="btn btn-primary btn-sm" role="button">Retry Combine</a>
-                {% endif %}
-
                 {% if observation.my_status == "incomplete" %}
                    <a href="{% url 'observation-dps-setstatus-view' observation.pk 'defined' 'defined' my_observations.number %}" class="btn btn-danger btn-sm" role="button">Reset</a>
                 {% endif %}

atdb/taskdatabase/views.py

@@ -130,7 +130,7 @@ class IndexView(ListView):
             observations = get_searched_observations(search_box)
         else:
             #observations = Observation.objects.order_by('-taskID')
-            observations = Observation.objects.order_by('-starttime')
+            observations = Observation.objects.order_by('-creationTime')
         if (my_status is not None):
             observations = get_filtered_observations(my_status)
         if (not_my_status is not None):