restore dose-unit endpoint values to endpoint list

hawc/apps/animal/managers.py

@@ -1,13 +1,13 @@
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional
 
 import numpy as np
 import pandas as pd
 from django.apps import apps
-from django.db import transaction
-from django.db.models import Max, Min
+from django.db import models, transaction
+from django.db.models import Max, Min, OuterRef, QuerySet, Subquery, Value
 from rest_framework.serializers import ValidationError
 
-from ..assessment.models import Assessment
+from ..assessment.models import Assessment, DoseUnits
 from ..common.models import BaseManager, get_distinct_charfield, get_distinct_charfield_opts
 from ..vocab.constants import VocabularyTermType
 from ..vocab.models import Term
@@ -104,9 +104,51 @@ def by_dose_regime(self, dose_regime):
         return self.filter(dose_regime=dose_regime)
 
 
+class EndpointQuerySet(QuerySet):
+    def annotate_dose_values(self, dose_units: Optional[DoseUnits] = None) -> QuerySet:
+        """Annotate dose unit-specific responses from queryset, if a dose-unit is available.
+
+        Args:
+            dose_units (Optional[DoseUnits]): selected dose units, if exists
+        """
+        if dose_units is None:
+            return self.annotate(
+                units_name=Value("", output_field=models.CharField()),
+                noel_value=Value(None, output_field=models.FloatField(null=True)),
+                loel_value=Value(None, output_field=models.FloatField(null=True)),
+                bmd=Value(None, output_field=models.FloatField(null=True)),
+                bmdl=Value(None, output_field=models.FloatField(null=True)),
+            )
+        DoseGroup = apps.get_model("animal", "DoseGroup")
+        noel_value_qs = DoseGroup.objects.filter(
+            dose_regime__animalgroup__endpoints=OuterRef("pk"),
+            dose_group_id=OuterRef("NOEL"),
+            dose_units=dose_units,
+        )
+        loel_value_qs = DoseGroup.objects.filter(
+            dose_regime__animalgroup__endpoints=OuterRef("pk"),
+            dose_group_id=OuterRef("LOEL"),
+            dose_units=dose_units,
+        )
+        Model = apps.get_model("bmd", "Model")
+        bmd_qs = Model.objects.filter(
+            selectedmodel__endpoint=OuterRef("pk"), selectedmodel__dose_units=dose_units
+        )
+        return self.annotate(
+            units_name=Value(dose_units.name, output_field=models.CharField()),
+            noel_value=Subquery(noel_value_qs.values("dose")),
+            loel_value=Subquery(loel_value_qs.values("dose")),
+            bmd=Subquery(bmd_qs.values("output__BMD")),
+            bmdl=Subquery(bmd_qs.values("output__BMDL")),
+        )
+
+
 class EndpointManager(BaseManager):
     assessment_relation = "assessment"
 
+    def get_queryset(self):
+        return EndpointQuerySet(self.model, using=self._db)
+
     def published(self, assessment_id=None):
         return self.get_qs(assessment_id).filter(animal_group__experiment__study__published=True)
 

hawc/apps/animal/templates/animal/endpoint_list.html

@@ -6,8 +6,8 @@
 <h2>Assessment endpoints ({{page_obj.paginator.count}} found)</h2>
 {% include 'common/filter_list.html' with plural_object_name='endpoints' %}
 <table id="mainTbl" class="table table-sm table-striped">
-    {% bs4_colgroup '15,20,15,50' %}
-    {% bs4_thead 'Study,Experiment,Animal group,Endpoint' %}
+    {% bs4_colgroup '12,14,15,24,7,7,7,7,7' %}
+    {% bs4_thead header_names %}
     <tbody>
         {% for object in object_list %}
         <tr>
@@ -28,10 +28,15 @@ <h2>Assessment endpoints ({{page_obj.paginator.count}} found)</h2>
                     <i data-id={{object.pk}} class="fa fa-eye previewModalIcon ml-2" title="preview in a modal"></i>
                 </span>
             </td>
+            <td>{{object.units_name|default:"-"}}</td>
+            <td>{{object.noel_value|default:"-"}}</td>
+            <td>{{object.loel_value|default:"-"}}</td>
+            <td>{{object.bmd|default:"-"}}</td>
+            <td>{{object.bmdl|default:"-"}}</td>
         </tr>
         {% empty %}
         <tr>
-            <td colspan="4">
+            <td colspan="9">
                 No endpoints available
             </td>
         </tr>

hawc/apps/animal/views.py

@@ -410,7 +410,16 @@ class EndpointFilterList(BaseFilterList):
     filterset_class = filterset.EndpointFilterSet
 
     def get_queryset(self):
-        return super().get_queryset().select_related("animal_group__experiment__study")
+        qs = super().get_queryset()
+        form = self.filterset.form
+        dose_units = form.cleaned_data["dose_units"] or form.fields["dose_units"].queryset.first()
+        return qs.select_related("animal_group__experiment__study").annotate_dose_values(dose_units)
+
+    def get_context_data(self, **kwargs):
+        oel_names = self.assessment.get_noel_names()
+        header_names = f"Study,Experiment,Animal group,Endpoint,Units,{oel_names.noel},{oel_names.loel},BMD,BMDL"
+        kwargs.update(header_names=header_names)
+        return super().get_context_data(**kwargs)
 
 
 @method_decorator(beta_tester_required, name="dispatch")

hawc/apps/assessment/models.py

@@ -340,7 +340,7 @@ def get_vocabulary_display(self) -> str:
         else:
             return ""
 
-    def get_noel_names(self):
+    def get_noel_names(self) -> NoelNames:
         if self.noel_name == constants.NoelName.NEL:
             return NoelNames(
                 "NEL",