Merge pull request #39 from DataManagementLab/#7_Frontend_Visualize_Coursebook

#7 frontend visualize coursebook

Author: bhaettasch

frontend/locale/de_DE/LC_MESSAGES/django.po

@@ -35,13 +35,15 @@ 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/duplicate.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/content/detail.html:86
 #: frontend/templates/frontend/course/create.html:30
+#: frontend/templates/frontend/course/duplicate.html:30
 #: frontend/templates/frontend/course/edit.html:30
 #: frontend/templates/frontend/profile/profile_edit.html:19
 msgid "Cancel"
@@ -52,23 +54,31 @@ msgstr "Abbrechen"
 msgid "Actions"
 msgstr "Aktionen"
 
-#: frontend/templates/frontend/content/detail.html:43
+#: frontend/templates/frontend/content/detail.html:33
+#: frontend/templates/frontend/content/detail.html:35
+#: frontend/templates/frontend/course/coursebook.html:16
+#, fuzzy
+#| msgid "Courses"
+msgid "Coursebook"
+msgstr "Kurse"
+
+#: frontend/templates/frontend/content/detail.html:49
 msgid "Back to course "
 msgstr "Zurück zum Kurs "
 
-#: frontend/templates/frontend/content/detail.html:49
+#: frontend/templates/frontend/content/detail.html:55
 msgid "By"
 msgstr "Von"
 
-#: frontend/templates/frontend/content/detail.html:59
+#: frontend/templates/frontend/content/detail.html:65
 msgid "Created at"
 msgstr "Erstellt am"
 
-#: frontend/templates/frontend/content/detail.html:67
+#: frontend/templates/frontend/content/detail.html:73
 msgid "Delete"
 msgstr "Löschen"
 
-#: frontend/templates/frontend/content/detail.html:71
+#: frontend/templates/frontend/content/detail.html:77
 #, python-format
 msgid ""
 "\n"
@@ -81,27 +91,20 @@ msgstr ""
 "Diese Aktion kann nicht rückgängig gemacht werden.\n"
 "                        "
 
-#: frontend/templates/frontend/content/detail.html:83
-#: frontend/templates/frontend/course/create.html:30
-#: frontend/templates/frontend/course/duplicate.html:30
-#: frontend/templates/frontend/profile/profile_edit.html:19
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: frontend/templates/frontend/content/detail.html:86
+#: frontend/templates/frontend/content/detail.html:89
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: frontend/templates/frontend/content/detail.html:99
+#: frontend/templates/frontend/content/detail.html:105
 #: frontend/templates/frontend/course/topic_contents.html:29
 msgid "Rating"
 msgstr "Bewertung"
 
-#: frontend/templates/frontend/content/detail.html:109
+#: frontend/templates/frontend/content/detail.html:115
 msgid "Comments"
 msgstr "Kommentare"
 
-#: frontend/templates/frontend/content/detail.html:115
+#: frontend/templates/frontend/content/detail.html:121
 msgid "Add comment"
 msgstr "Kommentar hinzufügen"
 
@@ -117,31 +120,30 @@ msgstr "Nächste"
 msgid "Previous"
 msgstr "Vorherige"
 
+#: frontend/templates/frontend/course/coursebook.html:10
+msgid "Export"
+msgstr "Exportieren"
+
+#: frontend/templates/frontend/course/coursebook.html:22
+#, fuzzy
+#| msgid "Your Courses"
+msgid "Your coursebook is empty"
+msgstr "Dein Kursbuch ist leer"
+
 #: 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/duplicate.html:29
-msgid "Create"
-msgstr "Erzeugen"
+#: frontend/templates/frontend/course/dropdown_topic.html:10
+msgid "Add Content"
+msgstr "Inhalte hinzufügen"
 
 #: frontend/templates/frontend/course/duplicate.html:11
 #: frontend/templates/frontend/course/duplicate.html:19
-#: frontend/templates/frontend/course/view.html:25
+#: frontend/templates/frontend/course/view.html:31
 msgid "Duplicate Course"
 msgstr "Kurs duplizieren"
 
-#: frontend/templates/frontend/course/view.html:36
-#: frontend/templates/frontend/course/view.html:27
-msgid "Delete Course"
-msgstr "Kurs löschen"
-
-#: frontend/templates/frontend/course/view.html:63
-#: frontend/templates/frontend/course/dropdown_topic.html:10
-msgid "Add Content"
-msgstr "Inhalte hinzufügen"
-
 #: frontend/templates/frontend/course/edit.html:11
 msgid "Edit course"
 msgstr "Kurs bearbeiten"
@@ -150,6 +152,10 @@ msgstr "Kurs bearbeiten"
 msgid "Edit Course"
 msgstr "Kurs hinzufügen"
 
+#: frontend/templates/frontend/course/view.html:36
+msgid "Delete Course"
+msgstr "Kurs löschen"
+
 #: frontend/templates/frontend/course/view.html:76
 msgid "No topics yet"
 msgstr "Bisher keine Themen"
@@ -287,6 +293,14 @@ msgstr "Kommentar erfolgreich gelöscht."
 msgid "Successfully edited Comment."
 msgstr "Kommentar erfolgreich bearbeitet."
 
+#: frontend/views/content.py:28
+msgid "Content '{cleaned_data['type']}' successfully added"
+msgstr "Inhalt '{cleaned_data['type']}' erfolgreich hinzugefügt"
+
+#: frontend/views/content.py:35
+msgid "An error occurred while processing the request"
+msgstr "Es trat ein Fehler beim Verarbeiten der Anfrage auf"
+
 #: frontend/views/course.py:27
 msgid ""
 "Course '{cleaned_data['title']}' successfully created. All settings and "
@@ -299,19 +313,7 @@ msgstr ""
 msgid "Course '{cleaned_data['title']}' successfully created"
 msgstr "Kurs '{cleaned_data['title']}' erfolgreich angelegt"
 
-#: frontend/views/content.py:28
-msgid "Content '{cleaned_data['type']}' successfully added"
-msgstr "Inhalt '{cleaned_data['type']}' erfolgreich hinzugefügt"
-
-#: frontend/views/content.py:35
-msgid "An error occurred while processing the request"
-msgstr "Es trat ein Fehler beim Verarbeiten der Anfrage auf"
-
-#: frontend/views/course.py:26
-msgid "Course '{cleaned_data['title']}' successfully created"
-msgstr "Kurs '{cleaned_data['title']}' erfolgreich angelegt"
-
-#: frontend/views/course.py:52
+#: frontend/views/course.py:88
 msgid "Course '{cleaned_data['title']}' successfully edited"
 msgstr "Kurs '{cleaned_data['title']}' erfolgreich bearbeitet"
 

frontend/templates/frontend/content/detail.html

@@ -27,8 +27,14 @@
                         <a class="dropdown-item"
                            href="{#{% url 'edit_md_file' course.id topic.id content.id %}#}">{% fa5_icon 'pencil-alt' 'fas' %}
                             Edit</a>
+                    {% endif %}
 
+                    {% if favorite %}
+                        <a class="dropdown-item" href="{% url 'frontend:coursebook-remove' course.id topic.id content.id %}">{% fa5_icon 'minus' 'far' %} {% trans 'Coursebook' %}</a>
+                    {% else %}
+                        <a class="dropdown-item" href="{% url 'frontend:coursebook-add' course.id topic.id content.id  %}">{% fa5_icon 'plus' 'far' %} {% trans 'Coursebook' %}</a>
                     {% endif %}
+
                     {% if isCurrentUserOwner or user.is_superuser or content.author == user %}
                         <a href="#" class="dropdown-item text-danger" data-toggle="modal"
                            data-target="#deleteContentModal">{% fa5_icon 'trash' 'fas' %} Delete</a>

frontend/templates/frontend/course/coursebook.html

@@ -0,0 +1,27 @@
+{% load i18n %}
+{# Load the tag library #}
+{% load bootstrap4 %}
+{% load fontawesome_5 %}
+{% load cc_frontend_tags %}
+
+<div class="mt-3">
+    {% with user|get_coursebook:course as topic_contents %}
+        {% if topic_contents|length > 0 %}
+            <a href="" class="btn btn-primary float-right text-right">{% trans 'Export' %}</a>
+        {% endif %}
+        <button class="btn btn-primary float-left mr-1" type="button" data-toggle="collapse" data-target="#collapseCoursebook"
+                aria-expanded="false" aria-controls="collapseCoursebook">
+            {% fa5_icon 'bars' 'fas' %}
+        </button>
+        <h2>{% trans 'Coursebook' %}</h2>
+        <div class="collapse show" id="collapseCoursebook">
+            <div class="card card-body">
+                {% if topic_contents|length > 0 %}
+                    {% include "frontend/course/topic_contents.html" %}
+                {% else %}
+                    <p>{% trans 'Your coursebook is empty' %}</p>
+                {% endif %}
+            </div>
+        </div>
+    {% endwith %}
+</div>

frontend/templates/frontend/course/view.html

@@ -84,6 +84,8 @@ <h5 style="margin-top: 20px;">
         <!-- TODO Add image? -->
     </div>
 
+    {% include 'frontend/course/coursebook.html' %}
+
     {% for entry in structure %}
         <div style="margin-top: 30px;">
             {% with forloop.counter as outer_index %}

frontend/templatetags/cc_frontend_tags.py

@@ -1,6 +1,7 @@
 from django import template
 from django.conf import settings
 
+from base.models import Favorite
 from collab_coursebook.settings import ALLOW_PUBLIC_COURSE_EDITING_BY_EVERYONE
 from content.models import CONTENT_TYPES
 
@@ -115,3 +116,10 @@ def add_content_button(user, course_id, topic_id):
     # generate list of tuple (content type, content verbose name) for add content dropdown
     content_data = [(content_type, content_model.DESC) for content_type, content_model in CONTENT_TYPES.items()]
     return {'user': user, 'course_id': course_id, 'topic_id': topic_id, 'content_data': content_data}
+
+
+@register.filter
+def get_coursebook(user, course):
+    favorites = Favorite.objects.filter(user=user.profile, course=course)
+    coursebook = [favorite.content for favorite in favorites]
+    return coursebook

frontend/urls.py

@@ -3,6 +3,7 @@
 from content.models import CONTENT_TYPES
 from frontend import views
 from frontend.views.search import SearchView
+from frontend.views.coursebook import add_to_coursebook, remove_from_coursebook
 
 app_name = "frontend"
 
@@ -25,8 +26,12 @@
         ])),
         path('<int:course_id>/topic/<int:topic_id>/content/', include([
             re_path(r'add/(?P<type>' + '|'.join([key for key in CONTENT_TYPES.keys()]) + ')/$', views.content.AddContentView.as_view(), name='content-add'),
-            path('<int:content_id>/comment/<int:pk>/delete/', views.DeleteComment.as_view(), name='comment-delete'),
-            path('<int:content_id>/comment/<int:pk>/edit/', views.EditComment.as_view(), name='comment-edit'),
+            path('<int:content_id>/', include([
+                path('comment/<int:pk>/delete/', views.DeleteComment.as_view(), name='comment-delete'),
+                path('comment/<int:pk>/edit/', views.EditComment.as_view(), name='comment-edit'),
+                path('coursebook/add/', views.coursebook.add_to_coursebook, name='coursebook-add'),
+                path('coursebook/remove/', views.coursebook.remove_from_coursebook, name='coursebook-remove'),
+            ])),
             path('<pk>/', views.ContentView.as_view(), name='content'),
             path('<pk>/read/', views.content.ContentReadingModeView.as_view(), name='content-reading-mode'),
         ])),

frontend/views/content.py

@@ -192,11 +192,9 @@ def get_context_data(self, **kwargs):
 
         if self.request.user.is_authenticated:
             context['user_rate'] = content.get_user_rate(self.request.user.profile)
-            """
-            if Favourite.objects.filter(course=course, user=get_user(self.request),
-                                        content_list=content).count() > 0:
-                context['favourite'] = True
-            """
+
+        context['favorite'] = Favorite.objects.filter(course=course, user=get_user(self.request),
+                                                      content=content).count() > 0
         return context
 
 
@@ -222,7 +220,8 @@ def get_context_data(self, **kwargs):
         topic = Topic.objects.get(pk=topic_id)
         if self.request.GET.get('coursebook'):
             course = get_object_or_404(Course, {"pk": self.kwargs['course_id']})
-            contents = [f.content for f in Favorite.objects.filter(course=course, user=self.request.user.profile)] #models.get_coursebook_flat(get_user(self.request), course)
+            contents = [f.content for f in Favorite.objects.filter(course=course,
+                                                                   user=self.request.user.profile)]  # models.get_coursebook_flat(get_user(self.request), course)
         else:
             contents = topic.get_contents(self.request.GET.get('s'), self.request.GET.get('f'))
 

frontend/views/coursebook.py

@@ -0,0 +1,24 @@
+from django.http import HttpResponseRedirect
+from django.shortcuts import get_object_or_404
+from django.urls import reverse
+from base.models import Course, Favorite, Topic, Content
+
+
+def add_to_coursebook(request, *args, **kwargs):
+    user = request.user.profile
+    course = get_object_or_404(Course, pk=kwargs['course_id'])
+    topic = get_object_or_404(Topic, pk=kwargs['topic_id'])
+    content = get_object_or_404(Content, pk=kwargs['content_id'])
+
+    Favorite.objects.create(content=content, user=user, course=course)
+    return HttpResponseRedirect(reverse('frontend:content', args=(course.id, topic.id, content.id,)))
+
+
+def remove_from_coursebook(request, *args, **kwargs):
+    user = request.user.profile
+    course = get_object_or_404(Course, pk=kwargs['course_id'])
+    topic = get_object_or_404(Topic, pk=kwargs['topic_id'])
+    content = get_object_or_404(Content, pk=kwargs['content_id'])
+
+    Favorite.objects.filter(course=course, user=user, content=content).delete()
+    return HttpResponseRedirect(reverse('frontend:content', args=(course.id, topic.id, content.id,)))