Dropped Courses #2262

fekoch · 2024-08-05T18:53:20Z

fixes #991

(@janno42) As discussed, we want:

A check-box "Allow drop-out?" when creating new evaluations
~~A setting "DROPOUT_QUESTIONNAIRE_ID" to set which questionnaire should be shown when using the drop-out function.~~
The "I dropped this course" button should be shown only on the student index and only for evaluations that "allow drop-out"
Show Dropout Questionnaire answers in Result UI
- (only shown to people who can see general text answers)
~~Dropout questionnaire Textanswers should not be shown in the textanswer review~~

evap/evaluation/models.py

evap/static/font-awesome/scss/_mixins.scss

evap/static/font-awesome/scss/fontawesome.scss

evap/student/templates/student_index_evaluate_or_drop.html

evap/evaluation/models.py

evap/staff/templates/staff_questionnaire_index_list.html

evap/student/templates/student_vote_questionnaire_group.html

evap/student/templates/student_index_evaluate_or_drop.html

fekoch · 2025-01-20T20:31:25Z

@janno42 New proposal: You can add drop-out-questionnaires for each evaluation, just like adding general questionnaires.

Simply by having at least one drop-out-questionnaire, the is_dropout_allowed-property is set on an evaluation and students can use the drop-out button in the UI.

A) Does this seem like a good idea?

and

B) Do we still need to have the whole "active-drop-out-questionnaire" logic if we implement it like that?

janno42

If the "Dropout Questionnaires" list in the contributor evaluation form is empty, the label should not be shown

Co-authored-by: Johannes Wolf <[email protected]>

niklasmohrin

I haven't looked at results and staff yet, but here is what I have so far :)

niklasmohrin · 2025-02-24T20:24:18Z

evap/evaluation/models.py

+    @property
+    def is_dropout_questionnaire(self):
+        return self.type == self.Type.DROPOUT
+
+    @property
+    def is_general_questionnaire(self):
+        return self.type in (self.Type.TOP, self.Type.BOTTOM)
+


Since these are defined on Questionnaire, I suppose they could just be called is_dropout and is_general?

niklasmohrin · 2025-02-24T20:27:59Z

evap/development/fixtures/test_data.json

+    "password": "pbkdf2_sha256$870000$FI1vp6JGLvZULamq2a9pIL$TLLlUbFnxARDpJFRmuL+gVR9QtFc9fxww/K7pM1PixM=",
+    "last_login": "2025-02-17T18:41:52.756",


Can you revert these, or does the CI fail then?

niklasmohrin · 2025-02-24T20:36:15Z

evap/student/views.py

+def get_vote_page_form_groups(
+    request, evaluation: Evaluation, preview: bool, dropout=False
+) -> OrderedDict[Contribution, list[QuestionnaireVotingForm]]:


I think that all methods with a dropout argument except vote itself should not have a default value. In fact, vote calls this function without passing its dropout value along, and I don't know if it's correct

niklasmohrin · 2025-02-24T20:37:58Z

evap/student/views.py

@@ -255,31 +296,38 @@ def render_vote_page(request, evaluation, preview, for_rendering_in_modal=False)


 @participant_required
-def vote(request, evaluation_id):  # noqa: PLR0912
+def vote(request: HttpRequest, evaluation_id: int, dropout=False):  # noqa: PLR0912


Suggested change

def vote(request: HttpRequest, evaluation_id: int, dropout=False): # noqa: PLR0912

def vote(request: HttpRequest, evaluation_id: int, dropout=False) -> HttpResponse: # noqa: PLR0912

niklasmohrin · 2025-02-24T20:46:56Z

evap/student/templates/student_vote_questionnaire_group.html

+                                    <input id="{{ choice.id_for_label }}" class="tab-selectable num-selectable btn-check" name="{{ choice.data.name }}" type="radio" value="{{ choice.data.value }}" autocomplete="off"{% if field.initial == choice.data.value %} checked="checked"{% endif %}{% if preview %} disabled{% endif %}/>
+                                    <label for="{{ choice.id_for_label }}" class="btn btn-sm btn-light vote-btn vote-btn-{{ color }} d-flex{% if field.errors %} choice-error{% endif %}">


I get the removal of active, but for the other changes I am puzzled - can you explain why you changed these?

field.value was wrong, the value is stored in initial

niklasmohrin · 2025-02-24T20:48:16Z

evap/student/templates/student_index_evaluate_or_drop.html

+    <form method="get" action="{% url 'student:drop' evaluation.id %}">
+    <confirmation-modal type="submit" confirm-button-class="btn-danger">


Please indent :)

Suggested change

<form method="get" action="{% url 'student:drop' evaluation.id %}">

<confirmation-modal type="submit" confirm-button-class="btn-danger">

<form method="get" action="{% url 'student:drop' evaluation.id %}">

<confirmation-modal type="submit" confirm-button-class="btn-danger">

niklasmohrin · 2025-02-24T20:50:46Z

evap/contributor/tests/test_views.py

+        for q in Questionnaire.objects.all():
+            q.visibility = Questionnaire.Visibility.MANAGERS
+            q.save()


Suggested change

for q in Questionnaire.objects.all():

q.visibility = Questionnaire.Visibility.MANAGERS

q.save()

Questionnaire.objects.update(visibility=Questionnaire.Visibility.MANAGERS)

niklasmohrin · 2025-02-24T20:51:52Z

evap/contributor/tests/test_views.py

+        self.assertContains(page, "General questionnaires")
+        self.assertContains(page, "Dropout Questionnaires")


It's a bit odd that "questionnaires" is capitalized for one option, but not for the other 🤔

niklasmohrin · 2025-02-24T21:20:32Z

evap/contributor/forms.py

+        selected_questionnaires |= self.cleaned_data.get("general_questionnaires").filter(is_locked=False)
+        selected_questionnaires |= self.cleaned_data.get("dropout_questionnaires").filter(is_locked=False)
+
+        self.cleaned_data.update(


I find it a bit odd that we update the form values instead of throwing a ValidationError when things don't add up. In person, we discussed that we can leave it as is for this PR because it is the same behavior as before, but I think we should revisit this afterwards. What do you think @richardebeling @Kakadus ?

hm. In that case the UI should probably prevent users from deselecting the button directly

niklasmohrin · 2025-02-24T21:28:55Z

evap/evaluation/tests/test_views.py

+    def test_choosing_dropout_sets_to_no_answer(self):
+        response = self.app.get(url=reverse("student:drop", args=[self.evaluation.id]), user=self.user, status=200)


I suppose this test class would be better placed in the student app

janno42

The dropout button on the student index page should be placed inline before the "Evaluate" button.
For the questions in the dropout questionnaire(s), no answers should be preselected.

Kakadus · 2025-02-24T21:43:23Z

evap/contributor/forms.py

+        selected_questionnaires |= self.cleaned_data.get("general_questionnaires").filter(is_locked=False)
+        selected_questionnaires |= self.cleaned_data.get("dropout_questionnaires").filter(is_locked=False)
+
+        self.cleaned_data.update(


hm. In that case the UI should probably prevent users from deselecting the button directly

Kakadus · 2025-02-24T21:47:03Z

evap/evaluation/models.py

+class QuestionnaireManager(Manager["Questionnaire"]):
+    def general_questionnaires(self) -> QuerySet["Questionnaire"]:
+        return (
+            super().get_queryset().exclude(type=Questionnaire.Type.CONTRIBUTOR).exclude(type=Questionnaire.Type.DROPOUT)


Suggested change

super().get_queryset().exclude(type=Questionnaire.Type.CONTRIBUTOR).exclude(type=Questionnaire.Type.DROPOUT)

super().get_queryset().exclude(type__in=(Questionnaire.Type.CONTRIBUTOR, Questionnaire.Type.DROPOUT))

Kakadus · 2025-03-03T16:45:56Z

evap/evaluation/models.py

@@ -620,6 +639,10 @@ def runtime(self):
    def is_in_evaluation_period(self):
        return self.vote_start_datetime <= datetime.now() <= self.vote_end_datetime

+    @property
+    def is_dropout_allowed(self):


Suggested change

def is_dropout_allowed(self):

def is_dropout_allowed(self) -> bool:

fekoch force-pushed the 991/dropped-courses branch from 6545c8d to 9ea80f3 Compare August 5, 2024 18:55

fekoch mentioned this pull request Aug 5, 2024

update fontawsome to 6.6.0 #2263

Merged

richardebeling reviewed Sep 2, 2024

View reviewed changes

fekoch force-pushed the 991/dropped-courses branch 3 times, most recently from d91a83b to 2f42c54 Compare October 14, 2024 17:02

fekoch force-pushed the 991/dropped-courses branch from 2f42c54 to e2e836e Compare October 14, 2024 19:07

richardebeling reviewed Oct 20, 2024

View reviewed changes

fekoch force-pushed the 991/dropped-courses branch from c24d5dd to 178fc31 Compare October 21, 2024 16:50

fekoch force-pushed the 991/dropped-courses branch from 0c1711f to 2f3043b Compare October 28, 2024 17:07

fekoch commented Oct 28, 2024

View reviewed changes

evap/student/templates/student_vote_questionnaire_group.html Outdated Show resolved Hide resolved

fekoch force-pushed the 991/dropped-courses branch 2 times, most recently from dc783bf to 96e9dc7 Compare November 11, 2024 17:09

fekoch force-pushed the 991/dropped-courses branch 2 times, most recently from 1fa6eb3 to 5a312ec Compare November 25, 2024 18:31

fekoch force-pushed the 991/dropped-courses branch 5 times, most recently from 2cb0daf to cfcf4fd Compare December 2, 2024 21:38

fekoch commented Dec 2, 2024

View reviewed changes

evap/student/templates/student_index_evaluate_or_drop.html Outdated Show resolved Hide resolved

janno42 reviewed Dec 16, 2024

View reviewed changes

evap/student/templates/student_index_evaluate_or_drop.html Outdated Show resolved Hide resolved

fekoch force-pushed the 991/dropped-courses branch from cfcf4fd to 0f5c592 Compare December 16, 2024 18:19

fekoch force-pushed the 991/dropped-courses branch 2 times, most recently from 9b73be5 to a88760b Compare January 13, 2025 17:47

fekoch force-pushed the 991/dropped-courses branch from 9993ca6 to c89627a Compare January 20, 2025 17:40

fekoch force-pushed the 991/dropped-courses branch 2 times, most recently from 4933bf8 to b722b2d Compare January 27, 2025 17:11

fekoch force-pushed the 991/dropped-courses branch from b722b2d to 9b1ca48 Compare January 27, 2025 21:20

fekoch requested a review from janno42 February 17, 2025 18:34

janno42 requested changes Feb 17, 2025

View reviewed changes

fekoch and others added 17 commits February 24, 2025 17:19

fix too many local variables

604408d

add drop button

14d4d3d

add DROPOUT Questionnaire-Type

d8b7cd8

/drop route

13a31b7

allow managing dropout questionnaires

587d743

allow adding dropout questionnaires to evaluation

a1dd332

UI tests

929c2bb

remove dropout questionnaires from avg. calculation

d7ec143

show dropout results

727fd5b

change drop disclaimer wording

88a2960

Co-authored-by: Johannes Wolf <[email protected]>

fix: dont use shortened varname

53ce364

use visibility.Hidden

136945b

change dropout modal wording

29fb6aa

Co-authored-by: Johannes Wolf <[email protected]>

rename evaluation form template

e33b909

make evap-badges font-weight normal by default

96c5c83

allow contributors to edit dropout questionnaires

bdc31e2

allow bulk assignment of dropout questionnaires

6891a7f

fekoch force-pushed the 991/dropped-courses branch from 952a2d1 to 7528c88 Compare February 24, 2025 16:23

fekoch requested a review from janno42 February 24, 2025 18:43

fekoch force-pushed the 991/dropped-courses branch from db7f3cc to 4427ab1 Compare February 24, 2025 19:15

fekoch added 3 commits February 24, 2025 21:16

display dropout questionnaire separately

58f0def

fix button in confirmation view

bf19ad6

hide general/dropout questionnaire field if queryset is empty

727acca

fekoch force-pushed the 991/dropped-courses branch from 4427ab1 to 727acca Compare February 24, 2025 20:16

test dropout results UI

2664d6d

niklasmohrin requested changes Feb 24, 2025

View reviewed changes

janno42 requested changes Mar 3, 2025

View reviewed changes

Kakadus reviewed Mar 3, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dropped Courses #2262

Dropped Courses #2262

fekoch commented Aug 5, 2024 •

edited

Loading

fekoch commented Jan 20, 2025

janno42 left a comment

niklasmohrin left a comment

niklasmohrin Feb 24, 2025

niklasmohrin Feb 24, 2025

niklasmohrin Feb 24, 2025

niklasmohrin Feb 24, 2025

niklasmohrin Feb 24, 2025

fekoch Feb 24, 2025

niklasmohrin Feb 24, 2025

niklasmohrin Feb 24, 2025

niklasmohrin Feb 24, 2025

niklasmohrin Feb 24, 2025

Kakadus Feb 24, 2025

niklasmohrin Feb 24, 2025

janno42 left a comment

Kakadus Feb 24, 2025

Kakadus Feb 24, 2025

Kakadus Mar 3, 2025

		"password": "pbkdf2_sha256$870000$FI1vp6JGLvZULamq2a9pIL$TLLlUbFnxARDpJFRmuL+gVR9QtFc9fxww/K7pM1PixM=",
		"last_login": "2025-02-17T18:41:52.756",

	def vote(request: HttpRequest, evaluation_id: int, dropout=False): # noqa: PLR0912
	def vote(request: HttpRequest, evaluation_id: int, dropout=False) -> HttpResponse: # noqa: PLR0912

		<input id="{{ choice.id_for_label }}" class="tab-selectable num-selectable btn-check" name="{{ choice.data.name }}" type="radio" value="{{ choice.data.value }}" autocomplete="off"{% if field.initial == choice.data.value %} checked="checked"{% endif %}{% if preview %} disabled{% endif %}/>
		<label for="{{ choice.id_for_label }}" class="btn btn-sm btn-light vote-btn vote-btn-{{ color }} d-flex{% if field.errors %} choice-error{% endif %}">

		<form method="get" action="{% url 'student:drop' evaluation.id %}">
		<confirmation-modal type="submit" confirm-button-class="btn-danger">

		self.assertContains(page, "General questionnaires")
		self.assertContains(page, "Dropout Questionnaires")

		def test_choosing_dropout_sets_to_no_answer(self):
		response = self.app.get(url=reverse("student:drop", args=[self.evaluation.id]), user=self.user, status=200)

	super().get_queryset().exclude(type=Questionnaire.Type.CONTRIBUTOR).exclude(type=Questionnaire.Type.DROPOUT)
	super().get_queryset().exclude(type__in=(Questionnaire.Type.CONTRIBUTOR, Questionnaire.Type.DROPOUT))

	def is_dropout_allowed(self):
	def is_dropout_allowed(self) -> bool:

Dropped Courses #2262

Are you sure you want to change the base?

Dropped Courses #2262

Conversation

fekoch commented Aug 5, 2024 • edited Loading

fekoch commented Jan 20, 2025

janno42 left a comment

Choose a reason for hiding this comment

niklasmohrin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

janno42 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fekoch commented Aug 5, 2024 •

edited

Loading