Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dropped Courses #2262

Open
wants to merge 40 commits into
base: main
Choose a base branch
from
Open

Dropped Courses #2262

wants to merge 40 commits into from

Conversation

fekoch
Copy link
Collaborator

@fekoch fekoch commented Aug 5, 2024 •
edited
Loading

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

@fekoch fekoch force-pushed the 991/dropped-courses branch from 6545c8d to 9ea80f3 Compare August 5, 2024 18:55
@fekoch fekoch mentioned this pull request Aug 5, 2024
Merged
richardebeling
richardebeling reviewed Sep 2, 2024
View reviewed changes
evap/evaluation/models.py Outdated Show resolved Hide resolved
evap/static/font-awesome/scss/_mixins.scss Outdated Show resolved Hide resolved
evap/static/font-awesome/scss/fontawesome.scss Outdated Show resolved Hide resolved
evap/student/templates/student_index_evaluate_or_drop.html Outdated Show resolved Hide resolved
@fekoch fekoch force-pushed the 991/dropped-courses branch 3 times, most recently from d91a83b to 2f42c54 Compare October 14, 2024 17:02
@fekoch fekoch force-pushed the 991/dropped-courses branch from 2f42c54 to e2e836e Compare October 14, 2024 19:07
richardebeling
richardebeling reviewed Oct 20, 2024
View reviewed changes
evap/evaluation/models.py Outdated Show resolved Hide resolved
evap/evaluation/models.py Outdated Show resolved Hide resolved
evap/evaluation/models.py Outdated Show resolved Hide resolved
evap/evaluation/models.py Outdated
Comment on lines 242 to 247
if self.type != Questionnaire.Type.DROPOUT:
raise ValueError("Can only set DROPOUT-type Questionnaires as active dropout questionnaire.")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably fair to just use an assertion -- or do we expect this to ever happen for a correct program execution?

evap/staff/templates/staff_questionnaire_index_list.html Outdated Show resolved Hide resolved
@fekoch fekoch force-pushed the 991/dropped-courses branch from c24d5dd to 178fc31 Compare October 21, 2024 16:50
@fekoch fekoch force-pushed the 991/dropped-courses branch from 0c1711f to 2f3043b Compare October 28, 2024 17:07
@fekoch fekoch force-pushed the 991/dropped-courses branch 2 times, most recently from dc783bf to 96e9dc7 Compare November 11, 2024 17:09
@fekoch fekoch force-pushed the 991/dropped-courses branch 2 times, most recently from 1fa6eb3 to 5a312ec Compare November 25, 2024 18:31
@fekoch fekoch force-pushed the 991/dropped-courses branch 5 times, most recently from 2cb0daf to cfcf4fd Compare December 2, 2024 21:38
@fekoch fekoch force-pushed the 991/dropped-courses branch from cfcf4fd to 0f5c592 Compare December 16, 2024 18:19
@fekoch fekoch force-pushed the 991/dropped-courses branch 2 times, most recently from 9b73be5 to a88760b Compare January 13, 2025 17:47
@fekoch fekoch force-pushed the 991/dropped-courses branch from 9993ca6 to c89627a Compare January 20, 2025 17:40
@fekoch
Copy link
Collaborator Author

fekoch commented Jan 20, 2025

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

image

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?

@fekoch fekoch force-pushed the 991/dropped-courses branch 2 times, most recently from 4933bf8 to b722b2d Compare January 27, 2025 17:11
@fekoch fekoch force-pushed the 991/dropped-courses branch from b722b2d to 9b1ca48 Compare January 27, 2025 21:20
fekoch added 28 commits January 27, 2025 22:54
@fekoch
prevent Dropout questionnaires from being set to a different type
e06a8b3
@fekoch
merge view logic with vote-view
883c919
@fekoch
add todos
9af6751
@fekoch
precommit
6794482
@fekoch
remove dropout questionnaires from avg. calculation
908e2ee
@fekoch
inject dropout questionnaire inside get_vote_page_form_groups
7de46ad
@fekoch
make dropout-questionnaire un-editable by managers after there are an…
ec520a6 
…swers for them
@fekoch
add is_dropout_questionnaire property
8031786
@fekoch
make sure if there are dropout-q's, set one as active
fd5bf2b
@fekoch
add dropout count
9176e9b
@fekoch
can_be_deleted prop for DROPOUT
738accd
@fekoch
test for dropout counter and allow_drop_out
3167bd6
@fekoch
add explanatory texts
3218ed7
@fekoch
prevent HttpRequest typing issue
12ff907 
The typing HttpRequest also allows for AnonymousUser as request.user.
In the future, we probably should add a custom HttpRequest class that
correctly states that request.user must be a UserProfile.
@fekoch
fix too many local variables
d0c0b7b
@fekoch
change naming to placate linter
b9f3075
@fekoch
add dropout questionnaire to testdata
5507165
@fekoch
add todos
7c744be
@fekoch
wip dropout result view
8107ae0
@fekoch
type QuestionnaireManager
b435014
@fekoch
add dropout_questionnaire to general_contribution when setting allow_…
d8bdaf1 
…drop_out to true
@fekoch
do not use allow_drop_out
476a5d9
@fekoch
add todo
fe399bb
@fekoch
remove active_dropout feature
da0fc14
@fekoch
UI for dropout
fe18498
@fekoch
add todo
368c1a2
@fekoch
QuestionnaireTests
ef2f4b6
@fekoch
remove unused imports
45b04fb
@fekoch fekoch force-pushed the 991/dropped-courses branch from 3ea84f6 to 45b04fb Compare January 27, 2025 21:56
@fekoch fekoch marked this pull request as ready for review January 27, 2025 21:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richardebeling richardebeling richardebeling left review comments

@janno42 janno42 janno42 left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Dropped courses
3 participants
@fekoch @janno42 @richardebeling