From 32e7e5e21a7580ecbad63ff746ae572fa7c83860 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 15 Sep 2020 15:37:59 +0200 Subject: [PATCH 1/8] add change_appointment to recruiter and study conductor --- castellum/castellum_auth/fixtures/groups.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/castellum/castellum_auth/fixtures/groups.json b/castellum/castellum_auth/fixtures/groups.json index bbbe6e544..0760eefac 100644 --- a/castellum/castellum_auth/fixtures/groups.json +++ b/castellum/castellum_auth/fixtures/groups.json @@ -52,6 +52,11 @@ "recruit", "recruitment", "participation" + ], + [ + "change_appointment", + "recruitment", + "appointment" ] ] } @@ -66,6 +71,11 @@ "conduct_study", "recruitment", "participation" + ], + [ + "change_appointment", + "recruitment", + "appointment" ] ] } -- GitLab From 142628c191423a11d56ccf106c2c4eb179e1efed Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 15 Sep 2020 15:43:06 +0200 Subject: [PATCH 2/8] Gardening --- castellum/execution/templates/execution/participation_base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/castellum/execution/templates/execution/participation_base.html b/castellum/execution/templates/execution/participation_base.html index 5b86d58dd..1ba76987b 100644 --- a/castellum/execution/templates/execution/participation_base.html +++ b/castellum/execution/templates/execution/participation_base.html @@ -1,5 +1,5 @@ {% extends "execution/base.html" %} -{% load i18n auth %} +{% load i18n %} {% block title %}{{ study }} · {{ block.super }}{% endblock %} -- GitLab From 84d94a3b3169449bf91e480a5d82f824b5eb6f19 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 15 Sep 2020 15:44:26 +0200 Subject: [PATCH 3/8] check change_appointment in recruitment --- castellum/recruitment/forms.py | 6 ++- .../templates/recruitment/contact.html | 44 ++++++++++--------- castellum/recruitment/views.py | 11 ++++- tests/recruitment/views/test_contact_view.py | 35 +++++++++++++++ 4 files changed, 73 insertions(+), 23 deletions(-) diff --git a/castellum/recruitment/forms.py b/castellum/recruitment/forms.py index 5f20df567..2918ecbdc 100644 --- a/castellum/recruitment/forms.py +++ b/castellum/recruitment/forms.py @@ -267,7 +267,7 @@ class AppointmentsForm(forms.ModelForm): yield self[name] -class ContactForm(AppointmentsForm): +class ContactForm(forms.ModelForm): class Meta: model = Participation fields = ['status', 'followup_date', 'followup_time', 'exclusion_criteria_checked'] @@ -290,6 +290,10 @@ class ContactForm(AppointmentsForm): self.fields['status'].widget.disabled_choices = [Participation.INVITED] +class ContactAndAppointmentsForm(ContactForm, AppointmentsForm): + pass + + class SendMailForm(forms.Form): batch_size = forms.IntegerField( min_value=1, label=_('How many subjects do you want to contact?') diff --git a/castellum/recruitment/templates/recruitment/contact.html b/castellum/recruitment/templates/recruitment/contact.html index 6d06ce8ef..ac8c55204 100644 --- a/castellum/recruitment/templates/recruitment/contact.html +++ b/castellum/recruitment/templates/recruitment/contact.html @@ -36,6 +36,8 @@ {% endif %} + {% has_perm 'recruitment.change_appointment' user study as can_change_appointment %} +
  • {% translate "Contacting details" %} @@ -51,7 +53,7 @@
    • {% endif %} - {% if study.studysession_set.exists %} + {% if can_change_appointment and study.studysession_set.exists %}
  • {% translate 'Appointments' %} @@ -160,28 +162,30 @@ {% endif %} - + {% endif %} {% include 'utils/form_errors.html' with form=form %} diff --git a/castellum/recruitment/views.py b/castellum/recruitment/views.py index f0ac228fc..e0c9329d6 100644 --- a/castellum/recruitment/views.py +++ b/castellum/recruitment/views.py @@ -45,6 +45,7 @@ from castellum.subjects.mixins import BaseDataProtectionUpdateView from castellum.utils import cached_request from castellum.utils import contrast_color +from .forms import ContactAndAppointmentsForm from .forms import ContactForm from .mixins import BaseAttributeSetUpdateView from .mixins import BaseCalendarView @@ -284,11 +285,16 @@ class MailRecruitmentView(BaseMailRecruitmentView): class ContactView(ParticipationMixin, PermissionRequiredMixin, UpdateView): model = Participation - form_class = ContactForm template_name = 'recruitment/contact.html' permission_required = 'recruitment.recruit' study_status = [Study.EXECUTION] + def get_form_class(self): + if self.request.user.has_perm('recruitment.change_appointment', self.study): + return ContactAndAppointmentsForm + else: + return ContactForm + def get_initial(self): initial = super().get_initial() if not self.object.match: @@ -321,7 +327,8 @@ class ContactView(ParticipationMixin, PermissionRequiredMixin, UpdateView): def form_valid(self, form): response = super().form_valid(form) - send_appointment_notifications(self.request, self.object, form.appointment_changes) + if isinstance(form, ContactAndAppointmentsForm): + send_appointment_notifications(self.request, self.object, form.appointment_changes) return response diff --git a/tests/recruitment/views/test_contact_view.py b/tests/recruitment/views/test_contact_view.py index bb2c360ec..ef2b591d9 100644 --- a/tests/recruitment/views/test_contact_view.py +++ b/tests/recruitment/views/test_contact_view.py @@ -1,12 +1,17 @@ +import datetime + +from django.contrib.auth.models import Permission from django.utils import timezone import pytest from model_bakery import baker +from castellum.castellum_auth.models import User from castellum.recruitment.models import Appointment from castellum.recruitment.models import Participation from castellum.studies.models import Resource from castellum.studies.models import Study +from castellum.studies.models import StudyMembership from castellum.studies.models import StudySession @@ -194,3 +199,33 @@ def test_appointment_resource_overlap_ignore_not_invited(client, member, partici 'appointment-%i_1' % session.pk: '12:00', }) assert response.status_code == 302 + + +def test_appointment_change_appointment_permission(client, member, participation): + future = timezone.now() + datetime.timedelta(days=10000) + user = baker.make(User, expiration_date=future, email='test@example.com') + user.user_permissions.add(Permission.objects.get(codename='privacy_level_1')) + user.user_permissions.add(Permission.objects.get(codename='recruit')) + StudyMembership.objects.create(user=user, study=participation.study) + + session = baker.make(StudySession, study=participation.study, duration=60) + + url = '/recruitment/{}/{}/'.format(participation.study.pk, participation.pk) + + client.force_login(user) + response = client.post(url, { + 'status': 2, + 'appointment-%i_0' % session.pk: '2020-01-01', + 'appointment-%i_1' % session.pk: '12:00', + }) + assert response.status_code == 302 + assert not participation.appointment_set.exists() + + client.force_login(member) + response = client.post(url, { + 'status': 2, + 'appointment-%i_0' % session.pk: '2020-01-01', + 'appointment-%i_1' % session.pk: '12:00', + }) + assert response.status_code == 302 + assert participation.appointment_set.exists() -- GitLab From 8b2571058c20a9dbaf7095e7e706d48d6a52aae6 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 15 Sep 2020 15:38:10 +0200 Subject: [PATCH 4/8] check change_appointment in execution (read+write) --- .../execution/templates/execution/participation_base.html | 5 +++-- castellum/execution/views.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/castellum/execution/templates/execution/participation_base.html b/castellum/execution/templates/execution/participation_base.html index 1ba76987b..2df8a3c3c 100644 --- a/castellum/execution/templates/execution/participation_base.html +++ b/castellum/execution/templates/execution/participation_base.html @@ -1,5 +1,5 @@ {% extends "execution/base.html" %} -{% load i18n %} +{% load i18n auth %} {% block title %}{{ study }} · {{ block.super }}{% endblock %} @@ -21,7 +21,8 @@ {% translate 'Criteria' %}
    • {% endif %} - {% if study.studysession_set.exists %} + {% has_perm 'recruitment.change_appointment' user study as can_change_appointment %} + {% if can_change_appointment and study.studysession_set.exists %}
  • {% translate 'Appointments' %}
    • diff --git a/castellum/execution/views.py b/castellum/execution/views.py index b8bdd2e76..ecc215e41 100644 --- a/castellum/execution/views.py +++ b/castellum/execution/views.py @@ -125,6 +125,7 @@ class ParticipationCriteriaView(ParticipationDetailMixin, DetailView): class ParticipationAppointmentsView(ParticipationDetailMixin, DetailView): template_name = 'execution/participation_appointments.html' + permission_required = ['recruitment.conduct_study', 'recruitment.change_appointment'] tab = 'appointments' def get_context_data(self, **kwargs): -- GitLab From 9aa66161b755bf58265e66a41ea5f1fc07745809 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 15 Sep 2020 16:14:16 +0200 Subject: [PATCH 5/8] Revert "check change_appointment in execution (read+write)" This reverts commit 6eb9fe62aba093e9dfdd7bb268e9b82756ffc34c. --- .../execution/templates/execution/participation_base.html | 5 ++--- castellum/execution/views.py | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/castellum/execution/templates/execution/participation_base.html b/castellum/execution/templates/execution/participation_base.html index 2df8a3c3c..1ba76987b 100644 --- a/castellum/execution/templates/execution/participation_base.html +++ b/castellum/execution/templates/execution/participation_base.html @@ -1,5 +1,5 @@ {% extends "execution/base.html" %} -{% load i18n auth %} +{% load i18n %} {% block title %}{{ study }} · {{ block.super }}{% endblock %} @@ -21,8 +21,7 @@ {% translate 'Criteria' %} {% endif %} - {% has_perm 'recruitment.change_appointment' user study as can_change_appointment %} - {% if can_change_appointment and study.studysession_set.exists %} + {% if study.studysession_set.exists %}
  • {% translate 'Appointments' %}
    • diff --git a/castellum/execution/views.py b/castellum/execution/views.py index ecc215e41..b8bdd2e76 100644 --- a/castellum/execution/views.py +++ b/castellum/execution/views.py @@ -125,7 +125,6 @@ class ParticipationCriteriaView(ParticipationDetailMixin, DetailView): class ParticipationAppointmentsView(ParticipationDetailMixin, DetailView): template_name = 'execution/participation_appointments.html' - permission_required = ['recruitment.conduct_study', 'recruitment.change_appointment'] tab = 'appointments' def get_context_data(self, **kwargs): -- GitLab From b7b5aeb1c20acc700293952aabd47dda63dfd179 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 15 Sep 2020 15:43:56 +0200 Subject: [PATCH 6/8] check change_appointment in execution (read only) --- .../execution/participation_appointments.html | 11 +++++++---- castellum/execution/views.py | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/castellum/execution/templates/execution/participation_appointments.html b/castellum/execution/templates/execution/participation_appointments.html index aee26fd53..a2b71a553 100644 --- a/castellum/execution/templates/execution/participation_appointments.html +++ b/castellum/execution/templates/execution/participation_appointments.html @@ -1,5 +1,5 @@ {% extends "execution/participation_base.html" %} -{% load i18n bootstrap4 utils %} +{% load i18n auth bootstrap4 utils %} {% block content %}
    @@ -25,7 +25,10 @@ {% endfor %}
    -
    - {% translate 'Update' %} -
    + {% has_perm 'recruitment.change_appointment' user study as can_change_appointment %} + {% if can_change_appointment %} +
    + {% translate 'Update' %} +
    + {% endif %} {% endblock %} diff --git a/castellum/execution/views.py b/castellum/execution/views.py index b8bdd2e76..e5c64133c 100644 --- a/castellum/execution/views.py +++ b/castellum/execution/views.py @@ -142,6 +142,7 @@ class ParticipationAppointmentsView(ParticipationDetailMixin, DetailView): class ParticipationAppointmentsUpdateView(ParticipationDetailMixin, UpdateView): template_name = 'execution/participation_appointments_form.html' + permission_required = ['recruitment.conduct_study', 'recruitment.change_appointment'] form_class = AppointmentsForm tab = 'appointments' -- GitLab From 9bb5993e3c2fb8ed80909cee7d6b42402f498b06 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 15 Sep 2020 16:07:09 +0200 Subject: [PATCH 7/8] check change_appointment in recruitment calendar --- castellum/recruitment/feeds.py | 2 +- castellum/recruitment/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/castellum/recruitment/feeds.py b/castellum/recruitment/feeds.py index ba551e249..b6f22d689 100644 --- a/castellum/recruitment/feeds.py +++ b/castellum/recruitment/feeds.py @@ -62,7 +62,7 @@ class FollowUpFeedForUser(BaseFollowUpFeed): class AppointmentFeed(BaseAppointmentFeed): def get_object(self, request, *args, **kwargs): study = get_object_or_404(Study, pk=kwargs['pk'], status=Study.EXECUTION) - perms = ['recruitment.recruit', 'studies.access_study'] + perms = ['recruitment.change_appointment', 'studies.access_study'] if not self.request.user.has_perms(perms, obj=study): raise PermissionDenied return study diff --git a/castellum/recruitment/views.py b/castellum/recruitment/views.py index e0c9329d6..e9b87d254 100644 --- a/castellum/recruitment/views.py +++ b/castellum/recruitment/views.py @@ -366,7 +366,7 @@ class AdditionalInfoUpdateView(RecruitmentUpdateMixin, BaseAdditionalInfoUpdateV class CalendarView(StudyMixin, PermissionRequiredMixin, BaseCalendarView): model = Study - permission_required = 'recruitment.recruit' + permission_required = 'recruitment.change_appointment' study_status = [Study.EXECUTION] nochrome = True feed = 'recruitment:calendar-feed' -- GitLab From ea53685988794247c2164f26b6939c5bcf06a39f Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 15 Sep 2020 15:44:43 +0200 Subject: [PATCH 8/8] link to recruitment calendar in execution --- .../templates/execution/participation_appointments_form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/castellum/execution/templates/execution/participation_appointments_form.html b/castellum/execution/templates/execution/participation_appointments_form.html index faa487f0b..be89cbb7c 100644 --- a/castellum/execution/templates/execution/participation_appointments_form.html +++ b/castellum/execution/templates/execution/participation_appointments_form.html @@ -27,7 +27,7 @@ {% endfor %}
    - {% translate 'Calendar' %} + {% translate 'Calendar' %}
    -- GitLab