add sort rating; implement get_rate method

Author: LeonardBongard

base/models/content.py

@@ -5,6 +5,7 @@
 from fontawesome_5.fields import IconField
 
 from base.models import Profile
+from .social import Rating
 
 
 class Category(models.Model):
@@ -168,17 +169,7 @@ def get_rate_num(self):
         return self.get_rate()
 
     def get_rate(self):
-        """
-        return the average rating and 0 if there are no ratings
-        :return: rating
-        :rtype: float
-        """
-
-        rating = self.ratings.aggregate(Avg('rating'))['rating__avg']  # todo something wrong here
-        print(self.ratings)
-        if rating is None:
-            return 0
-        return round(rating, 2)  # pylint: disable=no-member
+        return Rating.objects.filter(content_id=self.id).aggregate(Avg('rating'))['rating__avg']
 
     def get_rate_count(self):
         """
@@ -207,23 +198,19 @@ def get_user_rate(self, user):
         if self.user_already_rated(user):
             content_id = self.id
             return self.ratings.get(user=user).rating_set.first().rating
-                #user.get_rating_from_content(content_id).rating  # todo may change back to ratings
         return 0
 
-    def rate_content(self, user):
+    def rate_content(self, user, rating):
         """
         Rate content
+        :param rating: Rating of Content by User
         :param content: Content
         :param User user: user
-        :param int rate: rating
         :return: nothing
         """
-        # todo delete
-        #self.ratings.get(user=user).delete()
-        #self.ratings.add(user)
-        #self.ratings.filter(user_id=user.pk).delete()  # pylint: disable=no-member
-        # create function won't work
-        #self.ratings.add
+        Rating.objects.filter(user_id=user.user.id, content_id=self.id).delete()
+        rating = Rating.objects.create(user=user, content=self, rating=rating)  # user = profile
+        rating.save()
         # pylint: disable=no-member
         self.save()
 

base/models/profile.py

@@ -3,7 +3,6 @@
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.utils.translation import gettext_lazy as _
-from .social import Rating
 
 
 
@@ -16,9 +15,6 @@ class Profile(models.Model):
     def __str__(self):
         return str(self.user)
 
-    def get_rating_from_content(self, content_id):
-        return Rating.objects.get(user=self, content_id=content_id)
-
 
 @receiver(post_save, sender=User)
 def create_user_profile(sender, instance, created, **kwargs):

frontend/forms/course.py

@@ -25,8 +25,8 @@ class FilterAndSortForm(forms.Form):
     The form for entering filter and sorting Options
     """
 
-    FILTER_CHOICE = [('None', '------')] # + Content.STYLE # TODO Use
-    SORTING_CHOICE = [('None', '-----'), ('creation_date', 'Date')] # , ('rating', 'Rating')]
+    FILTER_CHOICE = [('None', '------')]  # + Content.STYLE
+    SORTING_CHOICE = [('None', '-----'), ('creation_date', 'Date'), ('rating', 'Rating')]
     filter = forms.CharField(label='Filter by',
                              widget=forms.Select(choices=FILTER_CHOICE,
                                                  attrs={'class': 'form-control',

frontend/templates/frontend/content/detail.html

@@ -19,8 +19,7 @@
             </button>
 
             <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuLink">
-                <a class="dropdown-item" href="
-                        {# url 'readingmode' course.id topic.id content.id #}{% if ending %}{{ ending }}{% endif %}">{% fa5_icon 'eye' 'far' %}
+                <a class="dropdown-item" href="{# url 'readingmode' course.id topic.id content.id #}{% if ending %}{{ ending }}{% endif %}">{% fa5_icon 'eye' 'far' %}
                     Reading Mode</a>
                 {% if user.is_authenticated %}
                     <a class="dropdown-item" href="{# url 'favourite_content' course.id topic.id content.id #}?onDetailPage=True">
@@ -95,19 +94,17 @@ <h5 class="modal-title" id="deleteContentModalLabel">{% trans "Delete" %} <i>{{
         {% include content.type|content_view %}
 
         <div class="mt-5">
-            {{ content.description|linebreaks }}
+            {{ content.description|linebreaks }} <!-- resolves to s -->
         </div>
     </div>
-    <h5><a name="rating">{% trans "Rating" %}</a></h5>
-    <div class="float-right text-right"><a>{% trans "Current" %}  {{ content.get_rate }}</a> </div>
+    <h5><a name="rating">{% trans "Rating" %}</a><span class="badge float-right text-right">{{ content.get_rate }}/5</span></h5>
         <div class="starrating risingstar d-flex justify-content-end flex-row-reverse">
             {% for i in 5|rev_range %}
                 <input type="radio" id="star{{ i }}" name="rating" value="{{ i }}"
                        {% if i <= user_rate %}class="active" {% endif %}/>
                 <label for="star{{ i }}" onclick="window.location.href='{% url 'frontend:rating' course.id topic.id content.id i %}'"></label>
             {% endfor %}
         </div>
-
     <h5 style="margin-top: 30px;"><a name="comments">{% trans "Comments" %}</a></h5>
     {% if user.is_authenticated %}
         <form action="{% url 'frontend:content' course.id topic.id content.id %}" method="post">

frontend/templates/frontend/course/topic_contents.html

@@ -19,14 +19,14 @@
                         </a>
                         <div class="card-footer">
                             <span class="badge badge-primary">{{ content.language }}</span>
+                            &nbsp;&middot;&nbsp;
                             {% if content.tags.count > 0 %}
-                                &nbsp;&middot;&nbsp;
                                 {% for tag in content.tags.all %}
-                                    <span class="badge badge-info">{{ tag }}</span>
+                                    <span class="badge badge-secondary">{{ tag }}</span>
                                 {% endfor %}
                             {% endif %}
                             &nbsp;&middot;&nbsp;
-                            {% trans "Rating" %}: {{ content.get_rate }}
+                              <span class="badge badge-info">{{ content.get_rate}}</span>
                         </div>
                     </div>
                 </div>

frontend/templates/frontend/course/view.html

@@ -73,16 +73,29 @@ <h5 style="margin-top: 20px;">
     {% for entry in structure %}
         <div style="margin-top: 30px;">
             {% with forloop.counter as outer_index %}
-                <h3 class="text-info">{{ outer_index }}. {{ entry.topic.title }}</h3>
-
-                {% with entry.topic.contents.all as topic_contents %}
+                <div class="float-right text-right">
+                        <form id="filter+sort" class="form-inline" method="post"
+                          action="{% url 'frontend:course' course.id %}">
+                            {% csrf_token %}
+                            {% bootstrap_form form %}
+                        </form>
+                </div>
+                <h3 class="text-info">{{ outer_index }}. {{ entry.topic.title }} {% if sorting != "None" %}({{ sorting }}){% endif %}</h3>
+                {% with entry.topic_contents as topic_contents %}
                     {% include "frontend/course/topic_contents.html" %}
                 {% endwith %}
                 {% if entry.subtopics %}
                         {% for subtopic in entry.subtopics %}
                             <div style="margin-top: 15px;">
-                                <h4 class="text-info">{{ outer_index }}.{{ forloop.counter }}. {{ subtopic.title }}</h4>
-                                {% with subtopic.contents.all as topic_contents %}
+                                <div class="float-right text-right">
+                                        <form id="filter+sort" class="form-inline" method="post"
+                                          action="{% url 'frontend:course' course.id %}">
+                                            {% csrf_token %}
+                                            {% bootstrap_form form %}
+                                        </form>
+                                </div>
+                                <h4 class="text-info">{{ outer_index }}.{{ forloop.counter }}. {{ subtopic.subtopic.title }} {% if sorting != "None" %}({{ sorting }}) {% endif %}</h4>
+                                {% with subtopic.topic_contents as topic_contents %}
                                     {% include "frontend/course/topic_contents.html" %}
                                 {% endwith %}
                             </div>

frontend/urls.py

@@ -12,8 +12,8 @@
     path('profile/edit/', views.ProfileEditView.as_view(), name="profile-edit"),
 
     path('courses/', include([
-        re_path(r'^(?P<sort>date-new|date-old|title-a|title-z)/$', views.CourseListView.as_view(),
-                name='courses-sort'),
+        re_path(r'^(?P<sort>date-new|date-old|title-a|title-z)/$',
+                views.CourseListView.as_view(), name='courses-sort'),
         path('', views.CourseListView.as_view(), name='courses'),
         path('<int:pk>/', include([
             path('', views.CourseView.as_view(), name='course'),

frontend/views/__init__.py

@@ -4,4 +4,4 @@
 from .course import CourseView, AddCourseView, CourseDeleteView
 from .content import ContentView
 from .comment import EditComment, DeleteComment
-from .content import RateContentView, rate_content
+from .content import rate_content

frontend/views/content.py

@@ -174,29 +174,9 @@ def get_context_data(self, **kwargs):
         return context
 
 
-class RateContentView(DetailView):
-    model = Content
-
-    #def get_context_data(self, **kwargs):
-        #None
-
-    #def dispatch(self, request, *args, **kwargs):
-        #None
-
-    def post(self, request, *args, **kwargs):  # pylint: disable=unused-argument
-        #None
-        form = RateForm(request.POST)
-        if form.is_valid():
-            post = form.save(commit=False)
-
-
-    #def get(self, request, *args, **kwargs):
-        #form = RateForm()
-
-
 def rate_content(request, course_id, topic_id, content_id, pk):
     """
-    Let's the user rate content
+    Let the user rate content
     :param int topic_id: id of the topic
     :param HttpRequest request: request
     :param int course_id: course id
@@ -205,26 +185,9 @@ def rate_content(request, course_id, topic_id, content_id, pk):
     :return: redirect to content page
     :rtype: HttpResponse
     """
-    # check if rating is valid
     content = get_object_or_404(Content, pk=content_id)
     profile = get_user(request)
-    #content.rate_content(request.user, rating)
-
-    # create or update rating
-    Rating.objects.filter(user_id=profile, content_id=content_id).delete()
-    print("pk: ", pk)
-    rating = Rating.objects.create(user=profile, content=content, rating=pk)  # user = profile
-    rating.save()
-
-    #content.rate_content(user=profile)
-
-    # update content rating
-    #content.rate_content(user=get_user(request), rate=rating)
-   # profile = get_user(request)
-    #profile
-    #content.ratings.filter(user=get_user(request)).delete()
-    print(content.get_user_rate(get_user(request)))
-   # content.save()
+    content.rate_content(user=profile, rating=pk)
 
     return HttpResponseRedirect(
         reverse_lazy('frontend:content', args=(course_id, topic_id, content_id,))

frontend/views/course.py

@@ -92,15 +92,22 @@ def get_context_data(self, **kwargs):
             index_split = entry.index.split('/')
             # Topic
             if len(index_split) == 1:
-                current_topic = {'topic': entry.topic, 'subtopics': []}
+                current_topic = {'topic': entry.topic, 'subtopics': [],
+                                 'topic_contents': entry.topic.get_contents(self.sorted_by, self.filtered_by)}
                 topics_recursive.append(current_topic)
             # Subtopic
             # Only handle up to one subtopic level
             else:
-                current_topic["subtopics"].append(entry.topic)
+                current_topic["subtopics"].append({'subtopic': entry.topic,  'topic_contents': entry.topic
+                                                  .get_contents(self.sorted_by, self.filtered_by)})
 
         context["structure"] = topics_recursive
 
+        if self.sorted_by is not None:
+            context['sorting'] = self.sorted_by
+        if self.filtered_by is not None:
+            context['filtering'] = self.filtered_by
+
 
         """# create a list of topics ordered by (sub-)topic and index
         flat_topic_list = create_topic_and_subtopic_list(topics, super().get_object())