-
{% trans %}Back{% endtrans %}
+ {% block title %}
+ {% trans %}UE Details{% endtrans %}
+ {% endblock %}
-
{{ object.code }} - {{ object.title }}
-
-
-
- {% trans %}CM: {% endtrans %} {{ object.hours_CM }}
-
-
- {% trans %}TD: {% endtrans %} {{ object.hours_TD }}
-
-
- {% trans %}TP: {% endtrans %} {{ object.hours_TP }}
-
-
- {% trans %}TE: {% endtrans %} {{ object.hours_TE }}
-
-
- {% trans %}THE: {% endtrans %} {{ object.hours_THE }}
-
+ {% block content %}
-
- {{ object.department }}
-
-
- {{ object.credit_type }}
-
-
- {{ object.get_semester_display() }}
-
-
+
+
+
{% trans %}Back{% endtrans %}
-
-
-
-
-
{% trans %}Global grade{% endtrans %}
-
{% trans %}Utility{% endtrans %}
-
{% trans %}Interest{% endtrans %}
-
{% trans %}Teaching{% endtrans %}
-
{% trans %}Work load{% endtrans %}
-
-
-
{{ display_star(object.grade_global_average) }}
-
{{ display_star(object.grade_utility_average) }}
-
{{ display_star(object.grade_interest_average) }}
-
{{ display_star(object.grade_teaching_average) }}
-
{{ display_star(object.grade_work_load_average) }}
-
-
-
{% trans %}Objectives{% endtrans %}
-
{{ object.objectives|markdown }}
-
{% trans %}Program{% endtrans %}
-
{{ object.program|markdown }}
-
{% trans %}Earned skills{% endtrans %}
-
{{ object.skills|markdown }}
-
{% trans %}Key concepts{% endtrans %}
-
{{ object.key_concepts|markdown }}
-
{% trans %}UE manager: {% endtrans %} {{ object.manager }}
-
-
-
-
- {% if object.has_user_already_commented(user) %}
-
- {% elif user.has_perm("pedagogy.add_uecomment") %}
-
-
-{% endblock %}
+
+ {% endblock %}
+{% endif %}
diff --git a/pedagogy/urls.py b/pedagogy/urls.py
index 9edcf861..cc296f73 100644
--- a/pedagogy/urls.py
+++ b/pedagogy/urls.py
@@ -24,12 +24,14 @@
from django.urls import path
from pedagogy.views import (
+ UECommentCreateView,
UECommentDeleteView,
+ UECommentDetailView,
UECommentReportCreateView,
UECommentUpdateView,
UECreateView,
UEDeleteView,
- UEDetailFormView,
+ UEDetailView,
UEGuideView,
UEModerationFormView,
UEUpdateView,
@@ -38,7 +40,17 @@ from pedagogy.views import (
urlpatterns = [
# Urls displaying the actual application for visitors
path("", UEGuideView.as_view(), name="guide"),
- path("ue/
/", UEDetailFormView.as_view(), name="ue_detail"),
+ path("ue//", UEDetailView.as_view(), name="ue_detail"),
+ path(
+ "ue//comment",
+ UECommentCreateView.as_view(),
+ name="comment_create",
+ ),
+ path(
+ "comment//",
+ UECommentDetailView.as_view(),
+ name="comment_detail",
+ ),
path(
"comment//edit/",
UECommentUpdateView.as_view(),
diff --git a/pedagogy/views.py b/pedagogy/views.py
index 4f21248e..4614e40e 100644
--- a/pedagogy/views.py
+++ b/pedagogy/views.py
@@ -24,11 +24,13 @@
from django.conf import settings
from django.contrib.auth.mixins import PermissionRequiredMixin
from django.db.models import Exists, OuterRef
+from django.http import HttpResponse
from django.shortcuts import get_object_or_404
from django.urls import reverse, reverse_lazy
from django.views.generic import (
CreateView,
DeleteView,
+ DetailView,
FormView,
TemplateView,
UpdateView,
@@ -36,7 +38,7 @@ from django.views.generic import (
from core.auth.mixins import PermissionOrAuthorRequiredMixin
from core.models import Notification, User
-from core.views import DetailFormView
+from core.views.mixins import AllowFragment, FragmentMixin, UseFragmentsMixin
from pedagogy.forms import (
UECommentForm,
UECommentModerationForm,
@@ -46,37 +48,56 @@ from pedagogy.forms import (
from pedagogy.models import UE, UEComment, UECommentReport
-class UEDetailFormView(PermissionRequiredMixin, DetailFormView):
- """Display every comment of an UE and detailed infos about it.
-
- Allow to comment the UE.
- """
-
- model = UE
- pk_url_kwarg = "ue_id"
- template_name = "pedagogy/ue_detail.jinja"
+class UECommentCreateView(PermissionRequiredMixin, FragmentMixin, CreateView):
+ model = UEComment
+ template_name = "pedagogy/fragments/ue_comment_form.jinja"
form_class = UECommentForm
- permission_required = "pedagogy.view_ue"
+ permission_required = "pedagogy.add_uecomment"
+ object = None # Avoid initialisation bug with FragmentMixin
+
+ @property
+ def ue(self):
+ if hasattr(self, "_ue"):
+ return self._ue
+ self._ue = get_object_or_404(UE, id=self.kwargs.get("ue_id"))
+ return self._ue
def has_permission(self):
- if self.request.method == "POST" and not self.request.user.has_perm(
- "pedagogy.add_uecomment"
- ):
- # if it's a POST request, the user is trying to add a new UEComment
- # thus he also needs the "add_uecomment" permission
+ if self.ue.has_user_already_commented(self.request.user):
return False
return super().has_permission()
def get_form_kwargs(self):
kwargs = super().get_form_kwargs()
kwargs["author_id"] = self.request.user.id
- kwargs["ue_id"] = self.object.id
+ kwargs["ue_id"] = self.ue.id
kwargs["is_creation"] = True
return kwargs
- def form_valid(self, form):
- form.save()
- return super().form_valid(form)
+ def get_context_data(self, **kwargs):
+ return super().get_context_data(**kwargs) | {
+ "action": reverse("pedagogy:comment_create", kwargs={"ue_id": self.ue.id})
+ }
+
+ def get_success_url(self):
+ return reverse("pedagogy:comment_detail", kwargs={"comment_id": self.object.id})
+
+
+class UEDetailView(
+ PermissionRequiredMixin, UseFragmentsMixin, AllowFragment, DetailView
+):
+ """Display every comment of an UE and detailed infos about it."""
+
+ model = UE
+ pk_url_kwarg = "ue_id"
+ template_name = "pedagogy/ue_detail.jinja"
+ permission_required = "pedagogy.view_ue"
+ fragments = {
+ "add_comment_form": UECommentCreateView,
+ }
+
+ def get_fragment_data(self):
+ return {"add_comment_form": {"ue_id": self.object.id}}
def get_context_data(self, **kwargs):
return super().get_context_data(**kwargs) | {
@@ -85,22 +106,33 @@ class UEDetailFormView(PermissionRequiredMixin, DetailFormView):
.annotate_is_reported()
.select_related("author")
.order_by("-publish_date")
- )
+ ),
}
- def get_success_url(self):
- # once the new ue comment has been saved
- # redirect to the same page we are currently
- return self.request.path
+
+class UECommentDetailView(PermissionRequiredMixin, DetailView):
+ model = UEComment
+ pk_url_kwarg = "comment_id"
+ template_name = "pedagogy/fragments/ue_comment.jinja"
+ permission_required = "pedagogy.view_ue"
+ context_object_name = "comment"
+
+ def dispatch(self, *args, **kwargs):
+ res: HttpResponse = super().dispatch(*args, **kwargs)
+ res.headers["HX-Trigger"] = "CommentUpdate"
+ return res
+
+ def get_context_data(self, **kwargs):
+ return super().get_context_data(**kwargs) | {"ue": self.object.ue}
-class UECommentUpdateView(PermissionOrAuthorRequiredMixin, UpdateView):
+class UECommentUpdateView(PermissionOrAuthorRequiredMixin, AllowFragment, UpdateView):
"""Allow edit of a given comment."""
model = UEComment
form_class = UECommentForm
pk_url_kwarg = "comment_id"
- template_name = "core/edit.jinja"
+ template_name = "pedagogy/fragments/ue_comment_form.jinja"
permission_required = "pedagogy.change_uecomment"
author_field = "author"
@@ -111,11 +143,18 @@ class UECommentUpdateView(PermissionOrAuthorRequiredMixin, UpdateView):
kwargs["is_creation"] = False
return kwargs
+ def get_context_data(self, **kwargs):
+ return super().get_context_data(**kwargs) | {
+ "action": reverse(
+ "pedagogy:comment_update", kwargs={"comment_id": self.object.id}
+ )
+ }
+
def get_success_url(self):
- return reverse("pedagogy:ue_detail", kwargs={"ue_id": self.object.ue_id})
+ return reverse("pedagogy:comment_detail", kwargs={"comment_id": self.object.id})
-class UECommentDeleteView(PermissionOrAuthorRequiredMixin, DeleteView):
+class UECommentDeleteView(PermissionOrAuthorRequiredMixin, AllowFragment, DeleteView):
"""Allow to delete a given comment."""
model = UEComment
@@ -124,8 +163,11 @@ class UECommentDeleteView(PermissionOrAuthorRequiredMixin, DeleteView):
permission_required = "pedagogy.delete_uecomment"
author_field = "author"
- def get_success_url(self):
- return reverse("pedagogy:ue_detail", kwargs={"ue_id": self.object.ue_id})
+ def form_valid(self, form):
+ self.object.delete()
+ response = HttpResponse(status=200)
+ response.headers["HX-Trigger"] = "CommentUpdate"
+ return response
class UEGuideView(PermissionRequiredMixin, TemplateView):
{% trans %}Global grade{% endtrans %}
+{% trans %}Utility{% endtrans %}
+{% trans %}Interest{% endtrans %}
+{% trans %}Teaching{% endtrans %}
+{% trans %}Work load{% endtrans %}
+{{ display_star(comment.grade_global) }}
+{{ display_star(comment.grade_utility) }}
+{{ display_star(comment.grade_interest) }}
+{{ display_star(comment.grade_teaching) }}
+{{ display_star(comment.grade_work_load) }}
++ {% trans %}This comment has been reported{% endtrans %} +
+ {% endif %} + + {% if comment.author_id == user.id or user.has_perm("pedagogy.change_comment") %} + + {% endif %} + {% if comment.author_id == user.id or user.has_perm("pedagogy.delete_comment") %} + + {% endif %} ++ + {% trans %}Report this comment{% endtrans %} + +
+{{ comment.publish_date.strftime('%d/%m/%Y') }}
{{ user_profile_link(comment.author) }}