klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2026-08-26 07:09:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

StarList uses proper inheritance and properly passes initial values and attributes + add empty comment clause

Browse Source
This commit is contained in:
klmp200
2026-08-21 14:22:46 +02:00
parent 12135b5c22
commit 82e71263dd
7 changed files with 142 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
locale/fr/LC_MESSAGES/django.po
+5 -1
View File
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-06-10 20:18+0200\n"
"POT-Creation-Date: 2026-08-21 14:10+0200\n"
"PO-Revision-Date: 2016-07-18\n"
"Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
"Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -4969,6 +4969,10 @@ msgstr "Ne pas voter"
msgid "This user has already commented on this UE"
msgstr "Cet utilisateur a déjà commenté cette UE"
#: pedagogy/forms.py
msgid "UE comment can't be empty."
msgstr "Un commentaire d'UE ne peut pas être vide."
#: pedagogy/forms.py
msgid "Accepted reports"
msgstr "Signalements acceptés"
pedagogy/forms.py
+32 -10
View File
@@ -22,6 +22,8 @@
#
from django import forms
from django.contrib.staticfiles.storage import staticfiles_storage
from django.forms.fields import ValidationError
from django.utils.translation import gettext_lazy as _
from core.models import User
@@ -30,7 +32,7 @@ from pedagogy.models import UE, UEComment, UECommentReport
class UEForm(forms.ModelForm):
"""Form handeling creation and edit of an UE."""
"""Form handling creation and edit of an UE."""
class Meta:
model = UE
@@ -68,22 +70,28 @@ class UEForm(forms.ModelForm):
self.fields["author"].initial = author_id
class StarList(forms.NumberInput):
class StarList(forms.RadioSelect):
template_name = "pedagogy/starlist.jinja"
def __init__(self, nubmer_of_stars=0):
super().__init__(None)
self.number_of_stars = nubmer_of_stars
def __init__(self, number_of_stars=0, attrs=None):
super().__init__(
attrs=attrs,
choices=(
(choice, _("Do not vote") if choice == -1 else choice)
for choice in range(-1, number_of_stars)
),
)
def get_context(self, name, value, attrs):
context = super().get_context(name, value, attrs)
context["number_of_stars"] = range(0, self.number_of_stars)
context["translations"] = {"do_not_vote": _("Do not vote")}
context["statics"] = {
"css": staticfiles_storage.url("pedagogy/css/starlist.scss"),
}
return context
class UECommentForm(forms.ModelForm):
"""Form handeling creation and edit of an UEComment."""
"""Form handling creation and edit of an UEComment."""
class Meta:
model = UEComment
@@ -129,11 +137,25 @@ class UECommentForm(forms.ModelForm):
),
)
# Ensure that at least one value is exists
if (
all(
grade == -1
for grade in [
self.cleaned_data[key]
for key in self.cleaned_data
if key.startswith("grade_")
]
)
and not self.cleaned_data["comment"]
):
raise ValidationError(message=_("UE comment can't be empty."))
return self.cleaned_data
class UECommentReportForm(forms.ModelForm):
"""Form handeling creation and edit of an UEReport."""
"""Form handling creation and edit of an UEReport."""
class Meta:
model = UECommentReport
@@ -153,7 +175,7 @@ class UECommentReportForm(forms.ModelForm):
class UECommentModerationForm(forms.Form):
"""Form handeling bulk comment deletion."""
"""Form handling bulk comment deletion."""
accepted_reports = forms.ModelMultipleChoiceField(
UECommentReport.objects.all(),
pedagogy/static/pedagogy/css/pedagogy.scss
-36
View File
@@ -521,39 +521,3 @@ details.accordion>.accordion-content {
border-color: $pedagogy-orange;
border-right: none;
}
fieldset.star {
label {
display: inline;
cursor: pointer;
}
.checked {
color: orange;
}
.unchecked {
color: gray;
}
.hovered {
color: #FFD700;
}
.checked.hovered {
color: orange;
}
.removed {
color: red;
}
input[type="radio"] {
display: none;
}
label:first-child {
margin-right: 10px;
}
}
pedagogy/static/pedagogy/css/starlist.scss
+42
View File
@@ -0,0 +1,42 @@
fieldset.star {
border: none;
label {
display: inline;
cursor: pointer;
}
.checked {
color: orange;
}
.unchecked {
color: gray;
}
.hovered {
color: #FFD700;
}
.checked.hovered {
color: orange;
}
.removed {
color: red;
}
input[type="radio"] {
display: none;
}
label:first-child {
margin-right: 10px;
}
&:has(input:required:invalid) {
border: 1px solid;
border-color: #c00000;
}
}
pedagogy/templates/pedagogy/starlist.jinja
+21 -13
View File
@@ -1,42 +1,50 @@
<link-once rel="stylesheet" type="text/css" href="{{ statics.css }}" defer></link-once>
<fieldset
class="star"
x-data="{ 'value': -1, 'hover': -1 }"
x-data="{ 'value': {% if widget.value.0 %}{{ widget.value.0 }}{% else %}-1{% endif %}, 'hover': -1 }"
@mouseover.outside="hover = -1"
{% include "django/forms/widgets/attrs.html" %}
>
{# Do not vote button #}
<label
class="star"
@mouseover="hover = -1"
for="{{ widget.optgroups.0.1.0.attrs.id }}"
>
<input
type="radio"
name="{{ widget.name }}"
value="-1"
value="{{ widget.optgroups.0.1.0.value }}"
@click="value = -1"
{% with widget=widget.optgroups.0.1.0 %}
{% include "django/forms/widgets/attrs.html" %}
{% endwith %}
>
<i class="fa fa-times-circle"></i>
{{ translations.do_not_vote }}
{{ widget.optgroups.0.1.0.label }}
</label>
{# Star widget #}
{% for i in number_of_stars %}
{% for opt in widget.optgroups|slice:"1:" %}
<label
class="star"
@mouseover="hover = {{ forloop.counter0 }}"
@mouseover="hover = {{ opt.1.0.value }}"
for="{{ opt.1.0.attrs.id }}"
>
<input
type="radio"
name="{{ widget.name }}"
value="{{ forloop.counter0 }}"
@click="value = {{ forloop.counter0 }}"
value="{{ opt.1.0.value }}"
@click="value = {{ opt.1.0.value }}"
{% with widget=opt.1.0 %}
{% include "django/forms/widgets/attrs.html" %}
{% endwith %}
>
<i
class="{{ widget.name }} fa fa-star"
:class="{
'checked': value >= {{ forloop.counter0 }},
'unchecked': value < {{ forloop.counter0 }},
'hovered': hover >= {{ forloop.counter0 }},
'removed': hover >= 0 && value >= {{ forloop.counter0 }} && hover < {{ forloop.counter0 }},
'checked': value >= {{ opt.1.0.value }},
'unchecked': value < {{ opt.1.0.value }},
'hovered': hover >= {{ opt.1.0.value }},
'removed': hover >= 0 && value >= {{ opt.1.0.value }} && hover < {{ opt.1.0.value }},
}"
></i>
</label>
pedagogy/templates/pedagogy/ue_detail.jinja
+2 -1
View File
@@ -89,13 +89,14 @@
<p>{% trans %}You already posted a comment on this UE. If you want to comment again, please modify or delete your previous comment.{% endtrans %}</p>
</div>
{% elif user.has_perm("pedagogy.add_uecomment") %}
<details class="accordion" id="leave_comment">
<details class="accordion" id="leave_comment" {% if form.errors %}open{%endif%}>
<summary>{% trans %}Leave comment{% endtrans %}</summary>
<div class="accordion-content">
<form action="{{ url('pedagogy:ue_detail', ue_id=object.id) }}" method="post" enctype="multipart/form-data">
{% csrf_token %}
<div class="leave-comment-grid-container">
<div class="form-stars">
{{ form.non_field_errors() }}
{{ form.author.errors }}
{{ form.ue.errors }}
pedagogy/tests/tests.py
+18
View File
@@ -339,6 +339,24 @@ class TestUVCommentCreationAndDisplay(TestCase):
response = self.client.get(self.ue_url)
self.assertContains(response, text="Superbe UE")
def test_create_ue_empty_comment_fail(self):
self.client.force_login(self.tutu)
response = self.client.post(
self.ue_url,
{
"author": self.tutu.id,
"ue": UE.objects.get(code="PA00").id,
"grade_global": -1,
"grade_utility": -1,
"grade_interest": -1,
"grade_teaching": -1,
"grade_work_load": -1,
"comment": "",
},
)
assert response.status_code == 200
self.assertInHTML("Un commentaire d'UE ne peut pas être vide.", response.text)
def test_create_ue_comment_unauthorized_fail(self):
nb_comments = self.ue.comments.count()
# Test with anonymous user