feat: allow searching club announcements

Author: UsernameDP

intranet/apps/dashboard/views.py

@@ -331,6 +331,28 @@ class RawPaginationData(TypedDict, Generic[T]):
     page_obj: Paginator[T]
 
 
+def filter_announcements_by_search(request, items):
+    print(items)
+    if "search" not in request.GET:
+        return items
+    searchParam = request.GET["search"]
+    if len(searchParam.strip()) == 0:
+        return items
+    searchParam = searchParam.lower()
+
+    def filterMethod(item):
+        return searchParam in item.title.lower() or searchParam in item.content.lower()
+
+    filteredItems = list(filter(filterMethod, items))
+
+    sorted_announcements = sorted(
+        filteredItems,
+        key=lambda announcement: (searchParam.lower() not in announcement.title.lower(), searchParam.lower() not in announcement.content.lower()),
+    )
+
+    return sorted_announcements
+
+
 def paginate_announcements_list_raw(
     request: HttpRequest,
     items: Sequence[T],
@@ -358,6 +380,8 @@ def paginate_announcements_list_raw(
     else:
         page_num = DEFAULT_PAGE_NUM
 
+    items = filter_announcements_by_search(request, items)
+
     paginator = Paginator(items, 15)
     if page_num not in paginator.page_range:
         page_num = DEFAULT_PAGE_NUM

intranet/static/js/dashboard/announcements.js

@@ -1,5 +1,5 @@
 /* global $ */
-$(document).ready(function() {
+$(document).ready(function () {
     updatePartiallyHidden();
 
     filterClubAnnouncements();
@@ -62,6 +62,12 @@ $(document).ready(function() {
         filterClubAnnouncements();
     });
 
+    $("#subscribed-announcement-search").submit((e) => {
+        e.preventDefault();
+        const value = $("#subscribed-announcement-search-input").val();
+        window.location.replace("/announcements/club?search=" + value);
+    })
+
 });
 
 function updatePartiallyHidden() {

intranet/templates/dashboard/dashboard.html

@@ -102,11 +102,16 @@
         <div class="warning-announcement">{{ dash_warning|safe|linebreaks }}</div>
     {% endif %}
 
-    <div class="announcements-header">
+    <div class="announcements-header" style="">
 
         <h2>{{ dashboard_header }}</h2>
+            <span class="announcements-icon-wrapper" style="display: flex; flex-direction: row;">
+            {% if view_announcements_url == "club_announcements" %}
+            <form id="subscribed-announcement-search" style="display: flex; margin-right:1px">
+                <input id="subscribed-announcement-search-input" type="text" placeholder="Search Club Announcements" style="width: 15rem;" class="dashboard-textinput" onsubmit="" >
+            </form>
+            {% endif %}
 
-            <span class="announcements-icon-wrapper">
             {% if show_expired or not show_widgets %}
                 <a href="{% url 'index' %}" class="button" style="float:left"><i class="fas fa-arrow-left" style="width: 11px"></i> Dashboard</a>
                 &nbsp;