Enhance filtering functionality and UI consistency across user-related views by implementing a generic search filter and updating filter display in templates.

generic/templates/generic/cid_view.html

@@ -7,23 +7,12 @@
 
 {% block content %}
 
-    <div id="view-filter-options">
-    <details class="filter">
-        <summary>
-        <h3>Filter CID Users </h3>
-        </summary>
-        <form action="" method="get">
-            {{ filter.form |crispy}}
-            <input class="btn btn-primary btn-sm mt-1 mb-1" type="submit" />
-        </form>
-    </details>
-    </div>
-
     <div>
         <span id="manage-span">
             {% render_table table %}
         </span>
     </div>
+    {% include "generic/partials/filter_bar.html" with filter=filter app_name=app_name collapse_id="bottom-filter-body" %}
 
     <details>
         <summary>

generic/templates/generic/supervisor_list.html

@@ -4,18 +4,6 @@
 
     <h2>Supervisors</h2>
 
-        <details>
-            <summary>
-                <h4>Filter</h4>
-            </summary>
-            <div id="view-filter-options">
-                <form action="" method="get">
-                    {{ filter.form }}
-                    <input class="btn btn-primary btn-sm mt-1 mb-1" type="submit" />
-                </form>
-            </div>
-        </details>
-
         {% render_table table %}
 
 {% comment %}     <ul id="supervisor-list">
@@ -25,6 +13,7 @@
             </li>
         {% endfor %}
     </ul> {% endcomment %}
+    {% include "generic/partials/filter_bar.html" with filter=filter app_name=app_name collapse_id="bottom-filter-body" %}
 
 {% endblock %}
 

generic/templates/generic/user_view.html

@@ -71,6 +71,7 @@
             {% render_table table %}
         </span>
     </div>
+    {% include "generic/partials/filter_bar.html" with filter=filter app_name=app_name collapse_id="bottom-filter-body" %}
 
     <a href="{% url 'accounts_bulk_create' %}">Bulk create users</a>
     <a href="{% url 'create_user' %}">Create single user</a>