improved filtering in admin interface, fixed indicator sets/indicators count message

Author: Dmytro Trotsko

src/assets/js/indicatorSetsTable.js

@@ -117,7 +117,7 @@ var table = new DataTable("#indicatorSetsTable", {
                             `Showing <b>${response.num_of_indicators}</b> distinct ${pluralize(response.num_of_indicators, "indicator")} (arranged in <b>${response.num_of_indicator_sets}</b> ${pluralize(response.num_of_indicator_sets, "set")}), including <b>${numberWithCommas(response.num_of_locations)}</b> Delphi-hosted time series across numerous locations.`;
                     } else {
                         indicatorSetsInfo.innerHTML =
-                            `Showing <b>${response.num_of_indicators}</b> indicator sets (arranged in <b>${response.num_of_indicator_sets}</b> ${pluralize(response.num_of_indicator_sets, "set")}).`;
+                            `Showing <b>${response.num_of_indicators}</b> ${pluralize(response.num_of_indicators, "indicator")} (arranged in <b>${response.num_of_indicator_sets}</b> ${pluralize(response.num_of_indicator_sets, "set")}).`;
                     }
                 }
             });

src/indicators/admin.py

@@ -252,7 +252,7 @@ def download_nondelphi_indicator(self, request):
 @admin.register(USStateIndicator)
 class USStateIndicatorAdmin(BaseIndicatorAdmin):
     list_display = ("name", "indicator_set")
-    search_fields = ("name", "indicator_set")
+    search_fields = ("name", "indicator_set__name")
     ordering = ("name",)
     list_per_page = 50
     list_select_related = True

src/indicatorsets/admin.py

@@ -76,7 +76,7 @@ class IndicatorSetAdmin(BaseIndicatorSetAdmin):
     def get_queryset(self, request):
         # Exclude proxy model objects
         qs = super().get_queryset(request)
-        return qs.exclude(source_type="non_delphi")
+        return qs.exclude(source_type="non_delphi").exclude(source_type="us_state")
 
     change_list_template = "admin/indicatorsets/indicator_set_changelist.html"
 
@@ -187,7 +187,7 @@ class USStateIndicatorSetAdmin(BaseIndicatorSetAdmin):
     )
     search_fields = ("name", "state", "description")
     ordering = ["name"]
-    list_filter = ["state"]
+    list_filter = ["original_data_provider"]
 
     def get_queryset(self, request):
         # Exclude proxy model objects