Merge branch 'dev' into 1109-create-a-basedataservice-class

Author: jchate6

poetry.lock

@@ -65,9 +65,12 @@ def query(self, term):
     def to_target(self):
         target = super().to_target()
         result = self.catalog_data[0]['mpc_orb']
+        if isinstance(result, list):
+            result = result[0]
 
         target.type = 'NON_SIDEREAL'
         target.scheme = 'MPC_COMET'
+
         target.name = result['designation_data']['iau_designation'].replace('(', '').replace(')', '')
         extra_desigs = []
         if result['designation_data'].get('name', "") != "":

tom_catalogs/harvesters/mpc.py

@@ -34,22 +34,20 @@
           <th>Facility</th>
           <th>Status</th>
           <th>Start</th>
-          <th>End</th>
           <th>Groups</th>
           <th>Saved Data</th>
           <th>Download All</th>
         </tr>
       </thead>
       <tbody>
-        {% for observation in filter.qs %}
+        {% for observation in object_list %}
         <tr>
           <td><input type="checkbox" name="selected" value="{{observation.id}}"></td>
           <td><a class="btn btn-success" href="{% url 'tom_observations:detail' observation.id %}">Details</a></td>
-          <td><a href="{% url 'tom_targets:detail' observation.target.id %}?tab=observations" title="{{ observation.target.id }}">{{ observation.target.names|join:", " }}</a></td>
+          <td><a href="{% url 'tom_targets:detail' observation.target.id %}?tab=observations" title="{{ observation.target.id }}">{{ observation.target.name }}</a></td>
           <td>{{ observation.facility }}</td>
           <td>{{ observation.status }}</td>
           <td>{{ observation.scheduled_start }}</td>
-          <td>{{ observation.scheduled_end }}</td>
           <td>{% for o in observation.observationgroup_set.all %}{{ o.name }} {% endfor %}</td>
           <td>{{ observation.dataproduct_set.count }}</td>
           <td>

tom_observations/templates/tom_observations/observation_list.html

@@ -12,7 +12,7 @@
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.core.management import call_command
 from django_filters import (CharFilter, ChoiceFilter, DateTimeFromToRangeFilter, FilterSet, ModelMultipleChoiceFilter,
-                            OrderingFilter)
+                            OrderingFilter, MultipleChoiceFilter)
 from django_filters.views import FilterView
 from django.shortcuts import redirect
 from django.urls import reverse, reverse_lazy
@@ -31,7 +31,7 @@
 from tom_observations.cadence import CadenceForm, get_cadence_strategy
 from tom_observations.facility import get_service_class, get_service_classes
 from tom_observations.facility import BaseManualObservationFacility
-from tom_observations.forms import AddExistingObservationForm
+from tom_observations.forms import AddExistingObservationForm, facility_choices
 from tom_observations.models import ObservationRecord, ObservationGroup, ObservationTemplate, DynamicCadence
 from tom_targets.models import Target
 
@@ -46,10 +46,28 @@ class ObservationFilter(FilterSet):
         fields=['scheduled_start', 'scheduled_end', 'status', 'created', 'modified']
     )
     scheduled_start = DateTimeFromToRangeFilter()
-    scheduled_end = DateTimeFromToRangeFilter
+    scheduled_end = DateTimeFromToRangeFilter()
+    target_id = ModelMultipleChoiceFilter(
+        queryset=Target.objects.filter(observationrecord__isnull=False).distinct().order_by('name')
+    )
     observationgroup = ModelMultipleChoiceFilter(
         label='Observation Groups', queryset=ObservationGroup.objects.all()
     )
+    facility = MultipleChoiceFilter(choices=facility_choices())
+
+    def __init__(self, *args, **kwargs):
+        """
+        The "status" filter is populated dynamically via list comprehension here in the __init__ (at runtime).
+        This is important because the `ObservationRecord` db table doesn't necessarily exist at
+        Class-interpretation-time
+        """
+        super().__init__(*args, **kwargs)
+        self.status = MultipleChoiceFilter(
+            choices=[
+                (s, s) for s in
+                ObservationRecord.objects.values_list('status', flat=True).order_by('status').distinct()
+            ]
+        )
 
     class Meta:
         model = ObservationRecord