update

Author: LeonardBongard

base/models/content.py

@@ -42,6 +42,7 @@ class Course(models.Model):
     description: short description of the course
     owner: people that may change the structure of the course
     """
+
     class Meta:
         verbose_name = _("Course")
         verbose_name_plural = _("Courses")
@@ -53,15 +54,17 @@ class Meta:
     creation_date = models.DateTimeField(verbose_name=_('Creation Date'), auto_now_add=True, blank=True)
 
     image = models.ImageField(verbose_name=_("Title Image"), blank=True, upload_to='uploads/courses/%Y/%m/%d/')
-    topics = models.ManyToManyField("Topic", verbose_name=_("Topics"), through='CourseStructureEntry', related_name="courses", blank=True)
+    topics = models.ManyToManyField("Topic", verbose_name=_("Topics"), through='CourseStructureEntry',
+                                    related_name="courses", blank=True)
 
     owners = models.ManyToManyField(Profile, related_name='owned_courses', verbose_name=_("Owners"))
     restrict_changes = models.BooleanField(verbose_name=_("Edit Restriction"),
-        help_text=_("Is the course protected and can only be edited by the owners?"), blank=True, default=False)
+                                           help_text=_("Is the course protected and can only be edited by the owners?"),
+                                           blank=True, default=False)
 
     category = models.ForeignKey(Category, verbose_name=_("Category"), related_name="courses", on_delete=models.CASCADE)
     period = models.ForeignKey(Period, verbose_name=_("Period"), related_name="courses",
-        blank=True, null=True, on_delete=models.SET_NULL)
+                               blank=True, null=True, on_delete=models.SET_NULL)
 
     def __str__(self):
         return self.title
@@ -74,6 +77,7 @@ class Topic(models.Model):
     title: Name of the topic
     category: category this topic belongs to
     """
+
     class Meta:
         verbose_name = _("Topic")
         verbose_name_plural = _("Topics")
@@ -125,6 +129,7 @@ class Content(models.Model):
     author: user that created the content
     parent_topic: the topic the content belongs to/describes
     """
+
     class Meta:
         verbose_name = _("Content")
         verbose_name_plural = _("Contents")
@@ -139,8 +144,10 @@ class Meta:
     language = models.CharField(verbose_name=_("Language"), max_length=30, choices=settings.LANGUAGES)
     tags = models.ManyToManyField(Tag, verbose_name=_("Tags"), related_name='contents', blank=True)
 
-    readonly = models.BooleanField(verbose_name=_("Readonly"), help_text=_("Can this content be updated?"), default=False)
-    public = models.BooleanField(verbose_name=_("Show in public courses?"), help_text=_("May this content be displayed in courses that don't require registration?"), default=False)
+    readonly = models.BooleanField(verbose_name=_("Readonly"), help_text=_("Can this content be updated?"),
+                                   default=False)
+    public = models.BooleanField(verbose_name=_("Show in public courses?"), help_text=_(
+        "May this content be displayed in courses that don't require registration?"), default=False)
 
     creation_date = models.DateTimeField(verbose_name=_('Creation Date'), auto_now_add=True, blank=True)
     preview = models.ImageField(verbose_name=_("Rendered preview"), blank=True, null=True)
@@ -166,7 +173,9 @@ def get_rate(self):
         :return: rating
         :rtype: float
         """
-        rating = self.ratings.aggregate(Avg('rating'))['rating__avg']
+
+        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
@@ -196,25 +205,27 @@ def get_user_rate(self, user):
         :rtype: int
         """
         if self.user_already_rated(user):
-            # TODO FIX
-            return 0 #self.ratings.get(user_id=user.pk).rating  # pylint: disable=no-member
+            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, rate):
+    def rate_content(self, user):
         """
         Rate content
         :param content: Content
         :param User user: user
         :param int rate: rating
         :return: nothing
         """
-        #print(self.ratings.)
-        # self.ratings (Content) != Rating
-
-        #self.ratings.objects.create(user=user, content_id=self.pk, rating=rate)  # pylint: disable=no-member
-
-        self.ratings.filter(user_id=user.user.pk, content=self).delete()  # pylint: disable=no-member
-        self.ratings.objects.create(user=user, content=self, rating=rate)  # pylint: disable=no-member
+        # 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
+        # pylint: disable=no-member
+        self.save()
 
     def get_index_in_course(self, course):
         """
@@ -233,6 +244,7 @@ class CourseStructureEntry(models.Model):
     index: position that is meant (e.g. "1#2" -> second undertopic of the first topic)
     topic: topic at specified position/index
     """
+
     class Meta:
         verbose_name = _("Course Structure Entry")
         verbose_name_plural = _("Course Structure Entries")

base/models/profile.py

@@ -3,6 +3,8 @@
 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
+
 
 
 class Profile(models.Model):
@@ -14,6 +16,9 @@ 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):
@@ -24,3 +29,4 @@ def create_user_profile(sender, instance, created, **kwargs):
 @receiver(post_save, sender=User)
 def save_user_profile(sender, instance, **kwargs):
     instance.profile.save()
+

frontend/templates/frontend/content/detail.html

@@ -98,9 +98,8 @@ <h5 class="modal-title" id="deleteContentModalLabel">{% trans "Delete" %} <i>{{
             {{ content.description|linebreaks }}
         </div>
     </div>
-ratings
     <h5><a name="rating">{% trans "Rating" %}</a></h5>
-    <div class="float-right text-right"><a>{% trans "Current" %}  {{ content.get_rate_num }}</a> </div>
+    <div class="float-right text-right"><a>{% trans "Current" %}  {{ content.get_rate }}</a> </div>
         <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 }}"
@@ -109,7 +108,6 @@ <h5><a name="rating">{% trans "Rating" %}</a></h5>
             {% 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/views/content.py

@@ -206,19 +206,25 @@ def rate_content(request, course_id, topic_id, content_id, pk):
     :rtype: HttpResponse
     """
     # check if rating is valid
-    rating = pk
-    print(course_id,topic_id,content_id,rating)
-    print(type(get_user(request)))
     content = get_object_or_404(Content, pk=content_id)
     profile = get_user(request)
-    content.rate_content(profile, rating)
-
-    # check if content already has rating
-    #Rating.objects.filter(user_id=profile, content_id=content_id).delete()
-    #Rating.objects.create(user=profile, content=content, rating=rating)  # user = profile; rating_obj =
-
-    content.ratings.add(profile)
-    content.save()
+    #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()
 
     return HttpResponseRedirect(
         reverse_lazy('frontend:content', args=(course_id, topic_id, content_id,))