chg ! sort in admin

Author: vitali-yanushchyk-valor

src/country_workspace/admin/batch.py

@@ -22,6 +22,7 @@ class BatchAdmin(BaseModelAdmin):
     )
     readonly_fields = ("country_office", "program", "imported_by")
     search_fields = ("name",)
+    ordering = ("-import_date",)
 
     def has_add_permission(self, request: HttpRequest) -> bool:
         return False

src/country_workspace/admin/rdp.py

@@ -23,6 +23,7 @@ class RdpAdmin(BaseModelAdmin):
     fields = ("name", "country_office", "program", "pushed_by", "push_date", "status", "hope_rdi_id", "related_job")
     readonly_fields = ("country_office", "program", "related_job", "push_date", "hope_rdi_id")
     search_fields = ("name",)
+    ordering = ("-push_date",)
 
     def has_add_permission(self, request: HttpRequest) -> bool:
         return False

src/country_workspace/models/batch.py

@@ -14,7 +14,7 @@ class BatchSource(models.TextChoices):
     country_office = models.ForeignKey("Office", on_delete=models.CASCADE, related_name="%(class)ss")
     program = models.ForeignKey("Program", on_delete=models.CASCADE, related_name="%(class)ss")
     name = models.CharField(max_length=255, blank=True, null=True)
-    import_date = models.DateTimeField(auto_now=True)
+    import_date = models.DateTimeField(auto_now=True, db_index=True)
     imported_by = models.ForeignKey(User, on_delete=models.CASCADE)
     source = models.CharField(max_length=255, blank=True, null=True, choices=BatchSource.choices)
 

src/country_workspace/models/rdp.py

@@ -20,7 +20,7 @@ class PushStatus(models.TextChoices):
     hope_rdi_id = models.CharField(
         max_length=200, null=True, editable=False, help_text=_("RDI unique ID within the HOPE core.")
     )
-    push_date = models.DateTimeField(auto_now=True)
+    push_date = models.DateTimeField(auto_now=True, db_index=True)
     pushed_by = models.ForeignKey(User, on_delete=models.CASCADE)
 
     class Meta:

src/country_workspace/workspaces/admin/batch.py

@@ -25,11 +25,11 @@ def queryset(self, request: HttpRequest, queryset: QuerySet) -> QuerySet:
 
 @register(CountryBatch, site=workspace)
 class CountryBatchAdmin(SelectedProgramMixin, WorkspaceModelAdmin):
-    list_display = ["import_date", "name", "imported_by", "source"]
-    search_fields = ("label",)
+    list_display = ["name", "import_date", "imported_by", "source"]
+    search_fields = ("name",)
     change_list_template = ["workspace/change_list.html"]
     change_form_template = ["workspace/change_form.html"]
-    ordering = ("name",)
+    ordering = ("-import_date",)
     list_filter = (("source", ChoiceFilter), ("imported_by", UserAutoCompleteFilter))
     readonly_fields = fields = ("name", "source")
 
@@ -38,12 +38,6 @@ def get_common_context(self, request: HttpRequest, pk: str | None = None, **kwar
         kwargs["modeladmin_name"] = self.__class__.__name__
         return super().get_common_context(request, pk, **kwargs)
 
-    def get_search_results(
-        self, request: HttpRequest, queryset: QuerySet[CountryBatch], search_term: str
-    ) -> tuple[QuerySet[CountryBatch], bool]:
-        queryset = self.model.objects.filter(program=state.program)
-        return queryset, False
-
     def get_queryset(self, request: HttpRequest) -> "QuerySet[CountryBatch]":
         return (
             super()

src/country_workspace/workspaces/admin/rdp.py

@@ -24,7 +24,7 @@ class CountryRdpAdmin(SelectedProgramMixin, WorkspaceModelAdmin):
     search_fields = ("name",)
     change_list_template = ["workspace/change_list.html"]
     change_form_template = ["workspace/change_form.html"]
-    ordering = ("name",)
+    ordering = ("-push_date",)
 
     def has_change_permission(self, request: HttpRequest, obj: CountryRdp | None = None) -> bool:
         return False
@@ -40,7 +40,9 @@ def get_common_context(self, request: HttpRequest, pk: str | None = None, **kwar
     def related_job(self, obj: CountryRdp) -> str:
         if job := obj.jobs.first():
             url = reverse("workspace:workspaces_countryasyncjob_change", args=[job.pk])
-            return format_html('<a href="{}">{}</a>', url, str(job))
+            return format_html(
+                '<a href="{}" style="color: var(--link-fg); text-decoration: underline;">{}</a>', url, str(job)
+            )
         return "-"
 
     def get_queryset(self, request: HttpRequest) -> QuerySet[CountryRdp]: