Merge pull request #37 from DataManagementLab/#29_Frontend_Integrate_search_functionality

Frontend: Integrate search functionality

Author: bhaettasch

frontend/locale/de_DE/LC_MESSAGES/django.po

@@ -35,38 +35,40 @@ msgstr "Soll der folgende Kommentar wirklich gelöscht werden?"
 
 #: frontend/templates/frontend/content/addcontent.html:23
 #: frontend/templates/frontend/course/create.html:29
+#: frontend/templates/frontend/course/edit.html:29
 msgid "Create"
 msgstr "Erzeugen"
 
 #: frontend/templates/frontend/content/addcontent.html:24
 #: frontend/templates/frontend/content/detail.html:80
 #: frontend/templates/frontend/course/create.html:30
+#: frontend/templates/frontend/course/edit.html:30
 #: frontend/templates/frontend/profile/profile_edit.html:19
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #: frontend/templates/frontend/content/detail.html:18
-#: frontend/templates/frontend/course/view.html:25
+#: frontend/templates/frontend/course/view.html:24
 msgid "Actions"
 msgstr "Aktionen"
 
-#: frontend/templates/frontend/content/detail.html:46
+#: frontend/templates/frontend/content/detail.html:43
 msgid "Back to course "
 msgstr "Zurück zum Kurs "
 
-#: frontend/templates/frontend/content/detail.html:52
+#: frontend/templates/frontend/content/detail.html:49
 msgid "By"
 msgstr "Von"
 
-#: frontend/templates/frontend/content/detail.html:62
+#: frontend/templates/frontend/content/detail.html:59
 msgid "Created at"
 msgstr "Erstellt am"
 
-#: frontend/templates/frontend/content/detail.html:70
+#: frontend/templates/frontend/content/detail.html:67
 msgid "Delete"
 msgstr "Löschen"
 
-#: frontend/templates/frontend/content/detail.html:74
+#: frontend/templates/frontend/content/detail.html:71
 #, python-format
 msgid ""
 "\n"
@@ -80,38 +82,26 @@ msgstr ""
 "                        "
 
 #: frontend/templates/frontend/content/detail.html:83
-#: frontend/templates/frontend/course/create.html:30
-#: frontend/templates/frontend/course/edit.html:30
-#: frontend/templates/frontend/profile/profile_edit.html:19
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: frontend/templates/frontend/content/detail.html:86
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: frontend/templates/frontend/content/detail.html:102
+#: frontend/templates/frontend/content/detail.html:99
 #: frontend/templates/frontend/course/topic_contents.html:29
 msgid "Rating"
 msgstr "Bewertung"
 
-#: frontend/templates/frontend/content/detail.html:112
+#: frontend/templates/frontend/content/detail.html:109
 msgid "Comments"
 msgstr "Kommentare"
 
-#: frontend/templates/frontend/content/detail.html:118
+#: frontend/templates/frontend/content/detail.html:115
 msgid "Add comment"
 msgstr "Kommentar hinzufügen"
 
 #: frontend/templates/frontend/course/create.html:11
 msgid "Create a new course"
 msgstr "Neuen Kurs anlegen"
 
-#: frontend/templates/frontend/course/create.html:29
-#: frontend/templates/frontend/course/edit.html:29
-msgid "Create"
-msgstr "Erzeugen"
-
 #: frontend/templates/frontend/course/dropdown_topic.html:10
 msgid "Add Content"
 msgstr "Inhalte hinzufügen"
@@ -120,16 +110,15 @@ msgstr "Inhalte hinzufügen"
 msgid "Edit course"
 msgstr "Kurs bearbeiten"
 
-#: frontend/templates/frontend/course/view.html:26
+#: frontend/templates/frontend/course/view.html:35
 msgid "Edit Course"
 msgstr "Kurs hinzufügen"
 
-#: frontend/templates/frontend/course/view.html:27
+#: frontend/templates/frontend/course/view.html:36
 msgid "Delete Course"
 msgstr "Kurs löschen"
 
-#: frontend/templates/frontend/course/view.html:63
-#: frontend/templates/frontend/course/view.html:78
+#: frontend/templates/frontend/course/view.html:76
 msgid "No topics yet"
 msgstr "Bisher keine Themen"
 
@@ -157,7 +146,7 @@ msgstr "Kurse für Kategorie"
 
 #: frontend/templates/frontend/course_lists/courses_category.html:18
 #: frontend/templates/frontend/course_lists/courses_period.html:18
-#: frontend/templates/frontend/navbar.html:5
+#: frontend/templates/frontend/navbar.html:12
 msgid "All Courses"
 msgstr "Alle Kurse"
 
@@ -201,11 +190,16 @@ msgstr "Login"
 msgid "Go to dashboard"
 msgstr "Zum Dashboard"
 
-#: frontend/templates/frontend/navbar.html:7
+#: frontend/templates/frontend/navbar.html:8
+#: frontend/templates/frontend/search.html:11
+msgid "Search"
+msgstr "Suche"
+
+#: frontend/templates/frontend/navbar.html:14
 msgid "Admin Menu"
 msgstr "Admin-Menü"
 
-#: frontend/templates/frontend/navbar.html:12
+#: frontend/templates/frontend/navbar.html:19
 msgid "Logout"
 msgstr "Logout"
 
@@ -237,6 +231,18 @@ msgstr "Zurücksetzen"
 msgid "Submit"
 msgstr "Abschicken"
 
+#: frontend/templates/frontend/search.html:19
+msgid "Search Results for "
+msgstr "Suchergebnisse für "
+
+#: frontend/templates/frontend/search.html:30
+msgid "No courses found"
+msgstr "Keine Kurse gefunden"
+
+#: frontend/templates/frontend/search.html:45
+msgid "No topics found"
+msgstr "Keine Themen gefunden"
+
 #: frontend/views/comment.py:33 frontend/views/comment.py:107
 msgid "You don't have permission to do this."
 msgstr "Keine Berechtigung, um das durchzuführen"
@@ -268,6 +274,3 @@ msgstr "Kurs '{cleaned_data['title']}' erfolgreich bearbeitet"
 #: frontend/views/profile.py:25
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
-
-#~ msgid "Delete Course"
-#~ msgstr "Kurs löschen"

frontend/templates/frontend/navbar.html

@@ -1,7 +1,14 @@
 {% load i18n %}
+{% load fontawesome_5 %}
 
 {% if user.is_authenticated %}
     <div class="float-right" style="color: #ffffff;font-weight: bold;">
+
+        <form class="form-inline float-left" action="{% url 'frontend:search' %}">
+            <input class="form-control" type="search" name="q" placeholder="{% trans 'Search' %}" aria-label="Search">
+            <button class="btn btn-outline-success" type="submit">{% fa5_icon "search" "far" %}</button>
+        </form>
+
         <a href="{% url "frontend:courses" %}" class="btn btn-primary" style="">{% trans "All Courses" %}</a>
         {% if user.is_superuser %}
             <a href="{% url "admin:index" %}" class="btn btn-danger" style="">{% trans "Admin Menu" %}</a>

frontend/templates/frontend/search.html

@@ -0,0 +1,59 @@
+{% extends 'frontend/base_logged_in.html' %}
+
+{# Load the tag library #}
+{% load bootstrap4 %}
+{% load i18n %}
+{% load static %}
+{% load fontawesome_5 %}
+
+{# Load CSS and JavaScript #}
+
+{% block title %}{% trans "Search" %} - Collab Coursebook{% endblock %}
+
+{% block imports %}
+    <link rel="stylesheet" href="{% static 'vendor/chosen-js/chosen.css' %}">
+    <link rel="stylesheet" href="{% static 'css/bootstrap-chosen.css' %}">
+{% endblock %}
+
+{% block content %}
+    <h1>{% trans 'Search Results for ' %}"{{ search_query }}"</h1>
+    <h3>Courses</h3>
+    {% if search_data.courses %}
+        <ul style="list-style-type: none;">
+        {% for course in search_data.courses %}
+            <li>{{ forloop.counter }}.
+                <a href="{% url 'frontend:course' course.id %}"><b>{{ course.title }}</b></a>
+            </li>
+        {% endfor %}
+        </ul>
+    {% else %}
+        <p>{% trans 'No courses found' %}</p>
+    {% endif %}
+
+    <h3>Topics</h3>
+    {% if search_data.course_structure_entries %}
+        <ul style="list-style-type: none;">
+        {% for entry in search_data.course_structure_entries %}
+            <li>{{ forloop.counter }}.
+                <a href="{% url 'frontend:course' entry.course.id %}">
+                    {{ entry.course.title }}: <b>{{ entry.topic.title }}</b>
+                </a>
+            </li>
+        {% endfor %}
+        </ul>
+    {% else %}
+        <p>{% trans 'No topics found' %}</p>
+    {% endif %}
+
+
+
+{% endblock %}
+
+{% block bottom_script %}
+    <script src="{% static 'vendor/chosen-js/chosen.jquery.js' %}"></script>
+    <script>
+        $(function () {
+            $('.chosen-select').chosen();
+        });
+    </script>
+{% endblock %}

frontend/urls.py

@@ -2,13 +2,14 @@
 
 from content.models import CONTENT_TYPES
 from frontend import views
+from frontend.views.search import SearchView
 
 app_name = "frontend"
 
 urlpatterns = [
     path('', views.StartView.as_view(), name="index"),
     path('dashboard/', views.DashboardView.as_view(), name="dashboard"),
-
+    path('search/', views.search.SearchView.as_view(), name='search'),
     path('profile/<int:pk>/', views.ProfileView.as_view(), name="profile"),
     path('profile/edit/', views.ProfileEditView.as_view(), name="profile-edit"),
 

frontend/views/search.py

@@ -0,0 +1,24 @@
+from django.views.generic import ListView
+from django.contrib.auth.mixins import LoginRequiredMixin
+from base.models import Course, CourseStructureEntry
+
+
+class SearchView(ListView, LoginRequiredMixin):
+    """
+    Search for course and topic titles
+    """
+    model = Course
+    template_name = 'frontend/search.html'
+    context_object_name = 'search_data'
+
+    def get_queryset(self):
+        query = self.request.GET.get('q')
+        query = query.strip().lower()
+        courses = Course.objects.filter(title__icontains=query)
+        course_structure_entries = CourseStructureEntry.objects.filter(topic__title__icontains=query)
+        return {'courses': courses, 'course_structure_entries': course_structure_entries}
+
+    def get_context_data(self, *, object_list=None, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['search_query'] = self.request.GET.get('q')
+        return context