use htmx dynsel widget in orphaned subsidies

scipost_django/finances/forms.py

@@ -305,12 +305,7 @@ class SubsidyAttachmentInlineLinkForm(forms.ModelForm):
     subsidy = forms.ModelChoiceField(
         queryset=Subsidy.objects.all(),
         widget=HTMXDynSelWidget(
-            dynsel_context={
-                "results_page_url": reverse_lazy(
-                    "finances:_hx_dynsel_subsidy_result_page"
-                ),
-                "collection_name": "subsidies",
-            }
+            url=reverse_lazy("finances:subsidy_autocomplete"),
         ),
         help_text=("Start typing, and select from the popup."),
         required=False,
@@ -357,8 +352,8 @@ class SubsidyAttachmentInlineLinkForm(forms.ModelForm):
             )
         )
 
-    def clean_subsidy(self):
-        return
+    # def clean_subsidy(self):
+    #     return
 
     def clean(self):
         return self.cleaned_data

scipost_django/finances/managers.py

@@ -31,7 +31,7 @@ class SubsidyAttachmentQuerySet(models.QuerySet):
         return self.filter(kind=self.model.KIND_PROOF_OF_PAYMENT)
 
     def orphaned(self):
-        return self.filter(subsidy__isnull=True)
+        return self.filter(subsidy__isnull=True).order_by("date")
 
     def unattached(self):
         return self.filter(

scipost_django/finances/templates/finances/_hx_subsidyattachment_list_item.html

@@ -24,7 +24,7 @@
   </div>
   <div class="col-12"
        hx-get="{% url "finances:_hx_subsidyattachment_link_form" attachment_id=attachment.id %}"
-       hx-trigger="revealed once">
+       hx-trigger="intersect once">
     <div class="spinner-grow spinner-grow-sm ms-2"
          role="status"
          aria-hidden="true"></div>

scipost_django/finances/urls.py

@@ -112,20 +112,10 @@ urlpatterns = [
         name="subsidy_delete",
     ),
     path(
-        "subsidies/autocomplete/",
-        views.SubsidyAutocompleteView.as_view(),
+        "subsidies/autocomplete",
+        views.HXDynselSubsidyAutocomplete.as_view(),
         name="subsidy_autocomplete",
     ),
-    path(
-        "subsidies/_hx_dynsel_/page",
-        views.HXDynselSubsidyResultPage.as_view(),
-        name="_hx_dynsel_subsidy_result_page",
-    ),
-    path(
-        "subsidies/_hx_dynsel/select_option",
-        views.HXDynselSubsidySelectOption.as_view(),
-        name="_hx_dynsel_subsidy_select_option",
-    ),
     path(
         "subsidies/<int:pk>/", views.SubsidyDetailView.as_view(), name="subsidy_details"
     ),

scipost_django/finances/views.py

@@ -15,7 +15,7 @@ from django.template.response import TemplateResponse
 from django.utils.html import format_html
 import matplotlib
 
-from common.views import HXDynselResultPage, HXDynselSelectOptionView
+from common.views import HXDynselAutocomplete, HXDynselSelectOptionView
 from finances.constants import SUBSIDY_TYPE_SPONSORSHIPAGREEMENT, SUBSIDY_PROMISED
 
 matplotlib.use("Agg")
@@ -720,10 +720,8 @@ def _hx_subsidyattachment_link_form(request, attachment_id):
     )
 
 
-class HXDynselSubsidyResultPage(HXDynselResultPage):
+class HXDynselSubsidyAutocomplete(HXDynselAutocomplete):
     model = Subsidy
-    collection_name = "subsidies"
-    obj_select_option_url = reverse_lazy("finances:_hx_dynsel_subsidy_select_option")
 
     def search(self, queryset, q):
         return queryset.filter(
@@ -737,10 +735,6 @@ class HXDynselSubsidyResultPage(HXDynselResultPage):
         )
 
 
-class HXDynselSubsidySelectOption(HXDynselSelectOptionView):
-    model = Subsidy
-
-
 def subsidy_attachment(request, attachment_id):
     attachment = get_object_or_404(SubsidyAttachment.objects, id=attachment_id)
     if not (request.user.is_authenticated and attachment.visible_to_user(request.user)):