Fiscal Year Multiselect

tdrs-backend/Pipfile

@@ -26,7 +26,7 @@ boto3 = "==1.28.4"
 cryptography = "==3.4.7"
 dj-database-url = "==0.5.0"
 django = "==3.2.15"
-django-admin-508 = "==1.0.1"
+django-admin-508 = "==1.0.2"
 django-admin-logs = "==1.0.2"
 django-configurations = "==2.2"
 django-cors-headers = "==3.12.0"

tdrs-backend/tdpservice/search_indexes/admin/ssp.py

@@ -1,6 +1,7 @@
 """ModelAdmin classes for parsed SSP data files."""
-from .filters import CreationDateFilter, FiscalPeriodFilter, STTFilter
+from .filters import CreationDateFilter, STTFilter
 from .mixins import CsvExportAdminMixin, ReadOnlyAdminMixin
+from tdpservice.search_indexes.admin.multiselect_filter import MultiSelectDropdownFilter
 
 
 class SSP_M1Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
@@ -14,9 +15,10 @@ class SSP_M1Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]
 
 
@@ -31,9 +33,10 @@ class SSP_M2Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]
 
 
@@ -48,9 +51,10 @@ class SSP_M3Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]
 
 class SSP_M4Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
@@ -64,9 +68,10 @@ class SSP_M4Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]
 
 class SSP_M5Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
@@ -80,9 +85,10 @@ class SSP_M5Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]
 
 class SSP_M6Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
@@ -97,9 +103,10 @@ class SSP_M6Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]
 
 class SSP_M7Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
@@ -117,7 +124,8 @@ class SSP_M7Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]

tdrs-backend/tdpservice/search_indexes/admin/tanf.py

@@ -1,6 +1,7 @@
 """ModelAdmin classes for parsed TANF data files."""
-from .filters import CreationDateFilter, FiscalPeriodFilter, STTFilter
+from .filters import CreationDateFilter, STTFilter
 from .mixins import CsvExportAdminMixin, ReadOnlyAdminMixin
+from tdpservice.search_indexes.admin.multiselect_filter import MultiSelectDropdownFilter
 
 
 class TANF_T1Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
@@ -14,9 +15,10 @@ class TANF_T1Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]
 
 
@@ -31,9 +33,10 @@ class TANF_T2Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]
 
 
@@ -48,9 +51,10 @@ class TANF_T3Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]
 
 
@@ -65,9 +69,10 @@ class TANF_T4Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]
 
 
@@ -82,9 +87,10 @@ class TANF_T5Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]
 
 
@@ -99,9 +105,10 @@ class TANF_T6Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]
 
 
@@ -120,7 +127,8 @@ class TANF_T7Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]

tdrs-backend/tdpservice/search_indexes/admin/tribal.py

@@ -1,6 +1,7 @@
 """ModelAdmin classes for parsed TRIBAL data files."""
-from .filters import CreationDateFilter, FiscalPeriodFilter, STTFilter
+from .filters import CreationDateFilter, STTFilter
 from .mixins import CsvExportAdminMixin, ReadOnlyAdminMixin
+from tdpservice.search_indexes.admin.multiselect_filter import MultiSelectDropdownFilter
 
 
 class Tribal_TANF_T1Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
@@ -14,9 +15,10 @@ class Tribal_TANF_T1Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]
 
 
@@ -31,9 +33,10 @@ class Tribal_TANF_T2Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]
 
 
@@ -48,9 +51,10 @@ class Tribal_TANF_T3Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]
 
 class Tribal_TANF_T4Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
@@ -64,9 +68,10 @@ class Tribal_TANF_T4Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]
 class Tribal_TANF_T5Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     """ModelAdmin class for parsed Tribal_T5 data files."""
@@ -79,9 +84,10 @@ class Tribal_TANF_T5Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]
 
 class Tribal_TANF_T6Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
@@ -96,9 +102,10 @@ class Tribal_TANF_T6Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]
 
 class Tribal_TANF_T7Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
@@ -116,7 +123,8 @@ class Tribal_TANF_T7Admin(ReadOnlyAdminMixin, CsvExportAdminMixin):
     ]
 
     list_filter = [
-        FiscalPeriodFilter,
-        CreationDateFilter,
+        ('datafile__year', MultiSelectDropdownFilter),
+        ('datafile__quarter', MultiSelectDropdownFilter),
         ('datafile__stt__name', STTFilter),
+        CreationDateFilter,
     ]

tdrs-backend/tdpservice/search_indexes/templates/multiselectdropdownfilter.html

@@ -1,48 +1,50 @@
 {% load i18n admin_urls %}
-<h3>{% blocktrans with filter_title=title %} By {{ filter_title }} {% endblocktrans %}</h3>
+<div class="list-filter-dropdown">
+    <h3>{% blocktrans with filter_title=title %} By {{ filter_title }} {% endblocktrans %}</h3>
 
-<div>
-    {% for choice in choices|slice:":1" %}
-        <a href="{{ choice.query_string|iriencode }}" title="Show {{ choice.display }}">Show {{ choice.display }}</a>
-    {% endfor %}
-    <select id="{{ title|slugify }}_select" multiple style="color:#000000;width:100%" aria-multiselectable="true" aria-label="{{ title|slugify }}s">
-    {% for choice in choices|slice:"1:" %}
-        <option{% if choice.selected %} selected{% endif %}
-            value="{{ choice.value }}"
-            data-key="{{ choice.key }}"
-            data-query="{{ choice.query_string|iriencode }}"
-            style="color:#000000"
-            {% if choice.selected %} aria-checked="true" {% else %} aria-checked="false" {% endif %}>
-            {{ choice.display }}
-        </option>
-    {% endfor %}
-    </select>
+    <div>
+        {% for choice in choices|slice:":1" %}
+            <a href="{{ choice.query_string|iriencode }}" title="Show {{ choice.display }}">Show {{ choice.display }}</a>
+        {% endfor %}
+        <select id="{{ title|slugify }}_select" multiple style="color:#000000;width:100%" aria-multiselectable="true" aria-label="{{ title|slugify }}s" size="{% if choices|length < 7 %} {{ choices|length }} {% else %} 8 {% endif %}">
+        {% for choice in choices|slice:"1:" %}
+            <option{% if choice.selected %} selected{% endif %}
+                value="{{ choice.value }}"
+                data-key="{{ choice.key }}"
+                data-query="{{ choice.query_string|iriencode }}"
+                style="color:#000000"
+                {% if choice.selected %} aria-checked="true" {% else %} aria-checked="false" {% endif %}>
+                {{ choice.display }}
+            </option>
+        {% endfor %}
+        </select>
+        <a id="{{ title|slugify }}_submit" href="" title="Filter by {{ title }}">Filter by {{ title }}</a>
+    </div>
 </div>
 
 <script>
-    // This function must have this name as it is referenced inside of https://github.com/raft-tech/django-admin-508/blob/main/admin_interface/static/admin_interface/508/dropdown-filter.js
-    // to allow custom filters to hook into the onClick event for the DAC `Apply Filters` button.
-    function custom_filter_callback($) {
-        // fetch data from selected options
-        var params = {};
-        var query = null;
-        $('select#{{ title|slugify }}_select > option:selected').each(function() {
-            var key = $(this).attr('data-key');
-            if (! params.hasOwnProperty(key)) params[key] = [];
-            params[key].push($(this).val());
-            if (!query) query = $(this).attr('data-query');
-        });
-
-        // do we have selected options at all?
-        if (!query) return "";
+    (function($) {
+        $('a#{{ title|slugify }}_submit').click(function(evt) {
+            // fetch data from selected options
+            var params = {};
+            var query = null;
+            $('select#{{ title|slugify }}_select > option:selected').each(function() {
+                var key = $(this).attr('data-key');
+                if (! params.hasOwnProperty(key)) params[key] = [];
+                params[key].push($(this).val());
+                if (!query) query = $(this).attr('data-query');
+            });
+            // do we had selected options at all?
+            if (!query) return false;
 
-        // build up the href
-        var params_query = '';
-        for (var key in params) {
-            if (params.hasOwnProperty(key)) {
-                params_query += '&' + key + '=' + params[key].join()
+            // build up the href
+            var params_query = '';
+            for (var key in params) {
+                if (params.hasOwnProperty(key)) {
+                    params_query += '&' + key + '=' + params[key].join()
+                }
             }
-        }
-        return query + params_query;
-    }
+            this.href = query + params_query;
+        });
+    })(django.jQuery);
 </script>