diff --git a/peachjam/models/judgment.py b/peachjam/models/judgment.py index fed299b0e..cca44efb6 100644 --- a/peachjam/models/judgment.py +++ b/peachjam/models/judgment.py @@ -585,11 +585,13 @@ class CauseList(CoreDocument): judges = models.ManyToManyField(Judge, blank=True, verbose_name=_("judges")) def assign_title(self): - court_name = self.court.name if self.court else "" + court_name = self.registry.name if self.registry else "" + if not self.registry: + court_name = self.court.name if self.court else "" nature_name = self.nature.name if self.nature else "" - date_str = self.date.strftime("%Y-%m-%d") if self.date else "" + date_str = self.date.strftime("%d %B %Y") - self.title = f"{court_name} {nature_name} {date_str}" + self.title = f"{court_name} - {nature_name} - {date_str}" def pre_save(self): self.assign_title() diff --git a/peachjam/views/causelist.py b/peachjam/views/causelist.py index 745ee63ce..c200bb8fd 100644 --- a/peachjam/views/causelist.py +++ b/peachjam/views/causelist.py @@ -7,7 +7,15 @@ from django.views.generic import TemplateView from peachjam.helpers import lowercase_alphabet -from peachjam.models import CauseList, Court, CourtClass, CourtRegistry, Judge, Taxonomy +from peachjam.models import ( + CauseList, + Court, + CourtClass, + CourtRegistry, + DocumentNature, + Judge, + Taxonomy, +) from peachjam.registry import registry from peachjam.views import BaseDocumentDetailView, FilteredDocumentListView from peachjam.views.courts import MonthMixin, RegistryMixin @@ -84,6 +92,25 @@ def get_context_data(self, **kwargs): def add_facets(self, context): context["facet_data"] = {} + + if "natures" not in self.exclude_facets: + natures = DocumentNature.objects.filter( + pk__in=self.form.filter_queryset( + self.get_base_queryset(), exclude="natures" + ) + .order_by() + .values_list("nature_id", flat=True) + .distinct() + ) + context["facet_data"]["natures"] = { + "label": _("Document nature"), + "type": "radio", + "options": sorted( + [(n.code, n.name) for n in natures], key=lambda x: x[1] + ), + "values": self.request.GET.getlist("natures"), + } + if "judges" not in self.exclude_facets: judges = list( judge