Merge branch 'main' into #26_pdf

# Conflicts:
#	requirements.txt

Author: bhaettasch

base/locale/de_DE/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-05 11:48+0000\n"
+"POT-Creation-Date: 2020-06-22 14:54+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

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):
@@ -42,6 +43,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 +55,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 +78,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 +130,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 +145,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)
@@ -161,15 +169,10 @@ 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']
-        if rating is None:
-            return 0
-        return round(rating, 2)  # pylint: disable=no-member
+        rating = Rating.objects.filter(content_id=self.id).aggregate(Avg('rating'))['rating__avg']
+        if rating is not None:
+            return rating
+        return -1
 
     def get_rate_count(self):
         """
@@ -196,19 +199,23 @@ 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
         return 0
 
-    def rate_content(self, user, rate):
+    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
         """
-        self.ratings.filter(user_id=user.pk, content_id=self.id).delete()  # pylint: disable=no-member
-        self.ratings.objects.create(user=user, content_id=self.pk, rating=rate)  # pylint: disable=no-member
+        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()
 
     def get_index_in_course(self, course):
         """
@@ -227,6 +234,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

@@ -5,6 +5,7 @@
 from django.utils.translation import gettext_lazy as _
 
 
+
 class Profile(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE, primary_key=True)
     bio = models.TextField(verbose_name=_("Biography"), blank=True)
@@ -24,3 +25,4 @@ def create_user_profile(sender, instance, created, **kwargs):
 @receiver(post_save, sender=User)
 def save_user_profile(sender, instance, **kwargs):
     instance.profile.save()
+

collab_coursebook/locale/de_DE/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-05 11:48+0000\n"
+"POT-Creation-Date: 2020-06-22 14:54+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

collab_coursebook/settings.py

@@ -48,11 +48,14 @@
     'frontend',
     'content',
     'export',
+    'debug_toolbar',
 ]
 
 MIDDLEWARE = [
+    'debug_toolbar.middleware.DebugToolbarMiddleware',
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -151,6 +154,11 @@
 MEDIA_URL = '/media/'
 MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 
+# Used for Debug Toolbar
+INTERNAL_IPS = [
+    '127.0.0.1',
+]
+
 # Settings for Bootstrap
 BOOTSTRAP4 = {
     # Use custom CSS

collab_coursebook/urls.py

@@ -19,6 +19,7 @@
 from django.urls import path, include
 
 import django_cas_ng.views
+import debug_toolbar
 
 urlpatterns = [
     path('admin/', admin.site.urls),
@@ -27,4 +28,6 @@
     path('accounts/logout/', django_cas_ng.views.LogoutView.as_view(), name='cas_ng_logout'),
     path('accounts/callback/', django_cas_ng.views.CallbackView.as_view(), name='cas_ng_proxy_callback'),
     path('', include('frontend.urls', namespace='frontend')),
+    path('i18n/', include('django.conf.urls.i18n')),
+    path('__debug__/', include(debug_toolbar.urls)),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

content/locale/de_DE/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-05 11:48+0000\n"
+"POT-Creation-Date: 2020-06-22 14:54+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

content/templates/content/export/Image.tex

@@ -0,0 +1,10 @@
+{% load cc_export_tags %}
+{% autoescape off %}
+
+\textbf{Image}
+\Image{ {{content.description|tex_escape}} }{% templatetag openbrace %}{{content.imagecontent.image.path}}{% templatetag closebrace%}
+\newline
+ {{content.description|tex_escape}}
+\newline
+
+{% endautoescape %}

content/templates/content/export/YouTubeVideo.tex

@@ -0,0 +1,9 @@
+{% load cc_export_tags %}
+{% autoescape off %}
+\textbf{YouTube video}
+\newline
+\href{ {{ content.ytvideocontent.url }} }{ {{ content.ytvideocontent.url }} }
+\newline
+{{content.description|tex_escape}}
+\newline
+{% endautoescape %}

content/templates/content/export/base.tex

@@ -0,0 +1,34 @@
+{% load cc_export_tags %}
+{% autoescape off %}
+
+\documentclass[a4paper]{article}
+
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage[ngerman]{babel}
+\usepackage{graphicx}
+\usepackage{float}
+\usepackage{grffile}
+\usepackage{hyperref}
+\usepackage[left=1cm, right=1cm, top=2cm, bottom=2cm]{geometry}
+
+%% Generate a latex graphic
+% 1: caption
+% 2: image path
+\newcommand{\Image}[2]{
+    \begin{figure}[H]
+    \centering
+    \includegraphics[width=\textwidth]{#2}
+    \caption{#1}
+    \end{figure}
+}
+
+\begin{document}
+
+    \title{ {{ course.title|tex_escape }} }
+    \author{ {{user|tex_escape}} }
+    \maketitle
+
+% \end{document} gets appended in code
+
+{% endautoescape %}