Participants editable by editors #1639

knollengewaechs · 2021-10-18T16:50:35Z

fixes #1569 (hopefully)

richardebeling

Thanks for contributing :)

evap/contributor/forms.py

evap/static/scss/_adjustments.scss

janno42

the user select field for me looks like this:

i assume it looks better for you - have you tested it on the current main branch and did you update the bootstrap submodule and the npm sass installation?

evap/contributor/forms.py

janno42

✔️ Meets requirements
✔️ UI functionality checked

evap/static/scss/_adjustments.scss

niklasmohrin

I haven't really checked whether everything that needs to be deleted actually is deleted, but the diff looks good at least :)

evap/static/scss/_adjustments.scss

evap/contributor/forms.py

evap/contributor/tests/test_forms.py

evap/contributor/tests/test_views.py

janno42

I just remembered one thing that needs to be done in this PR as well (sorry).
Similar to the button requesting a new account in the contributor section, we need the same button (opening the same modal) also for participants, in case editors want to add someone who doesn't have an account yet.

knollengewaechs · 2022-01-24T22:41:08Z

I just remembered one thing that needs to be done in this PR as well (sorry). Similar to the button requesting a new account in the contributor section, we need the same button (opening the same modal) also for participants, in case editors want to add someone who doesn't have an account yet.

Is the button only needed when editors are allowed to edit?
Should the button be under the request changes button or next to the participant field?

janno42 · 2022-01-31T17:16:09Z

The button should only be shown when editors are allowed to edit. It should optimally be placed next to the participant field but I assume this isn't easy. So it is also okay to place it where the request changes button would be if editors aren't allowed to edit.

janno42 · 2022-01-31T21:34:34Z

yes, please :)
the following form field should have at least the same distance to the button as the button has to the top of the card.

knollengewaechs · 2022-01-31T21:58:53Z

yes, please :) the following form field should have at least the same distance to the button as the button has to the top of the card.

(Sorry for deleting my previous question. After I found the solution it just looked so much better that I didn't think I needed to ask it anymore, and I deleted it before seeing your answer, however I managed to do that.) Anyway, I hope it looks fine now!

janno42

nice, almost done =)

evap/contributor/templates/contributor_evaluation_form.html

evap/contributor/forms.py

evap/contributor/templates/contributor_evaluation_form.html

evap/staff/forms.py

evap/contributor/tests/test_views.py

richardebeling

select2 was updated to 4.1.0-rc1 on upstream:main in between (see #1702) -- so after merging or rebasing, the select2 stuff should disappear from the diff.

evap/contributor/templates/contributor_evaluation_form.html

evap/contributor/tests/test_forms.py

evap/contributor/tests/test_views.py

evap/staff/tests/test_forms.py

evap/static/scss/_adjustments.scss

richardebeling

Code is fine with me, haven't tested manually.

evap/contributor/tests/test_views.py

niklasmohrin

Code looks good, UI does too as far as I can tell - @janno42 I am relying on your thorough review though :)

…fail :(

…test and sorry for the long commit message that is longer than the changes themselves

…o edit

janno42 · 2022-03-25T18:38:25Z

Thank you so much 👍

knollengewaechs · 2022-03-26T15:32:09Z

yeeeey, this PR finally made it! :D

knollengewaechs force-pushed the participants_editable_by_editors branch 3 times, most recently from fb05859 to 9356846 Compare October 18, 2021 18:16

richardebeling requested changes Oct 18, 2021

View reviewed changes

evap/contributor/forms.py Outdated Show resolved Hide resolved

evap/static/scss/_adjustments.scss Outdated Show resolved Hide resolved

evap/static/scss/_adjustments.scss Outdated Show resolved Hide resolved

knollengewaechs force-pushed the participants_editable_by_editors branch from 42b280c to 2410ce2 Compare November 22, 2021 21:42

knollengewaechs requested a review from richardebeling November 23, 2021 11:42

janno42 requested changes Nov 23, 2021

View reviewed changes

evap/contributor/forms.py Outdated Show resolved Hide resolved

knollengewaechs force-pushed the participants_editable_by_editors branch from 35ea686 to 645fa50 Compare December 6, 2021 21:01

knollengewaechs requested a review from janno42 December 6, 2021 21:18

janno42 approved these changes Dec 13, 2021

View reviewed changes

evap/static/scss/_adjustments.scss Show resolved Hide resolved

janno42 requested a review from niklasmohrin December 13, 2021 16:56

niklasmohrin approved these changes Dec 13, 2021

View reviewed changes

evap/static/scss/_adjustments.scss Show resolved Hide resolved

richardebeling requested changes Dec 16, 2021

View reviewed changes

evap/contributor/forms.py Outdated Show resolved Hide resolved

evap/contributor/tests/test_forms.py Show resolved Hide resolved

evap/contributor/tests/test_views.py Outdated Show resolved Hide resolved

janno42 requested changes Jan 19, 2022

View reviewed changes

janno42 reviewed Feb 7, 2022

View reviewed changes

knollengewaechs commented Feb 7, 2022

View reviewed changes

evap/contributor/tests/test_views.py Outdated Show resolved Hide resolved

richardebeling requested changes Feb 8, 2022

View reviewed changes

knollengewaechs force-pushed the participants_editable_by_editors branch from f6e2926 to 2f27b00 Compare February 21, 2022 18:20

knollengewaechs force-pushed the participants_editable_by_editors branch from 8d2b2d1 to c351217 Compare March 14, 2022 20:41

knollengewaechs requested review from janno42 and richardebeling March 14, 2022 21:10

richardebeling mentioned this pull request Mar 15, 2022

Modals specify ids for their buttons that are never used #1722

Closed

richardebeling approved these changes Mar 15, 2022

View reviewed changes

richardebeling requested a review from niklasmohrin March 15, 2022 00:20

janno42 reviewed Mar 21, 2022

View reviewed changes

evap/contributor/tests/test_views.py Outdated Show resolved Hide resolved

evap/contributor/tests/test_views.py Outdated Show resolved Hide resolved

knollengewaechs requested a review from janno42 March 21, 2022 19:48

niklasmohrin approved these changes Mar 21, 2022

View reviewed changes

Laura Meister added 21 commits March 21, 2022 22:02

let contributors edit participants

f821165

applies css only to UserModelMultipleChoiceField for participants

25f8876

small lintings

4b9c37e

delete test for request participant change button for contributors

b739fd2

rename css class for participant multi select

27f1da5

adjust color of multiple user selection choices

ca26036

make codacy slightly more content

2e3c629

make Niklas slightly more content

cd758fe

make spellchecker slightly more content...

507dfaa

filters participant queryset, also adds tests, but makes other tests …

3f86b29

…fail :(

fixes tests

07520e8

apply formatting

748383d

keep checking evaluation title in change evaluation request modal in …

74c9824

…test and sorry for the long commit message that is longer than the changes themselves

show creation of new account button if contributors are not allowed t…

047107e

…o edit

add test that right button is shown

c6d48fe

adress reviews

b31c66c

address reviews

8f045a6

complete test

6eabfd5

apply formatting

c36c91c

delete comments

876be0b

use actual instead of relative count in test

ebd6a50

knollengewaechs force-pushed the participants_editable_by_editors branch from 9645013 to ebd6a50 Compare March 21, 2022 21:03

janno42 approved these changes Mar 25, 2022

View reviewed changes

janno42 merged commit 0d25cf8 into e-valuation:main Mar 25, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Participants editable by editors #1639

Participants editable by editors #1639

knollengewaechs commented Oct 18, 2021

richardebeling left a comment

janno42 left a comment

janno42 left a comment

niklasmohrin left a comment

janno42 left a comment

knollengewaechs commented Jan 24, 2022 •

edited

Loading

janno42 commented Jan 31, 2022

janno42 commented Jan 31, 2022

knollengewaechs commented Jan 31, 2022

janno42 left a comment

richardebeling left a comment

richardebeling left a comment

niklasmohrin left a comment

janno42 commented Mar 25, 2022

knollengewaechs commented Mar 26, 2022

Participants editable by editors #1639

Participants editable by editors #1639

Conversation

knollengewaechs commented Oct 18, 2021

richardebeling left a comment

Choose a reason for hiding this comment

janno42 left a comment

Choose a reason for hiding this comment

janno42 left a comment

Choose a reason for hiding this comment

niklasmohrin left a comment

Choose a reason for hiding this comment

janno42 left a comment

Choose a reason for hiding this comment

knollengewaechs commented Jan 24, 2022 • edited Loading

janno42 commented Jan 31, 2022

janno42 commented Jan 31, 2022

knollengewaechs commented Jan 31, 2022

janno42 left a comment

Choose a reason for hiding this comment

richardebeling left a comment

Choose a reason for hiding this comment

richardebeling left a comment

Choose a reason for hiding this comment

niklasmohrin left a comment

Choose a reason for hiding this comment

janno42 commented Mar 25, 2022

knollengewaechs commented Mar 26, 2022

knollengewaechs commented Jan 24, 2022 •

edited

Loading