- {% if perms.funds.delete_applicationsubmission %}
-
- {% trans "Delete" %}
-
-
- {% endif %}
- {% if request.user|has_edit_perm:object %}
-
- {% trans "Edit" %}
-
-
- {% endif %}
-
-
-
+
+
-
+
{# Tab 1 #}
-
- {% for activity in object_list %}
- {% if activity.type == 'comment' %}
-
-
-
- {{ activity.source_content_type.name|source_type }}
-
-
+ {% endif %}
+ {% endfor %}
+
{# Tab 2 #}
-
- {% for activity in object_list %}
- {% if activity.type == 'action' %}
- '
- token = 'fake-token'
+ backend = "django_slack.backends.TestBackend"
+ target_url = "https://my-slack-backend.com/incoming/my-very-secret-key"
+ target_room = "#"
+ token = "fake-token"
@override_settings(
SLACK_ENDPOINT_URL=target_url,
@@ -340,7 +352,7 @@ def test_cant_send_with_no_room(self):
error_message = "Missing configuration: Room ID"
adapter = SlackAdapter()
submission = ApplicationSubmissionFactory()
- messages = adapter.send_message('my message', '', source=submission)
+ messages = adapter.send_message("my message", "", source=submission)
self.assertEqual(messages, error_message)
@override_settings(
@@ -353,7 +365,7 @@ def test_cant_send_with_no_token(self):
error_message = "Missing configuration: Slack Token"
adapter = SlackAdapter()
submission = ApplicationSubmissionFactory()
- messages = adapter.send_message('my message', '', source=submission)
+ messages = adapter.send_message("my message", "", source=submission)
self.assertEqual(messages, error_message)
@override_settings(
@@ -367,12 +379,12 @@ def test_correct_payload(self):
backend.reset_messages()
submission = ApplicationSubmissionFactory()
adapter = SlackAdapter()
- message = 'my message'
- adapter.send_message(message, '', source=submission)
+ message = "my message"
+ adapter.send_message(message, "", source=submission)
messages = backend.retrieve_messages()
self.assertEqual(len(messages), 1)
- message_payload = json.loads(messages[0]['payload'])
- self.assertEqual(message_payload['text'], message)
+ message_payload = json.loads(messages[0]["payload"])
+ self.assertEqual(message_payload["text"], message)
@override_settings(
SLACK_ENDPOINT_URL=target_url,
@@ -383,16 +395,16 @@ def test_correct_payload(self):
def test_fund_custom_slack_channel(self):
backend = get_backend()
backend.reset_messages()
- responses.add(responses.POST, self.target_url, status=200, body='OK')
- submission = ApplicationSubmissionFactory(round__parent__slack_channel='dummy')
+ responses.add(responses.POST, self.target_url, status=200, body="OK")
+ submission = ApplicationSubmissionFactory(round__parent__slack_channel="dummy")
adapter = SlackAdapter()
- message = 'my message'
- adapter.send_message(message, '', source=submission)
+ message = "my message"
+ adapter.send_message(message, "", source=submission)
messages = backend.retrieve_messages()
self.assertEqual(len(messages), 1)
- message_payload = json.loads(messages[0]['payload'])
- self.assertEqual(message_payload['text'], message)
- self.assertEqual(message_payload['channel'], '#dummy')
+ message_payload = json.loads(messages[0]["payload"])
+ self.assertEqual(message_payload["text"], message)
+ self.assertEqual(message_payload["channel"], "#dummy")
@override_settings(
SLACK_ENDPOINT_URL=target_url,
@@ -403,27 +415,33 @@ def test_fund_custom_slack_channel(self):
def test_fund_multiple_custom_slack_channel(self):
backend = get_backend()
backend.reset_messages()
- submission = ApplicationSubmissionFactory(round__parent__slack_channel='dummy1, dummy2')
+ submission = ApplicationSubmissionFactory(
+ round__parent__slack_channel="dummy1, dummy2"
+ )
adapter = SlackAdapter()
- message = 'my message'
- adapter.send_message(message, '', source=submission)
+ message = "my message"
+ adapter.send_message(message, "", source=submission)
messages = backend.retrieve_messages()
self.assertEqual(len(messages), 2)
for index, sent_message in enumerate(messages):
- message_payload = json.loads(sent_message['payload'])
- self.assertEqual(message_payload['text'], message)
- self.assertEqual(message_payload['channel'], '#dummy' + str(index + 1))
+ message_payload = json.loads(sent_message["payload"])
+ self.assertEqual(message_payload["text"], message)
+ self.assertEqual(message_payload["channel"], "#dummy" + str(index + 1))
def test_gets_lead_if_slack_set(self):
adapter = SlackAdapter()
submission = ApplicationSubmissionFactory()
- recipients = adapter.recipients(MESSAGES.COMMENT, source=submission, related=None)
+ recipients = adapter.recipients(
+ MESSAGES.COMMENT, source=submission, related=None
+ )
self.assertTrue(submission.lead.slack in recipients[0])
def test_gets_blank_if_slack_not_set(self):
adapter = SlackAdapter()
- submission = ApplicationSubmissionFactory(lead__slack='')
- recipients = adapter.recipients(MESSAGES.COMMENT, source=submission, related=None)
+ submission = ApplicationSubmissionFactory(lead__slack="")
+ recipients = adapter.recipients(
+ MESSAGES.COMMENT, source=submission, related=None
+ )
self.assertTrue(submission.lead.slack in recipients[0])
@override_settings(
@@ -437,8 +455,11 @@ def test_message_with_good_response(self):
self.adapter_process(MESSAGES.NEW_SUBMISSION)
self.assertEqual(Message.objects.count(), 1)
sent_message = Message.objects.first()
- self.assertEqual(sent_message.content[0:10], self.adapter.messages[MESSAGES.NEW_SUBMISSION][0:10])
- self.assertEqual(sent_message.status, '200: OK')
+ self.assertEqual(
+ sent_message.content[0:10],
+ self.adapter.messages[MESSAGES.NEW_SUBMISSION][0:10],
+ )
+ self.assertEqual(sent_message.status, "200: OK")
@override_settings(
SLACK_ENDPOINT_URL=target_url,
@@ -451,11 +472,11 @@ def test_400_bad_request(self):
backend.reset_messages()
submission = ApplicationSubmissionFactory()
adapter = SlackAdapter()
- message = ''
- message_status = adapter.send_message(message, '', source=submission)
+ message = ""
+ message_status = adapter.send_message(message, "", source=submission)
messages = backend.retrieve_messages()
self.assertEqual(len(messages), 0)
- self.assertEqual(message_status, '400: Bad Request')
+ self.assertEqual(message_status, "400: Bad Request")
@override_settings(SEND_MESSAGES=True)
@@ -480,58 +501,67 @@ def test_no_email_own_comment(self):
application = ApplicationSubmissionFactory()
comment = CommentFactory(user=application.user, source=application)
- self.adapter_process(MESSAGES.COMMENT, related=comment, user=comment.user, source=comment.source)
+ self.adapter_process(
+ MESSAGES.COMMENT, related=comment, user=comment.user, source=comment.source
+ )
self.assertEqual(len(mail.outbox), 0)
def test_reviewers_email(self):
reviewers = ReviewerFactory.create_batch(4)
- submission = ApplicationSubmissionFactory(status='external_review', reviewers=reviewers, workflow_stages=2)
+ submission = ApplicationSubmissionFactory(
+ status="external_review", reviewers=reviewers, workflow_stages=2
+ )
self.adapter_process(MESSAGES.READY_FOR_REVIEW, source=submission)
self.assertEqual(len(mail.outbox), 4)
- self.assertTrue(mail.outbox[0].subject, 'ready to review')
+ self.assertTrue(mail.outbox[0].subject, "ready to review")
def test_reviewer_update_email(self):
reviewers = ReviewerFactory.create_batch(4)
- submission = ApplicationSubmissionFactory(status='external_review', reviewers=reviewers, workflow_stages=2)
+ submission = ApplicationSubmissionFactory(
+ status="external_review", reviewers=reviewers, workflow_stages=2
+ )
added = [AssignedReviewersFactory(submission=submission, reviewer=reviewers[0])]
self.adapter_process(MESSAGES.REVIEWERS_UPDATED, source=submission, added=added)
self.assertEqual(len(mail.outbox), 1)
- self.assertTrue(mail.outbox[0].subject, 'ready to review')
+ self.assertTrue(mail.outbox[0].subject, "ready to review")
def test_email_sent(self):
self.adapter_process(MESSAGES.NEW_SUBMISSION)
self.assertEqual(Message.objects.count(), 1)
sent_message = Message.objects.first()
- self.assertEqual(sent_message.status, 'sent')
+ self.assertEqual(sent_message.status, "sent")
def test_email_failed(self):
- with patch('django.core.mail.backends.locmem.EmailBackend.send_messages', side_effect=Exception('An error occurred')):
+ with patch(
+ "django.core.mail.backends.locmem.EmailBackend.send_messages",
+ side_effect=Exception("An error occurred"),
+ ):
self.adapter_process(MESSAGES.NEW_SUBMISSION)
self.assertEqual(Message.objects.count(), 1)
sent_message = Message.objects.first()
- self.assertEqual(sent_message.status, 'Error: An error occurred')
+ self.assertEqual(sent_message.status, "Error: An error occurred")
@override_settings(
SEND_MESSAGES=True,
- EMAIL_BACKEND='anymail.backends.test.EmailBackend',
+ EMAIL_BACKEND="anymail.backends.test.EmailBackend",
)
class TestAnyMailBehaviour(AdapterMixin, TestCase):
adapter = EmailAdapter()
- TEST_API_KEY = 'TEST_API_KEY'
+ TEST_API_KEY = "TEST_API_KEY"
# from: https://github.com/anymail/django-anymail/blob/7d8dbdace92d8addfcf0a517be0aaf481da11952/tests/test_mailgun_webhooks.py#L19
def mailgun_sign(self, data, api_key=TEST_API_KEY):
"""Add a Mailgun webhook signature to data dict"""
# Modifies the dict in place
- data.setdefault('timestamp', '1234567890')
- data.setdefault('token', '1234567890abcdef1234567890abcdef')
- data['signature'] = hmac.new(
- key=api_key.encode('ascii'),
- msg='{timestamp}{token}'.format(**data).encode('ascii'),
+ data.setdefault("timestamp", "1234567890")
+ data.setdefault("token", "1234567890abcdef1234567890abcdef")
+ data["signature"] = hmac.new(
+ key=api_key.encode("ascii"),
+ msg="{timestamp}{token}".format(**data).encode("ascii"),
digestmod=hashlib.sha256,
).hexdigest()
@@ -544,45 +574,46 @@ def test_email_new_submission(self):
self.assertEqual(len(mail.outbox), 1)
self.assertEqual(mail.outbox[0].to, [submission.user.email])
message = Message.objects.first()
- self.assertEqual(message.status, 'sent')
+ self.assertEqual(message.status, "sent")
# Anymail test Backend uses the index of the email as id: '0'
- self.assertEqual(message.external_id, '0')
+ self.assertEqual(message.external_id, "0")
@override_settings(ANYMAIL_MAILGUN_API_KEY=TEST_API_KEY)
def test_webhook_updates_status(self):
message = MessageFactory()
response = self.client.post(
- '/activity/anymail/mailgun/tracking/',
- data=self.mailgun_sign({
- 'event': 'delivered',
- 'Message-Id': message.external_id
- }),
+ "/activity/anymail/mailgun/tracking/",
+ data=self.mailgun_sign(
+ {"event": "delivered", "Message-Id": message.external_id}
+ ),
secure=True,
json=True,
)
self.assertEqual(response.status_code, 200)
message.refresh_from_db()
- self.assertTrue('delivered' in message.status)
+ self.assertTrue("delivered" in message.status)
@override_settings(ANYMAIL_MAILGUN_API_KEY=TEST_API_KEY)
def test_webhook_adds_reject_reason(self):
message = MessageFactory()
response = self.client.post(
- '/activity/anymail/mailgun/tracking/',
- data=self.mailgun_sign({
- 'event': 'dropped',
- 'reason': 'hardfail',
- 'code': 607,
- 'description': 'Marked as spam',
- 'Message-Id': message.external_id
- }),
+ "/activity/anymail/mailgun/tracking/",
+ data=self.mailgun_sign(
+ {
+ "event": "dropped",
+ "reason": "hardfail",
+ "code": 607,
+ "description": "Marked as spam",
+ "Message-Id": message.external_id,
+ }
+ ),
secure=True,
json=True,
)
self.assertEqual(response.status_code, 200)
message.refresh_from_db()
- self.assertTrue('rejected' in message.status)
- self.assertTrue('spam' in message.status)
+ self.assertTrue("rejected" in message.status)
+ self.assertTrue("spam" in message.status)
class TestAdaptersForProject(AdapterMixin, TestCase):
@@ -590,10 +621,10 @@ class TestAdaptersForProject(AdapterMixin, TestCase):
activity = ActivityAdapter
source_factory = ProjectFactory
# Slack
- backend = 'django_slack.backends.TestBackend'
- target_url = 'https://my-slack-backend.com/incoming/my-very-secret-key'
- target_room = '#'
- token = 'fake-token'
+ backend = "django_slack.backends.TestBackend"
+ target_url = "https://my-slack-backend.com/incoming/my-very-secret-key"
+ target_room = "#"
+ token = "fake-token"
def test_activity_lead_change(self):
old_lead = UserFactory()
@@ -615,11 +646,11 @@ def test_activity_lead_change_from_none(self):
MESSAGES.UPDATE_PROJECT_LEAD,
adapter=self.activity(),
source=project,
- related='Unassigned',
+ related="Unassigned",
)
self.assertEqual(Activity.objects.count(), 1)
activity = Activity.objects.first()
- self.assertIn(str('Unassigned'), activity.message)
+ self.assertIn(str("Unassigned"), activity.message)
self.assertIn(str(project.lead), activity.message)
def test_activity_created(self):
@@ -654,9 +685,9 @@ def test_slack_created(self):
)
messages = backend.retrieve_messages()
self.assertEqual(len(messages), 1)
- message_payload = json.loads(messages[0]['payload'])
- self.assertIn(str(user), message_payload['text'])
- self.assertIn(str(project), message_payload['text'])
+ message_payload = json.loads(messages[0]["payload"])
+ self.assertIn(str(user), message_payload["text"])
+ self.assertIn(str(project), message_payload["text"])
@override_settings(
SLACK_ENDPOINT_URL=target_url,
@@ -678,9 +709,9 @@ def test_slack_lead_change(self):
)
messages = backend.retrieve_messages()
self.assertEqual(len(messages), 1)
- message_payload = json.loads(messages[0]['payload'])
- self.assertIn(str(user), message_payload['text'])
- self.assertIn(str(project), message_payload['text'])
+ message_payload = json.loads(messages[0]["payload"])
+ self.assertIn(str(user), message_payload["text"])
+ self.assertIn(str(project), message_payload["text"])
@override_settings(
SLACK_ENDPOINT_URL=target_url,
@@ -705,9 +736,9 @@ def test_slack_applicant_update_invoice(self):
messages = backend.retrieve_messages()
self.assertEqual(len(messages), 1)
- message_payload = json.loads(messages[0]['payload'])
- self.assertIn(str(applicant), message_payload['text'])
- self.assertIn(str(project), message_payload['text'])
+ message_payload = json.loads(messages[0]["payload"])
+ self.assertIn(str(applicant), message_payload["text"])
+ self.assertIn(str(project), message_payload["text"])
@override_settings(
SLACK_ENDPOINT_URL=target_url,
diff --git a/hypha/apply/activity/tests/test_tasks.py b/hypha/apply/activity/tests/test_tasks.py
index 1be7c93335..ece65d0a8e 100644
--- a/hypha/apply/activity/tests/test_tasks.py
+++ b/hypha/apply/activity/tests/test_tasks.py
@@ -7,19 +7,19 @@
class TestSendEmail(TestCase):
- @patch('hypha.apply.activity.tasks.EmailMessage', autospec=True)
+ @patch("hypha.apply.activity.tasks.EmailMessage", autospec=True)
def test_args_passed_to_django(self, email_mock):
kwargs = {
- 'subject': 'subject',
- 'body': 'body',
- 'from_email': 'from_email',
- 'to': 'to',
+ "subject": "subject",
+ "body": "body",
+ "from_email": "from_email",
+ "to": "to",
}
- with self.settings(EMAIL_SUBJECT_PREFIX=''):
+ with self.settings(EMAIL_SUBJECT_PREFIX=""):
send_mail(*kwargs, logs=[MessageFactory()])
email_mock.assert_called_once_with(**kwargs)
- with self.settings(EMAIL_SUBJECT_PREFIX='[PREFIX] '):
+ with self.settings(EMAIL_SUBJECT_PREFIX="[PREFIX] "):
send_mail(*kwargs, logs=[MessageFactory()])
- kwargs['subject'] = '[PREFIX] subject'
+ kwargs["subject"] = "[PREFIX] subject"
email_mock.assert_called_with(**kwargs)
diff --git a/hypha/apply/activity/urls.py b/hypha/apply/activity/urls.py
index 4ba4a55f80..eebe907ae0 100644
--- a/hypha/apply/activity/urls.py
+++ b/hypha/apply/activity/urls.py
@@ -2,10 +2,10 @@
from .views import NotificationsView
-app_name = 'activity'
+app_name = "activity"
urlpatterns = [
- path('anymail/', include('anymail.urls')),
- path('notifications/', NotificationsView.as_view(), name='notifications')
+ path("anymail/", include("anymail.urls")),
+ path("notifications/", NotificationsView.as_view(), name="notifications"),
]
diff --git a/hypha/apply/activity/views.py b/hypha/apply/activity/views.py
index caadfa4946..36b5d91e2d 100644
--- a/hypha/apply/activity/views.py
+++ b/hypha/apply/activity/views.py
@@ -13,23 +13,23 @@
class ActivityContextMixin:
- """Mixin to add related 'comments' of the current view's 'self.object'
- """
+ """Mixin to add related 'comments' of the current view's 'self.object'"""
+
def get_context_data(self, **kwargs):
extra = {
# Do not prefetch on the related_object__author as the models
# are not homogeneous and this will fail
- 'comments': get_related_comments_for_user(self.object, self.request.user)
+ "comments": get_related_comments_for_user(self.object, self.request.user)
}
return super().get_context_data(**extra, **kwargs)
class CommentFormView(DelegatedViewMixin, CreateView):
form_class = CommentForm
- context_name = 'comment_form'
+ context_name = "comment_form"
def form_valid(self, form):
- source = self.kwargs['object']
+ source = self.kwargs["object"]
form.instance.user = self.request.user
form.instance.source = source
form.instance.type = COMMENT
@@ -45,28 +45,28 @@ def form_valid(self, form):
return response
def get_success_url(self):
- return self.object.source.get_absolute_url() + '#communications'
+ return self.object.source.get_absolute_url() + "#communications"
def get_form_kwargs(self):
# We dont want to pass the submission as the instance
kwargs = super().get_form_kwargs()
- kwargs.pop('instance')
+ kwargs.pop("instance")
return kwargs
-@method_decorator(staff_required, name='dispatch')
+@method_decorator(staff_required, name="dispatch")
class NotificationsView(ListView):
model = Activity
- template_name = 'activity/notifications.html'
+ template_name = "activity/notifications.html"
filterset_class = NotificationFilter
def get_queryset(self):
# List only last 30 days' activities
queryset = Activity.objects.filter(current=True).latest()
self.filterset = self.filterset_class(self.request.GET, queryset=queryset)
- return self.filterset.qs.distinct().order_by('-timestamp')
+ return self.filterset.qs.distinct().order_by("-timestamp")
def get_context_data(self, *, object_list=None, **kwargs):
context = super(NotificationsView, self).get_context_data()
- context['filter'] = self.filterset
+ context["filter"] = self.filterset
return context
diff --git a/hypha/apply/api/urls.py b/hypha/apply/api/urls.py
index ef7da2aba4..56bb45ad61 100644
--- a/hypha/apply/api/urls.py
+++ b/hypha/apply/api/urls.py
@@ -5,16 +5,16 @@
from .v1 import urls as v1_urls
-app_name = 'api'
+app_name = "api"
schema_url_patterns_v1 = [
- path('api/v1/', include(v1_urls)),
+ path("api/v1/", include(v1_urls)),
]
schema_view_v1 = get_schema_view(
openapi.Info(
title="Hypha API",
- default_version='v1',
+ default_version="v1",
description="Hypha APIs specification",
),
public=False,
@@ -23,6 +23,10 @@
)
urlpatterns = [
- path('v1/', include(v1_urls)),
- path('v1/doc/', schema_view_v1.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
+ path("v1/", include(v1_urls)),
+ path(
+ "v1/doc/",
+ schema_view_v1.with_ui("swagger", cache_timeout=0),
+ name="schema-swagger-ui",
+ ),
]
diff --git a/hypha/apply/api/v1/determination/permissions.py b/hypha/apply/api/v1/determination/permissions.py
index 38e6c45b8b..78d4b00dd3 100644
--- a/hypha/apply/api/v1/determination/permissions.py
+++ b/hypha/apply/api/v1/determination/permissions.py
@@ -10,6 +10,7 @@ class HasDeterminationCreatePermission(permissions.BasePermission):
"""
Custom permission that user should have for creating determination.
"""
+
def has_permission(self, request, view):
try:
submission = view.get_submission_object()
@@ -22,6 +23,7 @@ class HasDeterminationDraftPermission(permissions.BasePermission):
"""
Custom permission that user should have for editing determination.
"""
+
def has_object_permission(self, request, view, obj):
submission = view.get_submission_object()
return can_edit_determination(request.user, obj, submission)
diff --git a/hypha/apply/api/v1/determination/serializers.py b/hypha/apply/api/v1/determination/serializers.py
index 3989821a56..13f74c6d4f 100644
--- a/hypha/apply/api/v1/determination/serializers.py
+++ b/hypha/apply/api/v1/determination/serializers.py
@@ -6,30 +6,34 @@
class SubmissionDeterminationSerializer(serializers.ModelSerializer):
class Meta:
model = Determination
- fields = ['id', 'is_draft', ]
+ fields = [
+ "id",
+ "is_draft",
+ ]
extra_kwargs = {
- 'is_draft': {'required': False},
+ "is_draft": {"required": False},
}
def validate(self, data):
validated_data = super().validate(data)
- validated_data['form_data'] = dict(validated_data.items())
+ validated_data["form_data"] = dict(validated_data.items())
return validated_data
def update(self, instance, validated_data):
instance = super().update(instance, validated_data)
instance.send_notice = (
self.validated_data[instance.send_notice_field.id]
- if instance.send_notice_field else True
+ if instance.send_notice_field
+ else True
)
message = self.validated_data[instance.message_field.id]
- instance.message = '' if message is None else message
+ instance.message = "" if message is None else message
try:
instance.outcome = int(self.validated_data[instance.determination_field.id])
# Need to catch KeyError as outcome field would not exist in case of edit.
except KeyError:
pass
- instance.is_draft = self.validated_data.get('is_draft', False)
- instance.form_data = self.validated_data['form_data']
+ instance.is_draft = self.validated_data.get("is_draft", False)
+ instance.form_data = self.validated_data["form_data"]
instance.save()
return instance
diff --git a/hypha/apply/api/v1/determination/utils.py b/hypha/apply/api/v1/determination/utils.py
index d260a3ee7e..fdc0d6a89f 100644
--- a/hypha/apply/api/v1/determination/utils.py
+++ b/hypha/apply/api/v1/determination/utils.py
@@ -8,7 +8,7 @@
def get_fields_for_stage(submission):
- forms = submission.get_from_parent('determination_forms').all()
+ forms = submission.get_from_parent("determination_forms").all()
index = submission.workflow.stages.index(submission.stage)
try:
return forms[index].form.form_fields
@@ -22,7 +22,7 @@ def outcome_choices_for_phase(submission, user):
We need to filter out non-matching choices.
i.e. a transition to In Review is not a determination, while Needs more info or Rejected are.
"""
- available_choices = [('', _('-- No determination selected -- '))]
+ available_choices = [("", _("-- No determination selected -- "))]
choices = dict(DETERMINATION_CHOICES)
for transition_name in determination_actions(user, submission):
try:
diff --git a/hypha/apply/api/v1/determination/views.py b/hypha/apply/api/v1/determination/views.py
index d61cb9ab7b..d90653c812 100644
--- a/hypha/apply/api/v1/determination/views.py
+++ b/hypha/apply/api/v1/determination/views.py
@@ -34,24 +34,33 @@
class SubmissionDeterminationViewSet(
- BaseStreamForm,
- WagtailSerializer,
- SubmissionNestedMixin,
- viewsets.GenericViewSet
+ BaseStreamForm, WagtailSerializer, SubmissionNestedMixin, viewsets.GenericViewSet
):
permission_classes = (
- permissions.IsAuthenticated, IsApplyStaffUser,
+ permissions.IsAuthenticated,
+ IsApplyStaffUser,
)
permission_classes_by_action = {
- 'create': [permissions.IsAuthenticated, HasDeterminationCreatePermission, IsApplyStaffUser, ],
- 'draft': [permissions.IsAuthenticated, HasDeterminationDraftPermission, IsApplyStaffUser, ],
+ "create": [
+ permissions.IsAuthenticated,
+ HasDeterminationCreatePermission,
+ IsApplyStaffUser,
+ ],
+ "draft": [
+ permissions.IsAuthenticated,
+ HasDeterminationDraftPermission,
+ IsApplyStaffUser,
+ ],
}
serializer_class = SubmissionDeterminationSerializer
def get_permissions(self):
try:
# return permission_classes depending on `action`
- return [permission() for permission in self.permission_classes_by_action[self.action]]
+ return [
+ permission()
+ for permission in self.permission_classes_by_action[self.action]
+ ]
except KeyError:
# action is not set return default permission_classes
return [permission() for permission in self.permission_classes]
@@ -62,7 +71,7 @@ def get_defined_fields(self):
These form fields will be used to get respective serializer fields.
"""
- if self.action in ['retrieve', 'update']:
+ if self.action in ["retrieve", "update"]:
# For detail and edit api form fields used while submitting
# determination should be used.
determination = self.get_object()
@@ -76,13 +85,13 @@ def get_serializer_class(self):
if the request is to save as draft or the determination submitted
is saved as draft.
"""
- if self.action == 'retrieve':
+ if self.action == "retrieve":
determination = self.get_object()
draft = determination.is_draft
- elif self.action == 'draft':
+ elif self.action == "draft":
draft = True
else:
- draft = self.request.data.get('is_draft', False)
+ draft = self.request.data.get("is_draft", False)
return super().get_serializer_class(draft)
def get_queryset(self):
@@ -94,7 +103,7 @@ def get_object(self):
Get the determination object by id. If not found raise 404.
"""
queryset = self.get_queryset()
- obj = get_object_or_404(queryset, id=self.kwargs['pk'])
+ obj = get_object_or_404(queryset, id=self.kwargs["pk"])
self.check_object_permissions(self.request, obj)
return obj
@@ -109,8 +118,8 @@ def get_determination_data(self, determination):
determination_data[field_block.id] = determination.outcome
if isinstance(field_block.block, RichTextBlock):
determination_data[field_block.id] = field_block.value.source
- determination_data['id'] = determination.id
- determination_data['is_draft'] = determination.is_draft
+ determination_data["id"] = determination.id
+ determination_data["is_draft"] = determination.is_draft
return determination_data
def retrieve(self, request, *args, **kwargs):
@@ -118,9 +127,7 @@ def retrieve(self, request, *args, **kwargs):
Get details of a determination on a submission
"""
determination = self.get_object()
- ser = self.get_serializer(
- self.get_determination_data(determination)
- )
+ ser = self.get_serializer(self.get_determination_data(determination))
return Response(ser.data)
def get_form_fields(self):
@@ -132,17 +139,19 @@ def get_form_fields(self):
outcome_choices = outcome_choices_for_phase(
submission, self.request.user
)
- if self.action == 'update':
+ if self.action == "update":
# Outcome can not be edited after being set once, so we do not
# need to render this field.
# form_fields.pop(field_block.id)
- form_fields[field_block.id].widget = forms.TextInput(attrs={'readonly': 'readonly'})
+ form_fields[field_block.id].widget = forms.TextInput(
+ attrs={"readonly": "readonly"}
+ )
else:
# Outcome field choices need to be set according to the phase.
form_fields[field_block.id].choices = outcome_choices
return form_fields
- @action(detail=False, methods=['get'])
+ @action(detail=False, methods=["get"])
def fields(self, request, *args, **kwargs):
"""
List details of all the form fields that were created by admin for adding determinations.
@@ -156,13 +165,15 @@ def fields(self, request, *args, **kwargs):
def get_draft_determination(self):
submission = self.get_submission_object()
try:
- determination = Determination.objects.get(submission=submission, is_draft=True)
+ determination = Determination.objects.get(
+ submission=submission, is_draft=True
+ )
except Determination.DoesNotExist:
return
else:
return determination
- @action(detail=False, methods=['get'])
+ @action(detail=False, methods=["get"])
def draft(self, request, *args, **kwargs):
"""
Returns the draft determination submitted on a submission by current user.
@@ -170,9 +181,7 @@ def draft(self, request, *args, **kwargs):
determination = self.get_draft_determination()
if not determination:
return Response({})
- ser = self.get_serializer(
- self.get_determination_data(determination)
- )
+ ser = self.get_serializer(self.get_determination_data(determination))
return Response(ser.data)
def create(self, request, *args, **kwargs):
@@ -193,9 +202,9 @@ def create(self, request, *args, **kwargs):
ser = self.get_serializer(data=request.data)
ser.is_valid(raise_exception=True)
if has_final_determination(submission):
- return ValidationError({
- 'detail': 'A final determination has already been submitted.'
- })
+ return ValidationError(
+ {"detail": "A final determination has already been submitted."}
+ )
determination = self.get_draft_determination()
if determination is None:
determination = Determination.objects.create(
@@ -205,9 +214,7 @@ def create(self, request, *args, **kwargs):
determination.save()
ser.update(determination, ser.validated_data)
if determination.is_draft:
- ser = self.get_serializer(
- self.get_determination_data(determination)
- )
+ ser = self.get_serializer(self.get_determination_data(determination))
return Response(ser.data, status=status.HTTP_201_CREATED)
with transaction.atomic():
messenger(
@@ -217,7 +224,7 @@ def create(self, request, *args, **kwargs):
submission=submission,
related=determination,
)
- proposal_form = ser.validated_data.get('proposal_form')
+ proposal_form = ser.validated_data.get("proposal_form")
transition = transition_from_outcome(int(determination.outcome), submission)
if determination.outcome == NEEDS_MORE_INFO:
@@ -247,9 +254,7 @@ def create(self, request, *args, **kwargs):
source=submission,
related=determination,
)
- ser = self.get_serializer(
- self.get_determination_data(determination)
- )
+ ser = self.get_serializer(self.get_determination_data(determination))
return Response(ser.data, status=status.HTTP_201_CREATED)
def update(self, request, *args, **kwargs):
@@ -268,7 +273,5 @@ def update(self, request, *args, **kwargs):
source=determination.submission,
related=determination,
)
- ser = self.get_serializer(
- self.get_determination_data(determination)
- )
+ ser = self.get_serializer(self.get_determination_data(determination))
return Response(ser.data)
diff --git a/hypha/apply/api/v1/filters.py b/hypha/apply/api/v1/filters.py
index 6b2b0e545e..cec4b38333 100644
--- a/hypha/apply/api/v1/filters.py
+++ b/hypha/apply/api/v1/filters.py
@@ -18,46 +18,62 @@
class SubmissionsFilter(filters.FilterSet):
- round = filters.ModelMultipleChoiceFilter(field_name='round', queryset=get_used_rounds())
+ round = filters.ModelMultipleChoiceFilter(
+ field_name="round", queryset=get_used_rounds()
+ )
status = filters.MultipleChoiceFilter(choices=PHASES)
- active = filters.BooleanFilter(method='filter_active', label=_('Active'))
- submit_date = filters.DateFromToRangeFilter(field_name='submit_time', label=_('Submit date'))
+ active = filters.BooleanFilter(method="filter_active", label=_("Active"))
+ submit_date = filters.DateFromToRangeFilter(
+ field_name="submit_time", label=_("Submit date")
+ )
fund = filters.ModelMultipleChoiceFilter(
- field_name='page', label=_('fund'),
- queryset=Page.objects.type(FundType) | Page.objects.type(LabType)
+ field_name="page",
+ label=_("fund"),
+ queryset=Page.objects.type(FundType) | Page.objects.type(LabType),
)
screening_statuses = filters.ModelMultipleChoiceFilter(
- field_name='screening_statuses',
+ field_name="screening_statuses",
queryset=get_screening_statuses(),
- null_label=_('No Screening')
+ null_label=_("No Screening"),
)
reviewers = filters.ModelMultipleChoiceFilter(
- field_name='reviewers',
+ field_name="reviewers",
queryset=get_all_reviewers(),
)
lead = filters.ModelMultipleChoiceFilter(
- field_name='lead',
+ field_name="lead",
queryset=get_round_leads(),
)
category_options = filters.MultipleChoiceFilter(
- choices=[], label=_('Category'),
- method='filter_category_options'
+ choices=[], label=_("Category"), method="filter_category_options"
)
id = filters.ModelMultipleChoiceFilter(
- field_name='id',
- queryset=ApplicationSubmission.objects.exclude_draft().current().with_latest_update(),
- method='filter_id'
+ field_name="id",
+ queryset=ApplicationSubmission.objects.exclude_draft()
+ .current()
+ .with_latest_update(),
+ method="filter_id",
)
class Meta:
model = ApplicationSubmission
- fields = ('id', 'status', 'round', 'active', 'submit_date', 'fund', 'screening_statuses', 'reviewers', 'lead')
+ fields = (
+ "id",
+ "status",
+ "round",
+ "active",
+ "submit_date",
+ "fund",
+ "screening_statuses",
+ "reviewers",
+ "lead",
+ )
def __init__(self, *args, exclude=None, limit_statuses=None, **kwargs):
if exclude is None:
exclude = []
super().__init__(*args, **kwargs)
- self.filters['category_options'].extra['choices'] = [
+ self.filters["category_options"].extra["choices"] = [
(option.id, option.value)
for option in Option.objects.filter(category__filter_on_dashboard=True)
]
@@ -80,12 +96,14 @@ def filter_category_options(self, queryset, name, value):
And then use those category fields to filter submissions with their form_data.
"""
query = Q()
- submission_data = queryset.values('form_fields', 'form_data').distinct()
+ submission_data = queryset.values("form_fields", "form_data").distinct()
for submission in submission_data:
- for field in submission['form_fields']:
+ for field in submission["form_fields"]:
if isinstance(field.block, CategoryQuestionBlock):
try:
- category_options = category_ids = submission['form_data'][field.id]
+ category_options = category_ids = submission["form_data"][
+ field.id
+ ]
except KeyError:
include_in_filter = False
else:
@@ -96,7 +114,7 @@ def filter_category_options(self, queryset, name, value):
# If yes then those submissions should be filtered in the list
if include_in_filter:
kwargs = {
- '{0}__{1}'.format('form_data', field.id): category_ids
+ "{0}__{1}".format("form_data", field.id): category_ids
}
query |= Q(**kwargs)
return queryset.filter(query)
@@ -116,15 +134,15 @@ def filter(self, qs, value):
class CommentFilter(filters.FilterSet):
- since = filters.DateTimeFilter(field_name="timestamp", lookup_expr='gte')
- before = filters.DateTimeFilter(field_name="timestamp", lookup_expr='lte')
+ since = filters.DateTimeFilter(field_name="timestamp", lookup_expr="gte")
+ before = filters.DateTimeFilter(field_name="timestamp", lookup_expr="lte")
newer = NewerThanFilter(queryset=Activity.comments.all())
class Meta:
model = Activity
- fields = ['visibility', 'since', 'before', 'newer']
+ fields = ["visibility", "since", "before", "newer"]
class AllCommentFilter(CommentFilter):
class Meta(CommentFilter.Meta):
- fields = CommentFilter.Meta.fields + ['source_object_id']
+ fields = CommentFilter.Meta.fields + ["source_object_id"]
diff --git a/hypha/apply/api/v1/mixin.py b/hypha/apply/api/v1/mixin.py
index f132366d1f..f2c3b85ccb 100644
--- a/hypha/apply/api/v1/mixin.py
+++ b/hypha/apply/api/v1/mixin.py
@@ -6,20 +6,14 @@
class SubmissionNestedMixin:
def get_submission_object(self):
- return get_object_or_404(
- ApplicationSubmission, id=self.kwargs['submission_pk']
- )
+ return get_object_or_404(ApplicationSubmission, id=self.kwargs["submission_pk"])
class InvoiceNestedMixin:
def get_invoice_object(self):
- return get_object_or_404(
- Invoice, id=self.kwargs['invoice_pk']
- )
+ return get_object_or_404(Invoice, id=self.kwargs["invoice_pk"])
class ProjectNestedMixin:
def get_project_object(self):
- return get_object_or_404(
- Project, id=self.kwargs['project_pk']
- )
+ return get_object_or_404(Project, id=self.kwargs["project_pk"])
diff --git a/hypha/apply/api/v1/pagination.py b/hypha/apply/api/v1/pagination.py
index 1382e50358..e626238ea0 100644
--- a/hypha/apply/api/v1/pagination.py
+++ b/hypha/apply/api/v1/pagination.py
@@ -2,5 +2,5 @@
class StandardResultsSetPagination(pagination.PageNumberPagination):
- page_size_query_param = 'page_size'
+ page_size_query_param = "page_size"
max_page_size = 1000
diff --git a/hypha/apply/api/v1/projects/serializers.py b/hypha/apply/api/v1/projects/serializers.py
index a86b54e6ad..06edda05fc 100644
--- a/hypha/apply/api/v1/projects/serializers.py
+++ b/hypha/apply/api/v1/projects/serializers.py
@@ -6,15 +6,15 @@
class InvoiceDeliverableListSerializer(serializers.ModelSerializer):
invoice_id = serializers.SerializerMethodField()
- project_id = serializers.IntegerField(source='deliverable.project.id')
+ project_id = serializers.IntegerField(source="deliverable.project.id")
class Meta:
model = InvoiceDeliverable
- fields = ('id', 'deliverable', 'quantity', 'invoice_id', 'project_id')
+ fields = ("id", "deliverable", "quantity", "invoice_id", "project_id")
depth = 1
def get_invoice_id(self, obj):
- return self.context['invoice'].id
+ return self.context["invoice"].id
class DeliverableSerializer(serializers.Serializer):
@@ -25,7 +25,5 @@ def validate_id(self, value):
try:
Deliverable.objects.get(id=value)
except Deliverable.DoesNotExist as e:
- raise exceptions.ValidationError({
- 'detail': _('Not found')
- }) from e
+ raise exceptions.ValidationError({"detail": _("Not found")}) from e
return value
diff --git a/hypha/apply/api/v1/projects/views.py b/hypha/apply/api/v1/projects/views.py
index c3e6e6cd98..f3991bb06d 100644
--- a/hypha/apply/api/v1/projects/views.py
+++ b/hypha/apply/api/v1/projects/views.py
@@ -25,11 +25,12 @@ class InvoiceDeliverableViewSet(
ProjectNestedMixin,
mixins.CreateModelMixin,
mixins.DestroyModelMixin,
- viewsets.GenericViewSet
+ viewsets.GenericViewSet,
):
permission_classes = (
- permissions.IsAuthenticated, HasDeliverableEditPermission,
- IsApplyStaffUser | IsFinance1User | IsFinance2User
+ permissions.IsAuthenticated,
+ HasDeliverableEditPermission,
+ IsApplyStaffUser | IsFinance1User | IsFinance2User,
)
serializer_class = InvoiceDeliverableListSerializer
pagination_class = None
@@ -42,27 +43,29 @@ def create(self, request, *args, **kwargs):
ser = DeliverableSerializer(data=request.data)
ser.is_valid(raise_exception=True)
project = self.get_project_object()
- deliverable_id = ser.validated_data['id']
+ deliverable_id = ser.validated_data["id"]
if not project.deliverables.filter(id=deliverable_id).exists():
- raise ValidationError({'detail': _("Not Found")})
+ raise ValidationError({"detail": _("Not Found")})
invoice = self.get_invoice_object()
- deliverable = get_object_or_404(
- Deliverable, id=deliverable_id
- )
+ deliverable = get_object_or_404(Deliverable, id=deliverable_id)
if invoice.deliverables.filter(deliverable=deliverable).exists():
- raise ValidationError({'detail': _("Invoice Already has this deliverable")})
- quantity = ser.validated_data['quantity']
+ raise ValidationError({"detail": _("Invoice Already has this deliverable")})
+ quantity = ser.validated_data["quantity"]
if deliverable.available_to_invoice < quantity:
- raise ValidationError({'detail': _("Required quantity is more than available")})
+ raise ValidationError(
+ {"detail": _("Required quantity is more than available")}
+ )
invoice_deliverable = InvoiceDeliverable.objects.create(
- deliverable=deliverable,
- quantity=ser.validated_data['quantity']
+ deliverable=deliverable, quantity=ser.validated_data["quantity"]
)
invoice.deliverables.add(invoice_deliverable)
ser = self.get_serializer(invoice.deliverables.all(), many=True)
return Response(
- {'deliverables': ser.data, 'total': invoice.deliverables_total_amount['total']},
- status=status.HTTP_201_CREATED
+ {
+ "deliverables": ser.data,
+ "total": invoice.deliverables_total_amount["total"],
+ },
+ status=status.HTTP_201_CREATED,
)
def get_serializer_context(self):
@@ -76,5 +79,8 @@ def destroy(self, request, *args, **kwargs):
invoice.deliverables.remove(deliverable)
ser = self.get_serializer(invoice.deliverables.all(), many=True)
return Response(
- {'deliverables': ser.data, 'total': invoice.deliverables_total_amount['total']},
+ {
+ "deliverables": ser.data,
+ "total": invoice.deliverables_total_amount["total"],
+ },
)
diff --git a/hypha/apply/api/v1/reminder/serializers.py b/hypha/apply/api/v1/reminder/serializers.py
index 8f99cbab7e..147fe1bc3d 100644
--- a/hypha/apply/api/v1/reminder/serializers.py
+++ b/hypha/apply/api/v1/reminder/serializers.py
@@ -4,12 +4,11 @@
class SubmissionReminderSerializer(serializers.ModelSerializer):
-
def validate(self, data):
"""
Check title is empty.
"""
- required_fields = ['title']
+ required_fields = ["title"]
for field in required_fields:
if not data.get(field, None):
raise serializers.ValidationError({field: "shouldn't be empty"})
@@ -17,5 +16,13 @@ def validate(self, data):
class Meta:
model = Reminder
- fields = ('time', 'action_type', 'is_expired', 'id', 'action', 'title', 'description')
- read_only_fields = ('action_type', 'is_expired')
+ fields = (
+ "time",
+ "action_type",
+ "is_expired",
+ "id",
+ "action",
+ "title",
+ "description",
+ )
+ read_only_fields = ("action_type", "is_expired")
diff --git a/hypha/apply/api/v1/reminder/views.py b/hypha/apply/api/v1/reminder/views.py
index 9fe899c2e5..f3e05a0428 100644
--- a/hypha/apply/api/v1/reminder/views.py
+++ b/hypha/apply/api/v1/reminder/views.py
@@ -13,17 +13,18 @@ class SubmissionReminderViewSet(
SubmissionNestedMixin,
mixins.ListModelMixin,
mixins.CreateModelMixin,
- viewsets.GenericViewSet
+ viewsets.GenericViewSet,
):
permission_classes = (
- permissions.IsAuthenticated, IsApplyStaffUser,
+ permissions.IsAuthenticated,
+ IsApplyStaffUser,
)
serializer_class = SubmissionReminderSerializer
pagination_class = None
def get_queryset(self):
submission = self.get_submission_object()
- return Reminder.objects.filter(submission=submission).order_by('-time')
+ return Reminder.objects.filter(submission=submission).order_by("-time")
def perform_create(self, serializer):
serializer.save(user=self.request.user, submission=self.get_submission_object())
@@ -34,7 +35,7 @@ def destroy(self, request, *args, **kwargs):
ser = self.get_serializer(self.get_queryset(), many=True)
return Response(ser.data)
- @action(detail=False, methods=['get'])
+ @action(detail=False, methods=["get"])
def fields(self, request, *args, **kwargs):
"""
List details of all the form fields that were created by admin for adding reminders.
@@ -51,20 +52,22 @@ def fields(self, request, *args, **kwargs):
"id": "description",
"type": "textArea",
"kwargs": {"label": "Description"},
- "widget": {
- "attrs": {"cols": 40, "rows": 5},
- "type": "Textarea"
- }
+ "widget": {"attrs": {"cols": 40, "rows": 5}, "type": "Textarea"},
},
{
"id": "time",
"kwargs": {"label": "Time", "required": True},
- "type": "DateTime"
+ "type": "DateTime",
},
{
"id": "action",
- "kwargs": {"label": "Action", "required": True, "choices": Reminder.ACTIONS.items(), "initial": Reminder.REVIEW},
- "type": "Select"
- }
+ "kwargs": {
+ "label": "Action",
+ "required": True,
+ "choices": Reminder.ACTIONS.items(),
+ "initial": Reminder.REVIEW,
+ },
+ "type": "Select",
+ },
]
return Response(fields)
diff --git a/hypha/apply/api/v1/review/fields.py b/hypha/apply/api/v1/review/fields.py
index 600b86b243..0bc9ba7aa8 100644
--- a/hypha/apply/api/v1/review/fields.py
+++ b/hypha/apply/api/v1/review/fields.py
@@ -7,18 +7,17 @@
class ScoredAnswerListField(serializers.ListField):
- childs = [
- serializers.CharField(),
- serializers.ChoiceField(choices=RATE_CHOICES)
- ]
+ childs = [serializers.CharField(), serializers.ChoiceField(choices=RATE_CHOICES)]
def __init__(self, *args, **kwargs):
- draft = kwargs.pop('draft', False)
+ draft = kwargs.pop("draft", False)
super().__init__(*args, **kwargs)
if draft:
self.childs = [
- serializers.CharField(required=False, allow_null=True, allow_blank=True),
- serializers.ChoiceField(choices=RATE_CHOICES)
+ serializers.CharField(
+ required=False, allow_null=True, allow_blank=True
+ ),
+ serializers.ChoiceField(choices=RATE_CHOICES),
]
def run_child_validation(self, data):
diff --git a/hypha/apply/api/v1/review/permissions.py b/hypha/apply/api/v1/review/permissions.py
index 334154b266..d55e6a7f09 100644
--- a/hypha/apply/api/v1/review/permissions.py
+++ b/hypha/apply/api/v1/review/permissions.py
@@ -5,29 +5,34 @@ class HasReviewCreatePermission(permissions.BasePermission):
"""
Custom permission that user should have for creating review.
"""
+
def has_permission(self, request, view):
try:
submission = view.get_submission_object()
except KeyError:
return True
- return (
- submission.phase.permissions.can_review(request.user) and
- submission.has_permission_to_review(request.user)
- )
+ return submission.phase.permissions.can_review(
+ request.user
+ ) and submission.has_permission_to_review(request.user)
class HasReviewEditPermission(permissions.BasePermission):
"""
Custom permission that user should have for editing review.
"""
+
def has_object_permission(self, request, view, obj):
- return request.user.has_perm('review.change_review') or request.user == obj.author.reviewer
+ return (
+ request.user.has_perm("review.change_review")
+ or request.user == obj.author.reviewer
+ )
class HasReviewDetailPermission(permissions.BasePermission):
"""
Custom permission that user should have for viewing review.
"""
+
def has_object_permission(self, request, view, obj):
user = request.user
author = obj.author.reviewer
@@ -42,7 +47,12 @@ def has_object_permission(self, request, view, obj):
if user.is_reviewer and obj.reviewer_visibility:
return True
- if user.is_community_reviewer and submission.community_review and obj.reviewer_visibility and submission.user != user:
+ if (
+ user.is_community_reviewer
+ and submission.community_review
+ and obj.reviewer_visibility
+ and submission.user != user
+ ):
return True
return False
@@ -52,14 +62,18 @@ class HasReviewDeletePermission(permissions.BasePermission):
"""
Custom permission that user should have for deleting review.
"""
+
def has_object_permission(self, request, view, obj):
- return request.user.has_perm('review.delete_review') or request.user == obj.author
+ return (
+ request.user.has_perm("review.delete_review") or request.user == obj.author
+ )
class HasReviewOpinionPermission(permissions.BasePermission):
"""
Custom permission that user should have for posting opinion on a review.
"""
+
def has_object_permission(self, request, view, obj):
review = obj
user = request.user
@@ -75,7 +89,12 @@ def has_object_permission(self, request, view, obj):
if user.is_reviewer and review.reviewer_visibility:
return True
- if user.is_community_reviewer and submission.community_review and review.reviewer_visibility and submission.user != user:
+ if (
+ user.is_community_reviewer
+ and submission.community_review
+ and review.reviewer_visibility
+ and submission.user != user
+ ):
return True
return False
@@ -85,9 +104,15 @@ class HasReviewDraftPermission(permissions.BasePermission):
"""
Custom permission that user should have to access draft review.
"""
+
def has_object_permission(self, request, view, obj):
try:
submission = view.get_submission_object()
except KeyError:
return True
- return submission.can_review(request.user) and submission.assigned.draft_reviewed().filter(reviewer=request.user).exists()
+ return (
+ submission.can_review(request.user)
+ and submission.assigned.draft_reviewed()
+ .filter(reviewer=request.user)
+ .exists()
+ )
diff --git a/hypha/apply/api/v1/review/serializers.py b/hypha/apply/api/v1/review/serializers.py
index 80c2795e6a..d4353033e8 100644
--- a/hypha/apply/api/v1/review/serializers.py
+++ b/hypha/apply/api/v1/review/serializers.py
@@ -8,19 +8,19 @@
class ReviewOpinionReadSerializer(serializers.ModelSerializer):
- author_id = serializers.ReadOnlyField(source='author.id')
- opinion = serializers.ReadOnlyField(source='get_opinion_display')
+ author_id = serializers.ReadOnlyField(source="author.id")
+ opinion = serializers.ReadOnlyField(source="get_opinion_display")
class Meta:
model = ReviewOpinion
- fields = ('author_id', 'opinion')
+ fields = ("author_id", "opinion")
class ReviewOpinionWriteSerializer(serializers.ModelSerializer):
class Meta:
model = ReviewOpinion
- fields = ('opinion', )
- extra_kwargs = {'opinion': {'write_only': True}}
+ fields = ("opinion",)
+ extra_kwargs = {"opinion": {"write_only": True}}
class SubmissionReviewSerializer(serializers.ModelSerializer):
@@ -28,21 +28,23 @@ class SubmissionReviewSerializer(serializers.ModelSerializer):
class Meta:
model = Review
- fields = ['id', 'score', 'is_draft', 'opinions', ]
- extra_kwargs = {
- 'score': {'read_only': True},
- 'is_draft': {'required': False}
- }
+ fields = [
+ "id",
+ "score",
+ "is_draft",
+ "opinions",
+ ]
+ extra_kwargs = {"score": {"read_only": True}, "is_draft": {"required": False}}
def get_recommendation(self, obj):
return {
- 'value': obj.recommendation,
- 'display': obj.get_recommendation_display(),
+ "value": obj.recommendation,
+ "display": obj.get_recommendation_display(),
}
def validate(self, data):
validated_data = super().validate(data)
- validated_data['form_data'] = dict(validated_data.items())
+ validated_data["form_data"] = dict(validated_data.items())
return validated_data
def update(self, instance, validated_data):
@@ -52,7 +54,7 @@ def update(self, instance, validated_data):
instance.recommendation = int(
recommendation if recommendation is not None else NO
)
- instance.is_draft = self.validated_data.get('is_draft', False)
+ instance.is_draft = self.validated_data.get("is_draft", False)
# Old review forms do not have the requred visability field.
# This will set visibility to PRIVATE by default.
@@ -71,7 +73,7 @@ def update(self, instance, validated_data):
def calculate_score(self, instance, data):
scores = []
for field in instance.score_fields:
- score = data.get(field.id, ['', NA])
+ score = data.get(field.id, ["", NA])
# Include NA answers as 0.
score = score[1] if score is not None else NA
if score == NA:
@@ -80,9 +82,9 @@ def calculate_score(self, instance, data):
# Check if there are score_fields_without_text and also
# append scores from them.
for field in instance.score_fields_without_text:
- score = data.get(field.id, '')
+ score = data.get(field.id, "")
# Include '' answers as 0.
- if score is None or score == '':
+ if score is None or score == "":
score = 0
scores.append(int(score))
@@ -103,7 +105,7 @@ def get_id(self, obj):
def get_type(self, obj):
if isinstance(obj[1], BlockFieldWrapper):
- return 'LoadHTML'
+ return "LoadHTML"
return obj[1].__class__.__name__
def get_kwargs(self, obj):
diff --git a/hypha/apply/api/v1/review/utils.py b/hypha/apply/api/v1/review/utils.py
index 12b4d4d53d..c172bf7812 100644
--- a/hypha/apply/api/v1/review/utils.py
+++ b/hypha/apply/api/v1/review/utils.py
@@ -9,21 +9,33 @@ def review_workflow_actions(request, submission):
if submission.status == INITIAL_STATE:
# Automatically transition the application to "Internal review".
action = submission_stepped_phases[2][0].name
- elif submission.status == 'proposal_discussion':
+ elif submission.status == "proposal_discussion":
# Automatically transition the proposal to "Internal review".
- action = 'proposal_internal_review'
- elif submission.status == submission_stepped_phases[2][0].name and submission.reviews.count() > 1:
+ action = "proposal_internal_review"
+ elif (
+ submission.status == submission_stepped_phases[2][0].name
+ and submission.reviews.count() > 1
+ ):
# Automatically transition the application to "Ready for discussion".
action = submission_stepped_phases[3][0].name
- elif submission.status == 'ext_external_review' and submission.reviews.by_reviewers().count() > 1:
+ elif (
+ submission.status == "ext_external_review"
+ and submission.reviews.by_reviewers().count() > 1
+ ):
# Automatically transition the application to "Ready for discussion".
- action = 'ext_post_external_review_discussion'
- elif submission.status == 'com_external_review' and submission.reviews.by_reviewers().count() > 1:
+ action = "ext_post_external_review_discussion"
+ elif (
+ submission.status == "com_external_review"
+ and submission.reviews.by_reviewers().count() > 1
+ ):
# Automatically transition the application to "Ready for discussion".
- action = 'com_post_external_review_discussion'
- elif submission.status == 'external_review' and submission.reviews.by_reviewers().count() > 1:
+ action = "com_post_external_review_discussion"
+ elif (
+ submission.status == "external_review"
+ and submission.reviews.by_reviewers().count() > 1
+ ):
# Automatically transition the proposal to "Ready for discussion".
- action = 'post_external_review_discussion'
+ action = "post_external_review_discussion"
# If action is set run perform_transition().
if action:
@@ -39,7 +51,7 @@ def review_workflow_actions(request, submission):
def get_review_form_fields_for_stage(submission):
- forms = submission.get_from_parent('review_forms').all()
+ forms = submission.get_from_parent("review_forms").all()
index = submission.workflow.stages.index(submission.stage)
try:
return forms[index].form.form_fields
diff --git a/hypha/apply/api/v1/review/views.py b/hypha/apply/api/v1/review/views.py
index 5ad667c309..09033429c2 100644
--- a/hypha/apply/api/v1/review/views.py
+++ b/hypha/apply/api/v1/review/views.py
@@ -30,29 +30,58 @@
class SubmissionReviewViewSet(
- BaseStreamForm,
- WagtailSerializer,
- SubmissionNestedMixin,
- viewsets.GenericViewSet
+ BaseStreamForm, WagtailSerializer, SubmissionNestedMixin, viewsets.GenericViewSet
):
permission_classes = (
- permissions.IsAuthenticated, IsApplyStaffUser,
+ permissions.IsAuthenticated,
+ IsApplyStaffUser,
)
permission_classes_by_action = {
- 'create': [permissions.IsAuthenticated, HasReviewCreatePermission, IsApplyStaffUser, ],
- 'retrieve': [permissions.IsAuthenticated, HasReviewDetailPermission, IsApplyStaffUser, ],
- 'update': [permissions.IsAuthenticated, HasReviewEditPermission, IsApplyStaffUser, ],
- 'delete': [permissions.IsAuthenticated, HasReviewDeletePermission, IsApplyStaffUser, ],
- 'opinions': [permissions.IsAuthenticated, HasReviewOpinionPermission, IsApplyStaffUser, ],
- 'fields': [permissions.IsAuthenticated, HasReviewCreatePermission, IsApplyStaffUser, ],
- 'draft': [permissions.IsAuthenticated, HasReviewDraftPermission, IsApplyStaffUser, ],
+ "create": [
+ permissions.IsAuthenticated,
+ HasReviewCreatePermission,
+ IsApplyStaffUser,
+ ],
+ "retrieve": [
+ permissions.IsAuthenticated,
+ HasReviewDetailPermission,
+ IsApplyStaffUser,
+ ],
+ "update": [
+ permissions.IsAuthenticated,
+ HasReviewEditPermission,
+ IsApplyStaffUser,
+ ],
+ "delete": [
+ permissions.IsAuthenticated,
+ HasReviewDeletePermission,
+ IsApplyStaffUser,
+ ],
+ "opinions": [
+ permissions.IsAuthenticated,
+ HasReviewOpinionPermission,
+ IsApplyStaffUser,
+ ],
+ "fields": [
+ permissions.IsAuthenticated,
+ HasReviewCreatePermission,
+ IsApplyStaffUser,
+ ],
+ "draft": [
+ permissions.IsAuthenticated,
+ HasReviewDraftPermission,
+ IsApplyStaffUser,
+ ],
}
serializer_class = SubmissionReviewSerializer
def get_permissions(self):
try:
# return permission_classes depending on `action`
- return [permission() for permission in self.permission_classes_by_action[self.action]]
+ return [
+ permission()
+ for permission in self.permission_classes_by_action[self.action]
+ ]
except KeyError:
# action is not set return default permission_classes
return [permission() for permission in self.permission_classes]
@@ -63,12 +92,12 @@ def get_defined_fields(self):
These form fields will be used to get respective serializer fields.
"""
- if self.action in ['retrieve', 'update', 'opinions']:
+ if self.action in ["retrieve", "update", "opinions"]:
# For detail and edit api form fields used while submitting
# review should be used.
review = self.get_object()
return review.form_fields
- if self.action == 'draft':
+ if self.action == "draft":
review = self.get_review_by_reviewer()
return review.form_fields
submission = self.get_submission_object()
@@ -80,13 +109,13 @@ def get_serializer_class(self):
if the request is to save as draft or the review submitted
is saved as draft.
"""
- if self.action == 'retrieve':
+ if self.action == "retrieve":
review = self.get_object()
draft = review.is_draft
- elif self.action == 'draft':
+ elif self.action == "draft":
draft = True
else:
- draft = self.request.data.get('is_draft', False)
+ draft = self.request.data.get("is_draft", False)
return super().get_serializer_class(draft)
def get_queryset(self):
@@ -98,7 +127,7 @@ def get_object(self):
Get the review object by id. If not found raise 404.
"""
queryset = self.get_queryset()
- obj = get_object_or_404(queryset, id=self.kwargs['pk'])
+ obj = get_object_or_404(queryset, id=self.kwargs["pk"])
self.check_object_permissions(self.request, obj)
return obj
@@ -134,7 +163,9 @@ def create(self, request, *args, **kwargs):
submission=submission, author=self.get_reviewer()
)
if not create and not instance.is_draft:
- raise ValidationError({'detail': 'You have already posted a review for this submission'})
+ raise ValidationError(
+ {"detail": "You have already posted a review for this submission"}
+ )
instance.form_fields = self.get_defined_fields()
instance.save()
ser.update(instance, ser.validated_data)
@@ -148,9 +179,7 @@ def create(self, request, *args, **kwargs):
)
# Automatic workflow actions.
review_workflow_actions(self.request, submission)
- ser = self.get_serializer(
- self.get_review_data(instance)
- )
+ ser = self.get_serializer(self.get_review_data(instance))
return Response(ser.data, status=status.HTTP_201_CREATED)
def get_review_data(self, review):
@@ -158,10 +187,10 @@ def get_review_data(self, review):
Get review data which will be used for review detail api.
"""
review_data = review.form_data
- review_data['id'] = review.id
- review_data['score'] = review.score
- review_data['opinions'] = review.opinions
- review_data['is_draft'] = review.is_draft
+ review_data["id"] = review.id
+ review_data["score"] = review.score
+ review_data["opinions"] = review.opinions
+ review_data["is_draft"] = review.is_draft
for field_block in review.form_fields:
if isinstance(field_block.block, RichTextBlock):
review_data[field_block.id] = field_block.value.source
@@ -172,9 +201,7 @@ def retrieve(self, request, *args, **kwargs):
Get details of a review on a submission
"""
review = self.get_object()
- ser = self.get_serializer(
- self.get_review_data(review)
- )
+ ser = self.get_serializer(self.get_review_data(review))
return Response(ser.data)
def update(self, request, *args, **kwargs):
@@ -195,9 +222,7 @@ def update(self, request, *args, **kwargs):
)
# Automatic workflow actions.
review_workflow_actions(self.request, review.submission)
- ser = self.get_serializer(
- self.get_review_data(review)
- )
+ ser = self.get_serializer(self.get_review_data(review))
return Response(ser.data)
def destroy(self, request, *args, **kwargs):
@@ -220,7 +245,7 @@ def get_review_by_reviewer(self):
)
return review
- @action(detail=False, methods=['get'])
+ @action(detail=False, methods=["get"])
def draft(self, request, *args, **kwargs):
"""
Returns the draft review submitted on a submission by current user.
@@ -231,12 +256,10 @@ def draft(self, request, *args, **kwargs):
return Response({})
if not review.is_draft:
return Response({})
- ser = self.get_serializer(
- self.get_review_data(review)
- )
+ ser = self.get_serializer(self.get_review_data(review))
return Response(ser.data)
- @action(detail=False, methods=['get'])
+ @action(detail=False, methods=["get"])
def fields(self, request, *args, **kwargs):
"""
List details of all the form fields that were created by admin for adding reviews.
@@ -247,7 +270,7 @@ def fields(self, request, *args, **kwargs):
fields = FieldSerializer(fields.items(), many=True)
return Response(fields.data)
- @action(detail=True, methods=['post'])
+ @action(detail=True, methods=["post"])
def opinions(self, request, *args, **kwargs):
"""
Used to add opinions on a review.
@@ -259,22 +282,17 @@ def opinions(self, request, *args, **kwargs):
review = self.get_object()
ser = ReviewOpinionWriteSerializer(data=request.data)
ser.is_valid(raise_exception=True)
- opinion = ser.validated_data['opinion']
+ opinion = ser.validated_data["opinion"]
try:
review_opinion = ReviewOpinion.objects.get(
- review=review,
- author=self.get_reviewer()
+ review=review, author=self.get_reviewer()
)
except ReviewOpinion.DoesNotExist:
ReviewOpinion.objects.create(
- review=review,
- author=self.get_reviewer(),
- opinion=opinion
+ review=review, author=self.get_reviewer(), opinion=opinion
)
else:
review_opinion.opinion = opinion
review_opinion.save()
- ser = self.get_serializer(
- self.get_review_data(review)
- )
+ ser = self.get_serializer(self.get_review_data(review))
return Response(ser.data, status=status.HTTP_201_CREATED)
diff --git a/hypha/apply/api/v1/screening/filters.py b/hypha/apply/api/v1/screening/filters.py
index 51da1140a9..610c714934 100644
--- a/hypha/apply/api/v1/screening/filters.py
+++ b/hypha/apply/api/v1/screening/filters.py
@@ -6,4 +6,4 @@
class ScreeningStatusFilter(filters.FilterSet):
class Meta:
model = ScreeningStatus
- fields = ['yes', 'default']
+ fields = ["yes", "default"]
diff --git a/hypha/apply/api/v1/screening/serializers.py b/hypha/apply/api/v1/screening/serializers.py
index 1ab08ad63a..eeefea1b5a 100644
--- a/hypha/apply/api/v1/screening/serializers.py
+++ b/hypha/apply/api/v1/screening/serializers.py
@@ -6,7 +6,7 @@
class ScreeningStatusListSerializer(serializers.ModelSerializer):
class Meta:
model = ScreeningStatus
- fields = ('id', 'title', 'yes', 'default')
+ fields = ("id", "title", "yes", "default")
class ScreeningStatusSerializer(serializers.Serializer):
@@ -16,9 +16,7 @@ def validate_id(self, value):
try:
ScreeningStatus.objects.get(id=value)
except ScreeningStatus.DoesNotExist as e:
- raise exceptions.ValidationError({
- 'detail': 'Not found'
- }) from e
+ raise exceptions.ValidationError({"detail": "Not found"}) from e
return value
diff --git a/hypha/apply/api/v1/screening/tests/test_views.py b/hypha/apply/api/v1/screening/tests/test_views.py
index 719e21340e..b0d37f809b 100644
--- a/hypha/apply/api/v1/screening/tests/test_views.py
+++ b/hypha/apply/api/v1/screening/tests/test_views.py
@@ -9,33 +9,30 @@
from hypha.apply.users.tests.factories import ReviewerFactory, StaffFactory, UserFactory
-@override_settings(ROOT_URLCONF='hypha.apply.urls')
+@override_settings(ROOT_URLCONF="hypha.apply.urls")
@override_settings(SECURE_SSL_REDIRECT=False)
class ScreeningStatusViewSetTests(APITestCase):
def setUp(self):
ScreeningStatus.objects.all().delete()
- self.yes_screening_status = baker.make(
- 'funds.ScreeningStatus',
- yes=True
- )
+ self.yes_screening_status = baker.make("funds.ScreeningStatus", yes=True)
def get_screening_status_url(self, pk=None):
if pk:
- return reverse_lazy('api:v1:screenings-detail', kwargs={'pk': pk})
- return reverse_lazy('api:v1:screenings-list')
+ return reverse_lazy("api:v1:screenings-detail", kwargs={"pk": pk})
+ return reverse_lazy("api:v1:screenings-list")
def test_staff_can_list_screening_statuses(self):
user = StaffFactory()
self.client.force_authenticate(user)
- response = self.client.get(
- self.get_screening_status_url()
- )
+ response = self.client.get(self.get_screening_status_url())
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(len(response.json()), ScreeningStatus.objects.count())
- self.assertEqual(response.json()[0]['id'], self.yes_screening_status.id)
- self.assertEqual(response.json()[0]['title'], self.yes_screening_status.title)
- self.assertEqual(response.json()[0]['yes'], self.yes_screening_status.yes)
- self.assertEqual(response.json()[0]['default'], self.yes_screening_status.default)
+ self.assertEqual(response.json()[0]["id"], self.yes_screening_status.id)
+ self.assertEqual(response.json()[0]["title"], self.yes_screening_status.title)
+ self.assertEqual(response.json()[0]["yes"], self.yes_screening_status.yes)
+ self.assertEqual(
+ response.json()[0]["default"], self.yes_screening_status.default
+ )
def test_staff_can_view_screening_statuses_detail(self):
user = StaffFactory()
@@ -48,47 +45,36 @@ def test_staff_can_view_screening_statuses_detail(self):
def test_user_cant_list_screening_statuses(self):
user = UserFactory()
self.client.force_authenticate(user)
- response = self.client.get(
- self.get_screening_status_url()
- )
+ response = self.client.get(self.get_screening_status_url())
self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
def test_reviewer_cant_list_screening_statuses(self):
user = ReviewerFactory()
self.client.force_authenticate(user)
- response = self.client.get(
- self.get_screening_status_url()
- )
+ response = self.client.get(self.get_screening_status_url())
self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
@override_settings(SECURE_SSL_REDIRECT=False)
-@override_settings(ROOT_URLCONF='hypha.apply.urls')
+@override_settings(ROOT_URLCONF="hypha.apply.urls")
class SubmissionScreeningStatusViewSetTests(APITestCase):
def setUp(self):
ScreeningStatus.objects.all().delete()
- self.yes_screening_status = baker.make(
- 'funds.ScreeningStatus',
- yes=True
- )
+ self.yes_screening_status = baker.make("funds.ScreeningStatus", yes=True)
self.yes_default_screening_status = baker.make(
- 'funds.ScreeningStatus',
- yes=True,
- default=True
- )
- self.no_screening_status = baker.make(
- 'funds.ScreeningStatus',
- yes=False
+ "funds.ScreeningStatus", yes=True, default=True
)
+ self.no_screening_status = baker.make("funds.ScreeningStatus", yes=False)
self.no_default_screening_status = baker.make(
- 'funds.ScreeningStatus',
- yes=False,
- default=True
+ "funds.ScreeningStatus", yes=False, default=True
)
self.submission = ApplicationSubmissionFactory()
def get_submission_screening_status_url(self, submission_id=None):
- return reverse_lazy('api:v1:submission-screening_statuses-list', kwargs={'submission_pk': submission_id})
+ return reverse_lazy(
+ "api:v1:submission-screening_statuses-list",
+ kwargs={"submission_pk": submission_id},
+ )
def test_cant_add_screening_status_without_setting_default(self):
user = StaffFactory()
@@ -96,12 +82,12 @@ def test_cant_add_screening_status_without_setting_default(self):
self.submission.screening_statuses.clear()
response = self.client.post(
self.get_submission_screening_status_url(submission_id=self.submission.id),
- data={'id': self.yes_screening_status.id}
+ data={"id": self.yes_screening_status.id},
)
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertEqual(
- response.json()['detail'],
- "Can't set screening decision without default being set"
+ response.json()["detail"],
+ "Can't set screening decision without default being set",
)
def test_cant_add_two_types_of_screening_status(self):
@@ -111,12 +97,12 @@ def test_cant_add_two_types_of_screening_status(self):
self.submission.screening_statuses.add(self.yes_default_screening_status)
response = self.client.post(
self.get_submission_screening_status_url(submission_id=self.submission.id),
- data={'id': self.no_screening_status.id}
+ data={"id": self.no_screening_status.id},
)
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertEqual(
- response.json()['detail'],
- "Can't set screening decision for both yes and no"
+ response.json()["detail"],
+ "Can't set screening decision for both yes and no",
)
def test_add_screening_status(self):
@@ -126,14 +112,17 @@ def test_add_screening_status(self):
self.submission.screening_statuses.add(self.yes_default_screening_status)
response = self.client.post(
self.get_submission_screening_status_url(submission_id=self.submission.id),
- data={'id': self.yes_screening_status.id}
+ data={"id": self.yes_screening_status.id},
)
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
self.assertEqual(len(response.json()), 2)
- possible_ids = [self.yes_screening_status.id, self.yes_default_screening_status.id]
- self.assertIn(response.json()[0]['id'], possible_ids)
- self.assertIn(response.json()[1]['id'], possible_ids)
+ possible_ids = [
+ self.yes_screening_status.id,
+ self.yes_default_screening_status.id,
+ ]
+ self.assertIn(response.json()[0]["id"], possible_ids)
+ self.assertIn(response.json()[1]["id"], possible_ids)
def test_staff_can_list_submission_screening_statuses(self):
user = StaffFactory()
@@ -150,57 +139,79 @@ def test_set_default_screening_status(self):
self.submission.screening_statuses.clear()
self.client.force_authenticate(user)
response = self.client.post(
- reverse_lazy('api:v1:submission-screening_statuses-default', kwargs={'submission_pk': self.submission.id}),
- data={'yes': True}
+ reverse_lazy(
+ "api:v1:submission-screening_statuses-default",
+ kwargs={"submission_pk": self.submission.id},
+ ),
+ data={"yes": True},
)
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
default_set = self.submission.screening_statuses.get(default=True)
- self.assertEqual(response.json()['id'], default_set.id)
- self.assertEqual(response.json()['yes'], default_set.yes)
+ self.assertEqual(response.json()["id"], default_set.id)
+ self.assertEqual(response.json()["yes"], default_set.yes)
def test_change_default_screening_status(self):
user = StaffFactory()
self.client.force_authenticate(user)
self.submission.screening_statuses.clear()
response = self.client.post(
- reverse_lazy('api:v1:submission-screening_statuses-default', kwargs={'submission_pk': self.submission.id}),
- data={'yes': True}
+ reverse_lazy(
+ "api:v1:submission-screening_statuses-default",
+ kwargs={"submission_pk": self.submission.id},
+ ),
+ data={"yes": True},
)
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
default_set = self.submission.screening_statuses.get(default=True)
- self.assertEqual(response.json()['id'], default_set.id)
- self.assertEqual(response.json()['yes'], default_set.yes)
+ self.assertEqual(response.json()["id"], default_set.id)
+ self.assertEqual(response.json()["yes"], default_set.yes)
response = self.client.post(
- reverse_lazy('api:v1:submission-screening_statuses-default', kwargs={'submission_pk': self.submission.id}),
- data={'yes': False}
+ reverse_lazy(
+ "api:v1:submission-screening_statuses-default",
+ kwargs={"submission_pk": self.submission.id},
+ ),
+ data={"yes": False},
)
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
default_set = self.submission.screening_statuses.get(default=True)
- self.assertEqual(response.json()['id'], default_set.id)
- self.assertEqual(response.json()['yes'], default_set.yes)
+ self.assertEqual(response.json()["id"], default_set.id)
+ self.assertEqual(response.json()["yes"], default_set.yes)
def test_cant_change_default_screening_status(self):
user = StaffFactory()
self.submission.screening_statuses.clear()
self.client.force_authenticate(user)
- self.submission.screening_statuses.add(self.yes_default_screening_status, self.yes_screening_status)
+ self.submission.screening_statuses.add(
+ self.yes_default_screening_status, self.yes_screening_status
+ )
response = self.client.post(
- reverse_lazy('api:v1:submission-screening_statuses-default', kwargs={'submission_pk': self.submission.id}),
- data={'yes': False}
+ reverse_lazy(
+ "api:v1:submission-screening_statuses-default",
+ kwargs={"submission_pk": self.submission.id},
+ ),
+ data={"yes": False},
)
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
default_set = self.submission.screening_statuses.get(default=True)
- self.assertEqual(response.json()['id'], default_set.id)
- self.assertEqual(response.json()['yes'], default_set.yes)
+ self.assertEqual(response.json()["id"], default_set.id)
+ self.assertEqual(response.json()["yes"], default_set.yes)
def test_remove_submission_screening_status(self):
user = StaffFactory()
self.submission.screening_statuses.clear()
self.client.force_authenticate(user)
- self.submission.screening_statuses.add(self.yes_default_screening_status, self.yes_screening_status)
+ self.submission.screening_statuses.add(
+ self.yes_default_screening_status, self.yes_screening_status
+ )
response = self.client.delete(
- reverse_lazy('api:v1:submission-screening_statuses-detail', kwargs={'submission_pk': self.submission.id, 'pk': self.yes_screening_status.id})
+ reverse_lazy(
+ "api:v1:submission-screening_statuses-detail",
+ kwargs={
+ "submission_pk": self.submission.id,
+ "pk": self.yes_screening_status.id,
+ },
+ )
)
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(len(response.json()), 1)
@@ -211,12 +222,17 @@ def test_cant_remove_submission_default_screening_status(self):
self.submission.screening_statuses.add(self.yes_default_screening_status)
self.client.force_authenticate(user)
response = self.client.delete(
- reverse_lazy('api:v1:submission-screening_statuses-detail', kwargs={'submission_pk': self.submission.id, 'pk': self.yes_default_screening_status.id})
+ reverse_lazy(
+ "api:v1:submission-screening_statuses-detail",
+ kwargs={
+ "submission_pk": self.submission.id,
+ "pk": self.yes_default_screening_status.id,
+ },
+ )
)
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertEqual(
- response.json()['detail'],
- "Can't delete default screening decision."
+ response.json()["detail"], "Can't delete default screening decision."
)
def test_cant_remove_not_set_screening_status(self):
@@ -224,7 +240,13 @@ def test_cant_remove_not_set_screening_status(self):
self.submission.screening_statuses.clear()
self.client.force_authenticate(user)
response = self.client.delete(
- reverse_lazy('api:v1:submission-screening_statuses-detail', kwargs={'submission_pk': self.submission.id, 'pk': self.yes_screening_status.id})
+ reverse_lazy(
+ "api:v1:submission-screening_statuses-detail",
+ kwargs={
+ "submission_pk": self.submission.id,
+ "pk": self.yes_screening_status.id,
+ },
+ )
)
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
diff --git a/hypha/apply/api/v1/screening/views.py b/hypha/apply/api/v1/screening/views.py
index 79d1d7cf49..290dcd1888 100644
--- a/hypha/apply/api/v1/screening/views.py
+++ b/hypha/apply/api/v1/screening/views.py
@@ -20,7 +20,8 @@
class ScreeningStatusViewSet(viewsets.ReadOnlyModelViewSet):
permission_classes = (
- permissions.IsAuthenticated, IsApplyStaffUser,
+ permissions.IsAuthenticated,
+ IsApplyStaffUser,
)
filter_backends = (filters.DjangoFilterBackend,)
filterset_class = ScreeningStatusFilter
@@ -33,10 +34,12 @@ class SubmissionScreeningStatusViewSet(
SubmissionNestedMixin,
mixins.ListModelMixin,
mixins.CreateModelMixin,
- viewsets.GenericViewSet
+ viewsets.GenericViewSet,
):
permission_classes = (
- permissions.IsAuthenticated, IsApplyStaffUser, HasScreenPermission
+ permissions.IsAuthenticated,
+ IsApplyStaffUser,
+ HasScreenPermission,
)
serializer_class = ScreeningStatusListSerializer
pagination_class = None
@@ -50,29 +53,33 @@ def create(self, request, *args, **kwargs):
ser.is_valid(raise_exception=True)
submission = self.get_submission_object()
screening_status = get_object_or_404(
- ScreeningStatus, id=ser.validated_data['id']
+ ScreeningStatus, id=ser.validated_data["id"]
)
if not submission.screening_statuses.filter(default=True).exists():
- raise ValidationError({'detail': "Can't set screening decision without default being set"})
+ raise ValidationError(
+ {"detail": "Can't set screening decision without default being set"}
+ )
if (
- submission.screening_statuses.exists() and
- submission.screening_statuses.first().yes != screening_status.yes
+ submission.screening_statuses.exists()
+ and submission.screening_statuses.first().yes != screening_status.yes
):
- raise ValidationError({'detail': "Can't set screening decision for both yes and no"})
- submission.screening_statuses.add(
- screening_status
- )
+ raise ValidationError(
+ {"detail": "Can't set screening decision for both yes and no"}
+ )
+ submission.screening_statuses.add(screening_status)
ser = self.get_serializer(submission.screening_statuses.all(), many=True)
return Response(ser.data, status=status.HTTP_201_CREATED)
- @action(detail=False, methods=['post'])
+ @action(detail=False, methods=["post"])
def default(self, request, *args, **kwargs):
ser = ScreeningStatusDefaultSerializer(data=request.data)
ser.is_valid(raise_exception=True)
- yes = ser.validated_data['yes']
+ yes = ser.validated_data["yes"]
submission = self.get_submission_object()
if submission.screening_statuses.filter(default=False).exists():
- submission.screening_statuses.remove(*submission.screening_statuses.filter(default=False))
+ submission.screening_statuses.remove(
+ *submission.screening_statuses.filter(default=False)
+ )
screening_status = ScreeningStatus.objects.get(default=True, yes=yes)
if submission.has_default_screening_status_set:
default_status = submission.screening_statuses.get()
@@ -84,9 +91,9 @@ def default(self, request, *args, **kwargs):
def destroy(self, request, *args, **kwargs):
screening_status = self.get_object()
if screening_status.default:
- raise ValidationError({
- 'detail': "Can't delete default screening decision."
- })
+ raise ValidationError(
+ {"detail": "Can't delete default screening decision."}
+ )
submission = self.get_submission_object()
submission.screening_statuses.remove(screening_status)
ser = self.get_serializer(submission.screening_statuses.all(), many=True)
diff --git a/hypha/apply/api/v1/serializers.py b/hypha/apply/api/v1/serializers.py
index 5116360214..01288cc79f 100644
--- a/hypha/apply/api/v1/serializers.py
+++ b/hypha/apply/api/v1/serializers.py
@@ -24,13 +24,10 @@
class ActionSerializer(serializers.Field):
def to_representation(self, instance):
- actions = instance.get_actions_for_user(self.context['request'].user)
+ actions = instance.get_actions_for_user(self.context["request"].user)
representation = []
for transition, action in actions:
- action_dict = {
- 'value': transition,
- 'display': action
- }
+ action_dict = {"value": transition, "display": action}
# Sometimes the status does not exist in the
# determination matrix.
@@ -43,40 +40,48 @@ def to_representation(self, instance):
except KeyError:
redirect = None
if redirect:
- action_dict['type'] = 'redirect'
- action_dict['target'] = redirect.url
+ action_dict["type"] = "redirect"
+ action_dict["target"] = redirect.url
else:
- action_dict['type'] = 'submit'
+ action_dict["type"] = "submit"
representation.append(action_dict)
return representation
class OpinionSerializer(serializers.ModelSerializer):
- author_id = serializers.ReadOnlyField(source='author.id')
- opinion = serializers.ReadOnlyField(source='get_opinion_display')
+ author_id = serializers.ReadOnlyField(source="author.id")
+ opinion = serializers.ReadOnlyField(source="get_opinion_display")
class Meta:
model = ReviewOpinion
- fields = ('author_id', 'opinion')
+ fields = ("author_id", "opinion")
class ReviewSerializer(serializers.ModelSerializer):
user_id = serializers.SerializerMethodField()
- author_id = serializers.ReadOnlyField(source='author.id')
- url = serializers.ReadOnlyField(source='get_absolute_url')
+ author_id = serializers.ReadOnlyField(source="author.id")
+ url = serializers.ReadOnlyField(source="get_absolute_url")
opinions = OpinionSerializer(read_only=True, many=True)
recommendation = serializers.SerializerMethodField()
- score = serializers.ReadOnlyField(source='get_score_display')
+ score = serializers.ReadOnlyField(source="get_score_display")
class Meta:
model = Review
- fields = ('id', 'score', 'user_id', 'author_id', 'url', 'opinions', 'recommendation')
+ fields = (
+ "id",
+ "score",
+ "user_id",
+ "author_id",
+ "url",
+ "opinions",
+ "recommendation",
+ )
def get_recommendation(self, obj):
return {
- 'value': obj.recommendation,
- 'display': obj.get_recommendation_display(),
+ "value": obj.recommendation,
+ "display": obj.get_recommendation_display(),
}
def get_user_id(self, obj):
@@ -85,32 +90,33 @@ def get_user_id(self, obj):
class ReviewSummarySerializer(serializers.Serializer):
reviews = ReviewSerializer(many=True, read_only=True)
- count = serializers.ReadOnlyField(source='reviews.count')
- score = serializers.ReadOnlyField(source='reviews.score')
+ count = serializers.ReadOnlyField(source="reviews.count")
+ score = serializers.ReadOnlyField(source="reviews.score")
recommendation = serializers.SerializerMethodField()
assigned = serializers.SerializerMethodField()
def get_recommendation(self, obj):
recommendation = obj.reviews.recommendation()
return {
- 'value': recommendation,
- 'display': dict(RECOMMENDATION_CHOICES).get(recommendation),
+ "value": recommendation,
+ "display": dict(RECOMMENDATION_CHOICES).get(recommendation),
}
def get_assigned(self, obj):
- assigned_reviewers = obj.assigned.select_related('reviewer', 'role', 'type')
+ assigned_reviewers = obj.assigned.select_related("reviewer", "role", "type")
response = [
{
- 'id': assigned.id,
- 'name': str(assigned.reviewer),
- 'role': {
- 'icon': assigned.role and assigned.role.icon_url('fill-12x12'),
- 'name': assigned.role and assigned.role.name,
- 'order': assigned.role and assigned.role.order,
+ "id": assigned.id,
+ "name": str(assigned.reviewer),
+ "role": {
+ "icon": assigned.role and assigned.role.icon_url("fill-12x12"),
+ "name": assigned.role and assigned.role.name,
+ "order": assigned.role and assigned.role.order,
},
- 'is_staff': assigned.type.name == STAFF_GROUP_NAME,
- 'is_partner': assigned.type.name == PARTNER_GROUP_NAME,
- } for assigned in assigned_reviewers
+ "is_staff": assigned.type.name == STAFF_GROUP_NAME,
+ "is_partner": assigned.type.name == PARTNER_GROUP_NAME,
+ }
+ for assigned in assigned_reviewers
]
return response
@@ -121,30 +127,30 @@ def to_representation(self, value):
class DeterminationSerializer(serializers.ModelSerializer):
- outcome = serializers.ReadOnlyField(source='get_outcome_display')
+ outcome = serializers.ReadOnlyField(source="get_outcome_display")
author = serializers.CharField(read_only=True)
- url = serializers.ReadOnlyField(source='get_absolute_url')
+ url = serializers.ReadOnlyField(source="get_absolute_url")
updated_at = serializers.DateTimeField(read_only=True)
is_draft = serializers.BooleanField(read_only=True)
class Meta:
model = Determination
- fields = ('id', 'outcome', 'author', 'url', 'updated_at', 'is_draft')
+ fields = ("id", "outcome", "author", "url", "updated_at", "is_draft")
class DeterminationSummarySerializer(serializers.Serializer):
determinations = DeterminationSerializer(many=True, read_only=True)
- count = serializers.ReadOnlyField(source='determinations.count')
+ count = serializers.ReadOnlyField(source="determinations.count")
class SubmissionListSerializer(serializers.ModelSerializer):
- url = serializers.HyperlinkedIdentityField(view_name='api:v1:submissions-detail')
+ url = serializers.HyperlinkedIdentityField(view_name="api:v1:submissions-detail")
round = serializers.SerializerMethodField()
last_update = TimestampField()
class Meta:
model = ApplicationSubmission
- fields = ('id', 'title', 'status', 'url', 'round', 'last_update', 'summary')
+ fields = ("id", "title", "status", "url", "round", "last_update", "summary")
def get_round(self, obj):
"""
@@ -163,10 +169,7 @@ class Meta:
def get_parent(self, obj):
parent = obj.get_parent()
if parent:
- parent_data = {
- 'id': parent.id,
- 'name': parent.name
- }
+ parent_data = {"id": parent.id, "name": parent.name}
return parent_data
@@ -175,17 +178,19 @@ class SubmissionSummarySerializer(serializers.Serializer):
class SubmissionMetaTermsSerializer(serializers.Serializer):
- meta_terms = serializers.PrimaryKeyRelatedField(many=True, queryset=MetaTerm.objects.all())
+ meta_terms = serializers.PrimaryKeyRelatedField(
+ many=True, queryset=MetaTerm.objects.all()
+ )
class SubmissionDetailSerializer(serializers.ModelSerializer):
questions = serializers.SerializerMethodField()
meta_questions = serializers.SerializerMethodField()
meta_terms = MetaTermsDetailSerializer(many=True)
- stage = serializers.CharField(source='stage.name')
- actions = ActionSerializer(source='*')
- review = ReviewSummarySerializer(source='*')
- determination = DeterminationSummarySerializer(source='*')
+ stage = serializers.CharField(source="stage.name")
+ actions = ActionSerializer(source="*")
+ review = ReviewSummarySerializer(source="*")
+ determination = DeterminationSummarySerializer(source="*")
phase = serializers.CharField()
screening = serializers.SerializerMethodField()
action_buttons = serializers.SerializerMethodField()
@@ -196,30 +201,50 @@ class SubmissionDetailSerializer(serializers.ModelSerializer):
class Meta:
model = ApplicationSubmission
- fields = ('id', 'summary', 'title', 'stage', 'status', 'phase', 'meta_questions', 'meta_terms', 'questions', 'actions', 'review', 'screening', 'action_buttons', 'determination', 'is_determination_form_attached', 'is_user_staff', 'screening', 'flags', 'reminders')
+ fields = (
+ "id",
+ "summary",
+ "title",
+ "stage",
+ "status",
+ "phase",
+ "meta_questions",
+ "meta_terms",
+ "questions",
+ "actions",
+ "review",
+ "screening",
+ "action_buttons",
+ "determination",
+ "is_determination_form_attached",
+ "is_user_staff",
+ "screening",
+ "flags",
+ "reminders",
+ )
def serialize_questions(self, obj, fields):
for field_id in fields:
yield obj.serialize(field_id)
def get_is_user_staff(self, obj):
- request = self.context['request']
+ request = self.context["request"]
return request.user.is_apply_staff
def get_meta_questions(self, obj):
meta_questions = {
- 'title': 'Project Name',
- 'full_name': 'Legal Name',
- 'email': 'Email',
- 'value': 'Requested Funding',
- 'duration': 'Project Duration',
- 'address': 'Address'
+ "title": "Project Name",
+ "full_name": "Legal Name",
+ "email": "Email",
+ "value": "Requested Funding",
+ "duration": "Project Duration",
+ "address": "Address",
}
data = self.serialize_questions(obj, obj.named_blocks.values())
data = [
{
**response,
- 'question': meta_questions.get(response['type'], response['question'])
+ "question": meta_questions.get(response["type"], response["question"]),
}
for response in data
]
@@ -231,7 +256,7 @@ def get_screening(self, obj):
all_screening = []
for screening in obj.screening_statuses.values():
- if screening['default']:
+ if screening["default"]:
selected_default = screening
else:
selected_reasons.append(screening)
@@ -242,20 +267,14 @@ def get_screening(self, obj):
screening = {
"selected_reasons": selected_reasons,
"selected_default": selected_default,
- "all_screening": all_screening
+ "all_screening": all_screening,
}
return screening
def get_flags(self, obj):
flags = [
- {
- "type": 'user',
- "selected": obj.flagged_by(self.context['request'].user)
- },
- {
- "type": 'staff',
- "selected": obj.flagged_staff
- }
+ {"type": "user", "selected": obj.flagged_by(self.context["request"].user)},
+ {"type": "staff", "selected": obj.flagged_staff},
]
return flags
@@ -266,37 +285,37 @@ def get_questions(self, obj):
def get_reminders(self, obj):
reminders = []
for reminder in obj.reminders.all():
- reminders.append({
- "id": reminder.id,
- "submission_id": reminder.submission_id,
- "title": reminder.title,
- "action_type": reminder.action_type,
- "is_expired": reminder.is_expired
- })
+ reminders.append(
+ {
+ "id": reminder.id,
+ "submission_id": reminder.submission_id,
+ "title": reminder.title,
+ "action_type": reminder.action_type,
+ "is_expired": reminder.is_expired,
+ }
+ )
return reminders
def get_action_buttons(self, obj):
- request = self.context['request']
+ request = self.context["request"]
add_review = (
- obj.phase.permissions.can_review(request.user) and
- obj.can_review(request.user) and not
- obj.assigned.draft_reviewed().filter(reviewer=request.user).exists()
- )
- show_determination = (
- show_determination_button(request.user, obj)
+ obj.phase.permissions.can_review(request.user)
+ and obj.can_review(request.user)
+ and not obj.assigned.draft_reviewed().filter(reviewer=request.user).exists()
)
+ show_determination = show_determination_button(request.user, obj)
return {
- 'add_review': add_review,
- 'show_determination_button': show_determination,
+ "add_review": add_review,
+ "show_determination_button": show_determination,
}
class SubmissionActionSerializer(serializers.ModelSerializer):
- actions = ActionSerializer(source='*', read_only=True)
+ actions = ActionSerializer(source="*", read_only=True)
class Meta:
model = ApplicationSubmission
- fields = ('id', 'actions')
+ fields = ("id", "actions")
class RoundLabDetailSerializer(serializers.ModelSerializer):
@@ -304,14 +323,11 @@ class RoundLabDetailSerializer(serializers.ModelSerializer):
class Meta:
model = RoundsAndLabs
- fields = ('id', 'title', 'workflow')
+ fields = ("id", "title", "workflow")
def get_workflow(self, obj):
return [
- {
- 'value': phase.name,
- 'display': phase.display_name
- }
+ {"value": phase.name, "display": phase.display_name}
for phase in obj.workflow.values()
]
@@ -319,7 +335,7 @@ def get_workflow(self, obj):
class RoundLabSerializer(serializers.ModelSerializer):
class Meta:
model = RoundsAndLabs
- fields = ('id', 'title')
+ fields = ("id", "title")
class OpenRoundLabSerializer(serializers.ModelSerializer):
@@ -332,38 +348,48 @@ class OpenRoundLabSerializer(serializers.ModelSerializer):
class Meta:
model = RoundsAndLabs
- fields = ('id', 'title', 'url_path', 'search_description', 'start_date', 'end_date',
- 'description', 'image', 'weight', 'landing_url')
+ fields = (
+ "id",
+ "title",
+ "url_path",
+ "search_description",
+ "start_date",
+ "end_date",
+ "description",
+ "image",
+ "weight",
+ "landing_url",
+ )
def get_description(self, obj):
- if hasattr(obj, 'roundbase'):
+ if hasattr(obj, "roundbase"):
return obj.roundbase.fund.applicationbase.description
- elif hasattr(obj, 'labbase'):
+ elif hasattr(obj, "labbase"):
return obj.labbase.description
return None
def get_image(self, obj):
- if hasattr(obj, 'roundbase'):
+ if hasattr(obj, "roundbase"):
fund_image = obj.roundbase.fund.applicationbase.image
if fund_image:
return fund_image.file.url
- elif hasattr(obj, 'labbase'):
+ elif hasattr(obj, "labbase"):
lab_image = obj.labbase.image
if lab_image:
return lab_image.url
return None
def get_weight(self, obj):
- if hasattr(obj, 'roundbase'):
+ if hasattr(obj, "roundbase"):
return obj.roundbase.fund.applicationbase.weight
- elif hasattr(obj, 'labbase'):
+ elif hasattr(obj, "labbase"):
return obj.labbase.weight
return None
def get_landing_url(self, obj):
- if hasattr(obj, 'roundbase'):
+ if hasattr(obj, "roundbase"):
return obj.roundbase.fund.applicationbase.get_full_url()
- elif hasattr(obj, 'labbase'):
+ elif hasattr(obj, "labbase"):
return obj.labbase.get_full_url()
return None
@@ -371,40 +397,61 @@ def get_landing_url(self, obj):
class CommentSerializer(serializers.ModelSerializer):
user = serializers.StringRelatedField()
message = serializers.SerializerMethodField()
- edit_url = serializers.HyperlinkedIdentityField(view_name='api:v1:comments-edit')
+ edit_url = serializers.HyperlinkedIdentityField(view_name="api:v1:comments-edit")
editable = serializers.SerializerMethodField()
timestamp = TimestampField(read_only=True)
edited = TimestampField(read_only=True)
class Meta:
model = Activity
- fields = ('id', 'timestamp', 'user', 'message', 'visibility', 'edited', 'edit_url', 'editable')
+ fields = (
+ "id",
+ "timestamp",
+ "user",
+ "message",
+ "visibility",
+ "edited",
+ "edit_url",
+ "editable",
+ )
def get_message(self, obj):
return bleach_value(markdown_to_html(obj.message))
def get_editable(self, obj):
- return self.context['request'].user == obj.user
+ return self.context["request"].user == obj.user
class CommentCreateSerializer(serializers.ModelSerializer):
user = serializers.StringRelatedField()
- edit_url = serializers.HyperlinkedIdentityField(view_name='api:v1:comments-edit')
+ edit_url = serializers.HyperlinkedIdentityField(view_name="api:v1:comments-edit")
editable = serializers.SerializerMethodField()
timestamp = TimestampField(read_only=True)
edited = TimestampField(read_only=True)
class Meta:
model = Activity
- fields = ('id', 'timestamp', 'user', 'message', 'visibility', 'edited', 'edit_url', 'editable')
+ fields = (
+ "id",
+ "timestamp",
+ "user",
+ "message",
+ "visibility",
+ "edited",
+ "edit_url",
+ "editable",
+ )
def get_editable(self, obj):
- return self.context['request'].user == obj.user
+ return self.context["request"].user == obj.user
class CommentEditSerializer(CommentCreateSerializer):
class Meta(CommentCreateSerializer.Meta):
- read_only_fields = ('timestamp', 'edited',)
+ read_only_fields = (
+ "timestamp",
+ "edited",
+ )
class UserSerializer(serializers.Serializer):
diff --git a/hypha/apply/api/v1/stream_serializers.py b/hypha/apply/api/v1/stream_serializers.py
index 71f66b14ba..bbc529aac7 100644
--- a/hypha/apply/api/v1/stream_serializers.py
+++ b/hypha/apply/api/v1/stream_serializers.py
@@ -9,11 +9,10 @@
from .review.fields import ScoredAnswerListField
-IGNORE_ARGS = ['self', 'cls']
+IGNORE_ARGS = ["self", "cls"]
class WagtailSerializer:
-
def get_serializer_fields(self, draft=False):
"""
Get the respective serializer fields for all the form fields.
@@ -22,9 +21,7 @@ def get_serializer_fields(self, draft=False):
form_fields = self.get_form_fields()
for field_id, field in form_fields.items():
serializer_fields[field_id] = self._get_field(
- field,
- self.get_serializer_field_class(field),
- draft
+ field, self.get_serializer_field_class(field), draft
)
return serializer_fields
@@ -38,22 +35,22 @@ def _get_field(self, form_field, serializer_field_class, draft=False):
for kwarg, value in kwargs.items():
# set corresponding DRF attributes which don't have alternative
# in Django form fields
- if kwarg == 'required':
- field_kwargs['allow_blank'] = not value
- field_kwargs['allow_null'] = not value
+ if kwarg == "required":
+ field_kwargs["allow_blank"] = not value
+ field_kwargs["allow_null"] = not value
if draft:
# Set required false for fields if it's a draft.
- field_kwargs['required'] = False
- field_kwargs['allow_null'] = True
- field_kwargs['allow_blank'] = True
+ field_kwargs["required"] = False
+ field_kwargs["allow_null"] = True
+ field_kwargs["allow_blank"] = True
try:
field = serializer_field_class(**field_kwargs)
except TypeError:
# ScoredAnswerField doesn't have allow_blank attribute
- field_kwargs.pop('allow_blank')
- if serializer_field_class.__name__ == 'ScoredAnswerListField':
- field_kwargs['draft'] = True
+ field_kwargs.pop("allow_blank")
+ if serializer_field_class.__name__ == "ScoredAnswerListField":
+ field_kwargs["draft"] = True
return serializer_field_class(**field_kwargs)
return serializer_field_class(**field_kwargs)
@@ -64,7 +61,11 @@ def find_function_args(self, func):
Get the list of parameter names which function accepts.
"""
try:
- spec = inspect.getfullargspec(func) if hasattr(inspect, 'getfullargspec') else inspect.getargspec(func)
+ spec = (
+ inspect.getfullargspec(func)
+ if hasattr(inspect, "getfullargspec")
+ else inspect.getargspec(func)
+ )
return [i for i in spec[0] if i not in IGNORE_ARGS]
except TypeError:
return []
@@ -75,7 +76,7 @@ def find_class_args(self, klass):
"""
args = set()
for i in klass.mro():
- if i is object or not hasattr(i, '__init__'):
+ if i is object or not hasattr(i, "__init__"):
continue
args |= set(self.find_function_args(i.__init__))
@@ -83,7 +84,8 @@ def find_class_args(self, klass):
def find_matching_class_kwargs(self, reference_object, klass):
return {
- i: getattr(reference_object, i) for i in self.find_class_args(klass)
+ i: getattr(reference_object, i)
+ for i in self.find_class_args(klass)
if hasattr(reference_object, i)
}
@@ -97,25 +99,25 @@ def _get_field_kwargs(self, form_field, serializer_field_class):
"""
attrs = self.find_matching_class_kwargs(form_field, serializer_field_class)
- if 'choices' in attrs:
- choices = OrderedDict(attrs['choices']).keys()
- attrs['choices'] = OrderedDict(zip(choices, choices, strict=True))
+ if "choices" in attrs:
+ choices = OrderedDict(attrs["choices"]).keys()
+ attrs["choices"] = OrderedDict(zip(choices, choices, strict=True))
- if getattr(form_field, 'initial', None):
- attrs['default'] = form_field.initial
+ if getattr(form_field, "initial", None):
+ attrs["default"] = form_field.initial
# avoid "May not set both `required` and `default`"
- if attrs.get('required') and 'default' in attrs:
- del attrs['required']
+ if attrs.get("required") and "default" in attrs:
+ del attrs["required"]
if isinstance(form_field, BlockFieldWrapper):
- attrs['read_only'] = True
+ attrs["read_only"] = True
return attrs
# avoid "May not set both `read_only` and `required`"
- if form_field.widget.attrs.get('readonly', False) == 'readonly':
- attrs['read_only'] = True
- del attrs['required']
+ if form_field.widget.attrs.get("readonly", False) == "readonly":
+ attrs["read_only"] = True
+ del attrs["required"]
return attrs
def get_serializer_field_class(self, field):
@@ -140,6 +142,16 @@ def get_serializer_class(self, draft=False):
# Model serializers needs to have each field declared in the field options
# of Meta. This code adds the dynamically generated serializer fields
# to the serializer class meta fields.
- model_fields = [field for field in self.serializer_class.Meta.fields if hasattr(self.serializer_class.Meta.model, field)]
- self.serializer_class.Meta.fields = model_fields + [*self.get_serializer_fields(draft).keys()]
- return type('WagtailStreamSerializer', (self.serializer_class,), self.get_serializer_fields(draft))
+ model_fields = [
+ field
+ for field in self.serializer_class.Meta.fields
+ if hasattr(self.serializer_class.Meta.model, field)
+ ]
+ self.serializer_class.Meta.fields = model_fields + [
+ *self.get_serializer_fields(draft).keys()
+ ]
+ return type(
+ "WagtailStreamSerializer",
+ (self.serializer_class,),
+ self.get_serializer_fields(draft),
+ )
diff --git a/hypha/apply/api/v1/tests/test_serializers.py b/hypha/apply/api/v1/tests/test_serializers.py
index 6e2930ba82..2068685be2 100644
--- a/hypha/apply/api/v1/tests/test_serializers.py
+++ b/hypha/apply/api/v1/tests/test_serializers.py
@@ -9,46 +9,50 @@
from ..serializers import ReviewSummarySerializer
-@override_settings(ROOT_URLCONF='hypha.apply.urls')
+@override_settings(ROOT_URLCONF="hypha.apply.urls")
class TestReviewSummarySerializer(TestCase):
def test_handles_no_reviews(self):
submission = ApplicationSubmissionFactory()
data = ReviewSummarySerializer(submission).data
- self.assertEqual(data['count'], 0)
- self.assertEqual(data['score'], None)
- self.assertEqual(data['recommendation'], {'value': -1, 'display': None})
- self.assertEqual(data['assigned'], [])
- self.assertEqual(data['reviews'], [])
+ self.assertEqual(data["count"], 0)
+ self.assertEqual(data["score"], None)
+ self.assertEqual(data["recommendation"], {"value": -1, "display": None})
+ self.assertEqual(data["assigned"], [])
+ self.assertEqual(data["reviews"], [])
def test_handles_negative_reviews(self):
submission = ApplicationSubmissionFactory()
ReviewFactory(submission=submission)
data = ReviewSummarySerializer(submission).data
- self.assertEqual(data['count'], 1)
- self.assertEqual(data['score'], 0)
- self.assertEqual(data['recommendation'], {'value': 0, 'display': 'No'})
- self.assertEqual(len(data['assigned']), 1)
- self.assertEqual(len(data['reviews']), 1)
+ self.assertEqual(data["count"], 1)
+ self.assertEqual(data["score"], 0)
+ self.assertEqual(data["recommendation"], {"value": 0, "display": "No"})
+ self.assertEqual(len(data["assigned"]), 1)
+ self.assertEqual(len(data["reviews"]), 1)
class TestDeliverableSerializer(TestCase):
def test_id_is_required(self):
- serializer = DeliverableSerializer(data={'quantity': 1})
+ serializer = DeliverableSerializer(data={"quantity": 1})
self.assertFalse(serializer.is_valid())
- error_message = {'id': [ErrorDetail(string='This field is required.', code='required')]}
+ error_message = {
+ "id": [ErrorDetail(string="This field is required.", code="required")]
+ }
self.assertEqual(serializer.errors, error_message)
def test_validate_id(self):
- serializer = DeliverableSerializer(data={'id': 1, 'quantity': 1})
+ serializer = DeliverableSerializer(data={"id": 1, "quantity": 1})
self.assertFalse(serializer.is_valid())
- error_message = {'id': {'detail': ErrorDetail(string='Not found', code='invalid')}}
+ error_message = {
+ "id": {"detail": ErrorDetail(string="Not found", code="invalid")}
+ }
self.assertEqual(serializer.errors, error_message)
deliverable = DeliverableFactory()
- serializer = DeliverableSerializer(data={'id': deliverable.id, 'quantity': 1})
+ serializer = DeliverableSerializer(data={"id": deliverable.id, "quantity": 1})
self.assertTrue(serializer.is_valid())
def test_quantity_not_required(self):
deliverable = DeliverableFactory()
- serializer = DeliverableSerializer(data={'id': deliverable.id})
+ serializer = DeliverableSerializer(data={"id": deliverable.id})
self.assertTrue(serializer.is_valid())
diff --git a/hypha/apply/api/v1/tests/test_views.py b/hypha/apply/api/v1/tests/test_views.py
index 4f2b78d506..f8fe382d71 100644
--- a/hypha/apply/api/v1/tests/test_views.py
+++ b/hypha/apply/api/v1/tests/test_views.py
@@ -25,13 +25,13 @@
)
-@override_settings(ROOT_URLCONF='hypha.apply.urls')
+@override_settings(ROOT_URLCONF="hypha.apply.urls")
class TestCommentEdit(TestCase):
- def post_to_edit(self, comment_pk, message='my message'):
+ def post_to_edit(self, comment_pk, message="my message"):
return self.client.post(
- reverse_lazy('api:v1:comments-edit', kwargs={'pk': comment_pk}),
+ reverse_lazy("api:v1:comments-edit", kwargs={"pk": comment_pk}),
secure=True,
- data={'message': message},
+ data={"message": message},
)
def test_cant_edit_if_not_author(self):
@@ -44,7 +44,7 @@ def test_edit_updates_correctly(self):
comment = CommentFactory(user=user)
self.client.force_login(user)
- new_message = 'hi there'
+ new_message = "hi there"
response = self.post_to_edit(comment.pk, new_message)
@@ -55,9 +55,9 @@ def test_edit_updates_correctly(self):
time = comment.timestamp.timestamp() * 1000
- self.assertEqual(time, response.json()['timestamp'])
+ self.assertEqual(time, response.json()["timestamp"])
self.assertFalse(comment.current)
- self.assertEqual(response.json()['message'], new_message)
+ self.assertEqual(response.json()["message"], new_message)
def test_incorrect_id_denied(self):
response = self.post_to_edit(10000)
@@ -69,12 +69,13 @@ def test_does_nothing_if_same_message_and_visibility(self):
self.client.force_login(user)
self.client.post(
- reverse_lazy('api:v1:comments-edit', kwargs={'pk': comment.pk}),
+ reverse_lazy("api:v1:comments-edit", kwargs={"pk": comment.pk}),
secure=True,
data={
- 'message': comment.message,
- 'visibility': comment.visibility,
- })
+ "message": comment.message,
+ "visibility": comment.visibility,
+ },
+ )
self.assertEqual(Activity.objects.count(), 1)
@@ -84,24 +85,24 @@ def test_staff_can_change_visibility(self):
self.client.force_login(user)
response = self.client.post(
- reverse_lazy('api:v1:comments-edit', kwargs={'pk': comment.pk}),
+ reverse_lazy("api:v1:comments-edit", kwargs={"pk": comment.pk}),
secure=True,
data={
- 'message': 'the new message',
- 'visibility': ALL,
+ "message": "the new message",
+ "visibility": ALL,
},
)
self.assertEqual(response.status_code, 200, response.json())
- self.assertEqual(response.json()['visibility'], ALL)
+ self.assertEqual(response.json()["visibility"], ALL)
def test_out_of_order_does_nothing(self):
user = ApplicantFactory() # any role assigned user
comment = CommentFactory(user=user)
self.client.force_login(user)
- new_message = 'hi there'
- newer_message = 'hello there'
+ new_message = "hi there"
+ newer_message = "hello there"
response_one = self.post_to_edit(comment.pk, new_message)
response_two = self.post_to_edit(comment.pk, newer_message)
@@ -111,19 +112,28 @@ def test_out_of_order_does_nothing(self):
self.assertEqual(Activity.objects.count(), 2)
-@override_settings(ROOT_URLCONF='hypha.apply.urls')
+@override_settings(ROOT_URLCONF="hypha.apply.urls")
class TestInvoiceDeliverableViewset(TestCase):
def post_to_add(self, project_id, invoice_id, deliverable_id, quantity=1):
return self.client.post(
- reverse_lazy('api:v1:set-deliverables', kwargs={'project_pk': project_id, 'invoice_pk': invoice_id}),
+ reverse_lazy(
+ "api:v1:set-deliverables",
+ kwargs={"project_pk": project_id, "invoice_pk": invoice_id},
+ ),
secure=True,
- data={'id': deliverable_id, 'quantity': quantity},
+ data={"id": deliverable_id, "quantity": quantity},
)
def delete_to_remove(self, project_id, invoice_id, deliverable_id):
return self.client.delete(
- reverse_lazy('api:v1:remove-deliverables', kwargs={
- 'project_pk': project_id, 'invoice_pk': invoice_id, 'pk': deliverable_id}),
+ reverse_lazy(
+ "api:v1:remove-deliverables",
+ kwargs={
+ "project_pk": project_id,
+ "invoice_pk": invoice_id,
+ "pk": deliverable_id,
+ },
+ ),
secure=True,
)
@@ -265,7 +275,9 @@ def test_deliverables_cant_removed_after_finance2_approval(self):
staff = StaffFactory()
for user in [staff, finance1, finance2]:
self.client.force_login(user)
- response = self.delete_to_remove(project.id, invoice.id, invoice_deliverable.id)
+ response = self.delete_to_remove(
+ project.id, invoice.id, invoice_deliverable.id
+ )
self.assertEqual(response.status_code, 403)
def test_deliverable_dont_exists_in_project_deliverables(self):
@@ -277,7 +289,7 @@ def test_deliverable_dont_exists_in_project_deliverables(self):
response = self.post_to_add(project.id, invoice.id, deliverable.id)
self.assertEqual(response.status_code, 400)
- error_message = {'detail': ErrorDetail(string='Not Found', code='invalid')}
+ error_message = {"detail": ErrorDetail(string="Not Found", code="invalid")}
self.assertEqual(response.data, error_message)
def test_deliverable_already_exists_in_invoice(self):
@@ -291,7 +303,11 @@ def test_deliverable_already_exists_in_invoice(self):
response = self.post_to_add(project.id, invoice.id, deliverable.id)
self.assertEqual(response.status_code, 400)
- error_message = {'detail': ErrorDetail(string='Invoice Already has this deliverable', code='invalid')}
+ error_message = {
+ "detail": ErrorDetail(
+ string="Invoice Already has this deliverable", code="invalid"
+ )
+ }
self.assertEqual(response.data, error_message)
def test_deliverable_available_gte_quantity(self):
@@ -303,5 +319,9 @@ def test_deliverable_available_gte_quantity(self):
response = self.post_to_add(project.id, invoice.id, deliverable.id, quantity=3)
self.assertEqual(response.status_code, 400)
- error_message = {'detail': ErrorDetail(string='Required quantity is more than available', code='invalid')}
+ error_message = {
+ "detail": ErrorDetail(
+ string="Required quantity is more than available", code="invalid"
+ )
+ }
self.assertEqual(response.data, error_message)
diff --git a/hypha/apply/api/v1/urls.py b/hypha/apply/api/v1/urls.py
index 81d72dbb2e..c9b82e4cdc 100644
--- a/hypha/apply/api/v1/urls.py
+++ b/hypha/apply/api/v1/urls.py
@@ -21,29 +21,51 @@
SubmissionViewSet,
)
-app_name = 'v1'
+app_name = "v1"
router = routers.SimpleRouter()
-router.register(r'submissions', SubmissionViewSet, basename='submissions')
-router.register(r'comments', CommentViewSet, basename='comments')
-router.register(r'rounds', RoundViewSet, basename='rounds')
-router.register(r'screening_statuses', ScreeningStatusViewSet, basename='screenings')
-router.register(r'meta_terms', MetaTermsViewSet, basename='meta-terms')
-
-submission_router = routers.NestedSimpleRouter(router, r'submissions', lookup='submission')
-submission_router.register(r'actions', SubmissionActionViewSet, basename='submission-actions')
-submission_router.register(r'comments', SubmissionCommentViewSet, basename='submission-comments')
-submission_router.register(r'reviews', SubmissionReviewViewSet, basename='reviews')
-submission_router.register(r'determinations', SubmissionDeterminationViewSet, basename='determinations')
-submission_router.register(r'screening_statuses', SubmissionScreeningStatusViewSet, basename='submission-screening_statuses')
-submission_router.register(r'reminders', SubmissionReminderViewSet, basename='submission-reminder')
+router.register(r"submissions", SubmissionViewSet, basename="submissions")
+router.register(r"comments", CommentViewSet, basename="comments")
+router.register(r"rounds", RoundViewSet, basename="rounds")
+router.register(r"screening_statuses", ScreeningStatusViewSet, basename="screenings")
+router.register(r"meta_terms", MetaTermsViewSet, basename="meta-terms")
+
+submission_router = routers.NestedSimpleRouter(
+ router, r"submissions", lookup="submission"
+)
+submission_router.register(
+ r"actions", SubmissionActionViewSet, basename="submission-actions"
+)
+submission_router.register(
+ r"comments", SubmissionCommentViewSet, basename="submission-comments"
+)
+submission_router.register(r"reviews", SubmissionReviewViewSet, basename="reviews")
+submission_router.register(
+ r"determinations", SubmissionDeterminationViewSet, basename="determinations"
+)
+submission_router.register(
+ r"screening_statuses",
+ SubmissionScreeningStatusViewSet,
+ basename="submission-screening_statuses",
+)
+submission_router.register(
+ r"reminders", SubmissionReminderViewSet, basename="submission-reminder"
+)
urlpatterns = [
- path('user/', CurrentUser.as_view(), name='user'),
- path('submissions_filter/', SubmissionFilters.as_view(), name='submissions-filter'),
- path('projects//invoices//deliverables/', InvoiceDeliverableViewSet.as_view({'post': 'create'}), name='set-deliverables'),
- path('projects//invoices//deliverables//', InvoiceDeliverableViewSet.as_view({'delete': 'destroy'}), name='remove-deliverables'),
+ path("user/", CurrentUser.as_view(), name="user"),
+ path("submissions_filter/", SubmissionFilters.as_view(), name="submissions-filter"),
+ path(
+ "projects//invoices//deliverables/",
+ InvoiceDeliverableViewSet.as_view({"post": "create"}),
+ name="set-deliverables",
+ ),
+ path(
+ "projects//invoices//deliverables//",
+ InvoiceDeliverableViewSet.as_view({"delete": "destroy"}),
+ name="remove-deliverables",
+ ),
]
urlpatterns = router.urls + submission_router.urls + urlpatterns
diff --git a/hypha/apply/api/v1/utils.py b/hypha/apply/api/v1/utils.py
index 203a6fb7a5..f6af1638d1 100644
--- a/hypha/apply/api/v1/utils.py
+++ b/hypha/apply/api/v1/utils.py
@@ -15,84 +15,88 @@
def get_field_kwargs(form_field):
if isinstance(form_field, BlockFieldWrapper):
- return {'text': form_field.block.value.source}
+ return {"text": form_field.block.value.source}
kwargs = OrderedDict()
kwargs = {
- 'initial': form_field.initial,
- 'required': form_field.required,
- 'label': form_field.label,
- 'label_suffix': form_field.label_suffix,
- 'help_text': form_field.help_text,
- 'help_link': form_field.help_link
+ "initial": form_field.initial,
+ "required": form_field.required,
+ "label": form_field.label,
+ "label_suffix": form_field.label_suffix,
+ "help_text": form_field.help_text,
+ "help_link": form_field.help_link,
}
if isinstance(form_field, forms.CharField):
- if hasattr(form_field, 'word_limit'):
- kwargs['word_limit'] = form_field.word_limit
- kwargs['max_length'] = form_field.max_length
- kwargs['min_length'] = form_field.min_length
- kwargs['empty_value'] = form_field.empty_value
+ if hasattr(form_field, "word_limit"):
+ kwargs["word_limit"] = form_field.word_limit
+ kwargs["max_length"] = form_field.max_length
+ kwargs["min_length"] = form_field.min_length
+ kwargs["empty_value"] = form_field.empty_value
if isinstance(form_field, forms.ChoiceField):
- kwargs['choices'] = form_field.choices
+ kwargs["choices"] = form_field.choices
if isinstance(form_field, forms.TypedChoiceField):
- kwargs['empty_value'] = form_field.empty_value
+ kwargs["empty_value"] = form_field.empty_value
if isinstance(form_field, forms.IntegerField):
- kwargs['max_value'] = form_field.max_value
- kwargs['min_value'] = form_field.min_value
+ kwargs["max_value"] = form_field.max_value
+ kwargs["min_value"] = form_field.min_value
if isinstance(form_field, ScoredAnswerField):
fields = [
{
- 'type': form_field.fields[0].__class__.__name__,
- 'max_length': form_field.fields[0].max_length,
- 'min_length': form_field.fields[0].min_length,
- 'empty_value': form_field.fields[0].empty_value
+ "type": form_field.fields[0].__class__.__name__,
+ "max_length": form_field.fields[0].max_length,
+ "min_length": form_field.fields[0].min_length,
+ "empty_value": form_field.fields[0].empty_value,
},
{
- 'type': form_field.fields[1].__class__.__name__,
- 'choices': form_field.fields[1].choices,
+ "type": form_field.fields[1].__class__.__name__,
+ "choices": form_field.fields[1].choices,
},
]
- kwargs['fields'] = fields
+ kwargs["fields"] = fields
return kwargs
def get_field_widget(form_field):
if isinstance(form_field, BlockFieldWrapper):
- return {'type': 'LoadHTML', 'attrs': {}}
+ return {"type": "LoadHTML", "attrs": {}}
widget = {
- 'type': form_field.widget.__class__.__name__,
- 'attrs': form_field.widget.attrs
+ "type": form_field.widget.__class__.__name__,
+ "attrs": form_field.widget.attrs,
}
if isinstance(form_field.widget, TinyMCE):
mce_attrs = form_field.widget.mce_attrs
- plugins = mce_attrs.get('plugins')
+ plugins = mce_attrs.get("plugins")
if not isinstance(plugins, list):
- mce_attrs['plugins'] = [plugins]
- if 'toolbar1' in mce_attrs:
- mce_attrs['toolbar'] = mce_attrs.pop('toolbar1')
- widget['mce_attrs'] = mce_attrs
+ mce_attrs["plugins"] = [plugins]
+ if "toolbar1" in mce_attrs:
+ mce_attrs["toolbar"] = mce_attrs.pop("toolbar1")
+ widget["mce_attrs"] = mce_attrs
if isinstance(form_field.widget, ScoredAnswerWidget):
field_widgets = form_field.widget.widgets
widgets = [
{
- 'type': field_widgets[0].__class__.__name__,
- 'attrs': field_widgets[0].attrs,
- 'mce_attrs': field_widgets[0].mce_attrs
+ "type": field_widgets[0].__class__.__name__,
+ "attrs": field_widgets[0].attrs,
+ "mce_attrs": field_widgets[0].mce_attrs,
},
{
- 'type': field_widgets[1].__class__.__name__,
- 'attrs': field_widgets[1].attrs,
- }
+ "type": field_widgets[1].__class__.__name__,
+ "attrs": field_widgets[1].attrs,
+ },
]
- widget['widgets'] = widgets
+ widget["widgets"] = widgets
return widget
def get_round_leads():
return User.objects.filter(submission_lead__isnull=False).distinct()
+
def get_screening_statuses():
return ScreeningStatus.objects.filter(
- id__in=ApplicationSubmission.objects.all().values('screening_statuses__id').distinct('screening_statuses__id'))
+ id__in=ApplicationSubmission.objects.all()
+ .values("screening_statuses__id")
+ .distinct("screening_statuses__id")
+ )
def get_used_rounds():
@@ -105,6 +109,4 @@ def get_used_funds():
def get_category_options():
- return Option.objects.filter(
- category__filter_on_dashboard=True
- )
+ return Option.objects.filter(category__filter_on_dashboard=True)
diff --git a/hypha/apply/api/v1/views.py b/hypha/apply/api/v1/views.py
index c3789cbf0c..e5f7280120 100644
--- a/hypha/apply/api/v1/views.py
+++ b/hypha/apply/api/v1/views.py
@@ -49,41 +49,46 @@
class SubmissionViewSet(viewsets.ReadOnlyModelViewSet, viewsets.GenericViewSet):
permission_classes = (
- permissions.IsAuthenticated, IsApplyStaffUser,
+ permissions.IsAuthenticated,
+ IsApplyStaffUser,
)
filter_backends = (filters.DjangoFilterBackend,)
filter_class = SubmissionsFilter
pagination_class = StandardResultsSetPagination
def get_serializer_class(self):
- if self.action == 'list':
+ if self.action == "list":
return SubmissionListSerializer
return SubmissionDetailSerializer
def get_queryset(self):
- if self.action == 'list':
- return ApplicationSubmission.objects.exclude_draft().current().with_latest_update()
+ if self.action == "list":
+ return (
+ ApplicationSubmission.objects.exclude_draft()
+ .current()
+ .with_latest_update()
+ )
return ApplicationSubmission.objects.exclude_draft().prefetch_related(
- Prefetch('reviews', Review.objects.submitted()),
+ Prefetch("reviews", Review.objects.submitted()),
)
- @action(detail=True, methods=['put'])
+ @action(detail=True, methods=["put"])
def set_summary(self, request, pk=None):
submission = self.get_object()
serializer = SubmissionSummarySerializer(data=request.data)
serializer.is_valid(raise_exception=True)
- summary = serializer.validated_data['summary']
+ summary = serializer.validated_data["summary"]
submission.summary = summary
- submission.save(update_fields=['summary'])
+ submission.save(update_fields=["summary"])
serializer = self.get_serializer(submission)
return Response(serializer.data)
- @action(detail=True, methods=['post'])
+ @action(detail=True, methods=["post"])
def meta_terms(self, request, pk=None):
submission = self.get_object()
serializer = SubmissionMetaTermsSerializer(data=request.data)
serializer.is_valid(raise_exception=True)
- meta_terms_ids = serializer.validated_data['meta_terms']
+ meta_terms_ids = serializer.validated_data["meta_terms"]
submission.meta_terms.set(meta_terms_ids)
serializer = self.get_serializer(submission)
return Response(serializer.data)
@@ -91,63 +96,100 @@ def meta_terms(self, request, pk=None):
class SubmissionFilters(APIView):
permission_classes = (
- permissions.IsAuthenticated, IsApplyStaffUser,
+ permissions.IsAuthenticated,
+ IsApplyStaffUser,
)
def filter_unique_options(self, options):
- unique_items = [dict(item) for item in {tuple(option.items()) for option in options}]
+ unique_items = [
+ dict(item) for item in {tuple(option.items()) for option in options}
+ ]
return list(filter(lambda x: len(x.get("label")), unique_items))
def format(self, filterKey, label, options):
if label == "Screenings":
options.insert(0, {"key": None, "label": "No Screening"})
- return {
- "filterKey": filterKey,
- "label": label,
- "options": options
- }
+ return {"filterKey": filterKey, "label": label, "options": options}
def get(self, request, format=None):
filter_options = [
- self.format("fund", "Funds", [
- {"key": fund.get("id"), "label": fund.get("title")}
- for fund in get_used_funds().values()
- ]),
- self.format("round", "Rounds", [
- {"key": round.get("id"), "label": round.get("title")}
- for round in get_used_rounds().values()
- ]),
- self.format("status", "Statuses", [
- {'key': list(STATUSES.get(label)), 'label': label}
- for label in dict(STATUSES)
- ]),
- self.format("screening_statuses", "Screenings", self.filter_unique_options([
- {"key": screening.get("id"), "label": screening.get("title")}
- for screening in get_screening_statuses().values()
- ])),
- self.format("lead", "Leads", [
- {"key": lead.get('id'), "label": lead.get('full_name') or lead.get('email')}
- for lead in get_round_leads().values()
- ]),
- self.format("reviewers", "Reviewers", self.filter_unique_options([
- {"key": reviewer.get('id'), "label": reviewer.get('full_name') or reviewer.get('email')}
- for reviewer in get_all_reviewers().values()
- ])),
- self.format("category_options", "Category", self.filter_unique_options([
- {"key": option.get('id'), "label": option.get('value')}
- for option in get_category_options().values()
- ])),
+ self.format(
+ "fund",
+ "Funds",
+ [
+ {"key": fund.get("id"), "label": fund.get("title")}
+ for fund in get_used_funds().values()
+ ],
+ ),
+ self.format(
+ "round",
+ "Rounds",
+ [
+ {"key": round.get("id"), "label": round.get("title")}
+ for round in get_used_rounds().values()
+ ],
+ ),
+ self.format(
+ "status",
+ "Statuses",
+ [
+ {"key": list(STATUSES.get(label)), "label": label}
+ for label in dict(STATUSES)
+ ],
+ ),
+ self.format(
+ "screening_statuses",
+ "Screenings",
+ self.filter_unique_options(
+ [
+ {"key": screening.get("id"), "label": screening.get("title")}
+ for screening in get_screening_statuses().values()
+ ]
+ ),
+ ),
+ self.format(
+ "lead",
+ "Leads",
+ [
+ {
+ "key": lead.get("id"),
+ "label": lead.get("full_name") or lead.get("email"),
+ }
+ for lead in get_round_leads().values()
+ ],
+ ),
+ self.format(
+ "reviewers",
+ "Reviewers",
+ self.filter_unique_options(
+ [
+ {
+ "key": reviewer.get("id"),
+ "label": reviewer.get("full_name") or reviewer.get("email"),
+ }
+ for reviewer in get_all_reviewers().values()
+ ]
+ ),
+ ),
+ self.format(
+ "category_options",
+ "Category",
+ self.filter_unique_options(
+ [
+ {"key": option.get("id"), "label": option.get("value")}
+ for option in get_category_options().values()
+ ]
+ ),
+ ),
]
return Response(filter_options)
-class SubmissionActionViewSet(
- SubmissionNestedMixin,
- viewsets.GenericViewSet
-):
+class SubmissionActionViewSet(SubmissionNestedMixin, viewsets.GenericViewSet):
serializer_class = SubmissionActionSerializer
permission_classes = (
- permissions.IsAuthenticated, IsApplyStaffUser,
+ permissions.IsAuthenticated,
+ IsApplyStaffUser,
)
def get_object(self):
@@ -174,54 +216,62 @@ def create(self, request, *args, **kwargs):
{"action": "internal_review"}
```
"""
- action = request.data.get('action')
+ action = request.data.get("action")
if not action:
- raise ValidationError('Action must be provided.')
+ raise ValidationError("Action must be provided.")
obj = self.get_object()
- redirect = DeterminationCreateOrUpdateView.should_redirect(
- request, obj, action)
+ redirect = DeterminationCreateOrUpdateView.should_redirect(request, obj, action)
if redirect:
- raise NotFound({
- 'detail': 'The action should be performed at the determination view',
- 'target': redirect.url,
- })
+ raise NotFound(
+ {
+ "detail": "The action should be performed at the determination view",
+ "target": redirect.url,
+ }
+ )
try:
obj.perform_transition(action, self.request.user, request=self.request)
except DjangoPermissionDenied as e:
raise PermissionDenied(str(e)) from e
# refresh_from_db() raises errors for particular actions.
obj = self.get_object()
- serializer = SubmissionDetailSerializer(obj, context={
- 'request': request,
- })
- return Response({
- 'id': serializer.data['id'],
- 'status': serializer.data['status'],
- 'actions': serializer.data['actions'],
- 'phase': serializer.data['phase'],
- })
+ serializer = SubmissionDetailSerializer(
+ obj,
+ context={
+ "request": request,
+ },
+ )
+ return Response(
+ {
+ "id": serializer.data["id"],
+ "status": serializer.data["status"],
+ "actions": serializer.data["actions"],
+ "phase": serializer.data["phase"],
+ }
+ )
class RoundViewSet(
- mixins.RetrieveModelMixin,
- mixins.ListModelMixin,
- viewsets.GenericViewSet
+ mixins.RetrieveModelMixin, mixins.ListModelMixin, viewsets.GenericViewSet
):
queryset = RoundsAndLabs.objects.all()
serializer_class = RoundLabSerializer
permission_classes = (
- permissions.IsAuthenticated, IsApplyStaffUser,
+ permissions.IsAuthenticated,
+ IsApplyStaffUser,
)
permission_classes_by_action = {
- 'open': [HasAPIKey | permissions.IsAuthenticated, HasAPIKey | IsApplyStaffUser, ],
+ "open": [
+ HasAPIKey | permissions.IsAuthenticated,
+ HasAPIKey | IsApplyStaffUser,
+ ],
}
pagination_class = StandardResultsSetPagination
def get_serializer_class(self):
- if self.action == 'list':
+ if self.action == "list":
return RoundLabSerializer
- elif self.action == 'open':
+ elif self.action == "open":
return OpenRoundLabSerializer
return RoundLabDetailSerializer
@@ -232,12 +282,15 @@ def get_object(self):
def get_permissions(self):
try:
# return permission_classes depending on `action`
- return [permission() for permission in self.permission_classes_by_action[self.action]]
+ return [
+ permission()
+ for permission in self.permission_classes_by_action[self.action]
+ ]
except KeyError:
# action is not set return default permission_classes
return [permission() for permission in self.permission_classes]
- @action(methods=['get'], detail=False)
+ @action(methods=["get"], detail=False)
def open(self, request):
queryset = RoundsAndLabs.objects.open()
page = self.paginate_queryset(queryset)
@@ -252,24 +305,29 @@ class SubmissionCommentViewSet(
SubmissionNestedMixin,
mixins.ListModelMixin,
mixins.CreateModelMixin,
- viewsets.GenericViewSet
+ viewsets.GenericViewSet,
):
"""
List all the comments on a submission.
"""
- queryset = Activity.comments.all().select_related('user')
+
+ queryset = Activity.comments.all().select_related("user")
serializer_class = CommentCreateSerializer
permission_classes = (
- permissions.IsAuthenticated, IsApplyStaffUser,
+ permissions.IsAuthenticated,
+ IsApplyStaffUser,
)
filter_backends = (filters.DjangoFilterBackend,)
filter_class = CommentFilter
pagination_class = StandardResultsSetPagination
def get_queryset(self):
- return super().get_queryset().filter(
- submission=self.get_submission_object()
- ).visible_to(self.request.user)
+ return (
+ super()
+ .get_queryset()
+ .filter(submission=self.get_submission_object())
+ .visible_to(self.request.user)
+ )
def perform_create(self, serializer):
"""
@@ -279,7 +337,7 @@ def perform_create(self, serializer):
timestamp=timezone.now(),
type=COMMENT,
user=self.request.user,
- source=self.get_submission_object()
+ source=self.get_submission_object(),
)
messenger(
MESSAGES.COMMENT,
@@ -291,27 +349,26 @@ def perform_create(self, serializer):
class CommentViewSet(
- mixins.ListModelMixin,
- viewsets.GenericViewSet,
+ mixins.ListModelMixin,
+ viewsets.GenericViewSet,
):
"""
Edit a comment.
"""
- queryset = Activity.comments.all().select_related('user')
+
+ queryset = Activity.comments.all().select_related("user")
serializer_class = CommentEditSerializer
- permission_classes = (
- permissions.IsAuthenticated, IsAuthor
- )
+ permission_classes = (permissions.IsAuthenticated, IsAuthor)
def get_serializer_class(self):
- if self.action == 'list':
+ if self.action == "list":
return CommentSerializer
return CommentEditSerializer
def get_queryset(self):
return super().get_queryset().visible_to(self.request.user)
- @action(detail=True, methods=['post'])
+ @action(detail=True, methods=["post"])
def edit(self, request, *args, **kwargs):
return self.edit_comment(request, *args, **kwargs)
@@ -327,7 +384,9 @@ def edit_comment(self, request, *args, **kwargs):
serializer = self.get_serializer(comment_to_edit, data=request.data)
serializer.is_valid(raise_exception=True)
- if (serializer.validated_data['message'] != comment_to_update.message) or (serializer.validated_data['visibility'] != comment_to_update.visibility):
+ if (serializer.validated_data["message"] != comment_to_update.message) or (
+ serializer.validated_data["visibility"] != comment_to_update.visibility
+ ):
self.perform_create(serializer)
comment_to_update.current = False
comment_to_update.save()
@@ -351,8 +410,10 @@ class MetaTermsViewSet(mixins.ListModelMixin, viewsets.GenericViewSet):
"""
List all the Meta Terms
"""
+
queryset = MetaTerm.get_root_nodes()
serializer_class = MetaTermsSerializer
permission_classes = (
- permissions.IsAuthenticated, IsApplyStaffUser,
+ permissions.IsAuthenticated,
+ IsApplyStaffUser,
)
diff --git a/hypha/apply/categories/admin.py b/hypha/apply/categories/admin.py
index 11a95bd9ca..42f674f5f7 100644
--- a/hypha/apply/categories/admin.py
+++ b/hypha/apply/categories/admin.py
@@ -7,27 +7,27 @@
class CategoryAdmin(ModelAdmin):
- menu_label = 'Category Questions'
- menu_icon = 'list-ul'
+ menu_label = "Category Questions"
+ menu_icon = "list-ul"
model = Category
class MetaTermAdmin(ModelAdmin):
model = MetaTerm
- menu_icon = 'tag'
+ menu_icon = "tag"
list_per_page = 50
- list_display = ('get_as_listing_header', 'get_parent')
- search_fields = ('name',)
+ list_display = ("get_as_listing_header", "get_parent")
+ search_fields = ("name",)
inspect_view_enabled = True
- inspect_view_fields = ('name', 'get_parent', 'id')
+ inspect_view_fields = ("name", "get_parent", "id")
button_helper_class = MetaTermButtonHelper
def add_child_view(self, request, instance_pk):
- kwargs = {'model_admin': self, 'parent_pk': instance_pk}
+ kwargs = {"model_admin": self, "parent_pk": instance_pk}
view_class = AddChildMetaTermViewClass
return view_class.as_view(**kwargs)(request)
@@ -35,8 +35,8 @@ def get_admin_urls_for_registration(self):
"""Add the new url for add child page to the registered URLs."""
urls = super().get_admin_urls_for_registration()
add_child_url = re_path(
- self.url_helper.get_action_url_pattern('add_child'),
+ self.url_helper.get_action_url_pattern("add_child"),
self.add_child_view,
- name=self.url_helper.get_action_url_name('add_child')
+ name=self.url_helper.get_action_url_name("add_child"),
)
- return urls + (add_child_url, )
+ return urls + (add_child_url,)
diff --git a/hypha/apply/categories/admin_helpers.py b/hypha/apply/categories/admin_helpers.py
index 7ea66869ad..addea237ab 100644
--- a/hypha/apply/categories/admin_helpers.py
+++ b/hypha/apply/categories/admin_helpers.py
@@ -19,21 +19,24 @@ def prepare_classnames(self, start=None, add=None, exclude=None):
def add_child_button(self, pk, child_verbose_name, **kwargs):
"""Build a add child button, to easily add a child under meta term."""
instance = self.model.objects.get(pk=pk)
- if instance.is_archived or instance.get_parent() and instance.get_parent().is_archived:
+ if (
+ instance.is_archived
+ or instance.get_parent()
+ and instance.get_parent().is_archived
+ ):
return
classnames = self.prepare_classnames(
- start=self.edit_button_classnames + ['icon', 'icon-plus'],
- add=kwargs.get('classnames_add'),
- exclude=kwargs.get('classnames_exclude')
+ start=self.edit_button_classnames + ["icon", "icon-plus"],
+ add=kwargs.get("classnames_add"),
+ exclude=kwargs.get("classnames_exclude"),
)
return {
- 'classname': classnames,
- 'label': 'Add %s %s' % (
- child_verbose_name, self.verbose_name),
- 'title': 'Add %s %s under this one' % (
- child_verbose_name, self.verbose_name),
- 'url': self.url_helper.get_action_url('add_child', quote(pk)),
+ "classname": classnames,
+ "label": "Add %s %s" % (child_verbose_name, self.verbose_name),
+ "title": "Add %s %s under this one"
+ % (child_verbose_name, self.verbose_name),
+ "url": self.url_helper.get_action_url("add_child", quote(pk)),
}
def get_buttons_for_obj(self, obj, exclude=None, *args, **kwargs):
diff --git a/hypha/apply/categories/admin_views.py b/hypha/apply/categories/admin_views.py
index 96c6f96955..2a4e9d3926 100644
--- a/hypha/apply/categories/admin_views.py
+++ b/hypha/apply/categories/admin_views.py
@@ -19,12 +19,12 @@ def __init__(self, model_admin, parent_pk):
def get_page_title(self):
"""Generate a title that explains you are adding a child."""
title = super().get_page_title()
- return title + ' %s %s for %s' % (
+ return title + " %s %s for %s" % (
self.model.node_child_verbose_name,
self.opts.verbose_name,
- self.parent_instance
+ self.parent_instance,
)
def get_initial(self):
"""Set the selected parent field to the parent_pk."""
- return {'parent': self.parent_pk}
+ return {"parent": self.parent_pk}
diff --git a/hypha/apply/categories/apps.py b/hypha/apply/categories/apps.py
index 1d9503e06d..4b4114a236 100644
--- a/hypha/apply/categories/apps.py
+++ b/hypha/apply/categories/apps.py
@@ -2,4 +2,4 @@
class CategoriesConfig(AppConfig):
- name = 'hypha.apply.categories'
+ name = "hypha.apply.categories"
diff --git a/hypha/apply/categories/blocks.py b/hypha/apply/categories/blocks.py
index 91da656622..e40ea4d944 100644
--- a/hypha/apply/categories/blocks.py
+++ b/hypha/apply/categories/blocks.py
@@ -20,21 +20,21 @@ def get_categories_as_choices():
class CategoryQuestionBlock(OptionalFormFieldBlock):
class Meta:
- template = 'stream_forms/render_list_field.html'
+ template = "stream_forms/render_list_field.html"
category = ModelChooserBlock(required=True, choices=get_categories_as_choices)
- multi = BooleanBlock(label=_('Multi select'), required=False)
+ multi = BooleanBlock(label=_("Multi select"), required=False)
# Overwrite field label and help text so we can defer to the category
# as required
field_label = CharBlock(
- label=_('Label'),
+ label=_("Label"),
required=False,
- help_text=_('Leave blank to use the default Category label'),
+ help_text=_("Leave blank to use the default Category label"),
)
help_text = TextBlock(
- label=_('Help text'),
+ label=_("Help text"),
required=False,
- help_text=_('Leave blank to use the default Category help text'),
+ help_text=_("Leave blank to use the default Category help text"),
)
@cached_property
@@ -45,10 +45,10 @@ def get_instance(self, id):
return self.model_class.objects.get(id=id)
def get_field_class(self, struct_value):
- return forms.MultipleChoiceField if struct_value['multi'] else forms.ChoiceField
+ return forms.MultipleChoiceField if struct_value["multi"] else forms.ChoiceField
def use_defaults_from_category(self, kwargs, category):
- category_fields = {'label': 'name', 'help_text': 'help_text'}
+ category_fields = {"label": "name", "help_text": "help_text"}
for field in category_fields.keys():
if not kwargs.get(field):
@@ -58,15 +58,15 @@ def use_defaults_from_category(self, kwargs, category):
def get_field_kwargs(self, struct_value):
kwargs = super().get_field_kwargs(struct_value)
- category = self.get_instance(id=struct_value['category'])
+ category = self.get_instance(id=struct_value["category"])
kwargs = self.use_defaults_from_category(kwargs, category)
- choices = category.options.values_list('id', 'value')
- kwargs.update({'choices': choices})
+ choices = category.options.values_list("id", "value")
+ kwargs.update({"choices": choices})
return kwargs
def get_widget(self, struct_value):
- if struct_value['multi']:
- category = self.get_instance(id=struct_value['category'])
+ if struct_value["multi"]:
+ category = self.get_instance(id=struct_value["category"])
category_size = category.options.count()
# Pick widget according to number of options to maintain good usability.
if category_size < 32:
@@ -81,17 +81,17 @@ def prepare_data(self, value, data, serialize):
return data
if isinstance(data, str):
data = [data]
- category = self.get_instance(id=value['category'])
- data = category.options.filter(id__in=data).values_list('value', flat=True)
+ category = self.get_instance(id=value["category"])
+ data = category.options.filter(id__in=data).values_list("value", flat=True)
return data
def render(self, value, context):
# Overwriting field_label and help_text with default for empty values
- category_fields = {'field_label': 'name', 'help_text': 'help_text'}
+ category_fields = {"field_label": "name", "help_text": "help_text"}
for field in category_fields.keys():
if not value.get(field):
- category = value['category']
+ category = value["category"]
if isinstance(category, int):
category = self.get_instance(id=category)
value[field] = getattr(category, category_fields[field])
@@ -101,4 +101,4 @@ def get_searchable_content(self, value, data):
return None
def no_response(self):
- return '-'
+ return "-"
diff --git a/hypha/apply/categories/categories_seed.py b/hypha/apply/categories/categories_seed.py
index 05ce50a177..ee7fb2994a 100644
--- a/hypha/apply/categories/categories_seed.py
+++ b/hypha/apply/categories/categories_seed.py
@@ -3,1621 +3,429 @@
{
"category": "Addressed problems",
"name": "Restrictive Internet filtering by technical methods (IP blocking, DNS filtering, TCP RST, DPI, etc.)",
- "tid": "318"
+ "tid": "318",
},
{
"category": "Addressed problems",
"name": "Blocking, filtering, or modification of political, social, and/or religious content (including apps)",
- "tid": "319"
+ "tid": "319",
},
{
"category": "Addressed problems",
"name": "Technical attacks against government critics, journalists, and/or human rights organizations (Cyberattacks)",
- "tid": "351"
+ "tid": "351",
},
{
"category": "Addressed problems",
"name": "Localized or nationwide communications shut down or throttling (Blackouts)",
- "tid": "320"
+ "tid": "320",
},
{
"category": "Addressed problems",
"name": "Physical intimidation, arrest, violence (including device seizure or destruction), and death for political or social reasons",
- "tid": "354"
+ "tid": "354",
},
{
"category": "Addressed problems",
"name": "Pro-government manipulation of online discussions (propaganda, imitation content, and/or sockpuppets)",
- "tid": "353"
+ "tid": "353",
},
{
"category": "Addressed problems",
"name": "Repressive surveillance or monitoring of communication",
- "tid": "321"
+ "tid": "321",
},
{
"category": "Addressed problems",
"name": "Policies, laws, or directives that increase surveillance, censorship, and punishment",
- "tid": "352"
+ "tid": "352",
},
{
"category": "Addressed problems",
"name": "Government practices that hold intermediaries (social networks or ISPs) liable for user content",
- "tid": "355"
+ "tid": "355",
},
{
"category": "Addressed problems",
"name": "Prohibitive cost to access the Internet",
- "tid": "357"
+ "tid": "357",
},
+ {"category": "Addressed problems", "name": "Other", "tid": "327"},
+ {"category": "Focus", "name": "Access to the Internet", "tid": "2"},
{
- "category": "Addressed problems",
- "name": "Other",
- "tid": "327"
- },
- {
- "category": "Focus",
- "name": "Access to the Internet",
- "tid": "2"
- },
- {
- "category": "Focus",
- "name": "Awareness of privacy and security threats",
- "tid": "363"
- },
- {
- "category": "Focus",
- "name": "Privacy enhancement",
- "tid": "3"
- },
- {
- "category": "Focus",
- "name": "Security from danger or threat online",
- "tid": "1"
- },
- {
- "category": "Objective(s)",
- "name": "Deploying technology",
- "tid": "362"
- },
- {
- "category": "Objective(s)",
- "name": "Software or hardware development",
- "tid": "360"
- },
- {
- "category": "Objective(s)",
- "name": "Testing",
- "tid": "333"
- },
- {
- "category": "Objective(s)",
- "name": "Research",
- "tid": "361"
- },
- {
- "category": "Objective(s)",
- "name": "Technology development",
- "tid": "330"
- },
- {
- "category": "Objective(s)",
- "name": "Training",
- "tid": "331"
- },
- {
- "category": "Beneficiaries",
- "name": "General public",
- "tid": "335"
- },
- {
- "category": "Beneficiaries",
- "name": "Women",
- "tid": "342"
- },
- {
- "category": "Beneficiaries",
- "name": "Youth",
- "tid": "343"
- },
- {
- "category": "Beneficiaries",
- "name": "Sexual minorities",
- "tid": "345"
- },
- {
- "category": "Beneficiaries",
- "name": "Ethnic minorities",
- "tid": "344"
- },
- {
- "category": "Beneficiaries",
- "name": "Activists",
- "tid": "336"
- },
- {
- "category": "Beneficiaries",
- "name": "Journalists",
- "tid": "337"
- },
- {
- "category": "Beneficiaries",
- "name": "Advocacy groups/NGOs",
- "tid": "338"
- },
- {
- "category": "Beneficiaries",
- "name": "Academia",
- "tid": "339"
- },
- {
- "category": "Beneficiaries",
- "name": "Technologists",
- "tid": "340"
- },
- {
- "category": "Beneficiaries",
- "name": "Entrepreneurs",
- "tid": "359"
- },
- {
- "category": "Beneficiaries",
- "name": "Government",
- "tid": "341"
- },
- {
- "category": "Beneficiaries",
- "name": "Other",
- "tid": "350"
- },
- {
- "category": "Region(s)",
- "name": "Global",
- "tid": "271"
- },
- {
- "category": "Region(s)",
- "name": "North Africa and Middle east",
- "tid": "358"
- },
- {
- "category": "Region(s)",
- "name": "East Africa",
- "tid": "369"
- },
- {
- "category": "Region(s)",
- "name": "West Africa",
- "tid": "370"
- },
- {
- "category": "Region(s)",
- "name": "South Africa",
- "tid": "272"
- },
- {
- "category": "Region(s)",
- "name": "North Asia and Russia",
- "tid": "371"
- },
- {
- "category": "Region(s)",
- "name": "Central Asia",
- "tid": "274"
- },
- {
- "category": "Region(s)",
- "name": "East Asia",
- "tid": "372"
- },
- {
- "category": "Region(s)",
- "name": "South Asia",
- "tid": "373"
- },
- {
- "category": "Region(s)",
- "name": "South-East Asia",
- "tid": "365"
- },
- {
- "category": "Region(s)",
- "name": "Eastern Europe",
- "tid": "291"
- },
- {
- "category": "Region(s)",
- "name": "Central America",
- "tid": "273"
- },
- {
- "category": "Region(s)",
- "name": "Caribbean",
- "tid": "374"
- },
- {
- "category": "Region(s)",
- "name": "Andean",
- "tid": "375"
- },
- {
- "category": "Region(s)",
- "name": "Southern cone",
- "tid": "376"
- },
- {
- "category": "Project status",
- "name": "Just an Idea (Pre-alpha)",
- "tid": "329"
- },
- {
- "category": "Project status",
- "name": "It Exists! (Alpha/Beta)",
- "tid": "328"
- },
- {
- "category": "Project status",
- "name": "It's basically done. (Release)",
- "tid": "366"
- },
- {
- "category": "Project status",
- "name": "People Use It. (Production)",
- "tid": "367"
- },
- {
- "tid": "6",
- "name": "Afghanistan",
- "category": "Countries"
- },
- {
- "tid": "7",
- "name": "Aland Islands",
- "category": "Countries"
- },
- {
- "tid": "8",
- "name": "Albania",
- "category": "Countries"
- },
- {
- "tid": "9",
- "name": "Algeria",
- "category": "Countries"
- },
- {
- "tid": "10",
- "name": "American Samoa",
- "category": "Countries"
- },
- {
- "tid": "11",
- "name": "Andorra",
- "category": "Countries"
- },
- {
- "tid": "12",
- "name": "Angola",
- "category": "Countries"
- },
- {
- "tid": "13",
- "name": "Anguilla",
- "category": "Countries"
- },
- {
- "tid": "14",
- "name": "Antarctica",
- "category": "Countries"
- },
- {
- "tid": "15",
- "name": "Antigua and Barbuda",
- "category": "Countries"
- },
- {
- "tid": "16",
- "name": "Argentina",
- "category": "Countries"
- },
- {
- "tid": "17",
- "name": "Armenia",
- "category": "Countries"
- },
- {
- "tid": "18",
- "name": "Aruba",
- "category": "Countries"
- },
- {
- "tid": "19",
- "name": "Australia",
- "category": "Countries"
- },
- {
- "tid": "20",
- "name": "Austria",
- "category": "Countries"
- },
- {
- "tid": "21",
- "name": "Azerbaijan",
- "category": "Countries"
- },
- {
- "tid": "22",
- "name": "Bahamas",
- "category": "Countries"
- },
- {
- "tid": "23",
- "name": "Bahrain",
- "category": "Countries"
- },
- {
- "tid": "24",
- "name": "Bangladesh",
- "category": "Countries"
- },
- {
- "tid": "25",
- "name": "Barbados",
- "category": "Countries"
- },
- {
- "tid": "26",
- "name": "Belarus",
- "category": "Countries"
- },
- {
- "tid": "27",
- "name": "Belgium",
- "category": "Countries"
- },
- {
- "tid": "28",
- "name": "Belize",
- "category": "Countries"
- },
- {
- "tid": "29",
- "name": "Benin",
- "category": "Countries"
- },
- {
- "tid": "30",
- "name": "Bermuda",
- "category": "Countries"
- },
- {
- "tid": "31",
- "name": "Bhutan",
- "category": "Countries"
- },
- {
- "tid": "32",
- "name": "Bolivia",
- "category": "Countries"
- },
- {
- "tid": "33",
- "name": "Bosnia and Herzegovina",
- "category": "Countries"
- },
- {
- "tid": "34",
- "name": "Botswana",
- "category": "Countries"
- },
- {
- "tid": "35",
- "name": "Bouvet Island",
- "category": "Countries"
- },
- {
- "tid": "36",
- "name": "Brazil",
- "category": "Countries"
- },
- {
- "tid": "37",
- "name": "British Indian Ocean Territory",
- "category": "Countries"
- },
- {
- "tid": "38",
- "name": "British Virgin Islands",
- "category": "Countries"
- },
- {
- "tid": "39",
- "name": "Brunei",
- "category": "Countries"
- },
- {
- "tid": "40",
- "name": "Bulgaria",
- "category": "Countries"
- },
- {
- "tid": "41",
- "name": "Burkina Faso",
- "category": "Countries"
- },
- {
- "tid": "42",
- "name": "Burundi",
- "category": "Countries"
- },
- {
- "tid": "43",
- "name": "Cambodia",
- "category": "Countries"
- },
- {
- "tid": "44",
- "name": "Cameroon",
- "category": "Countries"
- },
- {
- "tid": "45",
- "name": "Canada",
- "category": "Countries"
- },
- {
- "tid": "46",
- "name": "Cape Verde",
- "category": "Countries"
- },
- {
- "tid": "47",
- "name": "Cayman Islands",
- "category": "Countries"
- },
- {
- "tid": "48",
- "name": "Central African Republic",
- "category": "Countries"
- },
- {
- "tid": "49",
- "name": "Chad",
- "category": "Countries"
- },
- {
- "tid": "50",
- "name": "Chile",
- "category": "Countries"
- },
- {
- "tid": "51",
- "name": "China",
- "category": "Countries"
- },
- {
- "tid": "52",
- "name": "Christmas Island",
- "category": "Countries"
- },
- {
- "tid": "53",
- "name": "Cocos (Keeling) Islands",
- "category": "Countries"
- },
- {
- "tid": "54",
- "name": "Colombia",
- "category": "Countries"
- },
- {
- "tid": "55",
- "name": "Comoros",
- "category": "Countries"
- },
- {
- "tid": "56",
- "name": "Congo (Brazzaville)",
- "category": "Countries"
- },
- {
- "tid": "57",
- "name": "Congo (Kinshasa)",
- "category": "Countries"
- },
- {
- "tid": "58",
- "name": "Cook Islands",
- "category": "Countries"
- },
- {
- "tid": "59",
- "name": "Costa Rica",
- "category": "Countries"
- },
- {
- "tid": "60",
- "name": "Croatia",
- "category": "Countries"
- },
- {
- "tid": "61",
- "name": "Cuba",
- "category": "Countries"
- },
- {
- "tid": "62",
- "name": "Curaçao",
- "category": "Countries"
- },
- {
- "tid": "63",
- "name": "Cyprus",
- "category": "Countries"
- },
- {
- "tid": "64",
- "name": "Czech Republic",
- "category": "Countries"
- },
- {
- "tid": "65",
- "name": "Denmark",
- "category": "Countries"
- },
- {
- "tid": "66",
- "name": "Djibouti",
- "category": "Countries"
- },
- {
- "tid": "67",
- "name": "Dominica",
- "category": "Countries"
- },
- {
- "tid": "68",
- "name": "Dominican Republic",
- "category": "Countries"
- },
- {
- "tid": "69",
- "name": "Ecuador",
- "category": "Countries"
- },
- {
- "tid": "70",
- "name": "Egypt",
- "category": "Countries"
- },
- {
- "tid": "71",
- "name": "El Salvador",
- "category": "Countries"
- },
- {
- "tid": "72",
- "name": "Equatorial Guinea",
- "category": "Countries"
- },
- {
- "tid": "73",
- "name": "Eritrea",
- "category": "Countries"
- },
- {
- "tid": "74",
- "name": "Estonia",
- "category": "Countries"
- },
- {
- "tid": "75",
- "name": "Ethiopia",
- "category": "Countries"
- },
- {
- "tid": "76",
- "name": "Falkland Islands",
- "category": "Countries"
- },
- {
- "tid": "77",
- "name": "Faroe Islands",
- "category": "Countries"
- },
- {
- "tid": "78",
- "name": "Fiji",
- "category": "Countries"
- },
- {
- "tid": "79",
- "name": "Finland",
- "category": "Countries"
- },
- {
- "tid": "80",
- "name": "France",
- "category": "Countries"
- },
- {
- "tid": "81",
- "name": "French Guiana",
- "category": "Countries"
- },
- {
- "tid": "82",
- "name": "French Polynesia",
- "category": "Countries"
- },
- {
- "tid": "83",
- "name": "French Southern Territories",
- "category": "Countries"
- },
- {
- "tid": "84",
- "name": "Gabon",
- "category": "Countries"
- },
- {
- "tid": "85",
- "name": "Gambia",
- "category": "Countries"
- },
- {
- "tid": "86",
- "name": "Georgia",
- "category": "Countries"
- },
- {
- "tid": "87",
- "name": "Germany",
- "category": "Countries"
- },
- {
- "tid": "88",
- "name": "Ghana",
- "category": "Countries"
- },
- {
- "tid": "89",
- "name": "Gibraltar",
- "category": "Countries"
- },
- {
- "tid": "90",
- "name": "Greece",
- "category": "Countries"
- },
- {
- "tid": "91",
- "name": "Greenland",
- "category": "Countries"
- },
- {
- "tid": "92",
- "name": "Grenada",
- "category": "Countries"
- },
- {
- "tid": "93",
- "name": "Guadeloupe",
- "category": "Countries"
- },
- {
- "tid": "94",
- "name": "Guam",
- "category": "Countries"
- },
- {
- "tid": "95",
- "name": "Guatemala",
- "category": "Countries"
- },
- {
- "tid": "96",
- "name": "Guernsey",
- "category": "Countries"
- },
- {
- "tid": "97",
- "name": "Guinea",
- "category": "Countries"
- },
- {
- "tid": "98",
- "name": "Guinea-Bissau",
- "category": "Countries"
- },
- {
- "tid": "99",
- "name": "Guyana",
- "category": "Countries"
- },
- {
- "tid": "100",
- "name": "Haiti",
- "category": "Countries"
- },
- {
- "tid": "101",
- "name": "Heard Island and McDonald Islands",
- "category": "Countries"
- },
- {
- "tid": "102",
- "name": "Honduras",
- "category": "Countries"
- },
- {
- "tid": "103",
- "name": "Hungary",
- "category": "Countries"
- },
- {
- "tid": "104",
- "name": "Iceland",
- "category": "Countries"
- },
- {
- "tid": "105",
- "name": "India",
- "category": "Countries"
- },
- {
- "tid": "106",
- "name": "Indonesia",
- "category": "Countries"
- },
- {
- "tid": "107",
- "name": "Iran",
- "category": "Countries"
- },
- {
- "tid": "108",
- "name": "Iraq",
- "category": "Countries"
- },
- {
- "tid": "109",
- "name": "Ireland",
- "category": "Countries"
- },
- {
- "tid": "110",
- "name": "Isle of Man",
- "category": "Countries"
- },
- {
- "tid": "111",
- "name": "Israel",
- "category": "Countries"
- },
- {
- "tid": "112",
- "name": "Italy",
- "category": "Countries"
- },
- {
- "tid": "113",
- "name": "Ivory Coast",
- "category": "Countries"
- },
- {
- "tid": "114",
- "name": "Jamaica",
- "category": "Countries"
- },
- {
- "tid": "115",
- "name": "Japan",
- "category": "Countries"
- },
- {
- "tid": "116",
- "name": "Jersey",
- "category": "Countries"
- },
- {
- "tid": "117",
- "name": "Jordan",
- "category": "Countries"
- },
- {
- "tid": "118",
- "name": "Kazakhstan",
- "category": "Countries"
- },
- {
- "tid": "119",
- "name": "Kenya",
- "category": "Countries"
- },
- {
- "tid": "120",
- "name": "Kiribati",
- "category": "Countries"
- },
- {
- "tid": "488",
- "name": "Kosovo",
- "category": "Countries"
- },
- {
- "tid": "121",
- "name": "Kuwait",
- "category": "Countries"
- },
- {
- "tid": "122",
- "name": "Kyrgyzstan",
- "category": "Countries"
- },
- {
- "tid": "123",
- "name": "Laos",
- "category": "Countries"
- },
- {
- "tid": "124",
- "name": "Latvia",
- "category": "Countries"
- },
- {
- "tid": "125",
- "name": "Lebanon",
- "category": "Countries"
- },
- {
- "tid": "126",
- "name": "Lesotho",
- "category": "Countries"
- },
- {
- "tid": "127",
- "name": "Liberia",
- "category": "Countries"
- },
- {
- "tid": "128",
- "name": "Libya",
- "category": "Countries"
- },
- {
- "tid": "129",
- "name": "Liechtenstein",
- "category": "Countries"
- },
- {
- "tid": "130",
- "name": "Lithuania",
- "category": "Countries"
- },
- {
- "tid": "131",
- "name": "Luxembourg",
- "category": "Countries"
- },
- {
- "tid": "132",
- "name": "Macedonia",
- "category": "Countries"
- },
- {
- "tid": "133",
- "name": "Madagascar",
- "category": "Countries"
- },
- {
- "tid": "134",
- "name": "Malawi",
- "category": "Countries"
- },
- {
- "tid": "135",
- "name": "Malaysia",
- "category": "Countries"
- },
- {
- "tid": "136",
- "name": "Maldives",
- "category": "Countries"
- },
- {
- "tid": "137",
- "name": "Mali",
- "category": "Countries"
- },
- {
- "tid": "138",
- "name": "Malta",
- "category": "Countries"
- },
- {
- "tid": "139",
- "name": "Marshall Islands",
- "category": "Countries"
- },
- {
- "tid": "140",
- "name": "Martinique",
- "category": "Countries"
- },
- {
- "tid": "141",
- "name": "Mauritania",
- "category": "Countries"
- },
- {
- "tid": "142",
- "name": "Mauritius",
- "category": "Countries"
- },
- {
- "tid": "143",
- "name": "Mayotte",
- "category": "Countries"
- },
- {
- "tid": "144",
- "name": "Mexico",
- "category": "Countries"
- },
- {
- "tid": "145",
- "name": "Micronesia",
- "category": "Countries"
- },
- {
- "tid": "146",
- "name": "Moldova",
- "category": "Countries"
- },
- {
- "tid": "147",
- "name": "Monaco",
- "category": "Countries"
- },
- {
- "tid": "148",
- "name": "Mongolia",
- "category": "Countries"
- },
- {
- "tid": "149",
- "name": "Montenegro",
- "category": "Countries"
- },
- {
- "tid": "150",
- "name": "Montserrat",
- "category": "Countries"
- },
- {
- "tid": "151",
- "name": "Morocco",
- "category": "Countries"
- },
- {
- "tid": "152",
- "name": "Mozambique",
- "category": "Countries"
- },
- {
- "tid": "153",
- "name": "Myanmar",
- "category": "Countries"
- },
- {
- "tid": "154",
- "name": "Namibia",
- "category": "Countries"
- },
- {
- "tid": "155",
- "name": "Nauru",
- "category": "Countries"
- },
- {
- "tid": "156",
- "name": "Nepal",
- "category": "Countries"
- },
- {
- "tid": "157",
- "name": "Netherlands",
- "category": "Countries"
- },
- {
- "tid": "158",
- "name": "Netherlands Antilles",
- "category": "Countries"
- },
- {
- "tid": "159",
- "name": "New Caledonia",
- "category": "Countries"
- },
- {
- "tid": "160",
- "name": "New Zealand",
- "category": "Countries"
- },
- {
- "tid": "161",
- "name": "Nicaragua",
- "category": "Countries"
- },
- {
- "tid": "162",
- "name": "Niger",
- "category": "Countries"
- },
- {
- "tid": "163",
- "name": "Nigeria",
- "category": "Countries"
- },
- {
- "tid": "164",
- "name": "Niue",
- "category": "Countries"
- },
- {
- "tid": "165",
- "name": "Norfolk Island",
- "category": "Countries"
- },
- {
- "tid": "166",
- "name": "North Korea",
- "category": "Countries"
- },
- {
- "tid": "167",
- "name": "Northern Mariana Islands",
- "category": "Countries"
- },
- {
- "tid": "168",
- "name": "Norway",
- "category": "Countries"
- },
- {
- "tid": "169",
- "name": "Oman",
- "category": "Countries"
- },
- {
- "tid": "170",
- "name": "Pakistan",
- "category": "Countries"
- },
- {
- "tid": "171",
- "name": "Palau",
- "category": "Countries"
- },
- {
- "tid": "172",
- "name": "Palestinian Territory",
- "category": "Countries"
- },
- {
- "tid": "173",
- "name": "Panama",
- "category": "Countries"
- },
- {
- "tid": "174",
- "name": "Papua New Guinea",
- "category": "Countries"
- },
- {
- "tid": "175",
- "name": "Paraguay",
- "category": "Countries"
- },
- {
- "tid": "176",
- "name": "Peru",
- "category": "Countries"
- },
- {
- "tid": "177",
- "name": "Philippines",
- "category": "Countries"
- },
- {
- "tid": "178",
- "name": "Pitcairn",
- "category": "Countries"
- },
- {
- "tid": "179",
- "name": "Poland",
- "category": "Countries"
- },
- {
- "tid": "180",
- "name": "Portugal",
- "category": "Countries"
- },
- {
- "tid": "181",
- "name": "Puerto Rico",
- "category": "Countries"
- },
- {
- "tid": "182",
- "name": "Qatar",
- "category": "Countries"
- },
- {
- "tid": "183",
- "name": "Reunion",
- "category": "Countries"
- },
- {
- "tid": "184",
- "name": "Romania",
- "category": "Countries"
- },
- {
- "tid": "185",
- "name": "Russia",
- "category": "Countries"
- },
- {
- "tid": "186",
- "name": "Rwanda",
- "category": "Countries"
- },
- {
- "tid": "187",
- "name": "Saint Barthélemy",
- "category": "Countries"
- },
- {
- "tid": "188",
- "name": "Saint Helena",
- "category": "Countries"
- },
- {
- "tid": "189",
- "name": "Saint Kitts and Nevis",
- "category": "Countries"
- },
- {
- "tid": "190",
- "name": "Saint Lucia",
- "category": "Countries"
- },
- {
- "tid": "191",
- "name": "Saint Martin (French part)",
- "category": "Countries"
- },
- {
- "tid": "192",
- "name": "Saint Pierre and Miquelon",
- "category": "Countries"
- },
- {
- "tid": "193",
- "name": "Saint Vincent and the Grenadines",
- "category": "Countries"
- },
- {
- "tid": "194",
- "name": "Samoa",
- "category": "Countries"
- },
- {
- "tid": "195",
- "name": "San Marino",
- "category": "Countries"
- },
- {
- "tid": "196",
- "name": "Sao Tome and Principe",
- "category": "Countries"
- },
- {
- "tid": "197",
- "name": "Saudi Arabia",
- "category": "Countries"
- },
- {
- "tid": "198",
- "name": "Senegal",
- "category": "Countries"
- },
- {
- "tid": "199",
- "name": "Serbia",
- "category": "Countries"
- },
- {
- "tid": "200",
- "name": "Seychelles",
- "category": "Countries"
- },
- {
- "tid": "201",
- "name": "Sierra Leone",
- "category": "Countries"
- },
- {
- "tid": "202",
- "name": "Singapore",
- "category": "Countries"
- },
- {
- "tid": "203",
- "name": "Slovakia",
- "category": "Countries"
- },
- {
- "tid": "204",
- "name": "Slovenia",
- "category": "Countries"
+ "category": "Focus",
+ "name": "Awareness of privacy and security threats",
+ "tid": "363",
},
+ {"category": "Focus", "name": "Privacy enhancement", "tid": "3"},
+ {"category": "Focus", "name": "Security from danger or threat online", "tid": "1"},
+ {"category": "Objective(s)", "name": "Deploying technology", "tid": "362"},
{
- "tid": "205",
- "name": "Solomon Islands",
- "category": "Countries"
- },
+ "category": "Objective(s)",
+ "name": "Software or hardware development",
+ "tid": "360",
+ },
+ {"category": "Objective(s)", "name": "Testing", "tid": "333"},
+ {"category": "Objective(s)", "name": "Research", "tid": "361"},
+ {"category": "Objective(s)", "name": "Technology development", "tid": "330"},
+ {"category": "Objective(s)", "name": "Training", "tid": "331"},
+ {"category": "Beneficiaries", "name": "General public", "tid": "335"},
+ {"category": "Beneficiaries", "name": "Women", "tid": "342"},
+ {"category": "Beneficiaries", "name": "Youth", "tid": "343"},
+ {"category": "Beneficiaries", "name": "Sexual minorities", "tid": "345"},
+ {"category": "Beneficiaries", "name": "Ethnic minorities", "tid": "344"},
+ {"category": "Beneficiaries", "name": "Activists", "tid": "336"},
+ {"category": "Beneficiaries", "name": "Journalists", "tid": "337"},
+ {"category": "Beneficiaries", "name": "Advocacy groups/NGOs", "tid": "338"},
+ {"category": "Beneficiaries", "name": "Academia", "tid": "339"},
+ {"category": "Beneficiaries", "name": "Technologists", "tid": "340"},
+ {"category": "Beneficiaries", "name": "Entrepreneurs", "tid": "359"},
+ {"category": "Beneficiaries", "name": "Government", "tid": "341"},
+ {"category": "Beneficiaries", "name": "Other", "tid": "350"},
+ {"category": "Region(s)", "name": "Global", "tid": "271"},
+ {"category": "Region(s)", "name": "North Africa and Middle east", "tid": "358"},
+ {"category": "Region(s)", "name": "East Africa", "tid": "369"},
+ {"category": "Region(s)", "name": "West Africa", "tid": "370"},
+ {"category": "Region(s)", "name": "South Africa", "tid": "272"},
+ {"category": "Region(s)", "name": "North Asia and Russia", "tid": "371"},
+ {"category": "Region(s)", "name": "Central Asia", "tid": "274"},
+ {"category": "Region(s)", "name": "East Asia", "tid": "372"},
+ {"category": "Region(s)", "name": "South Asia", "tid": "373"},
+ {"category": "Region(s)", "name": "South-East Asia", "tid": "365"},
+ {"category": "Region(s)", "name": "Eastern Europe", "tid": "291"},
+ {"category": "Region(s)", "name": "Central America", "tid": "273"},
+ {"category": "Region(s)", "name": "Caribbean", "tid": "374"},
+ {"category": "Region(s)", "name": "Andean", "tid": "375"},
+ {"category": "Region(s)", "name": "Southern cone", "tid": "376"},
+ {"category": "Project status", "name": "Just an Idea (Pre-alpha)", "tid": "329"},
+ {"category": "Project status", "name": "It Exists! (Alpha/Beta)", "tid": "328"},
{
- "tid": "206",
- "name": "Somalia",
- "category": "Countries"
- },
+ "category": "Project status",
+ "name": "It's basically done. (Release)",
+ "tid": "366",
+ },
+ {"category": "Project status", "name": "People Use It. (Production)", "tid": "367"},
+ {"tid": "6", "name": "Afghanistan", "category": "Countries"},
+ {"tid": "7", "name": "Aland Islands", "category": "Countries"},
+ {"tid": "8", "name": "Albania", "category": "Countries"},
+ {"tid": "9", "name": "Algeria", "category": "Countries"},
+ {"tid": "10", "name": "American Samoa", "category": "Countries"},
+ {"tid": "11", "name": "Andorra", "category": "Countries"},
+ {"tid": "12", "name": "Angola", "category": "Countries"},
+ {"tid": "13", "name": "Anguilla", "category": "Countries"},
+ {"tid": "14", "name": "Antarctica", "category": "Countries"},
+ {"tid": "15", "name": "Antigua and Barbuda", "category": "Countries"},
+ {"tid": "16", "name": "Argentina", "category": "Countries"},
+ {"tid": "17", "name": "Armenia", "category": "Countries"},
+ {"tid": "18", "name": "Aruba", "category": "Countries"},
+ {"tid": "19", "name": "Australia", "category": "Countries"},
+ {"tid": "20", "name": "Austria", "category": "Countries"},
+ {"tid": "21", "name": "Azerbaijan", "category": "Countries"},
+ {"tid": "22", "name": "Bahamas", "category": "Countries"},
+ {"tid": "23", "name": "Bahrain", "category": "Countries"},
+ {"tid": "24", "name": "Bangladesh", "category": "Countries"},
+ {"tid": "25", "name": "Barbados", "category": "Countries"},
+ {"tid": "26", "name": "Belarus", "category": "Countries"},
+ {"tid": "27", "name": "Belgium", "category": "Countries"},
+ {"tid": "28", "name": "Belize", "category": "Countries"},
+ {"tid": "29", "name": "Benin", "category": "Countries"},
+ {"tid": "30", "name": "Bermuda", "category": "Countries"},
+ {"tid": "31", "name": "Bhutan", "category": "Countries"},
+ {"tid": "32", "name": "Bolivia", "category": "Countries"},
+ {"tid": "33", "name": "Bosnia and Herzegovina", "category": "Countries"},
+ {"tid": "34", "name": "Botswana", "category": "Countries"},
+ {"tid": "35", "name": "Bouvet Island", "category": "Countries"},
+ {"tid": "36", "name": "Brazil", "category": "Countries"},
+ {"tid": "37", "name": "British Indian Ocean Territory", "category": "Countries"},
+ {"tid": "38", "name": "British Virgin Islands", "category": "Countries"},
+ {"tid": "39", "name": "Brunei", "category": "Countries"},
+ {"tid": "40", "name": "Bulgaria", "category": "Countries"},
+ {"tid": "41", "name": "Burkina Faso", "category": "Countries"},
+ {"tid": "42", "name": "Burundi", "category": "Countries"},
+ {"tid": "43", "name": "Cambodia", "category": "Countries"},
+ {"tid": "44", "name": "Cameroon", "category": "Countries"},
+ {"tid": "45", "name": "Canada", "category": "Countries"},
+ {"tid": "46", "name": "Cape Verde", "category": "Countries"},
+ {"tid": "47", "name": "Cayman Islands", "category": "Countries"},
+ {"tid": "48", "name": "Central African Republic", "category": "Countries"},
+ {"tid": "49", "name": "Chad", "category": "Countries"},
+ {"tid": "50", "name": "Chile", "category": "Countries"},
+ {"tid": "51", "name": "China", "category": "Countries"},
+ {"tid": "52", "name": "Christmas Island", "category": "Countries"},
+ {"tid": "53", "name": "Cocos (Keeling) Islands", "category": "Countries"},
+ {"tid": "54", "name": "Colombia", "category": "Countries"},
+ {"tid": "55", "name": "Comoros", "category": "Countries"},
+ {"tid": "56", "name": "Congo (Brazzaville)", "category": "Countries"},
+ {"tid": "57", "name": "Congo (Kinshasa)", "category": "Countries"},
+ {"tid": "58", "name": "Cook Islands", "category": "Countries"},
+ {"tid": "59", "name": "Costa Rica", "category": "Countries"},
+ {"tid": "60", "name": "Croatia", "category": "Countries"},
+ {"tid": "61", "name": "Cuba", "category": "Countries"},
+ {"tid": "62", "name": "Curaçao", "category": "Countries"},
+ {"tid": "63", "name": "Cyprus", "category": "Countries"},
+ {"tid": "64", "name": "Czech Republic", "category": "Countries"},
+ {"tid": "65", "name": "Denmark", "category": "Countries"},
+ {"tid": "66", "name": "Djibouti", "category": "Countries"},
+ {"tid": "67", "name": "Dominica", "category": "Countries"},
+ {"tid": "68", "name": "Dominican Republic", "category": "Countries"},
+ {"tid": "69", "name": "Ecuador", "category": "Countries"},
+ {"tid": "70", "name": "Egypt", "category": "Countries"},
+ {"tid": "71", "name": "El Salvador", "category": "Countries"},
+ {"tid": "72", "name": "Equatorial Guinea", "category": "Countries"},
+ {"tid": "73", "name": "Eritrea", "category": "Countries"},
+ {"tid": "74", "name": "Estonia", "category": "Countries"},
+ {"tid": "75", "name": "Ethiopia", "category": "Countries"},
+ {"tid": "76", "name": "Falkland Islands", "category": "Countries"},
+ {"tid": "77", "name": "Faroe Islands", "category": "Countries"},
+ {"tid": "78", "name": "Fiji", "category": "Countries"},
+ {"tid": "79", "name": "Finland", "category": "Countries"},
+ {"tid": "80", "name": "France", "category": "Countries"},
+ {"tid": "81", "name": "French Guiana", "category": "Countries"},
+ {"tid": "82", "name": "French Polynesia", "category": "Countries"},
+ {"tid": "83", "name": "French Southern Territories", "category": "Countries"},
+ {"tid": "84", "name": "Gabon", "category": "Countries"},
+ {"tid": "85", "name": "Gambia", "category": "Countries"},
+ {"tid": "86", "name": "Georgia", "category": "Countries"},
+ {"tid": "87", "name": "Germany", "category": "Countries"},
+ {"tid": "88", "name": "Ghana", "category": "Countries"},
+ {"tid": "89", "name": "Gibraltar", "category": "Countries"},
+ {"tid": "90", "name": "Greece", "category": "Countries"},
+ {"tid": "91", "name": "Greenland", "category": "Countries"},
+ {"tid": "92", "name": "Grenada", "category": "Countries"},
+ {"tid": "93", "name": "Guadeloupe", "category": "Countries"},
+ {"tid": "94", "name": "Guam", "category": "Countries"},
+ {"tid": "95", "name": "Guatemala", "category": "Countries"},
+ {"tid": "96", "name": "Guernsey", "category": "Countries"},
+ {"tid": "97", "name": "Guinea", "category": "Countries"},
+ {"tid": "98", "name": "Guinea-Bissau", "category": "Countries"},
+ {"tid": "99", "name": "Guyana", "category": "Countries"},
+ {"tid": "100", "name": "Haiti", "category": "Countries"},
{
- "tid": "207",
- "name": "South Africa",
- "category": "Countries"
- },
+ "tid": "101",
+ "name": "Heard Island and McDonald Islands",
+ "category": "Countries",
+ },
+ {"tid": "102", "name": "Honduras", "category": "Countries"},
+ {"tid": "103", "name": "Hungary", "category": "Countries"},
+ {"tid": "104", "name": "Iceland", "category": "Countries"},
+ {"tid": "105", "name": "India", "category": "Countries"},
+ {"tid": "106", "name": "Indonesia", "category": "Countries"},
+ {"tid": "107", "name": "Iran", "category": "Countries"},
+ {"tid": "108", "name": "Iraq", "category": "Countries"},
+ {"tid": "109", "name": "Ireland", "category": "Countries"},
+ {"tid": "110", "name": "Isle of Man", "category": "Countries"},
+ {"tid": "111", "name": "Israel", "category": "Countries"},
+ {"tid": "112", "name": "Italy", "category": "Countries"},
+ {"tid": "113", "name": "Ivory Coast", "category": "Countries"},
+ {"tid": "114", "name": "Jamaica", "category": "Countries"},
+ {"tid": "115", "name": "Japan", "category": "Countries"},
+ {"tid": "116", "name": "Jersey", "category": "Countries"},
+ {"tid": "117", "name": "Jordan", "category": "Countries"},
+ {"tid": "118", "name": "Kazakhstan", "category": "Countries"},
+ {"tid": "119", "name": "Kenya", "category": "Countries"},
+ {"tid": "120", "name": "Kiribati", "category": "Countries"},
+ {"tid": "488", "name": "Kosovo", "category": "Countries"},
+ {"tid": "121", "name": "Kuwait", "category": "Countries"},
+ {"tid": "122", "name": "Kyrgyzstan", "category": "Countries"},
+ {"tid": "123", "name": "Laos", "category": "Countries"},
+ {"tid": "124", "name": "Latvia", "category": "Countries"},
+ {"tid": "125", "name": "Lebanon", "category": "Countries"},
+ {"tid": "126", "name": "Lesotho", "category": "Countries"},
+ {"tid": "127", "name": "Liberia", "category": "Countries"},
+ {"tid": "128", "name": "Libya", "category": "Countries"},
+ {"tid": "129", "name": "Liechtenstein", "category": "Countries"},
+ {"tid": "130", "name": "Lithuania", "category": "Countries"},
+ {"tid": "131", "name": "Luxembourg", "category": "Countries"},
+ {"tid": "132", "name": "Macedonia", "category": "Countries"},
+ {"tid": "133", "name": "Madagascar", "category": "Countries"},
+ {"tid": "134", "name": "Malawi", "category": "Countries"},
+ {"tid": "135", "name": "Malaysia", "category": "Countries"},
+ {"tid": "136", "name": "Maldives", "category": "Countries"},
+ {"tid": "137", "name": "Mali", "category": "Countries"},
+ {"tid": "138", "name": "Malta", "category": "Countries"},
+ {"tid": "139", "name": "Marshall Islands", "category": "Countries"},
+ {"tid": "140", "name": "Martinique", "category": "Countries"},
+ {"tid": "141", "name": "Mauritania", "category": "Countries"},
+ {"tid": "142", "name": "Mauritius", "category": "Countries"},
+ {"tid": "143", "name": "Mayotte", "category": "Countries"},
+ {"tid": "144", "name": "Mexico", "category": "Countries"},
+ {"tid": "145", "name": "Micronesia", "category": "Countries"},
+ {"tid": "146", "name": "Moldova", "category": "Countries"},
+ {"tid": "147", "name": "Monaco", "category": "Countries"},
+ {"tid": "148", "name": "Mongolia", "category": "Countries"},
+ {"tid": "149", "name": "Montenegro", "category": "Countries"},
+ {"tid": "150", "name": "Montserrat", "category": "Countries"},
+ {"tid": "151", "name": "Morocco", "category": "Countries"},
+ {"tid": "152", "name": "Mozambique", "category": "Countries"},
+ {"tid": "153", "name": "Myanmar", "category": "Countries"},
+ {"tid": "154", "name": "Namibia", "category": "Countries"},
+ {"tid": "155", "name": "Nauru", "category": "Countries"},
+ {"tid": "156", "name": "Nepal", "category": "Countries"},
+ {"tid": "157", "name": "Netherlands", "category": "Countries"},
+ {"tid": "158", "name": "Netherlands Antilles", "category": "Countries"},
+ {"tid": "159", "name": "New Caledonia", "category": "Countries"},
+ {"tid": "160", "name": "New Zealand", "category": "Countries"},
+ {"tid": "161", "name": "Nicaragua", "category": "Countries"},
+ {"tid": "162", "name": "Niger", "category": "Countries"},
+ {"tid": "163", "name": "Nigeria", "category": "Countries"},
+ {"tid": "164", "name": "Niue", "category": "Countries"},
+ {"tid": "165", "name": "Norfolk Island", "category": "Countries"},
+ {"tid": "166", "name": "North Korea", "category": "Countries"},
+ {"tid": "167", "name": "Northern Mariana Islands", "category": "Countries"},
+ {"tid": "168", "name": "Norway", "category": "Countries"},
+ {"tid": "169", "name": "Oman", "category": "Countries"},
+ {"tid": "170", "name": "Pakistan", "category": "Countries"},
+ {"tid": "171", "name": "Palau", "category": "Countries"},
+ {"tid": "172", "name": "Palestinian Territory", "category": "Countries"},
+ {"tid": "173", "name": "Panama", "category": "Countries"},
+ {"tid": "174", "name": "Papua New Guinea", "category": "Countries"},
+ {"tid": "175", "name": "Paraguay", "category": "Countries"},
+ {"tid": "176", "name": "Peru", "category": "Countries"},
+ {"tid": "177", "name": "Philippines", "category": "Countries"},
+ {"tid": "178", "name": "Pitcairn", "category": "Countries"},
+ {"tid": "179", "name": "Poland", "category": "Countries"},
+ {"tid": "180", "name": "Portugal", "category": "Countries"},
+ {"tid": "181", "name": "Puerto Rico", "category": "Countries"},
+ {"tid": "182", "name": "Qatar", "category": "Countries"},
+ {"tid": "183", "name": "Reunion", "category": "Countries"},
+ {"tid": "184", "name": "Romania", "category": "Countries"},
+ {"tid": "185", "name": "Russia", "category": "Countries"},
+ {"tid": "186", "name": "Rwanda", "category": "Countries"},
+ {"tid": "187", "name": "Saint Barthélemy", "category": "Countries"},
+ {"tid": "188", "name": "Saint Helena", "category": "Countries"},
+ {"tid": "189", "name": "Saint Kitts and Nevis", "category": "Countries"},
+ {"tid": "190", "name": "Saint Lucia", "category": "Countries"},
+ {"tid": "191", "name": "Saint Martin (French part)", "category": "Countries"},
+ {"tid": "192", "name": "Saint Pierre and Miquelon", "category": "Countries"},
+ {"tid": "193", "name": "Saint Vincent and the Grenadines", "category": "Countries"},
+ {"tid": "194", "name": "Samoa", "category": "Countries"},
+ {"tid": "195", "name": "San Marino", "category": "Countries"},
+ {"tid": "196", "name": "Sao Tome and Principe", "category": "Countries"},
+ {"tid": "197", "name": "Saudi Arabia", "category": "Countries"},
+ {"tid": "198", "name": "Senegal", "category": "Countries"},
+ {"tid": "199", "name": "Serbia", "category": "Countries"},
+ {"tid": "200", "name": "Seychelles", "category": "Countries"},
+ {"tid": "201", "name": "Sierra Leone", "category": "Countries"},
+ {"tid": "202", "name": "Singapore", "category": "Countries"},
+ {"tid": "203", "name": "Slovakia", "category": "Countries"},
+ {"tid": "204", "name": "Slovenia", "category": "Countries"},
+ {"tid": "205", "name": "Solomon Islands", "category": "Countries"},
+ {"tid": "206", "name": "Somalia", "category": "Countries"},
+ {"tid": "207", "name": "South Africa", "category": "Countries"},
{
"tid": "208",
"name": "South Georgia and the South Sandwich Islands",
- "category": "Countries"
- },
- {
- "tid": "209",
- "name": "South Korea",
- "category": "Countries"
- },
- {
- "tid": "476",
- "name": "South Sudan",
- "category": "Countries"
- },
- {
- "tid": "210",
- "name": "Spain",
- "category": "Countries"
- },
- {
- "tid": "211",
- "name": "Sri Lanka",
- "category": "Countries"
- },
- {
- "tid": "212",
- "name": "Sudan",
- "category": "Countries"
- },
- {
- "tid": "213",
- "name": "Suriname",
- "category": "Countries"
- },
- {
- "tid": "214",
- "name": "Svalbard and Jan Mayen",
- "category": "Countries"
- },
- {
- "tid": "215",
- "name": "Swaziland",
- "category": "Countries"
- },
- {
- "tid": "216",
- "name": "Sweden",
- "category": "Countries"
- },
- {
- "tid": "217",
- "name": "Switzerland",
- "category": "Countries"
- },
- {
- "tid": "218",
- "name": "Syria",
- "category": "Countries"
- },
- {
- "tid": "219",
- "name": "Taiwan",
- "category": "Countries"
- },
- {
- "tid": "220",
- "name": "Tajikistan",
- "category": "Countries"
- },
- {
- "tid": "221",
- "name": "Tanzania",
- "category": "Countries"
- },
- {
- "tid": "222",
- "name": "Thailand",
- "category": "Countries"
- },
- {
- "tid": "223",
- "name": "Timor-Leste",
- "category": "Countries"
- },
- {
- "tid": "224",
- "name": "Togo",
- "category": "Countries"
- },
- {
- "tid": "225",
- "name": "Tokelau",
- "category": "Countries"
- },
- {
- "tid": "226",
- "name": "Tonga",
- "category": "Countries"
- },
- {
- "tid": "227",
- "name": "Trinidad and Tobago",
- "category": "Countries"
- },
- {
- "tid": "228",
- "name": "Tunisia",
- "category": "Countries"
- },
- {
- "tid": "229",
- "name": "Turkey",
- "category": "Countries"
- },
- {
- "tid": "230",
- "name": "Turkmenistan",
- "category": "Countries"
- },
- {
- "tid": "231",
- "name": "Turks and Caicos Islands",
- "category": "Countries"
- },
- {
- "tid": "232",
- "name": "Tuvalu",
- "category": "Countries"
- },
- {
- "tid": "233",
- "name": "U.S. Virgin Islands",
- "category": "Countries"
- },
- {
- "tid": "234",
- "name": "Uganda",
- "category": "Countries"
- },
- {
- "tid": "235",
- "name": "Ukraine",
- "category": "Countries"
- },
- {
- "tid": "236",
- "name": "United Arab Emirates",
- "category": "Countries"
- },
- {
- "tid": "237",
- "name": "United Kingdom",
- "category": "Countries"
- },
- {
- "tid": "238",
- "name": "United States",
- "category": "Countries"
- },
+ "category": "Countries",
+ },
+ {"tid": "209", "name": "South Korea", "category": "Countries"},
+ {"tid": "476", "name": "South Sudan", "category": "Countries"},
+ {"tid": "210", "name": "Spain", "category": "Countries"},
+ {"tid": "211", "name": "Sri Lanka", "category": "Countries"},
+ {"tid": "212", "name": "Sudan", "category": "Countries"},
+ {"tid": "213", "name": "Suriname", "category": "Countries"},
+ {"tid": "214", "name": "Svalbard and Jan Mayen", "category": "Countries"},
+ {"tid": "215", "name": "Swaziland", "category": "Countries"},
+ {"tid": "216", "name": "Sweden", "category": "Countries"},
+ {"tid": "217", "name": "Switzerland", "category": "Countries"},
+ {"tid": "218", "name": "Syria", "category": "Countries"},
+ {"tid": "219", "name": "Taiwan", "category": "Countries"},
+ {"tid": "220", "name": "Tajikistan", "category": "Countries"},
+ {"tid": "221", "name": "Tanzania", "category": "Countries"},
+ {"tid": "222", "name": "Thailand", "category": "Countries"},
+ {"tid": "223", "name": "Timor-Leste", "category": "Countries"},
+ {"tid": "224", "name": "Togo", "category": "Countries"},
+ {"tid": "225", "name": "Tokelau", "category": "Countries"},
+ {"tid": "226", "name": "Tonga", "category": "Countries"},
+ {"tid": "227", "name": "Trinidad and Tobago", "category": "Countries"},
+ {"tid": "228", "name": "Tunisia", "category": "Countries"},
+ {"tid": "229", "name": "Turkey", "category": "Countries"},
+ {"tid": "230", "name": "Turkmenistan", "category": "Countries"},
+ {"tid": "231", "name": "Turks and Caicos Islands", "category": "Countries"},
+ {"tid": "232", "name": "Tuvalu", "category": "Countries"},
+ {"tid": "233", "name": "U.S. Virgin Islands", "category": "Countries"},
+ {"tid": "234", "name": "Uganda", "category": "Countries"},
+ {"tid": "235", "name": "Ukraine", "category": "Countries"},
+ {"tid": "236", "name": "United Arab Emirates", "category": "Countries"},
+ {"tid": "237", "name": "United Kingdom", "category": "Countries"},
+ {"tid": "238", "name": "United States", "category": "Countries"},
{
"tid": "239",
"name": "United States Minor Outlying Islands",
- "category": "Countries"
- },
- {
- "tid": "240",
- "name": "Uruguay",
- "category": "Countries"
- },
- {
- "tid": "241",
- "name": "Uzbekistan",
- "category": "Countries"
- },
- {
- "tid": "242",
- "name": "Vanuatu",
- "category": "Countries"
- },
- {
- "tid": "243",
- "name": "Vatican",
- "category": "Countries"
- },
- {
- "tid": "244",
- "name": "Venezuela",
- "category": "Countries"
- },
- {
- "tid": "245",
- "name": "Vietnam",
- "category": "Countries"
- },
- {
- "tid": "246",
- "name": "Wallis and Futuna",
- "category": "Countries"
- },
- {
- "tid": "247",
- "name": "Western Sahara",
- "category": "Countries"
- },
- {
- "tid": "248",
- "name": "Yemen",
- "category": "Countries"
- },
- {
- "tid": "249",
- "name": "Zambia",
- "category": "Countries"
- },
- {
- "tid": "250",
- "name": "Zimbabwe",
- "category": "Countries"
- },
- {
- "tid": "302",
- "category": "Technology attributes",
- "name": "Anonymity"
- },
+ "category": "Countries",
+ },
+ {"tid": "240", "name": "Uruguay", "category": "Countries"},
+ {"tid": "241", "name": "Uzbekistan", "category": "Countries"},
+ {"tid": "242", "name": "Vanuatu", "category": "Countries"},
+ {"tid": "243", "name": "Vatican", "category": "Countries"},
+ {"tid": "244", "name": "Venezuela", "category": "Countries"},
+ {"tid": "245", "name": "Vietnam", "category": "Countries"},
+ {"tid": "246", "name": "Wallis and Futuna", "category": "Countries"},
+ {"tid": "247", "name": "Western Sahara", "category": "Countries"},
+ {"tid": "248", "name": "Yemen", "category": "Countries"},
+ {"tid": "249", "name": "Zambia", "category": "Countries"},
+ {"tid": "250", "name": "Zimbabwe", "category": "Countries"},
+ {"tid": "302", "category": "Technology attributes", "name": "Anonymity"},
{
"tid": "303",
"category": "Technology attributes",
- "name": "Application deployment"
- },
- {
- "tid": "298",
- "category": "Technology attributes",
- "name": "Browser extension"
- },
- {
- "tid": "299",
- "category": "Technology attributes",
- "name": "Browser plugin"
- },
- {
- "tid": "308",
- "category": "Technology attributes",
- "name": "Cryptography"
+ "name": "Application deployment",
},
+ {"tid": "298", "category": "Technology attributes", "name": "Browser extension"},
+ {"tid": "299", "category": "Technology attributes", "name": "Browser plugin"},
+ {"tid": "308", "category": "Technology attributes", "name": "Cryptography"},
{
"tid": "310",
"category": "Technology attributes",
- "name": "Dependency integration"
- },
- {
- "tid": "312",
- "category": "Technology attributes",
- "name": "Desktop App"
- },
- {
- "tid": "311",
- "category": "Technology attributes",
- "name": "Desktop client"
+ "name": "Dependency integration",
},
+ {"tid": "312", "category": "Technology attributes", "name": "Desktop App"},
+ {"tid": "311", "category": "Technology attributes", "name": "Desktop client"},
{
"tid": "316",
"category": "Technology attributes",
- "name": "Hardware/Embedded device(s)"
+ "name": "Hardware/Embedded device(s)",
},
{
"tid": "347",
"category": "Technology attributes",
- "name": "Infrastructure as a service (IaaS)"
+ "name": "Infrastructure as a service (IaaS)",
},
{
"tid": "306",
"category": "Technology attributes",
- "name": "Mobile application (clientside)"
- },
- {
- "tid": "314",
- "category": "Technology attributes",
- "name": "Networking"
- },
- {
- "tid": "356",
- "category": "Technology attributes",
- "name": "Not applicable"
- },
- {
- "tid": "317",
- "category": "Technology attributes",
- "name": "Other"
+ "name": "Mobile application (clientside)",
},
+ {"tid": "314", "category": "Technology attributes", "name": "Networking"},
+ {"tid": "356", "category": "Technology attributes", "name": "Not applicable"},
+ {"tid": "317", "category": "Technology attributes", "name": "Other"},
{
"tid": "346",
"category": "Technology attributes",
- "name": "Platform as a service (PaaS)"
- },
- {
- "tid": "349",
- "category": "Technology attributes",
- "name": "Reverse Engineering"
- },
- {
- "tid": "313",
- "category": "Technology attributes",
- "name": "Sensitive data"
- },
- {
- "tid": "305",
- "category": "Technology attributes",
- "name": "Server daemon"
+ "name": "Platform as a service (PaaS)",
},
+ {"tid": "349", "category": "Technology attributes", "name": "Reverse Engineering"},
+ {"tid": "313", "category": "Technology attributes", "name": "Sensitive data"},
+ {"tid": "305", "category": "Technology attributes", "name": "Server daemon"},
{
"tid": "315",
"category": "Technology attributes",
- "name": "Software as a Service (SaaS)"
- },
- {
- "tid": "300",
- "category": "Technology attributes",
- "name": "Unmanaged language"
+ "name": "Software as a Service (SaaS)",
},
+ {"tid": "300", "category": "Technology attributes", "name": "Unmanaged language"},
{
"tid": "301",
"category": "Technology attributes",
- "name": "User interface/experience"
+ "name": "User interface/experience",
},
{
"tid": "307",
"category": "Technology attributes",
- "name": "Web API/Mobile application (serverside)"
- },
- {
- "tid": "304",
- "category": "Technology attributes",
- "name": "Web application"
+ "name": "Web API/Mobile application (serverside)",
},
+ {"tid": "304", "category": "Technology attributes", "name": "Web application"},
{
"tid": "309",
"category": "Technology attributes",
- "name": "Wireless Communication"
- }
+ "name": "Wireless Communication",
+ },
]
diff --git a/hypha/apply/categories/management/commands/seed_categories.py b/hypha/apply/categories/management/commands/seed_categories.py
index e5b0526db7..61e616427e 100644
--- a/hypha/apply/categories/management/commands/seed_categories.py
+++ b/hypha/apply/categories/management/commands/seed_categories.py
@@ -11,9 +11,15 @@ class Command(BaseCommand):
@transaction.atomic
def handle(self, *args, **options):
for item in CATEGORIES:
- category, created = Category.objects.get_or_create(name=item['category'])
+ category, created = Category.objects.get_or_create(name=item["category"])
if created:
- self.stdout.write(self.style.SUCCESS(f"Category {item['category']} created"))
- term, created = Option.objects.get_or_create(value=item['name'], category=category)
+ self.stdout.write(
+ self.style.SUCCESS(f"Category {item['category']} created")
+ )
+ term, created = Option.objects.get_or_create(
+ value=item["name"], category=category
+ )
if created:
- self.stdout.write(f"Term {item['name']} added to category {item['category']}")
+ self.stdout.write(
+ f"Term {item['name']} added to category {item['category']}"
+ )
diff --git a/hypha/apply/categories/migrations/0001_initial.py b/hypha/apply/categories/migrations/0001_initial.py
index fa8ce2994a..da244f34fc 100644
--- a/hypha/apply/categories/migrations/0001_initial.py
+++ b/hypha/apply/categories/migrations/0001_initial.py
@@ -8,35 +8,59 @@
class Migration(migrations.Migration):
-
initial = True
- dependencies = [
- ]
+ dependencies = []
operations = [
migrations.CreateModel(
- name='Category',
+ name="Category",
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('name', models.CharField(max_length=255)),
- ('help_text', models.CharField(blank=True, max_length=255)),
+ (
+ "id",
+ models.AutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ ("name", models.CharField(max_length=255)),
+ ("help_text", models.CharField(blank=True, max_length=255)),
],
options={
- 'verbose_name_plural': 'Categories',
+ "verbose_name_plural": "Categories",
},
),
migrations.CreateModel(
- name='Option',
+ name="Option",
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('sort_order', models.IntegerField(blank=True, editable=False, null=True)),
- ('value', models.CharField(max_length=255)),
- ('category', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='options', to='categories.Category')),
+ (
+ "id",
+ models.AutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ (
+ "sort_order",
+ models.IntegerField(blank=True, editable=False, null=True),
+ ),
+ ("value", models.CharField(max_length=255)),
+ (
+ "category",
+ modelcluster.fields.ParentalKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ related_name="options",
+ to="categories.Category",
+ ),
+ ),
],
options={
- 'ordering': ['sort_order'],
- 'abstract': False,
+ "ordering": ["sort_order"],
+ "abstract": False,
},
),
]
diff --git a/hypha/apply/categories/migrations/0002_metacategory.py b/hypha/apply/categories/migrations/0002_metacategory.py
index 0f47ec3348..3496b8d006 100644
--- a/hypha/apply/categories/migrations/0002_metacategory.py
+++ b/hypha/apply/categories/migrations/0002_metacategory.py
@@ -5,25 +5,42 @@
class Migration(migrations.Migration):
-
dependencies = [
- ('categories', '0001_initial'),
+ ("categories", "0001_initial"),
]
operations = [
migrations.CreateModel(
- name='MetaCategory',
+ name="MetaCategory",
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('path', models.CharField(max_length=255, unique=True)),
- ('depth', models.PositiveIntegerField()),
- ('numchild', models.PositiveIntegerField(default=0)),
- ('name', models.CharField(help_text='Keep the name short, ideally one word.', max_length=50, unique=True)),
- ('node_order_index', models.IntegerField(blank=True, default=0, editable=False)),
+ (
+ "id",
+ models.AutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ ("path", models.CharField(max_length=255, unique=True)),
+ ("depth", models.PositiveIntegerField()),
+ ("numchild", models.PositiveIntegerField(default=0)),
+ (
+ "name",
+ models.CharField(
+ help_text="Keep the name short, ideally one word.",
+ max_length=50,
+ unique=True,
+ ),
+ ),
+ (
+ "node_order_index",
+ models.IntegerField(blank=True, default=0, editable=False),
+ ),
],
options={
- 'verbose_name': 'Meta Category',
- 'verbose_name_plural': 'Meta Categories',
+ "verbose_name": "Meta Category",
+ "verbose_name_plural": "Meta Categories",
},
bases=(wagtail.search.index.Indexed, models.Model),
),
diff --git a/hypha/apply/categories/migrations/0003_rename_meta_categories_to_meta_terms.py b/hypha/apply/categories/migrations/0003_rename_meta_categories_to_meta_terms.py
index 76e8fa9ad6..d0184f9ef5 100644
--- a/hypha/apply/categories/migrations/0003_rename_meta_categories_to_meta_terms.py
+++ b/hypha/apply/categories/migrations/0003_rename_meta_categories_to_meta_terms.py
@@ -6,29 +6,59 @@
class Migration(migrations.Migration):
-
dependencies = [
- ('categories', '0002_metacategory'),
+ ("categories", "0002_metacategory"),
]
operations = [
migrations.CreateModel(
- name='MetaTerm',
+ name="MetaTerm",
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('path', models.CharField(max_length=255, unique=True)),
- ('depth', models.PositiveIntegerField()),
- ('numchild', models.PositiveIntegerField(default=0)),
- ('name', models.CharField(help_text='Keep the name short, ideally one word.', max_length=50, unique=True)),
- ('is_archived', models.BooleanField(default=False, verbose_name='Archived')),
- ('help_text', wagtail.fields.RichTextField(blank=True)),
- ('filter_on_dashboard', models.BooleanField(default=True, help_text='Make available to filter on dashboard')),
- ('available_to_applicants', models.BooleanField(default=False, help_text='Make available to applicants')),
- ('node_order_index', models.IntegerField(blank=True, default=0, editable=False)),
+ (
+ "id",
+ models.AutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ ("path", models.CharField(max_length=255, unique=True)),
+ ("depth", models.PositiveIntegerField()),
+ ("numchild", models.PositiveIntegerField(default=0)),
+ (
+ "name",
+ models.CharField(
+ help_text="Keep the name short, ideally one word.",
+ max_length=50,
+ unique=True,
+ ),
+ ),
+ (
+ "is_archived",
+ models.BooleanField(default=False, verbose_name="Archived"),
+ ),
+ ("help_text", wagtail.fields.RichTextField(blank=True)),
+ (
+ "filter_on_dashboard",
+ models.BooleanField(
+ default=True, help_text="Make available to filter on dashboard"
+ ),
+ ),
+ (
+ "available_to_applicants",
+ models.BooleanField(
+ default=False, help_text="Make available to applicants"
+ ),
+ ),
+ (
+ "node_order_index",
+ models.IntegerField(blank=True, default=0, editable=False),
+ ),
],
options={
- 'verbose_name': 'Meta Term',
- 'verbose_name_plural': 'Meta Terms',
+ "verbose_name": "Meta Term",
+ "verbose_name_plural": "Meta Terms",
},
bases=(wagtail.search.index.Indexed, models.Model),
),
diff --git a/hypha/apply/categories/migrations/0004_rename_meta_categories_to_meta_terms.py b/hypha/apply/categories/migrations/0004_rename_meta_categories_to_meta_terms.py
index 75b2953ddc..7915bdfdb1 100644
--- a/hypha/apply/categories/migrations/0004_rename_meta_categories_to_meta_terms.py
+++ b/hypha/apply/categories/migrations/0004_rename_meta_categories_to_meta_terms.py
@@ -4,14 +4,13 @@
class Migration(migrations.Migration):
-
dependencies = [
- ('categories', '0003_rename_meta_categories_to_meta_terms'),
- ('funds', '0070_rename_meta_categories_to_meta_terms'),
+ ("categories", "0003_rename_meta_categories_to_meta_terms"),
+ ("funds", "0070_rename_meta_categories_to_meta_terms"),
]
operations = [
migrations.DeleteModel(
- name='MetaCategory',
+ name="MetaCategory",
),
]
diff --git a/hypha/apply/categories/migrations/0005_alter_is_archived_field_on_terms.py b/hypha/apply/categories/migrations/0005_alter_is_archived_field_on_terms.py
index 5d34f431c5..06403469d1 100644
--- a/hypha/apply/categories/migrations/0005_alter_is_archived_field_on_terms.py
+++ b/hypha/apply/categories/migrations/0005_alter_is_archived_field_on_terms.py
@@ -4,15 +4,18 @@
class Migration(migrations.Migration):
-
dependencies = [
- ('categories', '0004_rename_meta_categories_to_meta_terms'),
+ ("categories", "0004_rename_meta_categories_to_meta_terms"),
]
operations = [
migrations.AlterField(
- model_name='metaterm',
- name='is_archived',
- field=models.BooleanField(default=False, help_text='Archived terms can be viewed but not set on content.', verbose_name='Archived'),
+ model_name="metaterm",
+ name="is_archived",
+ field=models.BooleanField(
+ default=False,
+ help_text="Archived terms can be viewed but not set on content.",
+ verbose_name="Archived",
+ ),
),
]
diff --git a/hypha/apply/categories/migrations/0006_use_category_options_as_submission_filter.py b/hypha/apply/categories/migrations/0006_use_category_options_as_submission_filter.py
index 624fbd8dd1..68f85e009f 100644
--- a/hypha/apply/categories/migrations/0006_use_category_options_as_submission_filter.py
+++ b/hypha/apply/categories/migrations/0006_use_category_options_as_submission_filter.py
@@ -4,15 +4,16 @@
class Migration(migrations.Migration):
-
dependencies = [
- ('categories', '0005_alter_is_archived_field_on_terms'),
+ ("categories", "0005_alter_is_archived_field_on_terms"),
]
operations = [
migrations.AddField(
- model_name='category',
- name='filter_on_dashboard',
- field=models.BooleanField(default=False, help_text='Make available to filter on dashboard'),
+ model_name="category",
+ name="filter_on_dashboard",
+ field=models.BooleanField(
+ default=False, help_text="Make available to filter on dashboard"
+ ),
),
]
diff --git a/hypha/apply/categories/models.py b/hypha/apply/categories/models.py
index e8ef4d7c10..dca6f99428 100644
--- a/hypha/apply/categories/models.py
+++ b/hypha/apply/categories/models.py
@@ -15,7 +15,7 @@
class Option(Orderable):
value = models.CharField(max_length=255)
- category = ParentalKey('Category', related_name='options')
+ category = ParentalKey("Category", related_name="options")
def __str__(self):
return self.value
@@ -27,92 +27,100 @@ class Category(ClusterableModel):
When used in a form: name -> field label and help_text -> help_text
"""
+
name = models.CharField(max_length=255)
filter_on_dashboard = models.BooleanField(
- default=False, help_text=_('Make available to filter on dashboard')
+ default=False, help_text=_("Make available to filter on dashboard")
)
help_text = models.CharField(max_length=255, blank=True)
panels = [
- FieldPanel('name'),
- FieldPanel('filter_on_dashboard'),
- FieldPanel('help_text'),
- InlinePanel('options', label=_('Options')),
+ FieldPanel("name"),
+ FieldPanel("filter_on_dashboard"),
+ FieldPanel("help_text"),
+ InlinePanel("options", label=_("Options")),
]
def __str__(self):
return self.name
class Meta:
- verbose_name_plural = 'Categories'
+ verbose_name_plural = "Categories"
class MetaTerm(index.Indexed, MP_Node):
- """ Hierarchal "Meta" terms """
+ """Hierarchal "Meta" terms"""
+
name = models.CharField(
- max_length=50, unique=True, help_text=_('Keep the name short, ideally one word.')
+ max_length=50,
+ unique=True,
+ help_text=_("Keep the name short, ideally one word."),
)
is_archived = models.BooleanField(
- default=False, verbose_name=_('Archived'),
- help_text=_('Archived terms can be viewed but not set on content.')
+ default=False,
+ verbose_name=_("Archived"),
+ help_text=_("Archived terms can be viewed but not set on content."),
)
filter_on_dashboard = models.BooleanField(
- default=True, help_text=_('Make available to filter on dashboard')
+ default=True, help_text=_("Make available to filter on dashboard")
)
available_to_applicants = models.BooleanField(
- default=False, help_text=_('Make available to applicants')
+ default=False, help_text=_("Make available to applicants")
+ )
+ help_text = RichTextField(
+ features=["h2", "h3", "bold", "italic", "link", "hr", "ol", "ul"], blank=True
)
- help_text = RichTextField(features=[
- 'h2', 'h3', 'bold', 'italic', 'link', 'hr', 'ol', 'ul'], blank=True)
# node tree specific fields and attributes
node_order_index = models.IntegerField(blank=True, default=0, editable=False)
- node_child_verbose_name = 'child'
+ node_child_verbose_name = "child"
# important: node_order_by should NOT be changed after first Node created
- node_order_by = ['node_order_index', 'name']
+ node_order_by = ["node_order_index", "name"]
panels = [
- FieldPanel('name'),
- FieldPanel('parent'),
+ FieldPanel("name"),
+ FieldPanel("parent"),
MultiFieldPanel(
[
- FieldPanel('is_archived'),
- FieldPanel('filter_on_dashboard'),
- FieldPanel('available_to_applicants'),
- FieldPanel('help_text'),
+ FieldPanel("is_archived"),
+ FieldPanel("filter_on_dashboard"),
+ FieldPanel("available_to_applicants"),
+ FieldPanel("help_text"),
],
- heading=_('Options'),
+ heading=_("Options"),
),
]
def get_as_listing_header(self):
depth = self.get_depth()
rendered = render_to_string(
- 'categories/admin/includes/meta_term_list_header.html',
+ "categories/admin/includes/meta_term_list_header.html",
{
- 'depth': depth,
- 'depth_minus_1': depth - 1,
- 'is_root': self.is_root(),
- 'name': self.name,
- 'is_archived': self.is_archived,
- }
+ "depth": depth,
+ "depth_minus_1": depth - 1,
+ "is_root": self.is_root(),
+ "name": self.name,
+ "is_archived": self.is_archived,
+ },
)
return rendered
- get_as_listing_header.short_description = 'Name'
- get_as_listing_header.admin_order_field = 'name'
+
+ get_as_listing_header.short_description = "Name"
+ get_as_listing_header.admin_order_field = "name"
def get_parent(self, *args, **kwargs):
return super().get_parent(*args, **kwargs)
- get_parent.short_description = 'Parent'
+
+ get_parent.short_description = "Parent"
search_fields = [
- index.SearchField('name', partial_match=True),
+ index.SearchField("name", partial_match=True),
]
def delete(self):
if self.is_root():
- raise PermissionDenied('Cannot delete root term.')
+ raise PermissionDenied("Cannot delete root term.")
else:
super().delete()
@@ -128,13 +136,13 @@ def __str__(self):
return self.name
class Meta:
- verbose_name = 'Meta Term'
- verbose_name_plural = 'Meta Terms'
+ verbose_name = "Meta Term"
+ verbose_name_plural = "Meta Terms"
class MetaTermChoiceField(forms.ModelChoiceField):
def label_from_instance(self, obj):
- depth_line = '-' * (obj.get_depth() - 1)
+ depth_line = "-" * (obj.get_depth() - 1)
return "{} {}".format(depth_line, super().label_from_instance(obj))
@@ -147,29 +155,31 @@ class MetaTermForm(WagtailAdminModelForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
- instance = kwargs['instance']
+ instance = kwargs["instance"]
if instance.is_root() or MetaTerm.objects.count() == 0:
- self.fields['parent'].disabled = True
- self.fields['parent'].required = False
- self.fields['parent'].empty_label = 'N/A - Root Term'
- self.fields['parent'].widget = forms.HiddenInput()
+ self.fields["parent"].disabled = True
+ self.fields["parent"].required = False
+ self.fields["parent"].empty_label = "N/A - Root Term"
+ self.fields["parent"].widget = forms.HiddenInput()
- self.fields['name'].label += ' (Root - First term can be named root)'
+ self.fields["name"].label += " (Root - First term can be named root)"
elif instance.id:
- self.fields['parent'].initial = instance.get_parent()
+ self.fields["parent"].initial = instance.get_parent()
def clean_parent(self):
- parent = self.cleaned_data['parent']
+ parent = self.cleaned_data["parent"]
if parent and parent.is_archived:
- raise forms.ValidationError('The parent is archived therefore can not add child under it.')
+ raise forms.ValidationError(
+ "The parent is archived therefore can not add child under it."
+ )
return parent
def save(self, commit=True, *args, **kwargs):
instance = super().save(*args, **kwargs, commit=False)
- parent = self.cleaned_data['parent']
+ parent = self.cleaned_data["parent"]
if not commit:
return instance
@@ -182,7 +192,7 @@ def save(self, commit=True, *args, **kwargs):
else:
instance.save()
if instance.get_parent() != parent:
- instance.move(parent, pos='sorted-child')
+ instance.move(parent, pos="sorted-child")
return instance
diff --git a/hypha/apply/categories/templates/categories/admin/includes/meta_term_list_header.html b/hypha/apply/categories/templates/categories/admin/includes/meta_term_list_header.html
index 4350cfd26e..e4d90faf94 100644
--- a/hypha/apply/categories/templates/categories/admin/includes/meta_term_list_header.html
+++ b/hypha/apply/categories/templates/categories/admin/includes/meta_term_list_header.html
@@ -6,9 +6,9 @@
{% if is_archived %}
- {{ name }} ({% trans "archived" %})
+ {{ name }} ({% trans "archived" %})
{% else %}
- {{ name }}
+ {{ name }}
{% endif %}
{% endif %}
diff --git a/hypha/apply/categories/tests/factories.py b/hypha/apply/categories/tests/factories.py
index d63bc904a8..2b380422cc 100644
--- a/hypha/apply/categories/tests/factories.py
+++ b/hypha/apply/categories/tests/factories.py
@@ -7,13 +7,13 @@ class CategoryFactory(factory.django.DjangoModelFactory):
class Meta:
model = Category
- name = factory.Faker('word')
- help_text = factory.Faker('sentence')
+ name = factory.Faker("word")
+ help_text = factory.Faker("sentence")
class OptionFactory(factory.django.DjangoModelFactory):
class Meta:
model = Option
- value = factory.Faker('word')
+ value = factory.Faker("word")
category = factory.SubFactory(CategoryFactory)
diff --git a/hypha/apply/categories/tests/test_blocks.py b/hypha/apply/categories/tests/test_blocks.py
index f4f90c83fb..c940d7642f 100644
--- a/hypha/apply/categories/tests/test_blocks.py
+++ b/hypha/apply/categories/tests/test_blocks.py
@@ -14,10 +14,10 @@ def setUp(self):
def get_field(self, **kwargs):
data = {
- 'field_label': '',
- 'help_text': '',
- 'category': self.category.id,
- 'multi': False,
+ "field_label": "",
+ "help_text": "",
+ "category": self.category.id,
+ "multi": False,
}
data.update(kwargs)
@@ -26,15 +26,15 @@ def get_field(self, **kwargs):
return self.block.get_field(block)
def test_field_and_help_default(self):
- field = self.get_field(field_label='', help_text='')
+ field = self.get_field(field_label="", help_text="")
self.assertEqual(self.category.name, field.label)
self.assertEqual(self.category.help_text, field.help_text)
def test_supplied_field_and_help(self):
- values = {'field_label': 'LABEL', 'help_text': 'HELP'}
+ values = {"field_label": "LABEL", "help_text": "HELP"}
field = self.get_field(**values)
- self.assertEqual(values['field_label'], field.label)
- self.assertEqual(values['help_text'], field.help_text)
+ self.assertEqual(values["field_label"], field.label)
+ self.assertEqual(values["help_text"], field.help_text)
def test_multi_select_enabled(self):
field = self.get_field(multi=True)
@@ -50,9 +50,9 @@ def test_options_included_in_choices(self):
field = self.get_field()
self.assertEqual(
field.choices,
- [(option.id, option.value) for option in self.category.options.all()]
+ [(option.id, option.value) for option in self.category.options.all()],
)
def test_can_render_if_no_response(self):
- display = self.block.render({'category': self.category}, {'data': None})
+ display = self.block.render({"category": self.category}, {"data": None})
self.assertIn(self.block.no_response()[0], display)
diff --git a/hypha/apply/dashboard/apps.py b/hypha/apply/dashboard/apps.py
index c694d18cb5..f4704c7449 100644
--- a/hypha/apply/dashboard/apps.py
+++ b/hypha/apply/dashboard/apps.py
@@ -2,4 +2,4 @@
class DashboardConfig(AppConfig):
- name = 'hypha.apply.dashboard'
+ name = "hypha.apply.dashboard"
diff --git a/hypha/apply/dashboard/static/js/django_select2-checkboxes.js b/hypha/apply/dashboard/static/js/django_select2-checkboxes.js
index e64657c6d7..40abe6a090 100644
--- a/hypha/apply/dashboard/static/js/django_select2-checkboxes.js
+++ b/hypha/apply/dashboard/static/js/django_select2-checkboxes.js
@@ -1,31 +1,39 @@
-(function($) {
- $.fn.select2.amd.require(
- [
- 'select2/multi-checkboxes/selection',
- 'select2/multi-checkboxes/results'
- ],
- function(SelectionAdapter, ResultsAdapter) {
+(function ($) {
+ $.fn.select2.amd.require(
+ [
+ "select2/multi-checkboxes/selection",
+ "select2/multi-checkboxes/results",
+ ],
+ function (SelectionAdapter, ResultsAdapter) {
+ $(function () {
+ $(".django-select2-checkboxes").each(function (i, element) {
+ var $element = $(element);
+ $element.select2({
+ placeholder: $element.data("placeholder"),
+ closeOnSelect: false,
+ templateSelection: function (data) {
+ let filterType = $element.data("placeholder");
- $(function () {
- $('.django-select2-checkboxes').each(function (i, element) {
- var $element = $(element);
- $element.select2({
- placeholder: $element.data('placeholder'),
- closeOnSelect: false,
- templateSelection: function(data) {
- let filterType = $element.data('placeholder');
-
- if (!data.selected.length) {
- return filterType
- } else if (data.selected.length == data.all.length) {
- return 'All ' + filterType + ' selected';
- }
- return data.selected.length + ' of ' + data.all.length + ' ' + filterType;
- },
- selectionAdapter: SelectionAdapter,
- returnesultsAdapter: ResultsAdapter
+ if (!data.selected.length) {
+ return filterType;
+ } else if (
+ data.selected.length == data.all.length
+ ) {
+ return "All " + filterType + " selected";
+ }
+ return (
+ data.selected.length +
+ " of " +
+ data.all.length +
+ " " +
+ filterType
+ );
+ },
+ selectionAdapter: SelectionAdapter,
+ returnesultsAdapter: ResultsAdapter,
+ });
+ });
});
- });
- });
- });
-}(this.jQuery));
+ }
+ );
+})(this.jQuery);
diff --git a/hypha/apply/dashboard/static/js/select2.multi-checkboxes.js b/hypha/apply/dashboard/static/js/select2.multi-checkboxes.js
index 815268be46..9faf906943 100644
--- a/hypha/apply/dashboard/static/js/select2.multi-checkboxes.js
+++ b/hypha/apply/dashboard/static/js/select2.multi-checkboxes.js
@@ -9,118 +9,121 @@
*/
/* global define jQuery */
-(function(factory) {
- if (typeof define === 'function' && define.amd) {
- define(['jquery'], factory);
- } else {
- // Browser globals
- factory(jQuery);
- }
-}(function(jQuery) {
- if (jQuery && jQuery.fn && jQuery.fn.select2 && jQuery.fn.select2.amd) {
- define = jQuery.fn.select2.amd.define;
- }
- var define;
-
- /* global define */
- define('select2/multi-checkboxes/dropdown', [
- 'select2/utils',
- 'select2/dropdown',
- 'select2/dropdown/search',
- 'select2/dropdown/attachBody'
- ],
- function(Utils, Dropdown, DropdownSearch, AttachBody) {
- return Utils.Decorate(
- Utils.Decorate(
- Dropdown,
- DropdownSearch
- ),
- AttachBody
- );
- });
-
-
- /* global define */
- define('select2/multi-checkboxes/results', [
- 'jquery',
- 'select2/utils',
- 'select2/results'
- ],
- function($, Utils, _Results) {
- function Results() {
- Results.__super__.constructor.apply(this, arguments);
+(function (factory) {
+ if (typeof define === "function" && define.amd) {
+ define(["jquery"], factory);
+ } else {
+ // Browser globals
+ factory(jQuery);
}
- Utils.Extend(Results, _Results);
-
- Results.prototype.highlightFirstItem = function() {
- this.ensureHighlightVisible();
- };
-
- Results.prototype.bind = function(container) {
- container.on('open', function() {
- var $options = this.$results.find('.select2-results__option[aria-selected]');
- var $selected = $options.filter('[aria-selected=true]');
- var $optionToScrollTo = ($selected.length > 0 ? $selected : $selected).first();
- $optionToScrollTo.trigger('mouseenter');
- });
- Results.__super__.bind.apply(this, arguments);
- };
-
- Results.prototype.template = function(result, container) {
- var template = this.options.get('templateResult');
- var escapeMarkup = this.options.get('escapeMarkup');
-
- var content = template(result, container);
- $(container).addClass('multi-checkboxes_wrap');
-
- if (content == null) {
- container.style.display = 'none';
- } else if (typeof content === 'string') {
- container.innerHTML = escapeMarkup(content);
- } else {
- $(container).append(content);
- }
- };
-
- return Results;
- });
+})(function (jQuery) {
+ if (jQuery && jQuery.fn && jQuery.fn.select2 && jQuery.fn.select2.amd) {
+ define = jQuery.fn.select2.amd.define;
+ }
+ var define;
+
+ /* global define */
+ define("select2/multi-checkboxes/dropdown", [
+ "select2/utils",
+ "select2/dropdown",
+ "select2/dropdown/search",
+ "select2/dropdown/attachBody",
+ ], function (Utils, Dropdown, DropdownSearch, AttachBody) {
+ return Utils.Decorate(
+ Utils.Decorate(Dropdown, DropdownSearch),
+ AttachBody
+ );
+ });
+
+ /* global define */
+ define("select2/multi-checkboxes/results", [
+ "jquery",
+ "select2/utils",
+ "select2/results",
+ ], function ($, Utils, _Results) {
+ function Results() {
+ Results.__super__.constructor.apply(this, arguments);
+ }
+ Utils.Extend(Results, _Results);
+
+ Results.prototype.highlightFirstItem = function () {
+ this.ensureHighlightVisible();
+ };
+ Results.prototype.bind = function (container) {
+ container.on("open", function () {
+ var $options = this.$results.find(
+ ".select2-results__option[aria-selected]"
+ );
+ var $selected = $options.filter("[aria-selected=true]");
+ var $optionToScrollTo = (
+ $selected.length > 0 ? $selected : $selected
+ ).first();
+ $optionToScrollTo.trigger("mouseenter");
+ });
+ Results.__super__.bind.apply(this, arguments);
+ };
- /* global define */
- define('select2/multi-checkboxes/selection', [
- 'select2/utils',
- 'select2/selection/multiple',
- 'select2/selection/placeholder',
- 'select2/selection/single',
- 'select2/selection/eventRelay'
- ],
- function(Utils, MultipleSelection, Placeholder, SingleSelection, EventRelay) {
- var adapter = Utils.Decorate(MultipleSelection, Placeholder);
- adapter = Utils.Decorate(adapter, EventRelay);
+ Results.prototype.template = function (result, container) {
+ var template = this.options.get("templateResult");
+ var escapeMarkup = this.options.get("escapeMarkup");
- adapter.prototype.render = function() {
- return SingleSelection.prototype.render.call(this);
- };
+ var content = template(result, container);
+ $(container).addClass("multi-checkboxes_wrap");
- adapter.prototype.update = function(data) {
- var $rendered = this.$selection.find('.select2-selection__rendered');
- var formatted = '';
+ if (content == null) {
+ container.style.display = "none";
+ } else if (typeof content === "string") {
+ container.innerHTML = escapeMarkup(content);
+ } else {
+ $(container).append(content);
+ }
+ };
- if (data.length === 0) {
- formatted = this.options.get('placeholder') || '';
- } else {
- var itemsData = {
- selected: data || [],
- all: this.$element.find('option') || []
+ return Results;
+ });
+
+ /* global define */
+ define("select2/multi-checkboxes/selection", [
+ "select2/utils",
+ "select2/selection/multiple",
+ "select2/selection/placeholder",
+ "select2/selection/single",
+ "select2/selection/eventRelay",
+ ], function (
+ Utils,
+ MultipleSelection,
+ Placeholder,
+ SingleSelection,
+ EventRelay
+ ) {
+ var adapter = Utils.Decorate(MultipleSelection, Placeholder);
+ adapter = Utils.Decorate(adapter, EventRelay);
+
+ adapter.prototype.render = function () {
+ return SingleSelection.prototype.render.call(this);
};
- formatted = this.display(itemsData, $rendered);
- }
- $rendered.empty().append(formatted);
- $rendered.prop('title', formatted);
- };
+ adapter.prototype.update = function (data) {
+ var $rendered = this.$selection.find(
+ ".select2-selection__rendered"
+ );
+ var formatted = "";
+
+ if (data.length === 0) {
+ formatted = this.options.get("placeholder") || "";
+ } else {
+ var itemsData = {
+ selected: data || [],
+ all: this.$element.find("option") || [],
+ };
+ formatted = this.display(itemsData, $rendered);
+ }
+
+ $rendered.empty().append(formatted);
+ $rendered.prop("title", formatted);
+ };
- return adapter;
- });
-})
-);
+ return adapter;
+ });
+});
diff --git a/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html b/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
index 3b58a3b02f..b83e83de14 100644
--- a/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
@@ -16,69 +16,69 @@
{% endadminbar %}
-
-
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/applicant_base.html b/hypha/apply/activity/templates/messages/email/applicant_base.html
index 636c74b1e1..add652564c 100644
--- a/hypha/apply/activity/templates/messages/email/applicant_base.html
+++ b/hypha/apply/activity/templates/messages/email/applicant_base.html
@@ -4,8 +4,8 @@
{% block salutation %}{% blocktrans with name=source.user.get_full_name|default:"applicant" %}Dear {{ name }},{% endblocktrans %}{% endblock %}
{% block more_info %}{% trans "Link to your application" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
-{% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
+ {% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
-{% trans "See our guide for more information" %}: {{ ORG_GUIDE_URL }}
+ {% trans "See our guide for more information" %}: {{ ORG_GUIDE_URL }}
-{% blocktrans %}If you have any issues accessing the submission system or other general inquiries, please email us at {{ ORG_EMAIL }}{% endblocktrans %}{% endblock %}
+ {% blocktrans %}If you have any issues accessing the submission system or other general inquiries, please email us at {{ ORG_EMAIL }}{% endblocktrans %}{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/assign_paf_approvers.html b/hypha/apply/activity/templates/messages/email/assign_paf_approvers.html
index e87757f02a..260d98bbf7 100644
--- a/hypha/apply/activity/templates/messages/email/assign_paf_approvers.html
+++ b/hypha/apply/activity/templates/messages/email/assign_paf_approvers.html
@@ -4,11 +4,11 @@
{% block salutation %}{% endblock %}
{% block content %}
-{% trans "Project documents are ready to be assigned for approval." %}
+ {% trans "Project documents are ready to be assigned for approval." %}
-{% trans "Title" %}: {{ source.title }}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %}
-{% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %}
+ {% trans "Title" %}: {{ source.title }}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %}
+ {% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %}
-{% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
+ {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/base.html b/hypha/apply/activity/templates/messages/email/base.html
index 32d0a614dc..d1d595f06c 100644
--- a/hypha/apply/activity/templates/messages/email/base.html
+++ b/hypha/apply/activity/templates/messages/email/base.html
@@ -6,9 +6,9 @@
{% block more_info %}{% endblock %}
{% blocktrans %}Kind Regards,
-The {{ ORG_SHORT_NAME }} Team{% endblocktrans %}
+ The {{ ORG_SHORT_NAME }} Team{% endblocktrans %}
---
+--
{{ ORG_LONG_NAME }}
{% if PUBLIC_SITE.root_url %}{{ PUBLIC_SITE.root_url }}{% elif ORG_URL %}{{ ORG_URL }}{% endif %}
{% block post_signature_content %}{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/batch_ready_to_review.html b/hypha/apply/activity/templates/messages/email/batch_ready_to_review.html
index 476ec5111c..acdb60888d 100644
--- a/hypha/apply/activity/templates/messages/email/batch_ready_to_review.html
+++ b/hypha/apply/activity/templates/messages/email/batch_ready_to_review.html
@@ -4,11 +4,11 @@
{% block salutation %}{% trans "Dear Reviewer," %}{% endblock %}
{% block content %}
-{% trans "New applications have been added to your review list." %}
-{% for submission in sources %}
+ {% trans "New applications have been added to your review list." %}
+ {% for submission in sources %}
-{% trans "Title" %}: {{ submission.title }}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ submission.get_absolute_url }}
-{% endfor %}
+ {% trans "Title" %}: {{ submission.title }}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ submission.get_absolute_url }}
+ {% endfor %}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/comment.html b/hypha/apply/activity/templates/messages/email/comment.html
index 10c9c2d76a..adcc0d0a07 100644
--- a/hypha/apply/activity/templates/messages/email/comment.html
+++ b/hypha/apply/activity/templates/messages/email/comment.html
@@ -3,8 +3,8 @@
{% load i18n %}
{% block content %}{% blocktrans with title=source.title user=comment.user %}There has been a new comment on "{{ title }}" by {{ user }}.{% endblocktrans %}
-{% trans "Read the full comment here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications{% endblock %}
+ {% trans "Read the full comment here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications{% endblock %}
{% block more_info %}
-{% blocktrans %}If you have any issues accessing the submission system or other general inquiries, please email us at {{ ORG_EMAIL }}{% endblocktrans %}
+ {% blocktrans %}If you have any issues accessing the submission system or other general inquiries, please email us at {{ ORG_EMAIL }}{% endblocktrans %}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/contract_uploaded.html b/hypha/apply/activity/templates/messages/email/contract_uploaded.html
index d83771099f..efe88ae8fa 100644
--- a/hypha/apply/activity/templates/messages/email/contract_uploaded.html
+++ b/hypha/apply/activity/templates/messages/email/contract_uploaded.html
@@ -3,33 +3,33 @@
{% load i18n %}
{% block salutation %}
-{% if request.user != source.user %}
-{% blocktrans with name=source.user.get_full_name|default:"vendor" %}Dear {{ name }},{% endblocktrans %}
-{% endif %}
+ {% if request.user != source.user %}
+ {% blocktrans with name=source.user.get_full_name|default:"vendor" %}Dear {{ name }},{% endblocktrans %}
+ {% endif %}
{% endblock %}
{% block content %}
-{% trans "A new contract has been added to your Project" %}:
+ {% trans "A new contract has been added to your Project" %}:
-{% trans "Title" %}: {{ source.title }}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
+ {% trans "Title" %}: {{ source.title }}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
-{% if contract.is_signed %}
-{% trans "This contract has already been signed and there is no action for you to take." %}
-{% else %}
-{% blocktrans %}Please review the contract and sign it before reuploading it to your Project page for the {{ ORG_SHORT_NAME }} Team to approve.{% endblocktrans %}
-{% endif %}
+ {% if contract.is_signed %}
+ {% trans "This contract has already been signed and there is no action for you to take." %}
+ {% else %}
+ {% blocktrans %}Please review the contract and sign it before reuploading it to your Project page for the {{ ORG_SHORT_NAME }} Team to approve.{% endblocktrans %}
+ {% endif %}
{% endblock %}
{% block more_info %}
-{% if request.user != source.user %}
-{% trans "Link to your application" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
-{% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
+ {% if request.user != source.user %}
+ {% trans "Link to your application" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
+ {% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
-{% trans "See our guide for more information" %}: {{ ORG_GUIDE_URL }}
+ {% trans "See our guide for more information" %}: {{ ORG_GUIDE_URL }}
-{% blocktrans %}If you have any issues accessing the submission system or other general inquiries, please email us at {{ ORG_EMAIL }}{% endblocktrans %}
-{% endif %}
+ {% blocktrans %}If you have any issues accessing the submission system or other general inquiries, please email us at {{ ORG_EMAIL }}{% endblocktrans %}
+ {% endif %}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/determination.html b/hypha/apply/activity/templates/messages/email/determination.html
index f47f293f49..99f53547de 100644
--- a/hypha/apply/activity/templates/messages/email/determination.html
+++ b/hypha/apply/activity/templates/messages/email/determination.html
@@ -3,6 +3,6 @@
{% block content %}{% trans "Your application has been reviewed and the outcome is" %}: {{ determination.clean_outcome }}
-{{ determination.message|bleach|striptags }}
+ {{ determination.message|bleach|striptags }}
-{% trans "Read the full determination here" %}: {{ request.scheme }}://{{ request.get_host }}{{ determination.get_absolute_url }}{% endblock %}
+ {% trans "Read the full determination here" %}: {{ request.scheme }}://{{ request.get_host }}{{ determination.get_absolute_url }}{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/invited_to_proposal.html b/hypha/apply/activity/templates/messages/email/invited_to_proposal.html
index 27bac4f1be..02bf64edc4 100644
--- a/hypha/apply/activity/templates/messages/email/invited_to_proposal.html
+++ b/hypha/apply/activity/templates/messages/email/invited_to_proposal.html
@@ -3,11 +3,11 @@
{% load i18n %}
{% block content %}{% blocktrans %}We’ve reviewed your Concept note and think it could be a good fit for {{ ORG_SHORT_NAME }} funding. We would like to invite you to submit a Proposal with more details about your project. You will receive a second email linking to a determination message with detailed feedback.{% endblocktrans %}
-{% blocktrans %}Please review our Proposal Guide at {{ ORG_GUIDE_URL }} to learn more about the information we’d like to see. In the proposal please also address the feedback we provided in the concept note determination.{% endblocktrans %}{% endblock %}
+ {% blocktrans %}Please review our Proposal Guide at {{ ORG_GUIDE_URL }} to learn more about the information we’d like to see. In the proposal please also address the feedback we provided in the concept note determination.{% endblocktrans %}{% endblock %}
{% block more_info %}{% trans "Here is the link to start creating your proposal" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
-{% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
+ {% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
-{% blocktrans %}The system will allow you to save a draft of your proposal as you work on it. When you feel it is ready for our review, please click the “Submit” button and we’ll know to take a look at it. We’ll reply to you with feedback on your Proposal as quickly as possible.{% endblocktrans %}
+ {% blocktrans %}The system will allow you to save a draft of your proposal as you work on it. When you feel it is ready for our review, please click the “Submit” button and we’ll know to take a look at it. We’ll reply to you with feedback on your Proposal as quickly as possible.{% endblocktrans %}
-{% blocktrans %}If you have any issues accessing the submission system or other general inquiries, please email us at {{ ORG_EMAIL }}{% endblocktrans %}{% endblock %}
+ {% blocktrans %}If you have any issues accessing the submission system or other general inquiries, please email us at {{ ORG_EMAIL }}{% endblocktrans %}{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/invoice_approved.html b/hypha/apply/activity/templates/messages/email/invoice_approved.html
index bfd469580e..722cb477e4 100644
--- a/hypha/apply/activity/templates/messages/email/invoice_approved.html
+++ b/hypha/apply/activity/templates/messages/email/invoice_approved.html
@@ -4,11 +4,11 @@
{% block salutation %}{% endblock %}
{% block content %}
-{% trans "An Invoice is waiting for your approval." %}
+ {% trans "An Invoice is waiting for your approval." %}
-{% trans "Title" %}: {{ source.title }}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ invoice.get_absolute_url }}
-{% trans "Project" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
+ {% trans "Title" %}: {{ source.title }}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ invoice.get_absolute_url }}
+ {% trans "Project" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
-{% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
+ {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/invoice_status_updated.html b/hypha/apply/activity/templates/messages/email/invoice_status_updated.html
index beb1dde56a..0aeba8e538 100644
--- a/hypha/apply/activity/templates/messages/email/invoice_status_updated.html
+++ b/hypha/apply/activity/templates/messages/email/invoice_status_updated.html
@@ -2,18 +2,18 @@
{% load i18n invoice_tools %}
{% block content %}
-{% display_invoice_status_for_user source.user invoice as invoice_status %}
-{% blocktrans with title=source.title date_from=invoice.date_from date_to=invoice.date_to %}An {{ ORG_SHORT_NAME }} staff member has updated your invoice for {{ title }} for period {{ date_from }} to {{ date_to }}.{% endblocktrans %}
+ {% display_invoice_status_for_user source.user invoice as invoice_status %}
+ {% blocktrans with title=source.title date_from=invoice.date_from date_to=invoice.date_to %}An {{ ORG_SHORT_NAME }} staff member has updated your invoice for {{ title }} for period {{ date_from }} to {{ date_to }}.{% endblocktrans %}
-{% blocktrans %}It is now {{ invoice_status }}.{% endblocktrans %}
+ {% blocktrans %}It is now {{ invoice_status }}.{% endblocktrans %}
-{% if has_changes_requested and invoice.comment %}
-{% trans "The staff member left this comment" %}:
+ {% if has_changes_requested and invoice.comment %}
+ {% trans "The staff member left this comment" %}:
- {{ invoice.comment }}
-{% endif %}
+ {{ invoice.comment }}
+ {% endif %}
-{% trans "Invoice Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ invoice.get_absolute_url }}
-{% trans "Title" %}: {{ source.title }}
-{% trans "Project Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
+ {% trans "Invoice Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ invoice.get_absolute_url }}
+ {% trans "Title" %}: {{ source.title }}
+ {% trans "Project Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/invoice_updated.html b/hypha/apply/activity/templates/messages/email/invoice_updated.html
index f20f2a81e9..df64ca24cf 100644
--- a/hypha/apply/activity/templates/messages/email/invoice_updated.html
+++ b/hypha/apply/activity/templates/messages/email/invoice_updated.html
@@ -2,11 +2,11 @@
{% load i18n invoice_tools %}
{% block content %}
-{% display_invoice_status_for_user source.user invoice as invoice_status %}
+ {% display_invoice_status_for_user source.user invoice as invoice_status %}
-{% blocktrans with title=source.title date_from=invoice.date_from date_to=invoice.date_to %}An {{ ORG_SHORT_NAME }} staff member has updated your invoice for {{ title }} for period {{ date_from }} to {{ date_to }}.{% endblocktrans %}
-{% blocktrans %}It is now {{ invoice_status }}.{% endblocktrans %}
+ {% blocktrans with title=source.title date_from=invoice.date_from date_to=invoice.date_to %}An {{ ORG_SHORT_NAME }} staff member has updated your invoice for {{ title }} for period {{ date_from }} to {{ date_to }}.{% endblocktrans %}
+ {% blocktrans %}It is now {{ invoice_status }}.{% endblocktrans %}
-{% trans "Title" %}: {{ source.title }}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
+ {% trans "Title" %}: {{ source.title }}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/paf_for_approval.html b/hypha/apply/activity/templates/messages/email/paf_for_approval.html
index 628b6a7e60..979e0d6945 100644
--- a/hypha/apply/activity/templates/messages/email/paf_for_approval.html
+++ b/hypha/apply/activity/templates/messages/email/paf_for_approval.html
@@ -4,11 +4,11 @@
{% block salutation %}{% endblock %}
{% block content %}
-{% trans "A Project is awaiting your review." %}
+ {% trans "A Project is awaiting your review." %}
-{% trans "Title" %}: {{ source.title }}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %}
-{% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %}
+ {% trans "Title" %}: {{ source.title }}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %}
+ {% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %}
-{% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
+ {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/partners_update_applicant.html b/hypha/apply/activity/templates/messages/email/partners_update_applicant.html
index 494b7d34b0..bb32ef59dc 100644
--- a/hypha/apply/activity/templates/messages/email/partners_update_applicant.html
+++ b/hypha/apply/activity/templates/messages/email/partners_update_applicant.html
@@ -2,10 +2,10 @@
{% load i18n %}
{% block content %}
-{% trans "New partner(s) has been added to your submission." %}
-{% for partner in added %}
-* {{ partner }}
-{% endfor %}
-{% trans "Title" %}: {{ submission.title }}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ submission.get_absolute_url }}
+ {% trans "New partner(s) has been added to your submission." %}
+ {% for partner in added %}
+ * {{ partner }}
+ {% endfor %}
+ {% trans "Title" %}: {{ submission.title }}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ submission.get_absolute_url }}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/partners_update_partner.html b/hypha/apply/activity/templates/messages/email/partners_update_partner.html
index 4707dc924a..e81705377b 100644
--- a/hypha/apply/activity/templates/messages/email/partners_update_partner.html
+++ b/hypha/apply/activity/templates/messages/email/partners_update_partner.html
@@ -4,8 +4,8 @@
{% block salutation %}{% trans "Dear Partner," %}{% endblock %}
{% block content %}
-{% trans "You have been added as a partner the following submission." %}
+ {% trans "You have been added as a partner the following submission." %}
-{% trans "Title" %}: {{ submission.title }}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ submission.get_absolute_url }}
+ {% trans "Title" %}: {{ submission.title }}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ submission.get_absolute_url }}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/project_final_approval.html b/hypha/apply/activity/templates/messages/email/project_final_approval.html
index 762e63e1a1..84a31ca594 100644
--- a/hypha/apply/activity/templates/messages/email/project_final_approval.html
+++ b/hypha/apply/activity/templates/messages/email/project_final_approval.html
@@ -4,11 +4,11 @@
{% block salutation %}{% endblock %}
{% block content %}
-{% trans "A Project is awaiting final approval." %}
+ {% trans "A Project is awaiting final approval." %}
-{% trans "Title" %}: {{ source.title }}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %}
-{% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %}
+ {% trans "Title" %}: {{ source.title }}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %}
+ {% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %}
-{% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
+ {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/project_request_change.html b/hypha/apply/activity/templates/messages/email/project_request_change.html
index 64bf7ae516..1482407df7 100644
--- a/hypha/apply/activity/templates/messages/email/project_request_change.html
+++ b/hypha/apply/activity/templates/messages/email/project_request_change.html
@@ -4,9 +4,9 @@
{% block salutation %}{% endblock %}
{% block content %}
-{% trans "A Project has been rejected by PAF reviewers, please update it accordingly and resubmit it to the reviewers." %}
+ {% trans "A Project has been rejected by PAF reviewers, please update it accordingly and resubmit it to the reviewers." %}
-{% trans "Title" %}: {{ source.title }}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:detail' pk=source.pk %}
+ {% trans "Title" %}: {{ source.title }}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:detail' pk=source.pk %}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/ready_for_contracting.html b/hypha/apply/activity/templates/messages/email/ready_for_contracting.html
index 9748a6c5ae..a1065fa4a8 100644
--- a/hypha/apply/activity/templates/messages/email/ready_for_contracting.html
+++ b/hypha/apply/activity/templates/messages/email/ready_for_contracting.html
@@ -4,12 +4,12 @@
{% block salutation %}{% endblock %}
{% block content %}
-{% trans "A Project is waiting for contract" %}
+ {% trans "A Project is waiting for contract" %}
-{% trans "Title" %}: {{ source.title }}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:detail' pk=source.pk %}
-{% trans "Project Approval Form" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %}
-{% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %}
+ {% trans "Title" %}: {{ source.title }}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:detail' pk=source.pk %}
+ {% trans "Project Approval Form" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %}
+ {% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %}
-{% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
+ {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/ready_for_invoicing.html b/hypha/apply/activity/templates/messages/email/ready_for_invoicing.html
index bae568e1f1..6e9d1d1c8e 100644
--- a/hypha/apply/activity/templates/messages/email/ready_for_invoicing.html
+++ b/hypha/apply/activity/templates/messages/email/ready_for_invoicing.html
@@ -4,8 +4,8 @@
{% block content %}{% blocktrans with title=source.title %}The contract for your project "{{ title }}" has approved. Now, your project is ready for invoicing.{% endblocktrans %}{% endblock %}
{% block more_info %}{% trans "Link to your project" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
-{% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
+ {% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
-{% trans "See our guide for more information" %}: {{ ORG_GUIDE_URL }}
+ {% trans "See our guide for more information" %}: {{ ORG_GUIDE_URL }}
-{% blocktrans %}If you have any issues accessing the project or other general inquiries, please email us at {{ ORG_EMAIL }}{% endblocktrans %}{% endblock %}
+ {% blocktrans %}If you have any issues accessing the project or other general inquiries, please email us at {{ ORG_EMAIL }}{% endblocktrans %}{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/ready_to_review.html b/hypha/apply/activity/templates/messages/email/ready_to_review.html
index 0e2174d775..1938cea4e9 100644
--- a/hypha/apply/activity/templates/messages/email/ready_to_review.html
+++ b/hypha/apply/activity/templates/messages/email/ready_to_review.html
@@ -3,14 +3,14 @@
{% load i18n %}
{% block salutation %}{% trans "Dear Reviewer," %}{% endblock %}
{% block content %}
-{% trans "This application is awaiting your review." %}
+ {% trans "This application is awaiting your review." %}
-{% trans "Title" %}: {{ source.title }}
-{% if related.title %}
-{% trans "Reminder Title" %}: {{ related.title }}
-{% endif %}
-{% if related.description %}
-{% trans "Reminder Description" %}: {{ related.description }}
-{% endif %}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
+ {% trans "Title" %}: {{ source.title }}
+ {% if related.title %}
+ {% trans "Reminder Title" %}: {{ related.title }}
+ {% endif %}
+ {% if related.description %}
+ {% trans "Reminder Description" %}: {{ related.description }}
+ {% endif %}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/report_frequency.html b/hypha/apply/activity/templates/messages/email/report_frequency.html
index 63633b9404..6d7f92bbd2 100644
--- a/hypha/apply/activity/templates/messages/email/report_frequency.html
+++ b/hypha/apply/activity/templates/messages/email/report_frequency.html
@@ -3,12 +3,12 @@
{% load i18n %}
{% block content %}
-{% blocktrans with title=source.title %}An {{ ORG_SHORT_NAME }} staff member has changed the reporting frequency of {{ title }}.{% endblocktrans %}
+ {% blocktrans with title=source.title %}An {{ ORG_SHORT_NAME }} staff member has changed the reporting frequency of {{ title }}.{% endblocktrans %}
-{% trans "The new schedule is" %}: {{ config.get_frequency_display }}
+ {% trans "The new schedule is" %}: {{ config.get_frequency_display }}
-{% trans "The next report is due" %}: {{ config.current_due_report.end_date }}
+ {% trans "The next report is due" %}: {{ config.current_due_report.end_date }}
-{% trans "Title" %}: {{ source.title }}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
+ {% trans "Title" %}: {{ source.title }}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/report_notify.html b/hypha/apply/activity/templates/messages/email/report_notify.html
index 0bb6cfb002..5cf3ca270b 100644
--- a/hypha/apply/activity/templates/messages/email/report_notify.html
+++ b/hypha/apply/activity/templates/messages/email/report_notify.html
@@ -3,9 +3,9 @@
{% load i18n %}
{% block content %}
-{% blocktrans with title=source.title end_date=report.end_date %}A report is due for {{ title }} on {{ end_date }}.{% endblocktrans %}
+ {% blocktrans with title=source.title end_date=report.end_date %}A report is due for {{ title }} on {{ end_date }}.{% endblocktrans %}
-{% blocktrans %}More information can be found on the project page:{% endblocktrans %}
-{{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
+ {% blocktrans %}More information can be found on the project page:{% endblocktrans %}
+ {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/report_skipped.html b/hypha/apply/activity/templates/messages/email/report_skipped.html
index 0b86d85748..7419063f1b 100644
--- a/hypha/apply/activity/templates/messages/email/report_skipped.html
+++ b/hypha/apply/activity/templates/messages/email/report_skipped.html
@@ -3,12 +3,12 @@
{% load i18n %}
{% block content %}
-{% blocktrans %}An {{ ORG_SHORT_NAME }} staff member has marked a report as {% endblocktrans %}{% if report.skipped %}{% trans "no longer required" %}{% else %}{% trans "required" %}{% endif %}{% blocktrans with title=source.title start_date=report.start_date end_date=report.end_date %} for {{ title }} for period {{ start_date }} to {{ end_date }}.{% endblocktrans %}
+ {% blocktrans %}An {{ ORG_SHORT_NAME }} staff member has marked a report as {% endblocktrans %}{% if report.skipped %}{% trans "no longer required" %}{% else %}{% trans "required" %}{% endif %}{% blocktrans with title=source.title start_date=report.start_date end_date=report.end_date %} for {{ title }} for period {{ start_date }} to {{ end_date }}.{% endblocktrans %}
-{% if not report.skipped %}
-{% trans "This report was previously not required. Please ensure you now complete the report." %}
-{% endif %}
+ {% if not report.skipped %}
+ {% trans "This report was previously not required. Please ensure you now complete the report." %}
+ {% endif %}
-{% trans "Title" %}: {{ source.title }}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
+ {% trans "Title" %}: {{ source.title }}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/report_submitted.html b/hypha/apply/activity/templates/messages/email/report_submitted.html
index d948fff052..c67a17bc74 100644
--- a/hypha/apply/activity/templates/messages/email/report_submitted.html
+++ b/hypha/apply/activity/templates/messages/email/report_submitted.html
@@ -2,10 +2,10 @@
{% load i18n %}
{% block content %}
-{% blocktrans with title=source.title start_date=report.start_date end_date=report.end_date %}An {{ ORG_SHORT_NAME }} staff member has submitted a report for {{ title }} for period {{ start_date }} to {{ end_date }}.{% endblocktrans %}
+ {% blocktrans with title=source.title start_date=report.start_date end_date=report.end_date %}An {{ ORG_SHORT_NAME }} staff member has submitted a report for {{ title }} for period {{ start_date }} to {{ end_date }}.{% endblocktrans %}
-{% trans "You can review the report here" %}: {{ request.scheme }}://{{ request.get_host }}{{ report.get_absolute_url }}
+ {% trans "You can review the report here" %}: {{ request.scheme }}://{{ request.get_host }}{{ report.get_absolute_url }}
-{% trans "Project" %}: {{ source.title }}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
+ {% trans "Project" %}: {{ source.title }}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/sent_to_compliance.html b/hypha/apply/activity/templates/messages/email/sent_to_compliance.html
index 628b6a7e60..979e0d6945 100644
--- a/hypha/apply/activity/templates/messages/email/sent_to_compliance.html
+++ b/hypha/apply/activity/templates/messages/email/sent_to_compliance.html
@@ -4,11 +4,11 @@
{% block salutation %}{% endblock %}
{% block content %}
-{% trans "A Project is awaiting your review." %}
+ {% trans "A Project is awaiting your review." %}
-{% trans "Title" %}: {{ source.title }}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %}
-{% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %}
+ {% trans "Title" %}: {{ source.title }}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %}
+ {% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %}
-{% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
+ {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/submission_confirmation.html b/hypha/apply/activity/templates/messages/email/submission_confirmation.html
index 84c1eea07c..04d2a51030 100644
--- a/hypha/apply/activity/templates/messages/email/submission_confirmation.html
+++ b/hypha/apply/activity/templates/messages/email/submission_confirmation.html
@@ -3,16 +3,16 @@
{% load i18n %}
{% block content %}{% blocktrans with title=source.title %}We appreciate your {{ title }} application submission to the {{ ORG_LONG_NAME }}.{% endblocktrans %}
-{% if source.is_draft %}{% trans "Please note that it is not submitted for review because it's still in draft." %} {% trans "You can access the draft at" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}{% else %}{% trans "We will review and reply to your submission as quickly as possible." %}{% endif %}
+ {% if source.is_draft %}{% trans "Please note that it is not submitted for review because it's still in draft." %} {% trans "You can access the draft at" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}{% else %}{% trans "We will review and reply to your submission as quickly as possible." %}{% endif %}
-{% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
+ {% trans "If you have any questions, please submit them here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
-{% blocktrans %}If you have issues accessing the submission system or general inquiries, please email us at {{ ORG_EMAIL }}.{% endblocktrans %}
+ {% blocktrans %}If you have issues accessing the submission system or general inquiries, please email us at {{ ORG_EMAIL }}.{% endblocktrans %}
-{% blocktrans %}For more information about our support options, review process, and selection criteria, please visit our website at {{ ORG_URL }}.{% endblocktrans %}
+ {% blocktrans %}For more information about our support options, review process, and selection criteria, please visit our website at {{ ORG_URL }}.{% endblocktrans %}
-{% with email_context=source.page.specific %}{{ email_context.confirmation_text_extra }}{% endwith %}
+ {% with email_context=source.page.specific %}{{ email_context.confirmation_text_extra }}{% endwith %}
-{% trans "Project name" %}: {{ source.title }}
-{% trans "Contact name" %}: {{ source.user.get_full_name }}
-{% trans "Contact email" %}: {{ source.user.email }}{% endblock %}
+ {% trans "Project name" %}: {{ source.title }}
+ {% trans "Contact name" %}: {{ source.user.get_full_name }}
+ {% trans "Contact email" %}: {{ source.user.email }}{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/submission_edit.html b/hypha/apply/activity/templates/messages/email/submission_edit.html
index 3ffec01938..a5148a24a5 100644
--- a/hypha/apply/activity/templates/messages/email/submission_edit.html
+++ b/hypha/apply/activity/templates/messages/email/submission_edit.html
@@ -2,5 +2,5 @@
{% load i18n %}
{% block content %}
-{% trans "Your submission has been edited by a member of staff." %}
+ {% trans "Your submission has been edited by a member of staff." %}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/submit_contract_documents.html b/hypha/apply/activity/templates/messages/email/submit_contract_documents.html
index 1d2840ebff..83d6401da5 100644
--- a/hypha/apply/activity/templates/messages/email/submit_contract_documents.html
+++ b/hypha/apply/activity/templates/messages/email/submit_contract_documents.html
@@ -6,10 +6,10 @@
{% endblock %}
{% block content %}
-{% trans "A Project's contract is awaiting your review." %}
+ {% trans "A Project's contract is awaiting your review." %}
-{% trans "Title" %}: {{ source.title }}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
+ {% trans "Title" %}: {{ source.title }}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
-{% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
+ {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/transition.html b/hypha/apply/activity/templates/messages/email/transition.html
index 4188597a68..ebb78fb817 100644
--- a/hypha/apply/activity/templates/messages/email/transition.html
+++ b/hypha/apply/activity/templates/messages/email/transition.html
@@ -3,4 +3,4 @@
{% load i18n %}
{% block content %}{% blocktrans with old_status=old_phase.public_name new_status=source.phase.public_name %}Your application is now in "{{ new_status }}" status (progressed from "{{ old_status }}").{% endblocktrans %}
-{% trans "Please submit any questions related to your application here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications{% endblock %}
+ {% trans "Please submit any questions related to your application here" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/vendor_setup_needed.html b/hypha/apply/activity/templates/messages/email/vendor_setup_needed.html
index 53d1339fdb..15e6267b8a 100644
--- a/hypha/apply/activity/templates/messages/email/vendor_setup_needed.html
+++ b/hypha/apply/activity/templates/messages/email/vendor_setup_needed.html
@@ -2,11 +2,11 @@
{% load i18n %}
{% block content %}
-{% blocktrans %}A Project has been created for your submission on {{ ORG_SHORT_NAME }}.{% endblocktrans %}
+ {% blocktrans %}A Project has been created for your submission on {{ ORG_SHORT_NAME }}.{% endblocktrans %}
-{% trans "Next step is to complete Contracting Information by visiting project detail page." %}
+ {% trans "Next step is to complete Contracting Information by visiting project detail page." %}
-{% trans "Project" %}: {{ source.title }}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
-{% trans "Submission" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.submission.get_absolute_url }}
+ {% trans "Project" %}: {{ source.title }}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
+ {% trans "Submission" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.submission.get_absolute_url }}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/email/vendor_updated.html b/hypha/apply/activity/templates/messages/email/vendor_updated.html
index 818cb1afb2..a585c5a53f 100644
--- a/hypha/apply/activity/templates/messages/email/vendor_updated.html
+++ b/hypha/apply/activity/templates/messages/email/vendor_updated.html
@@ -2,8 +2,8 @@
{% load i18n %}
{% block content %}
-{% blocktrans with title=source.title %}Contracting Information has been updated on {{ title }}.{% endblocktrans %}
+ {% blocktrans with title=source.title %}Contracting Information has been updated on {{ title }}.{% endblocktrans %}
-{% trans "Project" %}: {{ source.title }}
-{% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
+ {% trans "Project" %}: {{ source.title }}
+ {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
{% endblock %}
diff --git a/hypha/apply/activity/templates/messages/slack_message.html b/hypha/apply/activity/templates/messages/slack_message.html
index 1974748d10..61cc29ce67 100644
--- a/hypha/apply/activity/templates/messages/slack_message.html
+++ b/hypha/apply/activity/templates/messages/slack_message.html
@@ -2,5 +2,5 @@
{% block text %}
-{{ message|safe }}
+ {{ message|safe }}
{% endblock %}
diff --git a/hypha/apply/activity/templatetags/activity_tags.py b/hypha/apply/activity/templatetags/activity_tags.py
index 1aa8d779dd..d514d3c44c 100644
--- a/hypha/apply/activity/templatetags/activity_tags.py
+++ b/hypha/apply/activity/templatetags/activity_tags.py
@@ -14,10 +14,14 @@
@register.filter
def display_author(activity, user):
- if user.is_applicant and (activity.user.is_apply_staff or activity.user.is_finance or activity.user.is_contracting):
+ if user.is_applicant and (
+ activity.user.is_apply_staff
+ or activity.user.is_finance
+ or activity.user.is_contracting
+ ):
return settings.ORG_LONG_NAME
if isinstance(activity.related_object, Review) and activity.source.user == user:
- return 'Reviewer'
+ return "Reviewer"
return activity.user.get_full_name_with_group()
diff --git a/hypha/apply/activity/tests/factories.py b/hypha/apply/activity/tests/factories.py
index 34bbce84be..6f98839cee 100644
--- a/hypha/apply/activity/tests/factories.py
+++ b/hypha/apply/activity/tests/factories.py
@@ -25,7 +25,7 @@ class Params:
source = factory.SubFactory(ApplicationSubmissionFactory)
user = factory.SubFactory(UserFactory)
- message = factory.Faker('sentence')
+ message = factory.Faker("sentence")
timestamp = factory.LazyFunction(timezone.now)
@@ -48,8 +48,8 @@ class MessageFactory(factory.django.DjangoModelFactory):
class Meta:
model = Message
- type = 'Email'
- content = factory.Faker('sentence')
- recipient = factory.Faker('email')
+ type = "Email"
+ content = factory.Faker("sentence")
+ recipient = factory.Faker("email")
event = factory.SubFactory(EventFactory)
- external_id = factory.LazyFunction(lambda: '<{}>'.format(uuid.uuid4()))
+ external_id = factory.LazyFunction(lambda: "<{}>".format(uuid.uuid4()))
diff --git a/hypha/apply/activity/tests/test_messaging.py b/hypha/apply/activity/tests/test_messaging.py
index 35dfd159db..79ef43c635 100644
--- a/hypha/apply/activity/tests/test_messaging.py
+++ b/hypha/apply/activity/tests/test_messaging.py
@@ -34,11 +34,9 @@
class TestAdapter(AdapterBase):
"""A test class which will pass the message type to send_message"""
- adapter_type = 'Test Adapter'
- messages = {
- enum: enum.value
- for enum in MESSAGES.__members__.values()
- }
+
+ adapter_type = "Test Adapter"
+ messages = {enum: enum.value for enum in MESSAGES.__members__.values()}
def send_message(self, message, **kwargs):
pass
@@ -50,22 +48,22 @@ def log_message(self, message, recipient, event, status):
pass
-@override_settings(ROOT_URLCONF='hypha.apply.urls')
+@override_settings(ROOT_URLCONF="hypha.apply.urls")
class AdapterMixin(TestCase):
adapter = None
source_factory = None
def process_kwargs(self, message_type, **kwargs):
- if 'user' not in kwargs:
- kwargs['user'] = UserFactory()
- if 'source' not in kwargs:
- kwargs['source'] = self.source_factory()
- if 'request' not in kwargs:
- kwargs['request'] = make_request()
+ if "user" not in kwargs:
+ kwargs["user"] = UserFactory()
+ if "source" not in kwargs:
+ kwargs["source"] = self.source_factory()
+ if "request" not in kwargs:
+ kwargs["request"] = make_request()
if message_type in neat_related:
- kwargs['related'] = kwargs.get('related', 'a thing')
+ kwargs["related"] = kwargs.get("related", "a thing")
else:
- kwargs['related'] = None
+ kwargs["related"] = None
return kwargs
@@ -73,7 +71,7 @@ def adapter_process(self, message_type, adapter=None, **kwargs):
if not adapter:
adapter = self.adapter
kwargs = self.process_kwargs(message_type, **kwargs)
- event = EventFactory(source=kwargs['source'])
+ event = EventFactory(source=kwargs["source"])
adapter.process(message_type, event=event, **kwargs)
@@ -82,10 +80,10 @@ class TestBaseAdapter(AdapterMixin, TestCase):
source_factory = ApplicationSubmissionFactory
def setUp(self):
- patched_class = patch.object(TestAdapter, 'send_message')
+ patched_class = patch.object(TestAdapter, "send_message")
self.mock_adapter = patched_class.start()
self.adapter = TestAdapter()
- self.adapter.send_message.return_value = 'dummy_message'
+ self.adapter.send_message.return_value = "dummy_message"
self.addCleanup(patched_class.stop)
def test_can_send_a_message(self):
@@ -96,13 +94,13 @@ def test_can_send_a_message(self):
self.assertEqual(self.adapter.send_message.call_args[0], (message_type.value,))
def test_doesnt_send_a_message_if_not_configured(self):
- self.adapter_process('this_is_not_a_message_type')
+ self.adapter_process("this_is_not_a_message_type")
self.adapter.send_message.assert_not_called()
def test_calls_method_if_avaliable(self):
- method_name = 'new_method'
- return_message = 'Returned message'
+ method_name = "new_method"
+ return_message = "Returned message"
setattr(self.adapter, method_name, lambda **kw: return_message)
self.adapter.messages[method_name] = method_name
@@ -113,7 +111,7 @@ def test_calls_method_if_avaliable(self):
def test_that_kwargs_passed_to_send_message(self):
message_type = MESSAGES.UPDATE_LEAD
- kwargs = {'test': 'that', 'these': 'exist'}
+ kwargs = {"test": "that", "these": "exist"}
self.adapter_process(message_type, **kwargs)
self.adapter.send_message.assert_called_once()
@@ -122,9 +120,9 @@ def test_that_kwargs_passed_to_send_message(self):
def test_that_message_is_formatted(self):
message_type = MESSAGES.UPDATE_LEAD
- message = 'message value'
+ message = "message value"
- with patch.dict(self.adapter.messages, {message_type: '{message_to_format}'}):
+ with patch.dict(self.adapter.messages, {message_type: "{message_to_format}"}):
self.adapter_process(message_type, message_to_format=message)
self.adapter.send_message.assert_called_once()
@@ -133,12 +131,14 @@ def test_that_message_is_formatted(self):
def test_can_include_extra_kwargs(self):
message_type = MESSAGES.UPDATE_LEAD
- with patch.dict(self.adapter.messages, {message_type: '{extra}'}):
- with patch.object(self.adapter, 'extra_kwargs', return_value={'extra': 'extra'}):
+ with patch.dict(self.adapter.messages, {message_type: "{extra}"}):
+ with patch.object(
+ self.adapter, "extra_kwargs", return_value={"extra": "extra"}
+ ):
self.adapter_process(message_type)
self.adapter.send_message.assert_called_once()
- self.assertTrue('extra' in self.adapter.send_message.call_args[1])
+ self.assertTrue("extra" in self.adapter.send_message.call_args[1])
@override_settings(SEND_MESSAGES=False)
def test_django_messages_used(self):
@@ -158,10 +158,10 @@ def setUp(self):
self.mocked_adapter = Mock(AdapterBase)
self.backend = MessengerBackend
self.kwargs = {
- 'related': None,
- 'request': None,
- 'user': UserFactory(),
- 'source': self.source_factory(),
+ "related": None,
+ "request": None,
+ "user": UserFactory(),
+ "source": self.source_factory(),
}
def test_message_sent_to_adapter(self):
@@ -170,7 +170,9 @@ def test_message_sent_to_adapter(self):
messenger(MESSAGES.UPDATE_LEAD, **self.kwargs)
- adapter.process.assert_called_once_with(MESSAGES.UPDATE_LEAD, Event.objects.first(), **self.kwargs)
+ adapter.process.assert_called_once_with(
+ MESSAGES.UPDATE_LEAD, Event.objects.first(), **self.kwargs
+ )
def test_message_sent_to_all_adapter(self):
adapters = [self.mocked_adapter(), self.mocked_adapter()]
@@ -191,7 +193,9 @@ def test_event_created(self):
self.assertEqual(Event.objects.count(), 1)
self.assertEqual(Event.objects.first().type, MESSAGES.UPDATE_LEAD.name)
- self.assertEqual(Event.objects.first().get_type_display(), MESSAGES.UPDATE_LEAD.label)
+ self.assertEqual(
+ Event.objects.first().get_type_display(), MESSAGES.UPDATE_LEAD.label
+ )
self.assertEqual(Event.objects.first().by, user)
@@ -205,11 +209,13 @@ def setUp(self):
self.adapter = ActivityAdapter()
def test_activity_created(self):
- message = 'test message'
+ message = "test message"
user = UserFactory()
submission = ApplicationSubmissionFactory()
- self.adapter.send_message(message, user=user, source=submission, sources=[], related=None)
+ self.adapter.send_message(
+ message, user=user, source=submission, sources=[], related=None
+ )
self.assertEqual(Activity.objects.count(), 1)
activity = Activity.objects.first()
@@ -222,24 +228,24 @@ def test_reviewers_message_no_removed(self):
message = self.adapter.reviewers_updated([assigned_reviewer], [])
- self.assertTrue('Added' in message)
- self.assertFalse('Removed' in message)
+ self.assertTrue("Added" in message)
+ self.assertFalse("Removed" in message)
self.assertTrue(str(assigned_reviewer.reviewer) in message)
def test_reviewers_message_no_added(self):
assigned_reviewer = AssignedReviewersFactory()
message = self.adapter.reviewers_updated([], [assigned_reviewer])
- self.assertFalse('Added' in message)
- self.assertTrue('Removed' in message)
+ self.assertFalse("Added" in message)
+ self.assertTrue("Removed" in message)
self.assertTrue(str(assigned_reviewer.reviewer) in message)
def test_reviewers_message_both(self):
added, removed = AssignedReviewersFactory.create_batch(2)
message = self.adapter.reviewers_updated([added], [removed])
- self.assertTrue('Added' in message)
- self.assertTrue('Removed' in message)
+ self.assertTrue("Added" in message)
+ self.assertTrue("Removed" in message)
self.assertTrue(str(added.reviewer) in message)
self.assertTrue(str(removed.reviewer) in message)
@@ -258,19 +264,23 @@ def test_reviewers_with_and_without_role(self):
self.assertTrue(str(without_role.reviewer) in message)
def test_internal_transition_kwarg_for_invisible_transition(self):
- submission = ApplicationSubmissionFactory(status='post_review_discussion')
- kwargs = self.adapter.extra_kwargs(MESSAGES.TRANSITION, source=submission, sources=None)
+ submission = ApplicationSubmissionFactory(status="post_review_discussion")
+ kwargs = self.adapter.extra_kwargs(
+ MESSAGES.TRANSITION, source=submission, sources=None
+ )
- self.assertEqual(kwargs['visibility'], TEAM)
+ self.assertEqual(kwargs["visibility"], TEAM)
def test_public_transition_kwargs(self):
submission = ApplicationSubmissionFactory()
- kwargs = self.adapter.extra_kwargs(MESSAGES.TRANSITION, source=submission, sources=None)
+ kwargs = self.adapter.extra_kwargs(
+ MESSAGES.TRANSITION, source=submission, sources=None
+ )
- self.assertNotIn('visibility', kwargs)
+ self.assertNotIn("visibility", kwargs)
def test_handle_transition_public_to_public(self):
- submission = ApplicationSubmissionFactory(status='more_info')
+ submission = ApplicationSubmissionFactory(status="more_info")
old_phase = submission.workflow.phases_for()[0]
message = self.adapter.handle_transition(old_phase, submission)
@@ -282,7 +292,7 @@ def test_handle_transition_public_to_public(self):
self.assertIn(old_phase.public_name, message[ALL])
def test_handle_transition_to_private_to_public(self):
- submission = ApplicationSubmissionFactory(status='more_info')
+ submission = ApplicationSubmissionFactory(status="more_info")
old_phase = submission.workflow.phases_for()[1]
message = self.adapter.handle_transition(old_phase, submission)
@@ -294,7 +304,7 @@ def test_handle_transition_to_private_to_public(self):
self.assertIn(old_phase.public_name, message[ALL])
def test_handle_transition_to_public_to_private(self):
- submission = ApplicationSubmissionFactory(status='internal_review')
+ submission = ApplicationSubmissionFactory(status="internal_review")
old_phase = submission.workflow.phases_for()[0]
message = self.adapter.handle_transition(old_phase, submission)
@@ -305,14 +315,16 @@ def test_handle_transition_to_public_to_private(self):
def test_lead_saved_on_activity(self):
submission = ApplicationSubmissionFactory()
user = UserFactory()
- self.adapter.send_message('a message', user=user, source=submission, sources=[], related=user)
+ self.adapter.send_message(
+ "a message", user=user, source=submission, sources=[], related=user
+ )
activity = Activity.objects.first()
self.assertEqual(activity.related_object, user)
def test_review_saved_on_activity(self):
review = ReviewFactory()
self.adapter.send_message(
- 'a message',
+ "a message",
user=review.author.reviewer,
source=review.submission,
sources=[],
@@ -325,10 +337,10 @@ def test_review_saved_on_activity(self):
class TestSlackAdapter(AdapterMixin, TestCase):
source_factory = ApplicationSubmissionFactory
- backend = 'django_slack.backends.TestBackend'
- target_url = 'https://my-slack-backend.com/incoming/my-very-secret-key'
- target_room = '#
-
- {{ activity.source_content_type.name|source_type }}
-
-
-{% trans "Submit a new application" %}
-
- {% trans "Your active submissions" %} -
-
- {% for submission in my_active_submissions %}
-
{% if request.user|has_edit_perm:submission %}
-
+
{% endif %}
diff --git a/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html b/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html
index 2439a27e51..a382b38822 100644
--- a/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/contracting_dashboard.html
@@ -14,22 +14,22 @@
{% endadminbar %}
-
- {% if paf_waiting_for_approval.count %}
- {% include "dashboard/includes/paf_waiting_for_approval.html" with paf_waiting_for_approval=paf_waiting_for_approval %}
- {% endif %}
+
{% endblock %}
{% block extra_js %}
diff --git a/hypha/apply/dashboard/templates/dashboard/dashboard.html b/hypha/apply/dashboard/templates/dashboard/dashboard.html
index 9502418782..bdd7c86a0e 100644
--- a/hypha/apply/dashboard/templates/dashboard/dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/dashboard.html
@@ -22,104 +22,104 @@
{% endif %}
{% endadminbar %}
-
+ {% if paf_waiting_for_approval.count %}
+ {% include "dashboard/includes/paf_waiting_for_approval.html" with paf_waiting_for_approval=paf_waiting_for_approval %}
+ {% endif %}
- {% if paf_waiting_for_assignment.count %}
-
+ {% if projects_in_contracting.count %}
+ {% include "dashboard/includes/projects_in_contracting.html" with projects_in_contracting=projects_in_contracting %}
+ {% endif %}
+
-
- {% endif %}
+ {% if paf_waiting_for_assignment.count %}
+ {% trans "PAF waiting for assignee" %}
- {% render_table paf_waiting_for_assignment.table %} -
+
+ {% endif %}
- {% if projects_in_contracting.count %}
- {% include "dashboard/includes/projects_in_contracting.html" with projects_in_contracting=projects_in_contracting %}
- {% endif %}
-{% trans "PAF waiting for assignee" %}
+ {% render_table paf_waiting_for_assignment.table %} +
-
-
{% endblock %}
{% block extra_js %}
diff --git a/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html b/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
index f46efa0278..2b0e6f9a5d 100644
--- a/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
@@ -16,35 +16,35 @@
-
-
+ {{ awaiting_reviews.count }}
-{% trans "Submissions waiting for your review" %}
- {% if awaiting_reviews.count %} -{% trans "View" %}
- {% endif %}
-
-
- {{ projects.count }}
-{% trans "Live projects under your management" %}
- {% if projects.count %} -{% trans "View" %}
- {% endif %}
-
- {% if not paf_waiting_for_approval.count is None%}
-
- {{ paf_waiting_for_approval.count }}
-{% trans "Projects awaiting approval" %}
- {% if paf_waiting_for_approval.count %} -{% trans "View" %}
- {% endif %}
-
- {% endif %}
-
- {{ active_invoices.count }}
-{% trans "Requests for invoices requiring your attention" %}
- {% if active_invoices.count %} -{% trans "View" %}
+
+
-
+
-
+
+
{{ awaiting_reviews.count }}
+{% trans "Submissions waiting for your review" %}
+ {% if awaiting_reviews.count %} +{% trans "View" %}
+ {% endif %}
+
+
+ {{ projects.count }}
+{% trans "Live projects under your management" %}
+ {% if projects.count %} +{% trans "View" %}
+ {% endif %}
+
+ {% if not paf_waiting_for_approval.count is None%}
+
+ {{ paf_waiting_for_approval.count }}
+{% trans "Projects awaiting approval" %}
+ {% if paf_waiting_for_approval.count %} +{% trans "View" %}
+ {% endif %}
+
{% endif %}
-
+
+ {{ active_invoices.count }}
+{% trans "Requests for invoices requiring your attention" %}
+ {% if active_invoices.count %} +{% trans "View" %}
+ {% endif %}
+
+
- {% include "dashboard/includes/submissions-waiting-for-review.html" with in_review_count=awaiting_reviews.count my_review=awaiting_reviews.table display_more=awaiting_reviews.display_more active_statuses_filter=awaiting_reviews.active_statuses_filter %}
-
+
+ {% include "dashboard/includes/submissions-waiting-for-review.html" with in_review_count=awaiting_reviews.count my_review=awaiting_reviews.table display_more=awaiting_reviews.display_more active_statuses_filter=awaiting_reviews.active_statuses_filter %}
+
- {% if my_flagged.table.data %}
-
- {% include "dashboard/includes/flagged.html" with my_flagged=my_flagged.table display_more=my_flagged.display_more %}
-
- {% endif %}
+ {% if my_flagged.table.data %}
+
+ {% include "dashboard/includes/flagged.html" with my_flagged=my_flagged.table display_more=my_flagged.display_more %}
+
+ {% endif %}
+
+ {% if rounds.closed or rounds.open %}
+ {% include "funds/includes/round-block.html" with closed_rounds=rounds.closed open_rounds=rounds.open title="Your rounds and labs" page_type='dashboard' %}
+ {% endif %}
- {% if rounds.closed or rounds.open %}
- {% include "funds/includes/round-block.html" with closed_rounds=rounds.closed open_rounds=rounds.open title="Your rounds and labs" page_type='dashboard' %}
- {% endif %}
+ {% if paf_waiting_for_approval.count %}
+ {% include "dashboard/includes/paf_waiting_for_approval.html" with paf_waiting_for_approval=paf_waiting_for_approval %}
+ {% endif %}
- {% if paf_waiting_for_approval.count %}
- {% include "dashboard/includes/paf_waiting_for_approval.html" with paf_waiting_for_approval=paf_waiting_for_approval %}
- {% endif %}
+ {% if paf_waiting_for_assignment.count %}
+
+
+ {% endif %}
- {% if paf_waiting_for_assignment.count %}
- {% trans "PAF waiting for assignee" %}
+ {% render_table paf_waiting_for_assignment.table %} +
-
- {% endif %}
+ {% if projects.table.data %}
+ {% trans "PAF waiting for assignee" %}
- {% render_table paf_waiting_for_assignment.table %} -
+ {% trans "Your projects" as project_heading %}
+ {% include "funds/includes/table_filter_and_search.html" with filter=projects.filterset filter_action=projects.url search_term=search_term search_action=projects.url search_placeholder="projects" use_search=True use_batch_actions=False heading="Your projects" %}
+ {% render_table projects.table %}
- {% if projects.table.data %}
-
- {% endif %}
+ {% if active_invoices.count %}
+
- {% trans "Your projects" as project_heading %}
- {% include "funds/includes/table_filter_and_search.html" with filter=projects.filterset filter_action=projects.url search_term=search_term search_action=projects.url search_placeholder="projects" use_search=True use_batch_actions=False heading="Your projects" %}
- {% render_table projects.table %}
+ {% if projects.display_more %}
+
+ {% endif %}
- {% if projects.display_more %}
-
+
{% endif %}
-
+
+ {% endif %}
- {% if active_invoices.count %}
- {% trans "Active Invoices" %}
+ {% render_table active_invoices.table %} +
-
- {% endif %}
+ {% if my_reviewed.table.data %}
+ {% trans "Active Invoices" %}
- {% render_table active_invoices.table %} -
+ {% trans "Your previous reviews" as review_heading %}
+ {% include "funds/includes/table_filter_and_search.html" with filter=my_reviewed.filterset filter_action=my_reviewed.url search_term=search_term search_action=my_reviewed.url use_search=True use_batch_actions=False heading=review_heading %}
+ {% render_table my_reviewed.table %}
- {% if my_reviewed.table.data %}
-
+ {% endif %}
-
- {% trans "Your previous reviews" as review_heading %}
- {% include "funds/includes/table_filter_and_search.html" with filter=my_reviewed.filterset filter_action=my_reviewed.url search_term=search_term search_action=my_reviewed.url use_search=True use_batch_actions=False heading=review_heading %}
- {% render_table my_reviewed.table %}
-
- {% if my_reviewed.display_more %}
-
- {% endif %}
-
- {% endif %}
+ {% if my_reviewed.display_more %}
+
+ {% endif %}
+
@@ -84,16 +84,16 @@ {% trans 'Invoices' %}
- {% if paf_waiting_for_approval.count %}
- {% include "dashboard/includes/paf_waiting_for_approval.html" with paf_waiting_for_approval=paf_waiting_for_approval %}
- {% endif %}
+ {% if paf_waiting_for_approval.count %}
+ {% include "dashboard/includes/paf_waiting_for_approval.html" with paf_waiting_for_approval=paf_waiting_for_approval %}
+ {% endif %}
- {% if paf_waiting_for_assignment.count %}
-
{% endblock %}
diff --git a/hypha/apply/dashboard/templates/dashboard/includes/paf_waiting_for_approval.html b/hypha/apply/dashboard/templates/dashboard/includes/paf_waiting_for_approval.html
index 3464bc2401..0fdfcaa1a5 100644
--- a/hypha/apply/dashboard/templates/dashboard/includes/paf_waiting_for_approval.html
+++ b/hypha/apply/dashboard/templates/dashboard/includes/paf_waiting_for_approval.html
@@ -8,20 +8,20 @@ {% trans 'Invoices' %}
- {% if paf_waiting_for_approval.count %}
- {% include "dashboard/includes/paf_waiting_for_approval.html" with paf_waiting_for_approval=paf_waiting_for_approval %}
- {% endif %}
+ {% if paf_waiting_for_approval.count %}
+ {% include "dashboard/includes/paf_waiting_for_approval.html" with paf_waiting_for_approval=paf_waiting_for_approval %}
+ {% endif %}
- {% if paf_waiting_for_assignment.count %}
-
- {% trans "PAF waiting for assignee" %}
- {% render_table paf_waiting_for_assignment.table %}
-
- {% endif %}
+ {% if paf_waiting_for_assignment.count %}
+
+ {% trans "PAF waiting for assignee" %}
+ {% render_table paf_waiting_for_assignment.table %}
+
+ {% endif %}
{% trans "PAF waiting for assignee" %}
- {% render_table paf_waiting_for_assignment.table %} -{% trans "PAF waiting for assignee" %}
+ {% render_table paf_waiting_for_assignment.table %} +diff --git a/hypha/apply/dashboard/templates/dashboard/includes/projects_in_contracting.html b/hypha/apply/dashboard/templates/dashboard/includes/projects_in_contracting.html index 968d78503b..157854bc4d 100644 --- a/hypha/apply/dashboard/templates/dashboard/includes/projects_in_contracting.html +++ b/hypha/apply/dashboard/templates/dashboard/includes/projects_in_contracting.html @@ -8,20 +8,20 @@
diff --git a/hypha/apply/dashboard/templates/dashboard/partner_dashboard.html b/hypha/apply/dashboard/templates/dashboard/partner_dashboard.html index ff466c71f6..8ff142e2a6 100644 --- a/hypha/apply/dashboard/templates/dashboard/partner_dashboard.html +++ b/hypha/apply/dashboard/templates/dashboard/partner_dashboard.html @@ -13,52 +13,52 @@ {% endadminbar %} -
+
-
-
- - {% trans "You are the partner of these submissions" %} {{ partner_submissions_count }} -
+
+
+ {% if partner_submissions.data %}
+ {% render_table partner_submissions %}
+ {% else %}
+ {% trans "No submissions" %}
+ {% endif %}
+ + {% trans "You are the partner of these submissions" %} {{ partner_submissions_count }} +
- {% if partner_submissions.data %} - {% render_table partner_submissions %} - {% else %} - {% trans "No submissions" %} - {% endif %} -
-
{% trans "Your active submissions" %}
- {% for submission in my_submissions %} -
-
-
{% endblock %}
diff --git a/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html b/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html
index f977fa5998..1d6d0c05b6 100644
--- a/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html
@@ -14,79 +14,79 @@
{% slot header %}{% trans "Dashboard" %}{% endslot %}
{% endadminbar %}
-
+
\n') + return value.replace("\r\n", "
\n") diff --git a/hypha/apply/determinations/management/commands/migrate_proposal_determinations.py b/hypha/apply/determinations/management/commands/migrate_proposal_determinations.py index 4333565d77..dca0549646 100644 --- a/hypha/apply/determinations/management/commands/migrate_proposal_determinations.py +++ b/hypha/apply/determinations/management/commands/migrate_proposal_determinations.py @@ -99,11 +99,13 @@ class Command(BaseCommand): } def add_arguments(self, parser): - parser.add_argument('source', type=argparse.FileType('r'), help='Migration source JSON file') + parser.add_argument( + "source", type=argparse.FileType("r"), help="Migration source JSON file" + ) @transaction.atomic def handle(self, *args, **options): - with options['source'] as json_data: + with options["source"] as json_data: self.data = json.load(json_data) for id in self.data: @@ -114,9 +116,9 @@ def process(self, id): form_data = {} try: - determination = Determination.objects.get(drupal_id=node['nid']) + determination = Determination.objects.get(drupal_id=node["nid"]) except Determination.DoesNotExist: - determination = Determination(drupal_id=node['nid']) + determination = Determination(drupal_id=node["nid"]) # Disable auto_* on date fields so imported dates are used. for field in determination._meta.local_fields: @@ -126,18 +128,24 @@ def process(self, id): field.auto_now = False # TODO timezone? - determination.created_at = datetime.fromtimestamp(int(node['created']), timezone.utc) - determination.updated_at = datetime.fromtimestamp(int(node['changed']), timezone.utc) - determination.author = self.get_user(node['uid']) + determination.created_at = datetime.fromtimestamp( + int(node["created"]), timezone.utc + ) + determination.updated_at = datetime.fromtimestamp( + int(node["changed"]), timezone.utc + ) + determination.author = self.get_user(node["uid"]) determination.submission = self.get_submission(node) determination.outcome = self.get_determination(node) - determination.message = self.get_field_value('field_psr_determination_message', node) + determination.message = self.get_field_value( + "field_psr_determination_message", node + ) for field in node: if field in self.STREAMFIELD_MAP: try: - id = self.STREAMFIELD_MAP[field]['id'] - if id != 'message': + id = self.STREAMFIELD_MAP[field]["id"] + if id != "message": form_data[id] = self.get_field_value(field, node) except TypeError: pass @@ -149,8 +157,11 @@ def process(self, id): self.stdout.write(f"Processed \"{node['title']}\" ({node['nid']})") except IntegrityError: import pprint + pprint.pprint(determination.submission) - self.stdout.write(f"Skipped \"{node['title']}\" ({node['nid']}) due to IntegrityError") + self.stdout.write( + f"Skipped \"{node['title']}\" ({node['nid']}) due to IntegrityError" + ) pass def get_field_value(self, field, node): @@ -163,32 +174,32 @@ def get_field_value(self, field, node): field: [{value|target_id|tid: VALUE},] """ mapping = self.STREAMFIELD_MAP[field] - mapping_type = mapping['type'] - key = mapping.get('key', 'value') + mapping_type = mapping["type"] + key = mapping.get("key", "value") source_value = node[field] value = None if mapping_type == "direct": value = source_value - elif mapping_type == 'value': + elif mapping_type == "value": if key in source_value: - value = self.nl2br(source_value[key]) if source_value else '' + value = self.nl2br(source_value[key]) if source_value else "" else: - value = self.nl2br(source_value['value']) if source_value else '' - elif mapping_type == 'map' and 'map' in 'mapping': - value = mapping['map'].get(source_value[key]) - elif mapping_type == 'address' and 'map' in mapping: + value = self.nl2br(source_value["value"]) if source_value else "" + elif mapping_type == "map" and "map" in "mapping": + value = mapping["map"].get(source_value[key]) + elif mapping_type == "address" and "map" in mapping: try: - value_map = mapping['map'] + value_map = mapping["map"] value = {} for item in value_map: value[value_map[item]] = source_value[item] value = json.dumps(value) except TypeError: value = {} - elif mapping_type == 'boolean': - value = source_value[key] == '1' if source_value else False - elif mapping_type == 'category': + elif mapping_type == "boolean": + value = source_value[key] == "1" if source_value else False + elif mapping_type == "category": if not source_value: value = [] else: @@ -201,7 +212,7 @@ def get_field_value(self, field, node): option = self.get_referenced_term(item[key]) if option: value.append(option) - elif mapping_type == 'file': + elif mapping_type == "file": # TODO finish mapping. Requires access to the files. value = {} @@ -210,8 +221,8 @@ def get_field_value(self, field, node): def get_user(self, uid): # Dan Blah hade one extra admin account uid 52 in old system, # all content should be set to uid 2 in the new system. - if uid == '52': - uid = '2' + if uid == "52": + uid = "2" try: User = get_user_model() return User.objects.get(drupal_id=uid) @@ -220,10 +231,10 @@ def get_user(self, uid): def get_submission(self, node): try: - nid = node['field_submission_proposal']['target_id'] + nid = node["field_submission_proposal"]["target_id"] return ApplicationSubmission.objects.get(drupal_id=nid) except ApplicationSubmission.DoesNotExist: - return 'None' + return "None" def get_determination(self, node): choices = { @@ -231,15 +242,15 @@ def get_determination(self, node): "approved": 2, "dropped": 0, "unapproved": 0, - "undetermined": 1 + "undetermined": 1, } try: - determination = choices.get(node['field_psr_determination']['value'], 1) + determination = choices.get(node["field_psr_determination"]["value"], 1) except TypeError: determination = 1 return determination def nl2br(self, value): - return value.replace('\r\n', '
\n') + return value.replace("\r\n", "
\n") diff --git a/hypha/apply/determinations/migrations/0001_initial.py b/hypha/apply/determinations/migrations/0001_initial.py index 4729c5a3ee..1653ae5034 100644 --- a/hypha/apply/determinations/migrations/0001_initial.py +++ b/hypha/apply/determinations/migrations/0001_initial.py @@ -7,28 +7,62 @@ class Migration(migrations.Migration): - initial = True dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('funds', '0032_make_reviewers_optional_in_all_instances'), + ("funds", "0032_make_reviewers_optional_in_all_instances"), ] operations = [ migrations.CreateModel( - name='Determination', + name="Determination", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('determination_data', django.contrib.postgres.fields.jsonb.JSONField()), - ('determination', models.IntegerField(choices=[(0, 'Unapproved'), (1, 'Undetermined'), (2, 'Approved')], default=0, verbose_name='Determination')), - ('is_draft', models.BooleanField(default=False, verbose_name='Draft')), - ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), - ('submission', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='determination', to='funds.ApplicationSubmission')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "determination_data", + django.contrib.postgres.fields.jsonb.JSONField(), + ), + ( + "determination", + models.IntegerField( + choices=[ + (0, "Unapproved"), + (1, "Undetermined"), + (2, "Approved"), + ], + default=0, + verbose_name="Determination", + ), + ), + ("is_draft", models.BooleanField(default=False, verbose_name="Draft")), + ( + "author", + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + to=settings.AUTH_USER_MODEL, + ), + ), + ( + "submission", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + related_name="determination", + to="funds.ApplicationSubmission", + ), + ), ], ), migrations.AlterUniqueTogether( - name='determination', - unique_together={('author', 'submission')}, + name="determination", + unique_together={("author", "submission")}, ), ] diff --git a/hypha/apply/determinations/migrations/0002_add_fields.py b/hypha/apply/determinations/migrations/0002_add_fields.py index 648e297fd9..23344d6079 100644 --- a/hypha/apply/determinations/migrations/0002_add_fields.py +++ b/hypha/apply/determinations/migrations/0002_add_fields.py @@ -6,49 +6,56 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0001_initial'), + ("determinations", "0001_initial"), ] operations = [ migrations.AddField( - model_name='determination', - name='created_at', - field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now, verbose_name='Creation time'), + model_name="determination", + name="created_at", + field=models.DateTimeField( + auto_now_add=True, + default=django.utils.timezone.now, + verbose_name="Creation time", + ), preserve_default=False, ), migrations.AddField( - model_name='determination', - name='data', + model_name="determination", + name="data", field=django.contrib.postgres.fields.jsonb.JSONField(blank=True), preserve_default=False, ), migrations.AddField( - model_name='determination', - name='message', - field=models.TextField(blank=True, verbose_name='Determination message'), + model_name="determination", + name="message", + field=models.TextField(blank=True, verbose_name="Determination message"), ), migrations.AddField( - model_name='determination', - name='outcome', - field=models.IntegerField(choices=[(0, 'Rejected'), (1, 'Needs more info'), (2, 'Accepted')], default=1, verbose_name='Determination'), + model_name="determination", + name="outcome", + field=models.IntegerField( + choices=[(0, "Rejected"), (1, "Needs more info"), (2, "Accepted")], + default=1, + verbose_name="Determination", + ), ), migrations.AddField( - model_name='determination', - name='updated_at', - field=models.DateTimeField(auto_now=True, verbose_name='Update time'), + model_name="determination", + name="updated_at", + field=models.DateTimeField(auto_now=True, verbose_name="Update time"), ), migrations.AlterUniqueTogether( - name='determination', + name="determination", unique_together=set(), ), migrations.RemoveField( - model_name='determination', - name='determination', + model_name="determination", + name="determination", ), migrations.RemoveField( - model_name='determination', - name='determination_data', + model_name="determination", + name="determination_data", ), ] diff --git a/hypha/apply/determinations/migrations/0003_message_template_settings.py b/hypha/apply/determinations/migrations/0003_message_template_settings.py index 0ba59cffd5..180dd9e98a 100644 --- a/hypha/apply/determinations/migrations/0003_message_template_settings.py +++ b/hypha/apply/determinations/migrations/0003_message_template_settings.py @@ -6,30 +6,71 @@ class Migration(migrations.Migration): - dependencies = [ - ('wagtailcore', '0040_page_draft_title'), - ('determinations', '0002_add_fields'), + ("wagtailcore", "0040_page_draft_title"), + ("determinations", "0002_add_fields"), ] operations = [ migrations.CreateModel( - name='DeterminationMessageSettings', + name="DeterminationMessageSettings", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('request_accepted', wagtail.fields.RichTextField(verbose_name='Accepted')), - ('request_rejected', wagtail.fields.RichTextField(verbose_name='Rejected')), - ('request_more_info', wagtail.fields.RichTextField(verbose_name='Needs more info')), - ('concept_accepted', wagtail.fields.RichTextField(verbose_name='Accepted')), - ('concept_rejected', wagtail.fields.RichTextField(verbose_name='Rejected')), - ('concept_more_info', wagtail.fields.RichTextField(verbose_name='Needs more info')), - ('proposal_accepted', wagtail.fields.RichTextField(verbose_name='Accepted')), - ('proposal_rejected', wagtail.fields.RichTextField(verbose_name='Rejected')), - ('proposal_more_info', wagtail.fields.RichTextField(verbose_name='Needs more info')), - ('site', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, to='wagtailcore.Site')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "request_accepted", + wagtail.fields.RichTextField(verbose_name="Accepted"), + ), + ( + "request_rejected", + wagtail.fields.RichTextField(verbose_name="Rejected"), + ), + ( + "request_more_info", + wagtail.fields.RichTextField(verbose_name="Needs more info"), + ), + ( + "concept_accepted", + wagtail.fields.RichTextField(verbose_name="Accepted"), + ), + ( + "concept_rejected", + wagtail.fields.RichTextField(verbose_name="Rejected"), + ), + ( + "concept_more_info", + wagtail.fields.RichTextField(verbose_name="Needs more info"), + ), + ( + "proposal_accepted", + wagtail.fields.RichTextField(verbose_name="Accepted"), + ), + ( + "proposal_rejected", + wagtail.fields.RichTextField(verbose_name="Rejected"), + ), + ( + "proposal_more_info", + wagtail.fields.RichTextField(verbose_name="Needs more info"), + ), + ( + "site", + models.OneToOneField( + editable=False, + on_delete=django.db.models.deletion.CASCADE, + to="wagtailcore.Site", + ), + ), ], options={ - 'verbose_name': 'determination messages', + "verbose_name": "determination messages", }, ), ] diff --git a/hypha/apply/determinations/migrations/0004_change_labels.py b/hypha/apply/determinations/migrations/0004_change_labels.py index ece3150b24..d7b1826408 100644 --- a/hypha/apply/determinations/migrations/0004_change_labels.py +++ b/hypha/apply/determinations/migrations/0004_change_labels.py @@ -5,45 +5,48 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0003_message_template_settings'), + ("determinations", "0003_message_template_settings"), ] operations = [ migrations.AlterField( - model_name='determination', - name='outcome', - field=models.IntegerField(choices=[(0, 'Dismissed'), (1, 'Needs more info'), (2, 'Approved')], default=1, verbose_name='Determination'), + model_name="determination", + name="outcome", + field=models.IntegerField( + choices=[(0, "Dismissed"), (1, "Needs more info"), (2, "Approved")], + default=1, + verbose_name="Determination", + ), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='concept_accepted', - field=wagtail.fields.RichTextField(verbose_name='Approved'), + model_name="determinationmessagesettings", + name="concept_accepted", + field=wagtail.fields.RichTextField(verbose_name="Approved"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='concept_rejected', - field=wagtail.fields.RichTextField(verbose_name='Dismissed'), + model_name="determinationmessagesettings", + name="concept_rejected", + field=wagtail.fields.RichTextField(verbose_name="Dismissed"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='proposal_accepted', - field=wagtail.fields.RichTextField(verbose_name='Approved'), + model_name="determinationmessagesettings", + name="proposal_accepted", + field=wagtail.fields.RichTextField(verbose_name="Approved"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='proposal_rejected', - field=wagtail.fields.RichTextField(verbose_name='Dismissed'), + model_name="determinationmessagesettings", + name="proposal_rejected", + field=wagtail.fields.RichTextField(verbose_name="Dismissed"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='request_accepted', - field=wagtail.fields.RichTextField(verbose_name='Approved'), + model_name="determinationmessagesettings", + name="request_accepted", + field=wagtail.fields.RichTextField(verbose_name="Approved"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='request_rejected', - field=wagtail.fields.RichTextField(verbose_name='Dismissed'), + model_name="determinationmessagesettings", + name="request_rejected", + field=wagtail.fields.RichTextField(verbose_name="Dismissed"), ), ] diff --git a/hypha/apply/determinations/migrations/0005_determination_drupal_id.py b/hypha/apply/determinations/migrations/0005_determination_drupal_id.py index 5b3c5626e3..580b15ee48 100644 --- a/hypha/apply/determinations/migrations/0005_determination_drupal_id.py +++ b/hypha/apply/determinations/migrations/0005_determination_drupal_id.py @@ -4,15 +4,14 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0004_change_labels'), + ("determinations", "0004_change_labels"), ] operations = [ migrations.AddField( - model_name='determination', - name='drupal_id', + model_name="determination", + name="drupal_id", field=models.IntegerField(blank=True, editable=False, null=True), ), ] diff --git a/hypha/apply/determinations/migrations/0006_allow_multiple_determinations.py b/hypha/apply/determinations/migrations/0006_allow_multiple_determinations.py index 7a4bddebee..7a35dd97b1 100644 --- a/hypha/apply/determinations/migrations/0006_allow_multiple_determinations.py +++ b/hypha/apply/determinations/migrations/0006_allow_multiple_determinations.py @@ -5,15 +5,18 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0005_determination_drupal_id'), + ("determinations", "0005_determination_drupal_id"), ] operations = [ migrations.AlterField( - model_name='determination', - name='submission', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='determinations', to='funds.ApplicationSubmission'), + model_name="determination", + name="submission", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="determinations", + to="funds.ApplicationSubmission", + ), ), ] diff --git a/hypha/apply/determinations/migrations/0007_add_determinationformsettings.py b/hypha/apply/determinations/migrations/0007_add_determinationformsettings.py index c71c2876bb..dd9a005fc9 100644 --- a/hypha/apply/determinations/migrations/0007_add_determinationformsettings.py +++ b/hypha/apply/determinations/migrations/0007_add_determinationformsettings.py @@ -5,55 +5,233 @@ class Migration(migrations.Migration): - dependencies = [ - ('wagtailcore', '0040_page_draft_title'), - ('determinations', '0006_allow_multiple_determinations'), + ("wagtailcore", "0040_page_draft_title"), + ("determinations", "0006_allow_multiple_determinations"), ] operations = [ migrations.CreateModel( - name='DeterminationFormSettings', + name="DeterminationFormSettings", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('concept_principles_label', models.CharField(default='Goals and principles', max_length=255, verbose_name='label')), - ('concept_principles_help_text', models.TextField(blank=True, verbose_name='help text')), - ('concept_technical_label', models.CharField(default='Technical merit', max_length=255, verbose_name='label')), - ('concept_technical_help_text', models.TextField(blank=True, verbose_name='help text')), - ('concept_sustainable_label', models.CharField(default='Reasonable, realistic and sustainable', max_length=255, verbose_name='label')), - ('concept_sustainable_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_liked_label', models.CharField(default='Positive aspects', max_length=255, verbose_name='label')), - ('proposal_liked_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_concerns_label', models.CharField(default='Concerns', max_length=255, verbose_name='label')), - ('proposal_concerns_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_red_flags_label', models.CharField(default='Items that must be addressed', max_length=255, verbose_name='label')), - ('proposal_red_flags_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_overview_label', models.CharField(default='Project overview questions and comments', max_length=255, verbose_name='label')), - ('proposal_overview_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_objectives_label', models.CharField(default='Objectives questions and comments', max_length=255, verbose_name='label')), - ('proposal_objectives_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_strategy_label', models.CharField(default='Methods and strategy questions and comments', max_length=255, verbose_name='label')), - ('proposal_strategy_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_technical_label', models.CharField(default='Technical feasibility questions and comments', max_length=255, verbose_name='label')), - ('proposal_technical_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_alternative_label', models.CharField(default='Alternative analysis - "red teaming" questions and comments', max_length=255, verbose_name='label')), - ('proposal_alternative_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_usability_label', models.CharField(default='Usability questions and comments', max_length=255, verbose_name='label')), - ('proposal_usability_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_sustainability_label', models.CharField(default='Sustainability questions and comments', max_length=255, verbose_name='label')), - ('proposal_sustainability_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_collaboration_label', models.CharField(default='Collaboration questions and comments', max_length=255, verbose_name='label')), - ('proposal_collaboration_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_realism_label', models.CharField(default='Cost realism questions and comments', max_length=255, verbose_name='label')), - ('proposal_realism_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_qualifications_label', models.CharField(default='Qualifications questions and comments', max_length=255, verbose_name='label')), - ('proposal_qualifications_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_evaluation_label', models.CharField(default='Evaluation questions and comments', max_length=255, verbose_name='label')), - ('proposal_evaluation_help_text', models.TextField(blank=True, verbose_name='help text')), - ('site', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, to='wagtailcore.Site')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "concept_principles_label", + models.CharField( + default="Goals and principles", + max_length=255, + verbose_name="label", + ), + ), + ( + "concept_principles_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "concept_technical_label", + models.CharField( + default="Technical merit", max_length=255, verbose_name="label" + ), + ), + ( + "concept_technical_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "concept_sustainable_label", + models.CharField( + default="Reasonable, realistic and sustainable", + max_length=255, + verbose_name="label", + ), + ), + ( + "concept_sustainable_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_liked_label", + models.CharField( + default="Positive aspects", max_length=255, verbose_name="label" + ), + ), + ( + "proposal_liked_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_concerns_label", + models.CharField( + default="Concerns", max_length=255, verbose_name="label" + ), + ), + ( + "proposal_concerns_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_red_flags_label", + models.CharField( + default="Items that must be addressed", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_red_flags_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_overview_label", + models.CharField( + default="Project overview questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_overview_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_objectives_label", + models.CharField( + default="Objectives questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_objectives_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_strategy_label", + models.CharField( + default="Methods and strategy questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_strategy_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_technical_label", + models.CharField( + default="Technical feasibility questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_technical_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_alternative_label", + models.CharField( + default='Alternative analysis - "red teaming" questions and comments', + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_alternative_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_usability_label", + models.CharField( + default="Usability questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_usability_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_sustainability_label", + models.CharField( + default="Sustainability questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_sustainability_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_collaboration_label", + models.CharField( + default="Collaboration questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_collaboration_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_realism_label", + models.CharField( + default="Cost realism questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_realism_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_qualifications_label", + models.CharField( + default="Qualifications questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_qualifications_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_evaluation_label", + models.CharField( + default="Evaluation questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_evaluation_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "site", + models.OneToOneField( + editable=False, + on_delete=django.db.models.deletion.CASCADE, + to="wagtailcore.Site", + ), + ), ], options={ - 'verbose_name': 'determination settings', + "verbose_name": "determination settings", }, ), ] diff --git a/hypha/apply/determinations/migrations/0008_rename_more_info.py b/hypha/apply/determinations/migrations/0008_rename_more_info.py index f397dc4d8f..b2ad8a4365 100644 --- a/hypha/apply/determinations/migrations/0008_rename_more_info.py +++ b/hypha/apply/determinations/migrations/0008_rename_more_info.py @@ -4,15 +4,22 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0007_add_determinationformsettings'), + ("determinations", "0007_add_determinationformsettings"), ] operations = [ migrations.AlterField( - model_name='determination', - name='outcome', - field=models.IntegerField(choices=[(0, 'Dismissed'), (1, 'More information requested'), (2, 'Approved')], default=1, verbose_name='Determination'), + model_name="determination", + name="outcome", + field=models.IntegerField( + choices=[ + (0, "Dismissed"), + (1, "More information requested"), + (2, "Approved"), + ], + default=1, + verbose_name="Determination", + ), ), ] diff --git a/hypha/apply/determinations/migrations/0009_add_send_notice_field.py b/hypha/apply/determinations/migrations/0009_add_send_notice_field.py index 330519e11a..10562d01a3 100644 --- a/hypha/apply/determinations/migrations/0009_add_send_notice_field.py +++ b/hypha/apply/determinations/migrations/0009_add_send_notice_field.py @@ -4,15 +4,16 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0008_rename_more_info'), + ("determinations", "0008_rename_more_info"), ] operations = [ migrations.AddField( - model_name='determination', - name='send_notice', - field=models.BooleanField(default=True, verbose_name='Send message to applicant'), + model_name="determination", + name="send_notice", + field=models.BooleanField( + default=True, verbose_name="Send message to applicant" + ), ), ] diff --git a/hypha/apply/determinations/migrations/0010_add_determination_stream_field_forms.py b/hypha/apply/determinations/migrations/0010_add_determination_stream_field_forms.py index b747186fe6..3e5ccbcf3c 100644 --- a/hypha/apply/determinations/migrations/0010_add_determination_stream_field_forms.py +++ b/hypha/apply/determinations/migrations/0010_add_determination_stream_field_forms.py @@ -9,36 +9,725 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0009_add_send_notice_field'), + ("determinations", "0009_add_send_notice_field"), ] operations = [ migrations.CreateModel( - name='DeterminationForm', + name="DeterminationForm", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('form_fields', wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Section text/header')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('send_notice', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('determination', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('message', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], default=[])), - ('name', models.CharField(max_length=255)), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "form_fields", + wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[ + ("email", "Email"), + ("url", "URL"), + ], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock( + group="Fields", label="Section text/header" + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "send_notice", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "determination", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "info", + wagtail.blocks.static_block.StaticBlock(), + ), + ], + group=" Required", + ), + ), + ( + "message", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "info", + wagtail.blocks.static_block.StaticBlock(), + ), + ], + group=" Required", + ), + ), + ], + default=[], + ), + ), + ("name", models.CharField(max_length=255)), ], options={ - 'abstract': False, + "abstract": False, }, ), migrations.AddField( - model_name='determination', - name='form_data', - field=django.contrib.postgres.fields.jsonb.JSONField(default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder), + model_name="determination", + name="form_data", + field=django.contrib.postgres.fields.jsonb.JSONField( + default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder + ), ), migrations.AddField( - model_name='determination', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Section text/header')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('send_notice', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('determination', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('message', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], default=[]), + model_name="determination", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock( + group="Fields", label="Section text/header" + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "send_notice", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "determination", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "message", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ], + default=[], + ), ), migrations.AlterField( - model_name='determination', - name='data', + model_name="determination", + name="data", field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True), ), ] diff --git a/hypha/apply/determinations/migrations/0011_auto_20220111_1314.py b/hypha/apply/determinations/migrations/0011_auto_20220111_1314.py index b2ca4b01ae..4b4e906c85 100644 --- a/hypha/apply/determinations/migrations/0011_auto_20220111_1314.py +++ b/hypha/apply/determinations/migrations/0011_auto_20220111_1314.py @@ -5,20 +5,21 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0010_add_determination_stream_field_forms'), + ("determinations", "0010_add_determination_stream_field_forms"), ] operations = [ migrations.AlterField( - model_name='determination', - name='data', + model_name="determination", + name="data", field=models.JSONField(blank=True, null=True), ), migrations.AlterField( - model_name='determination', - name='form_data', - field=models.JSONField(default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder), + model_name="determination", + name="form_data", + field=models.JSONField( + default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder + ), ), ] diff --git a/hypha/apply/determinations/migrations/0012_auto_20220509_1136.py b/hypha/apply/determinations/migrations/0012_auto_20220509_1136.py index 044519ade4..3467152c92 100644 --- a/hypha/apply/determinations/migrations/0012_auto_20220509_1136.py +++ b/hypha/apply/determinations/migrations/0012_auto_20220509_1136.py @@ -5,55 +5,60 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0011_auto_20220111_1314'), + ("determinations", "0011_auto_20220111_1314"), ] operations = [ migrations.AlterField( - model_name='determinationmessagesettings', - name='concept_accepted', - field=wagtail.fields.RichTextField(blank=True, verbose_name='Approved'), + model_name="determinationmessagesettings", + name="concept_accepted", + field=wagtail.fields.RichTextField(blank=True, verbose_name="Approved"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='concept_more_info', - field=wagtail.fields.RichTextField(blank=True, verbose_name='Needs more info'), + model_name="determinationmessagesettings", + name="concept_more_info", + field=wagtail.fields.RichTextField( + blank=True, verbose_name="Needs more info" + ), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='concept_rejected', - field=wagtail.fields.RichTextField(blank=True, verbose_name='Dismissed'), + model_name="determinationmessagesettings", + name="concept_rejected", + field=wagtail.fields.RichTextField(blank=True, verbose_name="Dismissed"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='proposal_accepted', - field=wagtail.fields.RichTextField(blank=True, verbose_name='Approved'), + model_name="determinationmessagesettings", + name="proposal_accepted", + field=wagtail.fields.RichTextField(blank=True, verbose_name="Approved"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='proposal_more_info', - field=wagtail.fields.RichTextField(blank=True, verbose_name='Needs more info'), + model_name="determinationmessagesettings", + name="proposal_more_info", + field=wagtail.fields.RichTextField( + blank=True, verbose_name="Needs more info" + ), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='proposal_rejected', - field=wagtail.fields.RichTextField(blank=True, verbose_name='Dismissed'), + model_name="determinationmessagesettings", + name="proposal_rejected", + field=wagtail.fields.RichTextField(blank=True, verbose_name="Dismissed"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='request_accepted', - field=wagtail.fields.RichTextField(blank=True, verbose_name='Approved'), + model_name="determinationmessagesettings", + name="request_accepted", + field=wagtail.fields.RichTextField(blank=True, verbose_name="Approved"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='request_more_info', - field=wagtail.fields.RichTextField(blank=True, verbose_name='Needs more info'), + model_name="determinationmessagesettings", + name="request_more_info", + field=wagtail.fields.RichTextField( + blank=True, verbose_name="Needs more info" + ), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='request_rejected', - field=wagtail.fields.RichTextField(blank=True, verbose_name='Dismissed'), + model_name="determinationmessagesettings", + name="request_rejected", + field=wagtail.fields.RichTextField(blank=True, verbose_name="Dismissed"), ), ] diff --git a/hypha/apply/determinations/migrations/0013_auto_20220722_0844.py b/hypha/apply/determinations/migrations/0013_auto_20220722_0844.py index be5e5086b0..ec4af3333a 100644 --- a/hypha/apply/determinations/migrations/0013_auto_20220722_0844.py +++ b/hypha/apply/determinations/migrations/0013_auto_20220722_0844.py @@ -7,20 +7,689 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0012_auto_20220509_1136'), + ("determinations", "0012_auto_20220509_1136"), ] operations = [ migrations.AlterField( - model_name='determination', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Section text/header')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('send_notice', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('determination', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('message', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], default=[], use_json_field=True), + model_name="determination", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock( + group="Fields", label="Section text/header" + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "send_notice", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "determination", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "message", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ], + default=[], + use_json_field=True, + ), ), migrations.AlterField( - model_name='determinationform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Section text/header')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('send_notice', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('determination', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('message', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], default=[], use_json_field=True), + model_name="determinationform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock( + group="Fields", label="Section text/header" + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "send_notice", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "determination", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "message", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ], + default=[], + use_json_field=True, + ), ), ] diff --git a/hypha/apply/determinations/migrations/0014_alter_determination_formfield_send_notice.py b/hypha/apply/determinations/migrations/0014_alter_determination_formfield_send_notice.py index 3c539916ce..98daae3ceb 100644 --- a/hypha/apply/determinations/migrations/0014_alter_determination_formfield_send_notice.py +++ b/hypha/apply/determinations/migrations/0014_alter_determination_formfield_send_notice.py @@ -7,20 +7,683 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0013_auto_20220722_0844'), + ("determinations", "0013_auto_20220722_0844"), ] operations = [ migrations.AlterField( - model_name='determination', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Section text/header')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('determination', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('message', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('send_notice', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('default_value', wagtail.blocks.BooleanBlock(default=True, required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], default=[], use_json_field=True), + model_name="determination", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock( + group="Fields", label="Section text/header" + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "determination", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "message", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "send_notice", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock( + default=True, required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ], + default=[], + use_json_field=True, + ), ), migrations.AlterField( - model_name='determinationform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Section text/header')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('determination', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('message', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('send_notice', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('default_value', wagtail.blocks.BooleanBlock(default=True, required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], default=[], use_json_field=True), + model_name="determinationform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock( + group="Fields", label="Section text/header" + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "determination", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "message", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "send_notice", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock( + default=True, required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ], + default=[], + use_json_field=True, + ), ), ] diff --git a/hypha/apply/determinations/migrations/0015_alter_determinationformsettings_options.py b/hypha/apply/determinations/migrations/0015_alter_determinationformsettings_options.py index 4f6775b25d..a18906912c 100644 --- a/hypha/apply/determinations/migrations/0015_alter_determinationformsettings_options.py +++ b/hypha/apply/determinations/migrations/0015_alter_determinationformsettings_options.py @@ -4,14 +4,13 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0014_alter_determination_formfield_send_notice'), + ("determinations", "0014_alter_determination_formfield_send_notice"), ] operations = [ migrations.AlterModelOptions( - name='determinationformsettings', - options={'verbose_name': 'determination form settings'}, + name="determinationformsettings", + options={"verbose_name": "determination form settings"}, ), ] diff --git a/hypha/apply/determinations/migrations/0016_rename_section_text_field.py b/hypha/apply/determinations/migrations/0016_rename_section_text_field.py index f0da11f85f..e8b5420436 100644 --- a/hypha/apply/determinations/migrations/0016_rename_section_text_field.py +++ b/hypha/apply/determinations/migrations/0016_rename_section_text_field.py @@ -7,20 +7,679 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0015_alter_determinationformsettings_options'), + ("determinations", "0015_alter_determinationformsettings_options"), ] operations = [ migrations.AlterField( - model_name='determination', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('determination', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('message', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('send_notice', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('default_value', wagtail.blocks.BooleanBlock(default=True, required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], default=[], use_json_field=True), + model_name="determination", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "determination", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "message", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "send_notice", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock( + default=True, required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ], + default=[], + use_json_field=True, + ), ), migrations.AlterField( - model_name='determinationform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('determination', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('message', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('send_notice', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('default_value', wagtail.blocks.BooleanBlock(default=True, required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], default=[], use_json_field=True), + model_name="determinationform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "determination", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "message", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "send_notice", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock( + default=True, required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ], + default=[], + use_json_field=True, + ), ), ] diff --git a/hypha/apply/determinations/models.py b/hypha/apply/determinations/models.py index f5ebe09ea8..0707ba0cf6 100644 --- a/hypha/apply/determinations/models.py +++ b/hypha/apply/determinations/models.py @@ -29,21 +29,20 @@ class DeterminationQuerySet(models.QuerySet): def staff(self): # Designed to be used with a queryset related to submissions - return self.all().order_by('-updated_at') + return self.all().order_by("-updated_at") def active(self): # Designed to be used with a queryset related to submissions return self.get(is_draft=True) def submitted(self): - return self.filter(is_draft=False).order_by('-updated_at') + return self.filter(is_draft=False).order_by("-updated_at") def final(self): return self.submitted().filter(outcome__in=[ACCEPTED, REJECTED]) class DeterminationFormFieldsMixin(models.Model): - wagtail_reference_index_ignore = True class Meta: @@ -86,8 +85,8 @@ class DeterminationForm(DeterminationFormFieldsMixin, models.Model): name = models.CharField(max_length=255) panels = [ - FieldPanel('name'), - FieldPanel('form_fields'), + FieldPanel("name"), + FieldPanel("form_fields"), ] def __str__(self): @@ -96,16 +95,18 @@ def __str__(self): class Determination(DeterminationFormFieldsMixin, AccessFormData, models.Model): submission = models.ForeignKey( - 'funds.ApplicationSubmission', + "funds.ApplicationSubmission", on_delete=models.CASCADE, - related_name='determinations' + related_name="determinations", ) author = models.ForeignKey( settings.AUTH_USER_MODEL, on_delete=models.PROTECT, ) - outcome = models.IntegerField(verbose_name=_("Determination"), choices=DETERMINATION_CHOICES, default=1) + outcome = models.IntegerField( + verbose_name=_("Determination"), choices=DETERMINATION_CHOICES, default=1 + ) message = models.TextField(verbose_name=_("Determination message"), blank=True) # Stores old determination forms data @@ -114,9 +115,13 @@ class Determination(DeterminationFormFieldsMixin, AccessFormData, models.Model): # Stores data submitted via streamfield determination forms form_data = models.JSONField(default=dict, encoder=DjangoJSONEncoder) is_draft = models.BooleanField(default=False, verbose_name=_("Draft")) - created_at = models.DateTimeField(verbose_name=_('Creation time'), auto_now_add=True) - updated_at = models.DateTimeField(verbose_name=_('Update time'), auto_now=True) - send_notice = models.BooleanField(default=True, verbose_name=_("Send message to applicant")) + created_at = models.DateTimeField( + verbose_name=_("Creation time"), auto_now_add=True + ) + updated_at = models.DateTimeField(verbose_name=_("Update time"), auto_now=True) + send_notice = models.BooleanField( + default=True, verbose_name=_("Send message to applicant") + ) # Meta: used for migration purposes only drupal_id = models.IntegerField(null=True, blank=True, editable=False) @@ -132,17 +137,20 @@ def clean_outcome(self): return self.get_outcome_display() def get_absolute_url(self): - return reverse('apply:submissions:determinations:detail', args=(self.submission.id, self.id)) + return reverse( + "apply:submissions:determinations:detail", + args=(self.submission.id, self.id), + ) @property def submitted(self): return not self.is_draft def __str__(self): - return f'Determination for {self.submission.title} by {self.author!s}' + return f"Determination for {self.submission.title} by {self.author!s}" def __repr__(self): - return f'<{self.__class__.__name__}: {str(self.form_data)}>' + return f"<{self.__class__.__name__}: {str(self.form_data)}>" @property def use_new_determination_form(self): @@ -162,13 +170,14 @@ def use_new_determination_form(self): def detailed_data(self): if not self.use_new_determination_form: from .views import get_form_for_stage + return get_form_for_stage(self.submission).get_detailed_response(self.data) return self.get_detailed_response() def get_detailed_response(self): data = {} group = 0 - data.setdefault(group, {'title': None, 'questions': []}) + data.setdefault(group, {"title": None, "questions": []}) for field in self.form_fields: if issubclass( field.block.__class__, DeterminationMustIncludeFieldBlock @@ -178,21 +187,18 @@ def get_detailed_response(self): value = self.form_data[field.id] except KeyError: group = group + 1 - data.setdefault(group, {'title': field.value.source, 'questions': []}) + data.setdefault(group, {"title": field.value.source, "questions": []}) else: - data[group]['questions'].append( - (field.value.get('field_label'), value) - ) + data[group]["questions"].append((field.value.get("field_label"), value)) return data @register_setting class DeterminationMessageSettings(BaseSiteSetting): - wagtail_reference_index_ignore = True class Meta: - verbose_name = 'determination messages' + verbose_name = "determination messages" request_accepted = RichTextField("Approved", blank=True) request_rejected = RichTextField("Dismissed", blank=True) @@ -216,151 +222,242 @@ def get_for_stage(self, stage_name): for field in self._meta.get_fields(): if prefix in field.name: - key = field.name.replace(prefix, '') + key = field.name.replace(prefix, "") message_templates[key] = getattr(self, field.name) return message_templates request_tab_panels = [ - FieldPanel('request_accepted'), - FieldPanel('request_rejected'), - FieldPanel('request_more_info'), + FieldPanel("request_accepted"), + FieldPanel("request_rejected"), + FieldPanel("request_more_info"), ] concept_tab_panels = [ - FieldPanel('concept_accepted'), - FieldPanel('concept_rejected'), - FieldPanel('concept_more_info'), + FieldPanel("concept_accepted"), + FieldPanel("concept_rejected"), + FieldPanel("concept_more_info"), ] proposal_tab_panels = [ - FieldPanel('proposal_accepted'), - FieldPanel('proposal_rejected'), - FieldPanel('proposal_more_info'), + FieldPanel("proposal_accepted"), + FieldPanel("proposal_rejected"), + FieldPanel("proposal_more_info"), ] - edit_handler = TabbedInterface([ - ObjectList(request_tab_panels, heading=_('Request')), - ObjectList(concept_tab_panels, heading=_('Concept note')), - ObjectList(proposal_tab_panels, heading=_('Proposal')), - ]) + edit_handler = TabbedInterface( + [ + ObjectList(request_tab_panels, heading=_("Request")), + ObjectList(concept_tab_panels, heading=_("Concept note")), + ObjectList(proposal_tab_panels, heading=_("Proposal")), + ] + ) @register_setting class DeterminationFormSettings(BaseSiteSetting): class Meta: - verbose_name = 'determination form settings' - - concept_principles_label = models.CharField('label', default='Goals and principles', max_length=255) - concept_principles_help_text = models.TextField('help text', blank=True) - concept_technical_label = models.CharField('label', default='Technical merit', max_length=255) - concept_technical_help_text = models.TextField('help text', blank=True) - concept_sustainable_label = models.CharField('label', default='Reasonable, realistic and sustainable', max_length=255) - concept_sustainable_help_text = models.TextField('help text', blank=True) - - proposal_liked_label = models.CharField('label', default='Positive aspects', max_length=255) - proposal_liked_help_text = models.TextField('help text', blank=True) - proposal_concerns_label = models.CharField('label', default='Concerns', max_length=255) - proposal_concerns_help_text = models.TextField('help text', blank=True) - proposal_red_flags_label = models.CharField('label', default='Items that must be addressed', max_length=255) - proposal_red_flags_help_text = models.TextField('help text', blank=True) - proposal_overview_label = models.CharField('label', default='Project overview questions and comments', max_length=255) - proposal_overview_help_text = models.TextField('help text', blank=True) - proposal_objectives_label = models.CharField('label', default='Objectives questions and comments', max_length=255) - proposal_objectives_help_text = models.TextField('help text', blank=True) - proposal_strategy_label = models.CharField('label', default='Methods and strategy questions and comments', max_length=255) - proposal_strategy_help_text = models.TextField('help text', blank=True) - proposal_technical_label = models.CharField('label', default='Technical feasibility questions and comments', max_length=255) - proposal_technical_help_text = models.TextField('help text', blank=True) - proposal_alternative_label = models.CharField('label', default='Alternative analysis - "red teaming" questions and comments', max_length=255) - proposal_alternative_help_text = models.TextField('help text', blank=True) - proposal_usability_label = models.CharField('label', default='Usability questions and comments', max_length=255) - proposal_usability_help_text = models.TextField('help text', blank=True) - proposal_sustainability_label = models.CharField('label', default='Sustainability questions and comments', max_length=255) - proposal_sustainability_help_text = models.TextField('help text', blank=True) - proposal_collaboration_label = models.CharField('label', default='Collaboration questions and comments', max_length=255) - proposal_collaboration_help_text = models.TextField('help text', blank=True) - proposal_realism_label = models.CharField('label', default='Cost realism questions and comments', max_length=255) - proposal_realism_help_text = models.TextField('help text', blank=True) - proposal_qualifications_label = models.CharField('label', default='Qualifications questions and comments', max_length=255) - proposal_qualifications_help_text = models.TextField('help text', blank=True) - proposal_evaluation_label = models.CharField('label', default='Evaluation questions and comments', max_length=255) - proposal_evaluation_help_text = models.TextField('help text', blank=True) + verbose_name = "determination form settings" + + concept_principles_label = models.CharField( + "label", default="Goals and principles", max_length=255 + ) + concept_principles_help_text = models.TextField("help text", blank=True) + concept_technical_label = models.CharField( + "label", default="Technical merit", max_length=255 + ) + concept_technical_help_text = models.TextField("help text", blank=True) + concept_sustainable_label = models.CharField( + "label", default="Reasonable, realistic and sustainable", max_length=255 + ) + concept_sustainable_help_text = models.TextField("help text", blank=True) + + proposal_liked_label = models.CharField( + "label", default="Positive aspects", max_length=255 + ) + proposal_liked_help_text = models.TextField("help text", blank=True) + proposal_concerns_label = models.CharField( + "label", default="Concerns", max_length=255 + ) + proposal_concerns_help_text = models.TextField("help text", blank=True) + proposal_red_flags_label = models.CharField( + "label", default="Items that must be addressed", max_length=255 + ) + proposal_red_flags_help_text = models.TextField("help text", blank=True) + proposal_overview_label = models.CharField( + "label", default="Project overview questions and comments", max_length=255 + ) + proposal_overview_help_text = models.TextField("help text", blank=True) + proposal_objectives_label = models.CharField( + "label", default="Objectives questions and comments", max_length=255 + ) + proposal_objectives_help_text = models.TextField("help text", blank=True) + proposal_strategy_label = models.CharField( + "label", default="Methods and strategy questions and comments", max_length=255 + ) + proposal_strategy_help_text = models.TextField("help text", blank=True) + proposal_technical_label = models.CharField( + "label", default="Technical feasibility questions and comments", max_length=255 + ) + proposal_technical_help_text = models.TextField("help text", blank=True) + proposal_alternative_label = models.CharField( + "label", + default='Alternative analysis - "red teaming" questions and comments', + max_length=255, + ) + proposal_alternative_help_text = models.TextField("help text", blank=True) + proposal_usability_label = models.CharField( + "label", default="Usability questions and comments", max_length=255 + ) + proposal_usability_help_text = models.TextField("help text", blank=True) + proposal_sustainability_label = models.CharField( + "label", default="Sustainability questions and comments", max_length=255 + ) + proposal_sustainability_help_text = models.TextField("help text", blank=True) + proposal_collaboration_label = models.CharField( + "label", default="Collaboration questions and comments", max_length=255 + ) + proposal_collaboration_help_text = models.TextField("help text", blank=True) + proposal_realism_label = models.CharField( + "label", default="Cost realism questions and comments", max_length=255 + ) + proposal_realism_help_text = models.TextField("help text", blank=True) + proposal_qualifications_label = models.CharField( + "label", default="Qualifications questions and comments", max_length=255 + ) + proposal_qualifications_help_text = models.TextField("help text", blank=True) + proposal_evaluation_label = models.CharField( + "label", default="Evaluation questions and comments", max_length=255 + ) + proposal_evaluation_help_text = models.TextField("help text", blank=True) concept_help_text_tab_panels = [ - MultiFieldPanel([ - FieldPanel('concept_principles_label'), - FieldPanel('concept_principles_help_text'), - ], 'concept principles'), - MultiFieldPanel([ - FieldPanel('concept_technical_label'), - FieldPanel('concept_technical_help_text'), - ], 'concept technical'), - MultiFieldPanel([ - FieldPanel('concept_sustainable_label'), - FieldPanel('concept_sustainable_help_text'), - ], 'concept sustainable'), + MultiFieldPanel( + [ + FieldPanel("concept_principles_label"), + FieldPanel("concept_principles_help_text"), + ], + "concept principles", + ), + MultiFieldPanel( + [ + FieldPanel("concept_technical_label"), + FieldPanel("concept_technical_help_text"), + ], + "concept technical", + ), + MultiFieldPanel( + [ + FieldPanel("concept_sustainable_label"), + FieldPanel("concept_sustainable_help_text"), + ], + "concept sustainable", + ), ] proposal_help_text_tab_panels = [ - MultiFieldPanel([ - FieldPanel('proposal_liked_label'), - FieldPanel('proposal_liked_help_text'), - ], 'proposal liked'), - MultiFieldPanel([ - FieldPanel('proposal_concerns_label'), - FieldPanel('proposal_concerns_help_text'), - ], 'proposal concerns'), - MultiFieldPanel([ - FieldPanel('proposal_red_flags_label'), - FieldPanel('proposal_red_flags_help_text'), - ], 'proposal red flags'), - MultiFieldPanel([ - FieldPanel('proposal_overview_label'), - FieldPanel('proposal_overview_help_text'), - ], 'proposal overview'), - MultiFieldPanel([ - FieldPanel('proposal_objectives_label'), - FieldPanel('proposal_objectives_help_text'), - ], 'proposal objectives'), - MultiFieldPanel([ - FieldPanel('proposal_strategy_label'), - FieldPanel('proposal_strategy_help_text'), - ], 'proposal strategy'), - MultiFieldPanel([ - FieldPanel('proposal_technical_label'), - FieldPanel('proposal_technical_help_text'), - ], 'proposal technical'), - MultiFieldPanel([ - FieldPanel('proposal_alternative_label'), - FieldPanel('proposal_alternative_help_text'), - ], 'proposal alternative'), - MultiFieldPanel([ - FieldPanel('proposal_usability_label'), - FieldPanel('proposal_usability_help_text'), - ], 'proposal usability'), - MultiFieldPanel([ - FieldPanel('proposal_sustainability_label'), - FieldPanel('proposal_sustainability_help_text'), - ], 'proposal sustainability'), - MultiFieldPanel([ - FieldPanel('proposal_collaboration_label'), - FieldPanel('proposal_collaboration_help_text'), - ], 'proposal collaboration'), - MultiFieldPanel([ - FieldPanel('proposal_realism_label'), - FieldPanel('proposal_realism_help_text'), - ], 'proposal realism'), - MultiFieldPanel([ - FieldPanel('proposal_qualifications_label'), - FieldPanel('proposal_qualifications_help_text'), - ], 'proposal qualifications'), - MultiFieldPanel([ - FieldPanel('proposal_evaluation_label'), - FieldPanel('proposal_evaluation_help_text'), - ], 'proposal evaluation'), + MultiFieldPanel( + [ + FieldPanel("proposal_liked_label"), + FieldPanel("proposal_liked_help_text"), + ], + "proposal liked", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_concerns_label"), + FieldPanel("proposal_concerns_help_text"), + ], + "proposal concerns", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_red_flags_label"), + FieldPanel("proposal_red_flags_help_text"), + ], + "proposal red flags", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_overview_label"), + FieldPanel("proposal_overview_help_text"), + ], + "proposal overview", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_objectives_label"), + FieldPanel("proposal_objectives_help_text"), + ], + "proposal objectives", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_strategy_label"), + FieldPanel("proposal_strategy_help_text"), + ], + "proposal strategy", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_technical_label"), + FieldPanel("proposal_technical_help_text"), + ], + "proposal technical", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_alternative_label"), + FieldPanel("proposal_alternative_help_text"), + ], + "proposal alternative", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_usability_label"), + FieldPanel("proposal_usability_help_text"), + ], + "proposal usability", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_sustainability_label"), + FieldPanel("proposal_sustainability_help_text"), + ], + "proposal sustainability", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_collaboration_label"), + FieldPanel("proposal_collaboration_help_text"), + ], + "proposal collaboration", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_realism_label"), + FieldPanel("proposal_realism_help_text"), + ], + "proposal realism", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_qualifications_label"), + FieldPanel("proposal_qualifications_help_text"), + ], + "proposal qualifications", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_evaluation_label"), + FieldPanel("proposal_evaluation_help_text"), + ], + "proposal evaluation", + ), ] - edit_handler = TabbedInterface([ - ObjectList(concept_help_text_tab_panels, heading=_('Concept form')), - ObjectList(proposal_help_text_tab_panels, heading=_('Proposal form')), - ]) + edit_handler = TabbedInterface( + [ + ObjectList(concept_help_text_tab_panels, heading=_("Concept form")), + ObjectList(proposal_help_text_tab_panels, heading=_("Proposal form")), + ] + ) diff --git a/hypha/apply/determinations/options.py b/hypha/apply/determinations/options.py index 1da2980b18..c70b8eec9b 100644 --- a/hypha/apply/determinations/options.py +++ b/hypha/apply/determinations/options.py @@ -7,15 +7,15 @@ ACCEPTED = 2 DETERMINATION_CHOICES = ( - (REJECTED, _('Dismissed')), - (NEEDS_MORE_INFO, _('More information requested')), - (ACCEPTED, _('Approved')), + (REJECTED, _("Dismissed")), + (NEEDS_MORE_INFO, _("More information requested")), + (ACCEPTED, _("Approved")), ) DETERMINATION_TO_OUTCOME = { - 'rejected': REJECTED, - 'accepted': ACCEPTED, - 'more_info': NEEDS_MORE_INFO, + "rejected": REJECTED, + "accepted": ACCEPTED, + "more_info": NEEDS_MORE_INFO, } TRANSITION_DETERMINATION = { diff --git a/hypha/apply/determinations/templates/determinations/base_determination_form.html b/hypha/apply/determinations/templates/determinations/base_determination_form.html index 9e1430e680..d575ce5492 100644 --- a/hypha/apply/determinations/templates/determinations/base_determination_form.html +++ b/hypha/apply/determinations/templates/determinations/base_determination_form.html @@ -3,54 +3,54 @@ {% block title %}{% if object %}{% trans "Edit a Determination" %} {% if object.is_draft %}{% trans "draft" %}{% endif %}{% else %}{% trans "Create a Determination" %}{% endif %}{% endblock %} {% block content %} -{% block header %} - {% adminbar %} - {% slot header %}{% if object %}{% trans "Update Determination draft" %}{% else %}{% trans "Create Determination" %}{% endif %}{% endslot %} - {% slot sub_heading %}{% trans "For" %} {{ submission.title }}{% endslot %} - {% endadminbar %} -{% endblock %} + {% block header %} + {% adminbar %} + {% slot header %}{% if object %}{% trans "Update Determination draft" %}{% else %}{% trans "Create Determination" %}{% endif %}{% endslot %} + {% slot sub_heading %}{% trans "For" %} {{ submission.title }}{% endslot %} + {% endadminbar %} + {% endblock %} -{% block form %} -
- {% include "forms/includes/form_errors.html" with form=form %}
- {% block determination_information %}
- {% endblock %}
-
- {% for type, message in message_templates.items %}
-
{% endblock %}
diff --git a/hypha/apply/determinations/templates/determinations/batch_determination_form.html b/hypha/apply/determinations/templates/determinations/batch_determination_form.html
index 3d4be72628..77a17247c3 100644
--- a/hypha/apply/determinations/templates/determinations/batch_determination_form.html
+++ b/hypha/apply/determinations/templates/determinations/batch_determination_form.html
@@ -2,46 +2,46 @@
{% load i18n static %}
{% block extra_css %}
-{{ block.super }}
-
+ {{ block.super }}
+
{% endblock %}
{% block header %}
-
diff --git a/hypha/apply/funds/templates/funds/applicationrevision_list.html b/hypha/apply/funds/templates/funds/applicationrevision_list.html
index 3ce639ee8a..ca769513de 100644
--- a/hypha/apply/funds/templates/funds/applicationrevision_list.html
+++ b/hypha/apply/funds/templates/funds/applicationrevision_list.html
@@ -8,22 +8,22 @@
{% slot sub_heading %}{% trans "For" %} {{ submission.title }}{% endslot %}
{% endadminbar %}
-
-
- {% endif %}
+ {% if my_reviewed.table.data %}
+
- {% include "dashboard/includes/submissions-waiting-for-review.html" with in_review_count=awaiting_reviews.count my_review=awaiting_reviews.table display_more=awaiting_reviews.display_more active_statuses_filter=awaiting_reviews.active_statuses_filter %}
-
-
- {% if my_flagged.table.data %}
-
- {% include "dashboard/includes/flagged.html" with my_flagged=my_flagged.table display_more=my_flagged.display_more %}
-
- {% endif %}
-
- {% if my_reviewed.table.data %}
+ {% include "dashboard/includes/submissions-waiting-for-review.html" with in_review_count=awaiting_reviews.count my_review=awaiting_reviews.table display_more=awaiting_reviews.display_more active_statuses_filter=awaiting_reviews.active_statuses_filter %}
+
- {% trans "Your previous reviews" as review_heading %}
- {% include "funds/includes/table_filter_and_search.html" with filter=my_reviewed.filterset filter_action=my_reviewed.url search_term=search_term search_action=my_reviewed.url use_search=True use_batch_actions=False heading=review_heading %}
- {% render_table my_reviewed.table %}
+ {% if my_flagged.table.data %}
+
+ {% include "dashboard/includes/flagged.html" with my_flagged=my_flagged.table display_more=my_flagged.display_more %}
+
+ {% endif %}
- {% if my_reviewed.display_more %}
-
- {% endif %}
-
+
+ {% trans "Your previous reviews" as review_heading %}
+ {% include "funds/includes/table_filter_and_search.html" with filter=my_reviewed.filterset filter_action=my_reviewed.url search_term=search_term search_action=my_reviewed.url use_search=True use_batch_actions=False heading=review_heading %}
+ {% render_table my_reviewed.table %}
- {% if my_submissions %}
-
{% endblock %}
diff --git a/hypha/apply/dashboard/tests/test_views.py b/hypha/apply/dashboard/tests/test_views.py
index 635d6740e2..980dd6dcce 100644
--- a/hypha/apply/dashboard/tests/test_views.py
+++ b/hypha/apply/dashboard/tests/test_views.py
@@ -26,14 +26,16 @@
class TestApplicantDashboard(BaseViewTestCase):
user_factory = ApplicantFactory
- url_name = 'dashboard:{}'
- base_view_name = 'dashboard'
+ url_name = "dashboard:{}"
+ base_view_name = "dashboard"
def test_can_access_dashboard_with_active(self):
- application = ApplicationSubmissionFactory(user=self.user, form_data__title='Improve the internet')
+ application = ApplicationSubmissionFactory(
+ user=self.user, form_data__title="Improve the internet"
+ )
response = self.get_page()
self.assertContains(response, application.title)
- self.assertNotContains(response, 'Submission history')
+ self.assertNotContains(response, "Submission history")
def test_can_have_draft_titles_on_dashboard(self):
submission = ApplicationSubmissionFactory(user=self.user)
@@ -43,58 +45,75 @@ def test_can_have_draft_titles_on_dashboard(self):
response = self.get_page()
self.assertNotContains(response, submission.title)
self.assertContains(response, submission.from_draft().title)
- self.assertNotContains(response, 'Submission history')
+ self.assertNotContains(response, "Submission history")
def test_can_not_access_other_users_active(self):
- application = ApplicationSubmissionFactory(form_data__title='Ruin the internet')
+ application = ApplicationSubmissionFactory(form_data__title="Ruin the internet")
response = self.get_page()
self.assertNotContains(response, application.title)
- self.assertNotContains(response, 'Submission history')
+ self.assertNotContains(response, "Submission history")
def test_gets_invite_if_invited_to_proposal(self):
InvitedToProposalFactory(user=self.user, draft=True)
response = self.get_page()
- self.assertContains(response, 'Start your ')
+ self.assertContains(response, "Start your ")
def test_no_invite_if_can_edit(self):
- ApplicationSubmissionFactory(user=self.user, status='concept_more_info', workflow_stages=2)
+ ApplicationSubmissionFactory(
+ user=self.user, status="concept_more_info", workflow_stages=2
+ )
response = self.get_page()
- self.assertNotContains(response, 'Start your ')
- self.assertContains(response, 'Edit', 1)
+ self.assertNotContains(response, "Start your ")
+ self.assertContains(response, "Edit", 1)
def test_no_edit_if_in_review(self):
- ApplicationSubmissionFactory(user=self.user, status='internal_review')
+ ApplicationSubmissionFactory(user=self.user, status="internal_review")
response = self.get_page()
- self.assertNotContains(response, 'Edit')
- self.assertNotContains(response, 'Submission history')
+ self.assertNotContains(response, "Edit")
+ self.assertNotContains(response, "Submission history")
class TestStaffDashboard(BaseViewTestCase):
user_factory = StaffFactory
- url_name = 'dashboard:{}'
- base_view_name = 'dashboard'
+ url_name = "dashboard:{}"
+ base_view_name = "dashboard"
def test_cannot_see_submission_in_determination_when_not_lead(self):
- ApplicationSubmissionFactory(status='concept_review_discussion', workflow_stages=2, form_data__title='Reviewr')
+ ApplicationSubmissionFactory(
+ status="concept_review_discussion",
+ workflow_stages=2,
+ form_data__title="Reviewr",
+ )
response = self.get_page()
- self.assertNotContains(response, 'Reviewr')
+ self.assertNotContains(response, "Reviewr")
def test_waiting_for_review_with_count(self):
- submission = ApplicationSubmissionFactory(status='external_review', workflow_stages=2, reviewers=[self.user])
+ submission = ApplicationSubmissionFactory(
+ status="external_review", workflow_stages=2, reviewers=[self.user]
+ )
response = self.get_page()
- self.assertContains(response, 'Submissions waiting for your review')
+ self.assertContains(response, "Submissions waiting for your review")
self.assertContains(response, submission.title)
- self.assertEqual(response.context['awaiting_reviews']['count'], 1)
+ self.assertEqual(response.context["awaiting_reviews"]["count"], 1)
def test_waiting_for_review_after_agreement_is_empty(self):
staff = StaffFactory()
- submission = ApplicationSubmissionFactory(status='external_review', workflow_stages=2, reviewers=[staff, self.user])
- review = ReviewFactory(submission=submission, author__reviewer=staff, author__staff=True, recommendation_yes=True)
- ReviewOpinionFactory(review=review, author__reviewer=self.user, opinion_agree=True)
- response = self.get_page()
- self.assertContains(response, 'Submissions waiting for your review')
+ submission = ApplicationSubmissionFactory(
+ status="external_review", workflow_stages=2, reviewers=[staff, self.user]
+ )
+ review = ReviewFactory(
+ submission=submission,
+ author__reviewer=staff,
+ author__staff=True,
+ recommendation_yes=True,
+ )
+ ReviewOpinionFactory(
+ review=review, author__reviewer=self.user, opinion_agree=True
+ )
+ response = self.get_page()
+ self.assertContains(response, "Submissions waiting for your review")
self.assertContains(response, "Nice! You're all caught up.")
- self.assertEqual(response.context['awaiting_reviews']['count'], 0)
+ self.assertEqual(response.context["awaiting_reviews"]["count"], 0)
def test_active_invoices_with_no_project(self):
response = self.get_page()
@@ -141,54 +160,60 @@ def test_unassigned_staff_cant_see_projects_awaiting_review_stats_or_table(self)
class TestStaffDashboardWithWagtailAdminAccess(BaseViewTestCase):
user_factory = StaffWithWagtailAdminAccessFactory
- url_name = 'dashboard:{}'
- base_view_name = 'dashboard'
+ url_name = "dashboard:{}"
+ base_view_name = "dashboard"
def test_does_show_admin_button_to_staff_with_wagtail_admin_access(self):
response = self.get_page()
- self.assertContains(response, 'wagtail-admin-button')
+ self.assertContains(response, "wagtail-admin-button")
class TestStaffDashboardWithoutWagtailAdminAccess(BaseViewTestCase):
user_factory = StaffWithoutWagtailAdminAccessFactory
- url_name = 'dashboard:{}'
- base_view_name = 'dashboard'
+ url_name = "dashboard:{}"
+ base_view_name = "dashboard"
def test_doesnt_show_admin_button_to_staff_without_wagtail_admin_access(self):
response = self.get_page()
- self.assertNotContains(response, 'wagtail-admin-button')
+ self.assertNotContains(response, "wagtail-admin-button")
class TestReviewerDashboard(BaseViewTestCase):
user_factory = ReviewerFactory
- url_name = 'dashboard:{}'
- base_view_name = 'dashboard'
+ url_name = "dashboard:{}"
+ base_view_name = "dashboard"
def test_waiting_for_review_with_count(self):
- submission = ApplicationSubmissionFactory(status='external_review', workflow_stages=2, reviewers=[self.user])
+ submission = ApplicationSubmissionFactory(
+ status="external_review", workflow_stages=2, reviewers=[self.user]
+ )
response = self.get_page()
- self.assertContains(response, 'Submissions waiting for your review')
+ self.assertContains(response, "Submissions waiting for your review")
self.assertContains(response, submission.title)
- self.assertEqual(response.context['in_review_count'], 1)
+ self.assertEqual(response.context["in_review_count"], 1)
def test_no_submissions_waiting_for_review(self):
- submission = ApplicationSubmissionFactory(status='external_review', workflow_stages=2, reviewers=[])
+ submission = ApplicationSubmissionFactory(
+ status="external_review", workflow_stages=2, reviewers=[]
+ )
response = self.get_page()
self.assertNotContains(response, submission.title)
- self.assertEqual(response.context['in_review_count'], 0)
+ self.assertEqual(response.context["in_review_count"], 0)
def test_submission_assigned_but_not_in_external_review_status(self):
- submission = ApplicationSubmissionFactory(status='concept_review_discussion', workflow_stages=2, reviewers=[self.user])
+ submission = ApplicationSubmissionFactory(
+ status="concept_review_discussion", workflow_stages=2, reviewers=[self.user]
+ )
response = self.get_page()
self.assertNotContains(response, submission.title)
- self.assertEqual(response.context['in_review_count'], 0)
+ self.assertEqual(response.context["in_review_count"], 0)
class TestAdminDashboard(BaseViewTestCase):
user_factory = AdminFactory
- url_name = 'dashboard:{}'
- base_view_name = 'dashboard'
+ url_name = "dashboard:{}"
+ base_view_name = "dashboard"
def test_does_show_admin_button_to_admins(self):
response = self.get_page()
- self.assertContains(response, 'wagtail-admin-button')
+ self.assertContains(response, "wagtail-admin-button")
diff --git a/hypha/apply/dashboard/urls.py b/hypha/apply/dashboard/urls.py
index 1c906f43b0..b1d468c529 100644
--- a/hypha/apply/dashboard/urls.py
+++ b/hypha/apply/dashboard/urls.py
@@ -2,8 +2,8 @@
from .views import DashboardView
-app_name = 'dashboard'
+app_name = "dashboard"
urlpatterns = [
- path('', DashboardView.as_view(), name="dashboard"),
+ path("", DashboardView.as_view(), name="dashboard"),
]
diff --git a/hypha/apply/dashboard/views.py b/hypha/apply/dashboard/views.py
index 3c9e76dbe6..975e10ad1e 100644
--- a/hypha/apply/dashboard/views.py
+++ b/hypha/apply/dashboard/views.py
@@ -34,16 +34,19 @@
class MySubmissionContextMixin:
def get_context_data(self, **kwargs):
submissions = ApplicationSubmission.objects.all().for_table(self.request.user)
- my_submissions = submissions.filter(
- user=self.request.user
- ).active().current().select_related('draft_revision')
- my_submissions = [
- submission.from_draft() for submission in my_submissions
- ]
-
- my_inactive_submissions = submissions.filter(user=self.request.user).inactive().current()
+ my_submissions = (
+ submissions.filter(user=self.request.user)
+ .active()
+ .current()
+ .select_related("draft_revision")
+ )
+ my_submissions = [submission.from_draft() for submission in my_submissions]
+
+ my_inactive_submissions = (
+ submissions.filter(user=self.request.user).inactive().current()
+ )
my_inactive_submissions_table = ReviewerSubmissionsTable(
- my_inactive_submissions, prefix='my-submissions-'
+ my_inactive_submissions, prefix="my-submissions-"
)
return super().get_context_data(
@@ -55,46 +58,62 @@ def get_context_data(self, **kwargs):
class MyFlaggedMixin:
def my_flagged(self, submissions):
- submissions = submissions.flagged_by(self.request.user).order_by('-submit_time')
- row_attrs = dict({'data-flag-type': 'user'}, **SummarySubmissionsTable._meta.row_attrs)
+ submissions = submissions.flagged_by(self.request.user).order_by("-submit_time")
+ row_attrs = dict(
+ {"data-flag-type": "user"}, **SummarySubmissionsTable._meta.row_attrs
+ )
limit = 5
return {
- 'table': SummarySubmissionsTable(submissions[:limit], prefix='my-flagged-', attrs={'class': 'all-submissions-table flagged-table'}, row_attrs=row_attrs),
- 'display_more': submissions.count() > limit,
+ "table": SummarySubmissionsTable(
+ submissions[:limit],
+ prefix="my-flagged-",
+ attrs={"class": "all-submissions-table flagged-table"},
+ row_attrs=row_attrs,
+ ),
+ "display_more": submissions.count() > limit,
}
class AdminDashboardView(MyFlaggedMixin, TemplateView):
- template_name = 'dashboard/dashboard.html'
+ template_name = "dashboard/dashboard.html"
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
submissions = ApplicationSubmission.objects.all().for_table(self.request.user)
- context.update({
- 'active_invoices': self.active_invoices(),
- 'awaiting_reviews': self.awaiting_reviews(submissions),
- 'my_reviewed': self.my_reviewed(submissions),
- 'projects': self.projects(),
- 'paf_waiting_for_approval': self.paf_waiting_for_approval(),
- 'rounds': self.rounds(),
- 'my_flagged': self.my_flagged(submissions),
- 'paf_waiting_for_assignment': self.paf_waiting_for_approver_assignment(),
- })
+ context.update(
+ {
+ "active_invoices": self.active_invoices(),
+ "awaiting_reviews": self.awaiting_reviews(submissions),
+ "my_reviewed": self.my_reviewed(submissions),
+ "projects": self.projects(),
+ "paf_waiting_for_approval": self.paf_waiting_for_approval(),
+ "rounds": self.rounds(),
+ "my_flagged": self.my_flagged(submissions),
+ "paf_waiting_for_assignment": self.paf_waiting_for_approver_assignment(),
+ }
+ )
return context
def awaiting_reviews(self, submissions):
- submissions = submissions.in_review_for(self.request.user).order_by('-submit_time')
+ submissions = submissions.in_review_for(self.request.user).order_by(
+ "-submit_time"
+ )
count = submissions.count()
limit = 5
return {
- 'active_statuses_filter': ''.join(f'&status={status}' for status in review_filter_for_user(self.request.user)),
- 'count': count,
- 'display_more': count > limit,
- 'table': SummarySubmissionsTableWithRole(submissions[:limit], prefix='my-review-'),
+ "active_statuses_filter": "".join(
+ f"&status={status}"
+ for status in review_filter_for_user(self.request.user)
+ ),
+ "count": count,
+ "display_more": count > limit,
+ "table": SummarySubmissionsTableWithRole(
+ submissions[:limit], prefix="my-review-"
+ ),
}
def active_invoices(self):
@@ -103,82 +122,100 @@ def active_invoices(self):
).in_progress()
return {
- 'count': invoices.count(),
- 'table': InvoiceDashboardTable(invoices),
+ "count": invoices.count(),
+ "table": InvoiceDashboardTable(invoices),
}
def projects(self):
projects = Project.objects.filter(lead=self.request.user).for_table()
filterset = ProjectListFilter(
- data=self.request.GET or None, request=self.request, queryset=projects)
+ data=self.request.GET or None, request=self.request, queryset=projects
+ )
limit = 10
return {
- 'count': projects.count(),
- 'filterset': filterset,
- 'table': ProjectsDashboardTable(projects[:limit]),
- 'display_more': projects.count() > limit,
- 'url': reverse('apply:projects:all'),
+ "count": projects.count(),
+ "filterset": filterset,
+ "table": ProjectsDashboardTable(projects[:limit]),
+ "display_more": projects.count() > limit,
+ "url": reverse("apply:projects:all"),
}
def paf_waiting_for_approver_assignment(self):
project_settings = ProjectSettings.for_request(self.request)
paf_approvals = PAFApprovals.objects.annotate(
- roles_count=Count('paf_reviewer_role__user_roles')
- ).filter(roles_count=len(list(self.request.user.groups.all())), approved=False, user__isnull=True)
+ roles_count=Count("paf_reviewer_role__user_roles")
+ ).filter(
+ roles_count=len(list(self.request.user.groups.all())),
+ approved=False,
+ user__isnull=True,
+ )
for role in self.request.user.groups.all():
- paf_approvals = paf_approvals.filter(paf_reviewer_role__user_roles__id=role.id)
+ paf_approvals = paf_approvals.filter(
+ paf_reviewer_role__user_roles__id=role.id
+ )
- paf_approvals_ids = paf_approvals.values_list('id', flat=True)
- projects = Project.objects.filter(paf_approvals__id__in=paf_approvals_ids).for_table()
+ paf_approvals_ids = paf_approvals.values_list("id", flat=True)
+ projects = Project.objects.filter(
+ paf_approvals__id__in=paf_approvals_ids
+ ).for_table()
if project_settings.paf_approval_sequential:
all_projects = list(projects)
for project in all_projects:
- matched_paf_approval = paf_approvals.filter(project=project).order_by(
- 'paf_reviewer_role__sort_order').first()
+ matched_paf_approval = (
+ paf_approvals.filter(project=project)
+ .order_by("paf_reviewer_role__sort_order")
+ .first()
+ )
if project.paf_approvals.filter(
paf_reviewer_role__sort_order__lt=matched_paf_approval.paf_reviewer_role.sort_order,
- approved=False).exists():
+ approved=False,
+ ).exists():
projects = projects.exclude(id=project.id)
return {
- 'count': projects.count(),
- 'table': ProjectsAssigneeDashboardTable(projects),
+ "count": projects.count(),
+ "table": ProjectsAssigneeDashboardTable(projects),
}
def paf_waiting_for_approval(self):
- if not self.request.user.is_apply_staff or not PAFApprovals.objects.filter(
- project__status=INTERNAL_APPROVAL,
- user=self.request.user,
- ).exists():
+ if (
+ not self.request.user.is_apply_staff
+ or not PAFApprovals.objects.filter(
+ project__status=INTERNAL_APPROVAL,
+ user=self.request.user,
+ ).exists()
+ ):
return {
- 'count': None,
- 'awaiting_your_approval': {
- 'count': None,
- 'table': None,
+ "count": None,
+ "awaiting_your_approval": {
+ "count": None,
+ "table": None,
+ },
+ "approved_by_you": {
+ "count": None,
+ "table": None,
},
- 'approved_by_you': {
- 'count': None,
- 'table': None,
- }
}
waiting_paf_approval = Project.objects.internal_approval().for_table()
project_settings = ProjectSettings.for_request(self.request)
if project_settings.paf_approval_sequential:
awaiting_user_approval = []
- for waiting_project in waiting_paf_approval.filter(paf_approvals__approved=False):
+ for waiting_project in waiting_paf_approval.filter(
+ paf_approvals__approved=False
+ ):
permission, _ = has_permission(
- 'paf_status_update',
+ "paf_status_update",
self.request.user,
object=waiting_project,
raise_exception=False,
- request=self.request
+ request=self.request,
)
if permission:
awaiting_user_approval.append(waiting_project)
@@ -193,53 +230,66 @@ def paf_waiting_for_approval(self):
)
return {
- 'count': len(awaiting_user_approval) + len(approved_by_user),
- 'awaiting_your_approval': {
- 'count': len(awaiting_user_approval),
- 'table': ProjectsDashboardTable(data=awaiting_user_approval),
+ "count": len(awaiting_user_approval) + len(approved_by_user),
+ "awaiting_your_approval": {
+ "count": len(awaiting_user_approval),
+ "table": ProjectsDashboardTable(data=awaiting_user_approval),
+ },
+ "approved_by_you": {
+ "count": len(approved_by_user),
+ "table": ProjectsDashboardTable(data=approved_by_user),
},
- 'approved_by_you': {
- 'count': len(approved_by_user),
- 'table': ProjectsDashboardTable(data=approved_by_user),
- }
}
def my_reviewed(self, submissions):
"""Staff reviewer's reviewed submissions for 'Previous reviews' block"""
- submissions = submissions.reviewed_by(self.request.user).order_by('-submit_time')
+ submissions = submissions.reviewed_by(self.request.user).order_by(
+ "-submit_time"
+ )
limit = 5
return {
- 'filterset': SubmissionFilterAndSearch(
- data=self.request.GET or None, request=self.request, queryset=submissions),
- 'table': SummarySubmissionsTableWithRole(submissions[:limit], prefix='my-review-'),
- 'display_more': submissions.count() > limit,
- 'url': reverse('funds:submissions:list'),
+ "filterset": SubmissionFilterAndSearch(
+ data=self.request.GET or None,
+ request=self.request,
+ queryset=submissions,
+ ),
+ "table": SummarySubmissionsTableWithRole(
+ submissions[:limit], prefix="my-review-"
+ ),
+ "display_more": submissions.count() > limit,
+ "url": reverse("funds:submissions:list"),
}
def rounds(self):
limit = 6
- rounds = RoundsAndLabs.objects.with_progress().active().order_by('-end_date').by_lead(
- self.request.user)
+ rounds = (
+ RoundsAndLabs.objects.with_progress()
+ .active()
+ .order_by("-end_date")
+ .by_lead(self.request.user)
+ )
return {
- 'closed': rounds.closed()[:limit],
- 'open': rounds.open()[:limit],
+ "closed": rounds.closed()[:limit],
+ "open": rounds.open()[:limit],
}
class FinanceDashboardView(MyFlaggedMixin, TemplateView):
- template_name = 'dashboard/finance_dashboard.html'
+ template_name = "dashboard/finance_dashboard.html"
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
- context.update({
- 'active_invoices': self.active_invoices(),
- 'invoices_for_approval': self.invoices_for_approval(),
- 'invoices_to_convert': self.invoices_to_convert(),
- 'paf_waiting_for_approval': self.paf_waiting_for_approval(),
- 'paf_waiting_for_assignment': self.paf_waiting_for_approver_assignment(),
- })
+ context.update(
+ {
+ "active_invoices": self.active_invoices(),
+ "invoices_for_approval": self.invoices_for_approval(),
+ "invoices_to_convert": self.invoices_to_convert(),
+ "paf_waiting_for_approval": self.paf_waiting_for_approval(),
+ "paf_waiting_for_assignment": self.paf_waiting_for_approver_assignment(),
+ }
+ )
return context
@@ -250,33 +300,48 @@ def active_invoices(self):
invoices = Invoice.objects.for_finance_1()
return {
- 'count': invoices.count(),
- 'table': InvoiceDashboardTable(invoices),
+ "count": invoices.count(),
+ "table": InvoiceDashboardTable(invoices),
}
def paf_waiting_for_approver_assignment(self):
project_settings = ProjectSettings.for_request(self.request)
paf_approvals = PAFApprovals.objects.annotate(
- roles_count=Count('paf_reviewer_role__user_roles')
- ).filter(roles_count=len(list(self.request.user.groups.all())), approved=False, user__isnull=True)
+ roles_count=Count("paf_reviewer_role__user_roles")
+ ).filter(
+ roles_count=len(list(self.request.user.groups.all())),
+ approved=False,
+ user__isnull=True,
+ )
for role in self.request.user.groups.all():
- paf_approvals = paf_approvals.filter(paf_reviewer_role__user_roles__id=role.id)
+ paf_approvals = paf_approvals.filter(
+ paf_reviewer_role__user_roles__id=role.id
+ )
- paf_approvals_ids = paf_approvals.values_list('id', flat=True)
- projects = Project.objects.filter(paf_approvals__id__in=paf_approvals_ids).for_table()
+ paf_approvals_ids = paf_approvals.values_list("id", flat=True)
+ projects = Project.objects.filter(
+ paf_approvals__id__in=paf_approvals_ids
+ ).for_table()
if project_settings.paf_approval_sequential:
all_projects = list(projects)
for project in all_projects:
- matched_paf_approval = paf_approvals.filter(project=project).order_by('paf_reviewer_role__sort_order').first()
- if project.paf_approvals.filter(paf_reviewer_role__sort_order__lt=matched_paf_approval.paf_reviewer_role.sort_order, approved=False).exists():
+ matched_paf_approval = (
+ paf_approvals.filter(project=project)
+ .order_by("paf_reviewer_role__sort_order")
+ .first()
+ )
+ if project.paf_approvals.filter(
+ paf_reviewer_role__sort_order__lt=matched_paf_approval.paf_reviewer_role.sort_order,
+ approved=False,
+ ).exists():
projects = projects.exclude(id=project.id)
return {
- 'count': projects.count(),
- 'table': ProjectsAssigneeDashboardTable(projects),
+ "count": projects.count(),
+ "table": ProjectsAssigneeDashboardTable(projects),
}
def invoices_for_approval(self):
@@ -285,51 +350,53 @@ def invoices_for_approval(self):
else:
invoices = Invoice.objects.approved_by_staff()
- return {
- 'count': invoices.count(),
- 'table': InvoiceDashboardTable(invoices)
- }
+ return {"count": invoices.count(), "table": InvoiceDashboardTable(invoices)}
def invoices_to_convert(self):
if settings.INVOICE_EXTENDED_WORKFLOW and self.request.user.is_finance_level_1:
return {
- 'count': None,
- 'table': None,
+ "count": None,
+ "table": None,
}
invoices = Invoice.objects.waiting_to_convert()
return {
- 'count': invoices.count(),
- 'table': InvoiceDashboardTable(invoices),
+ "count": invoices.count(),
+ "table": InvoiceDashboardTable(invoices),
}
def paf_waiting_for_approval(self):
- if not self.request.user.is_finance or not PAFApprovals.objects.filter(
- project__status=INTERNAL_APPROVAL,
- user=self.request.user,
- ).exists():
+ if (
+ not self.request.user.is_finance
+ or not PAFApprovals.objects.filter(
+ project__status=INTERNAL_APPROVAL,
+ user=self.request.user,
+ ).exists()
+ ):
return {
- 'count': None,
- 'awaiting_your_approval': {
- 'count': None,
- 'table': None,
+ "count": None,
+ "awaiting_your_approval": {
+ "count": None,
+ "table": None,
+ },
+ "approved_by_you": {
+ "count": None,
+ "table": None,
},
- 'approved_by_you': {
- 'count': None,
- 'table': None,
- }
}
waiting_paf_approval = Project.objects.internal_approval().for_table()
project_settings = ProjectSettings.for_request(self.request)
if project_settings.paf_approval_sequential:
awaiting_user_approval = []
- for waiting_project in waiting_paf_approval.filter(paf_approvals__approved=False):
+ for waiting_project in waiting_paf_approval.filter(
+ paf_approvals__approved=False
+ ):
permission, _ = has_permission(
- 'paf_status_update',
+ "paf_status_update",
self.request.user,
object=waiting_project,
raise_exception=False,
- request=self.request
+ request=self.request,
)
if permission:
awaiting_user_approval.append(waiting_project)
@@ -344,170 +411,216 @@ def paf_waiting_for_approval(self):
)
return {
- 'count': len(awaiting_user_approval) + len(approved_by_user),
- 'awaiting_your_approval': {
- 'count': len(awaiting_user_approval),
- 'table': ProjectsDashboardTable(data=awaiting_user_approval),
+ "count": len(awaiting_user_approval) + len(approved_by_user),
+ "awaiting_your_approval": {
+ "count": len(awaiting_user_approval),
+ "table": ProjectsDashboardTable(data=awaiting_user_approval),
+ },
+ "approved_by_you": {
+ "count": len(approved_by_user),
+ "table": ProjectsDashboardTable(data=approved_by_user),
},
- 'approved_by_you': {
- 'count': len(approved_by_user),
- 'table': ProjectsDashboardTable(data=approved_by_user),
- }
}
class ReviewerDashboardView(MyFlaggedMixin, MySubmissionContextMixin, TemplateView):
- template_name = 'dashboard/reviewer_dashboard.html'
+ template_name = "dashboard/reviewer_dashboard.html"
def get(self, request, *args, **kwargs):
# redirect to submissions list when we use the filter to search for something
if len(request.GET):
- query_str = '?'
+ query_str = "?"
for key, value in request.GET.items():
- query_str += key + '=' + value + '&'
- return HttpResponseRedirect(reverse_lazy('funds:submissions:list') + query_str)
+ query_str += key + "=" + value + "&"
+ return HttpResponseRedirect(
+ reverse_lazy("funds:submissions:list") + query_str
+ )
context = self.get_context_data(**kwargs)
return render(request, self.template_name, context)
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
- '''
+ """
If use_settings variable is set for ReviewerSettings use settings
parameters to filter submissions or return all as it
was by default.
- '''
+ """
reviewer_settings = ReviewerSettings.for_request(self.request)
if reviewer_settings.use_settings:
- submissions = ApplicationSubmission.objects.for_reviewer_settings(self.request.user, reviewer_settings).for_table(self.request.user)
+ submissions = ApplicationSubmission.objects.for_reviewer_settings(
+ self.request.user, reviewer_settings
+ ).for_table(self.request.user)
else:
- submissions = ApplicationSubmission.objects.all().for_table(self.request.user)
+ submissions = ApplicationSubmission.objects.all().for_table(
+ self.request.user
+ )
- context.update({
- 'awaiting_reviews': self.awaiting_reviews(submissions),
- 'my_reviewed': self.my_reviewed(submissions),
- 'my_flagged': self.my_flagged(submissions),
- 'paf_waiting_for_assignment': self.paf_waiting_for_approver_assignment(),
- })
+ context.update(
+ {
+ "awaiting_reviews": self.awaiting_reviews(submissions),
+ "my_reviewed": self.my_reviewed(submissions),
+ "my_flagged": self.my_flagged(submissions),
+ "paf_waiting_for_assignment": self.paf_waiting_for_approver_assignment(),
+ }
+ )
return context
def awaiting_reviews(self, submissions):
- submissions = submissions.in_review_for(self.request.user).order_by('-submit_time')
+ submissions = submissions.in_review_for(self.request.user).order_by(
+ "-submit_time"
+ )
count = submissions.count()
limit = 5
return {
- 'active_statuses_filter': ''.join(f'&status={status}' for status in review_filter_for_user(self.request.user)),
- 'count': count,
- 'display_more': count > limit,
- 'table': ReviewerSubmissionsTable(submissions[:limit], prefix='my-review-'),
+ "active_statuses_filter": "".join(
+ f"&status={status}"
+ for status in review_filter_for_user(self.request.user)
+ ),
+ "count": count,
+ "display_more": count > limit,
+ "table": ReviewerSubmissionsTable(submissions[:limit], prefix="my-review-"),
}
def paf_waiting_for_approver_assignment(self):
project_settings = ProjectSettings.for_request(self.request)
paf_approvals = PAFApprovals.objects.annotate(
- roles_count=Count('paf_reviewer_role__user_roles')
- ).filter(roles_count=len(list(self.request.user.groups.all())), approved=False, user__isnull=True)
+ roles_count=Count("paf_reviewer_role__user_roles")
+ ).filter(
+ roles_count=len(list(self.request.user.groups.all())),
+ approved=False,
+ user__isnull=True,
+ )
for role in self.request.user.groups.all():
- paf_approvals = paf_approvals.filter(paf_reviewer_role__user_roles__id=role.id)
+ paf_approvals = paf_approvals.filter(
+ paf_reviewer_role__user_roles__id=role.id
+ )
- paf_approvals_ids = paf_approvals.values_list('id', flat=True)
- projects = Project.objects.filter(paf_approvals__id__in=paf_approvals_ids).for_table()
+ paf_approvals_ids = paf_approvals.values_list("id", flat=True)
+ projects = Project.objects.filter(
+ paf_approvals__id__in=paf_approvals_ids
+ ).for_table()
if project_settings.paf_approval_sequential:
all_projects = list(projects)
for project in all_projects:
- matched_paf_approval = paf_approvals.filter(project=project).order_by('paf_reviewer_role__sort_order').first()
- if project.paf_approvals.filter(paf_reviewer_role__sort_order__lt=matched_paf_approval.paf_reviewer_role.sort_order, approved=False).exists():
+ matched_paf_approval = (
+ paf_approvals.filter(project=project)
+ .order_by("paf_reviewer_role__sort_order")
+ .first()
+ )
+ if project.paf_approvals.filter(
+ paf_reviewer_role__sort_order__lt=matched_paf_approval.paf_reviewer_role.sort_order,
+ approved=False,
+ ).exists():
projects = projects.exclude(id=project.id)
return {
- 'count': projects.count(),
- 'table': ProjectsAssigneeDashboardTable(projects),
+ "count": projects.count(),
+ "table": ProjectsAssigneeDashboardTable(projects),
}
def my_reviewed(self, submissions):
"""Staff reviewer's reviewed submissions for 'Previous reviews' block"""
- submissions = submissions.reviewed_by(self.request.user).order_by('-submit_time')
+ submissions = submissions.reviewed_by(self.request.user).order_by(
+ "-submit_time"
+ )
limit = 5
return {
- 'filterset': SubmissionReviewerFilterAndSearch(
- data=self.request.GET or None, request=self.request, queryset=submissions),
- 'table': ReviewerSubmissionsTable(submissions[:limit], prefix='my-review-'),
- 'display_more': submissions.count() > limit,
- 'url': reverse('funds:submissions:list'),
+ "filterset": SubmissionReviewerFilterAndSearch(
+ data=self.request.GET or None,
+ request=self.request,
+ queryset=submissions,
+ ),
+ "table": ReviewerSubmissionsTable(submissions[:limit], prefix="my-review-"),
+ "display_more": submissions.count() > limit,
+ "url": reverse("funds:submissions:list"),
}
class PartnerDashboardView(MySubmissionContextMixin, TemplateView):
- template_name = 'dashboard/partner_dashboard.html'
+ template_name = "dashboard/partner_dashboard.html"
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
submissions = ApplicationSubmission.objects.all().for_table(self.request.user)
# Submissions in which user added as partner
- partner_submissions, partner_submissions_table = self.partner_submissions(self.request.user, submissions)
+ partner_submissions, partner_submissions_table = self.partner_submissions(
+ self.request.user, submissions
+ )
- context.update({
- 'partner_submissions': partner_submissions_table,
- 'partner_submissions_count': partner_submissions.count(),
- })
+ context.update(
+ {
+ "partner_submissions": partner_submissions_table,
+ "partner_submissions_count": partner_submissions.count(),
+ }
+ )
return context
def partner_submissions(self, user, submissions):
- partner_submissions = submissions.partner_for(user).order_by('-submit_time')
- partner_submissions_table = SubmissionsTable(partner_submissions, prefix='my-partnered-')
+ partner_submissions = submissions.partner_for(user).order_by("-submit_time")
+ partner_submissions_table = SubmissionsTable(
+ partner_submissions, prefix="my-partnered-"
+ )
return partner_submissions, partner_submissions_table
class ContractingDashboardView(MyFlaggedMixin, TemplateView):
- template_name = 'dashboard/contracting_dashboard.html'
+ template_name = "dashboard/contracting_dashboard.html"
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
- context.update({
- 'paf_waiting_for_approval': self.paf_waiting_for_approval(),
- 'projects_in_contracting': self.projects_in_contracting(),
- 'paf_waiting_for_assignment': self.paf_waiting_for_approver_assignment(),
- })
+ context.update(
+ {
+ "paf_waiting_for_approval": self.paf_waiting_for_approval(),
+ "projects_in_contracting": self.projects_in_contracting(),
+ "paf_waiting_for_assignment": self.paf_waiting_for_approver_assignment(),
+ }
+ )
return context
def paf_waiting_for_approval(self):
- if not self.request.user.is_contracting or not PAFApprovals.objects.filter(
- project__status=INTERNAL_APPROVAL,
- user=self.request.user,
- ).exists():
+ if (
+ not self.request.user.is_contracting
+ or not PAFApprovals.objects.filter(
+ project__status=INTERNAL_APPROVAL,
+ user=self.request.user,
+ ).exists()
+ ):
return {
- 'count': None,
- 'awaiting_your_approval': {
- 'count': None,
- 'table': None,
+ "count": None,
+ "awaiting_your_approval": {
+ "count": None,
+ "table": None,
+ },
+ "approved_by_you": {
+ "count": None,
+ "table": None,
},
- 'approved_by_you': {
- 'count': None,
- 'table': None,
- }
}
waiting_paf_approval = Project.objects.internal_approval().for_table()
project_settings = ProjectSettings.for_request(self.request)
if project_settings.paf_approval_sequential:
awaiting_user_approval = []
- for waiting_project in waiting_paf_approval.filter(paf_approvals__approved=False):
+ for waiting_project in waiting_paf_approval.filter(
+ paf_approvals__approved=False
+ ):
permission, _ = has_permission(
- 'paf_status_update',
+ "paf_status_update",
self.request.user,
object=waiting_project,
raise_exception=False,
- request=self.request
+ request=self.request,
)
if permission:
awaiting_user_approval.append(waiting_project)
@@ -522,144 +635,188 @@ def paf_waiting_for_approval(self):
)
return {
- 'count': len(awaiting_user_approval) + len(approved_by_user),
- 'awaiting_your_approval': {
- 'count': len(awaiting_user_approval),
- 'table': ProjectsDashboardTable(data=awaiting_user_approval),
+ "count": len(awaiting_user_approval) + len(approved_by_user),
+ "awaiting_your_approval": {
+ "count": len(awaiting_user_approval),
+ "table": ProjectsDashboardTable(data=awaiting_user_approval),
+ },
+ "approved_by_you": {
+ "count": len(approved_by_user),
+ "table": ProjectsDashboardTable(data=approved_by_user),
},
- 'approved_by_you': {
- 'count': len(approved_by_user),
- 'table': ProjectsDashboardTable(data=approved_by_user),
- }
}
def paf_waiting_for_approver_assignment(self):
project_settings = ProjectSettings.for_request(self.request)
paf_approvals = PAFApprovals.objects.annotate(
- roles_count=Count('paf_reviewer_role__user_roles')
- ).filter(roles_count=len(list(self.request.user.groups.all())), approved=False, user__isnull=True)
+ roles_count=Count("paf_reviewer_role__user_roles")
+ ).filter(
+ roles_count=len(list(self.request.user.groups.all())),
+ approved=False,
+ user__isnull=True,
+ )
for role in self.request.user.groups.all():
- paf_approvals = paf_approvals.filter(paf_reviewer_role__user_roles__id=role.id)
+ paf_approvals = paf_approvals.filter(
+ paf_reviewer_role__user_roles__id=role.id
+ )
- paf_approvals_ids = paf_approvals.values_list('id', flat=True)
- projects = Project.objects.filter(paf_approvals__id__in=paf_approvals_ids).for_table()
+ paf_approvals_ids = paf_approvals.values_list("id", flat=True)
+ projects = Project.objects.filter(
+ paf_approvals__id__in=paf_approvals_ids
+ ).for_table()
if project_settings.paf_approval_sequential:
all_projects = list(projects)
for project in all_projects:
- matched_paf_approval = paf_approvals.filter(project=project).order_by('paf_reviewer_role__sort_order').first()
- if project.paf_approvals.filter(paf_reviewer_role__sort_order__lt=matched_paf_approval.paf_reviewer_role.sort_order, approved=False).exists():
+ matched_paf_approval = (
+ paf_approvals.filter(project=project)
+ .order_by("paf_reviewer_role__sort_order")
+ .first()
+ )
+ if project.paf_approvals.filter(
+ paf_reviewer_role__sort_order__lt=matched_paf_approval.paf_reviewer_role.sort_order,
+ approved=False,
+ ).exists():
projects = projects.exclude(id=project.id)
return {
- 'count': projects.count(),
- 'table': ProjectsAssigneeDashboardTable(projects),
+ "count": projects.count(),
+ "table": ProjectsAssigneeDashboardTable(projects),
}
def projects_in_contracting(self):
if not self.request.user.is_contracting:
return {
- 'count': None,
- 'waiting_for_contract': {
- 'count': None,
- 'table': None,
+ "count": None,
+ "waiting_for_contract": {
+ "count": None,
+ "table": None,
+ },
+ "waiting_for_contract_approval": {
+ "count": None,
+ "table": None,
},
- 'waiting_for_contract_approval': {
- 'count': None,
- 'table': None,
- }
}
projects_in_contracting = Project.objects.in_contracting()
- waiting_for_contract = projects_in_contracting.filter(contracts__isnull=True).for_table()
- waiting_for_contract_approval = projects_in_contracting.filter(contracts__isnull=False).for_table()
+ waiting_for_contract = projects_in_contracting.filter(
+ contracts__isnull=True
+ ).for_table()
+ waiting_for_contract_approval = projects_in_contracting.filter(
+ contracts__isnull=False
+ ).for_table()
return {
- 'count': projects_in_contracting.count(),
- 'waiting_for_contract': {
- 'count': waiting_for_contract.count(),
- 'table': ProjectsDashboardTable(data=waiting_for_contract)
+ "count": projects_in_contracting.count(),
+ "waiting_for_contract": {
+ "count": waiting_for_contract.count(),
+ "table": ProjectsDashboardTable(data=waiting_for_contract),
+ },
+ "waiting_for_contract_approval": {
+ "count": waiting_for_contract_approval.count(),
+ "table": ProjectsDashboardTable(data=waiting_for_contract_approval),
},
- 'waiting_for_contract_approval': {
- 'count': waiting_for_contract_approval.count(),
- 'table': ProjectsDashboardTable(data=waiting_for_contract_approval)
- }
}
class CommunityDashboardView(MySubmissionContextMixin, TemplateView):
- template_name = 'dashboard/community_dashboard.html'
+ template_name = "dashboard/community_dashboard.html"
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
submissions = ApplicationSubmission.objects.all().for_table(self.request.user)
# Submissions in community review phase
- my_community_review, my_community_review = self.my_community_review(self.request.user, submissions)
+ my_community_review, my_community_review = self.my_community_review(
+ self.request.user, submissions
+ )
# Partner's reviewed submissions
my_reviewed = self.my_reviewed(self.request, submissions)
- context.update({
- 'my_community_review': my_community_review,
- 'my_community_review_count': my_community_review.count(),
- 'my_reviewed': my_reviewed
- })
+ context.update(
+ {
+ "my_community_review": my_community_review,
+ "my_community_review_count": my_community_review.count(),
+ "my_reviewed": my_reviewed,
+ }
+ )
return context
def my_community_review(self, user, submissions):
- my_community_review = submissions.in_community_review(user).order_by('-submit_time')
- my_community_review_table = ReviewerSubmissionsTable(my_community_review, prefix='my-community-review-')
+ my_community_review = submissions.in_community_review(user).order_by(
+ "-submit_time"
+ )
+ my_community_review_table = ReviewerSubmissionsTable(
+ my_community_review, prefix="my-community-review-"
+ )
return my_community_review, my_community_review_table
def my_reviewed(self, request, submissions):
- return ReviewerSubmissionsTable(submissions.reviewed_by(request.user).order_by('-submit_time'), prefix='my-reviewed-')
+ return ReviewerSubmissionsTable(
+ submissions.reviewed_by(request.user).order_by("-submit_time"),
+ prefix="my-reviewed-",
+ )
class ApplicantDashboardView(TemplateView):
- template_name = 'dashboard/applicant_dashboard.html'
+ template_name = "dashboard/applicant_dashboard.html"
def get_context_data(self, **kwargs):
my_active_submissions = list(self.my_active_submissions(self.request.user))
context = super().get_context_data(**kwargs)
- context['my_active_submissions'] = my_active_submissions
- context['active_projects'] = self.active_project_data()
- context['historical_projects'] = self.historical_project_data()
- context['historical_submissions'] = self.historical_submission_data()
+ context["my_active_submissions"] = my_active_submissions
+ context["active_projects"] = self.active_project_data()
+ context["historical_projects"] = self.historical_project_data()
+ context["historical_submissions"] = self.historical_submission_data()
return context
def active_project_data(self):
- active_projects = Project.objects.filter(user=self.request.user).active().for_table()
+ active_projects = (
+ Project.objects.filter(user=self.request.user).active().for_table()
+ )
return {
- 'count': active_projects.count(),
- 'table': ProjectsDashboardTable(data=active_projects),
+ "count": active_projects.count(),
+ "table": ProjectsDashboardTable(data=active_projects),
}
def my_active_submissions(self, user):
- active_subs = ApplicationSubmission.objects.filter(
- user=user,
- ) .active().current().select_related('draft_revision')
+ active_subs = (
+ ApplicationSubmission.objects.filter(
+ user=user,
+ )
+ .active()
+ .current()
+ .select_related("draft_revision")
+ )
for submission in active_subs:
yield submission.from_draft()
def historical_project_data(self):
- historical_projects = Project.objects.filter(user=self.request.user).complete().for_table()
+ historical_projects = (
+ Project.objects.filter(user=self.request.user).complete().for_table()
+ )
return {
- 'count': historical_projects.count(),
- 'table': ProjectsDashboardTable(data=historical_projects),
+ "count": historical_projects.count(),
+ "table": ProjectsDashboardTable(data=historical_projects),
}
def historical_submission_data(self):
- historical_submissions = ApplicationSubmission.objects.filter(
- user=self.request.user,
- ).inactive().current().for_table(self.request.user)
+ historical_submissions = (
+ ApplicationSubmission.objects.filter(
+ user=self.request.user,
+ )
+ .inactive()
+ .current()
+ .for_table(self.request.user)
+ )
return {
- 'count': historical_submissions.count(),
- 'table': SubmissionsTable(data=historical_submissions)
+ "count": historical_submissions.count(),
+ "table": SubmissionsTable(data=historical_submissions),
}
diff --git a/hypha/apply/dashboard/wagtail_hooks.py b/hypha/apply/dashboard/wagtail_hooks.py
index 4925637e2d..28f6c0ba7f 100644
--- a/hypha/apply/dashboard/wagtail_hooks.py
+++ b/hypha/apply/dashboard/wagtail_hooks.py
@@ -7,12 +7,12 @@
from hypha.apply.home.models import ApplyHomePage
-@hooks.register('register_admin_menu_item')
+@hooks.register("register_admin_menu_item")
def register_dashboard_menu_item():
apply_home = ApplyHomePage.objects.first()
return MenuItem(
- 'Apply Dashboard',
- urljoin(apply_home.url, reverse('dashboard:dashboard', 'hypha.apply.urls')),
- classnames='icon icon-arrow-left',
+ "Apply Dashboard",
+ urljoin(apply_home.url, reverse("dashboard:dashboard", "hypha.apply.urls")),
+ classnames="icon icon-arrow-left",
order=100000,
)
diff --git a/hypha/apply/determinations/admin.py b/hypha/apply/determinations/admin.py
index 571d185f67..167aa83f4b 100644
--- a/hypha/apply/determinations/admin.py
+++ b/hypha/apply/determinations/admin.py
@@ -22,17 +22,17 @@ def __init__(self, *args, **kwargs):
class DeterminationFormAdmin(ListRelatedMixin, ModelAdmin):
model = DeterminationForm
- menu_icon = 'form'
- list_display = ('name', 'used_by')
+ menu_icon = "form"
+ list_display = ("name", "used_by")
button_helper_class = ButtonsWithClone
clone_view_class = CloneView
create_view_class = CreateDeterminationFormView
edit_view_class = EditDeterminationFormView
related_models = [
- ('applicationbasedeterminationform', 'application'),
- ('roundbasedeterminationform', 'round'),
- ('labbasedeterminationform', 'lab'),
+ ("applicationbasedeterminationform", "application"),
+ ("roundbasedeterminationform", "round"),
+ ("labbasedeterminationform", "lab"),
]
def get_admin_urls_for_registration(self):
@@ -40,16 +40,16 @@ def get_admin_urls_for_registration(self):
urls += (
re_path(
- self.url_helper.get_action_url_pattern('clone'),
+ self.url_helper.get_action_url_pattern("clone"),
self.clone_view,
- name=self.url_helper.get_action_url_name('clone')
+ name=self.url_helper.get_action_url_name("clone"),
),
)
return urls
def clone_view(self, request, **kwargs):
- kwargs.update(**{'model_admin': self})
+ kwargs.update(**{"model_admin": self})
view_class = self.clone_view_class
return view_class.as_view(**kwargs)(request)
diff --git a/hypha/apply/determinations/admin_views.py b/hypha/apply/determinations/admin_views.py
index 93e41c35ce..a363b49365 100644
--- a/hypha/apply/determinations/admin_views.py
+++ b/hypha/apply/determinations/admin_views.py
@@ -4,14 +4,12 @@
class CreateDeterminationFormView(CreateView):
-
def form_invalid(self, form):
show_admin_form_error_messages(self.request, form)
return self.render_to_response(self.get_context_data(form=form))
class EditDeterminationFormView(EditView):
-
def form_invalid(self, form):
show_admin_form_error_messages(self.request, form)
return self.render_to_response(self.get_context_data(form=form))
diff --git a/hypha/apply/determinations/apps.py b/hypha/apply/determinations/apps.py
index 79bd722956..97ed2ff3da 100644
--- a/hypha/apply/determinations/apps.py
+++ b/hypha/apply/determinations/apps.py
@@ -2,4 +2,4 @@
class DeterminationsConfig(AppConfig):
- name = 'hypha.apply.determinations'
+ name = "hypha.apply.determinations"
diff --git a/hypha/apply/determinations/blocks.py b/hypha/apply/determinations/blocks.py
index 859a93945b..81e055a63f 100644
--- a/hypha/apply/determinations/blocks.py
+++ b/hypha/apply/determinations/blocks.py
@@ -19,51 +19,51 @@ class DeterminationMustIncludeFieldBlock(MustIncludeFieldBlock):
class DeterminationBlock(DeterminationMustIncludeFieldBlock):
- name = 'determination'
- description = 'Overall determination'
+ name = "determination"
+ description = "Overall determination"
field_class = forms.TypedChoiceField
class Meta:
- icon = 'pick'
+ icon = "pick"
def get_field_kwargs(self, struct_value):
kwargs = super().get_field_kwargs(struct_value)
- kwargs['choices'] = DETERMINATION_CHOICES
+ kwargs["choices"] = DETERMINATION_CHOICES
return kwargs
def render(self, value, context=None):
- data = int(context['data'])
+ data = int(context["data"])
choices = dict(DETERMINATION_CHOICES)
- context['data'] = choices[data]
+ context["data"] = choices[data]
return super().render(value, context)
class DeterminationMessageBlock(DeterminationMustIncludeFieldBlock):
- name = 'message'
- description = 'Determination message'
+ name = "message"
+ description = "Determination message"
widget = RICH_TEXT_WIDGET
class Meta:
- icon = 'openquote'
- template = 'stream_forms/render_unsafe_field.html'
+ icon = "openquote"
+ template = "stream_forms/render_unsafe_field.html"
def get_field_kwargs(self, struct_value):
kwargs = super().get_field_kwargs(struct_value)
- kwargs['required'] = False
+ kwargs["required"] = False
return kwargs
class SendNoticeBlock(DeterminationMustIncludeFieldBlock):
- name = 'send_notice'
- description = 'Send Notice'
+ name = "send_notice"
+ description = "Send Notice"
default_value = BooleanBlock(default=True, required=False)
field_class = forms.BooleanField
class Meta:
- label = _('Send Notice')
- icon = 'tick-inverse'
+ label = _("Send Notice")
+ icon = "tick-inverse"
def get_searchable_content(self, value, data):
return None
@@ -73,9 +73,9 @@ def no_response(self):
class DeterminationCustomFormFieldsBlock(CustomFormFieldsBlock):
- char = CharFieldBlock(group=_('Fields'))
- text = TextFieldBlock(group=_('Fields'))
- text_markup = RichTextBlock(group=_('Fields'), label=_('Paragraph'))
- checkbox = CheckboxFieldBlock(group=_('Fields'))
- dropdown = DropdownFieldBlock(group=_('Fields'))
+ char = CharFieldBlock(group=_("Fields"))
+ text = TextFieldBlock(group=_("Fields"))
+ text_markup = RichTextBlock(group=_("Fields"), label=_("Paragraph"))
+ checkbox = CheckboxFieldBlock(group=_("Fields"))
+ dropdown = DropdownFieldBlock(group=_("Fields"))
required_blocks = DeterminationMustIncludeFieldBlock.__subclasses__()
diff --git a/hypha/apply/determinations/forms.py b/hypha/apply/determinations/forms.py
index ac7e3858ff..9a337cf291 100644
--- a/hypha/apply/determinations/forms.py
+++ b/hypha/apply/determinations/forms.py
@@ -18,8 +18,8 @@
class BaseDeterminationForm:
def __init__(self, *args, user, initial, action, edit=False, **kwargs):
- if 'site' in kwargs:
- site = kwargs.pop('site')
+ if "site" in kwargs:
+ site = kwargs.pop("site")
self.form_settings = DeterminationFormSettings.for_site(site)
try:
initial.update(outcome=TRANSITION_DETERMINATION[action])
@@ -33,11 +33,11 @@ def data_fields(self):
def clean_outcome(self):
# Enforce outcome as an int
- return int(self.cleaned_data['outcome'])
+ return int(self.cleaned_data["outcome"])
def clean(self):
cleaned_data = super().clean()
- cleaned_data['data'] = {
+ cleaned_data["data"] = {
key: value
for key, value in cleaned_data.items()
if key in self.data_fields()
@@ -47,11 +47,15 @@ def clean(self):
def apply_form_settings(self, application_type, fields):
for field in fields:
try:
- self.fields[field].label = getattr(self.form_settings, f'{application_type}_{field}_label')
+ self.fields[field].label = getattr(
+ self.form_settings, f"{application_type}_{field}_label"
+ )
except AttributeError:
pass
try:
- self.fields[field].help_text = getattr(self.form_settings, f'{application_type}_{field}_help_text')
+ self.fields[field].help_text = getattr(
+ self.form_settings, f"{application_type}_{field}_help_text"
+ )
except AttributeError:
pass
return fields
@@ -60,7 +64,7 @@ def apply_form_settings(self, application_type, fields):
def get_detailed_response(cls, saved_data):
data = {}
for group, title in cls.titles.items():
- data.setdefault(group, {'title': title, 'questions': []})
+ data.setdefault(group, {"title": title, "questions": []})
for name, field in cls.base_fields.items():
try:
@@ -69,7 +73,7 @@ def get_detailed_response(cls, saved_data):
# The field is not stored in the data
pass
else:
- data[field.group]['questions'].append((field.label, str(value)))
+ data[field.group]["questions"].append((field.label, str(value)))
return data
@@ -79,25 +83,22 @@ class BaseNormalDeterminationForm(BaseDeterminationForm, forms.ModelForm):
class Meta:
model = Determination
- fields = ['outcome', 'message', 'submission', 'author', 'data', 'send_notice']
+ fields = ["outcome", "message", "submission", "author", "data", "send_notice"]
widgets = {
- 'submission': forms.HiddenInput(),
- 'author': forms.HiddenInput(),
- 'data': forms.HiddenInput(),
+ "submission": forms.HiddenInput(),
+ "author": forms.HiddenInput(),
+ "data": forms.HiddenInput(),
}
error_messages = {
NON_FIELD_ERRORS: {
- 'unique_together': "You have already created a determination for this submission",
+ "unique_together": "You have already created a determination for this submission",
}
}
def data_fields(self):
- return [
- field for field in self.fields
- if field not in self._meta.fields
- ]
+ return [field for field in self.fields if field not in self._meta.fields]
def outcome_choices_for_phase(self, submission, user):
"""
@@ -105,8 +106,8 @@ def outcome_choices_for_phase(self, submission, user):
We need to filter out non-matching choices.
i.e. a transition to In Review is not a determination, while Needs more info or Rejected are.
"""
- available_choices = [('', _('-- No determination selected -- '))]
- choices = dict(self.fields['outcome'].choices)
+ available_choices = [("", _("-- No determination selected -- "))]
+ choices = dict(self.fields["outcome"].choices)
for transition_name in determination_actions(user, submission):
try:
@@ -114,7 +115,9 @@ def outcome_choices_for_phase(self, submission, user):
except KeyError:
pass
else:
- available_choices.append((determination_type, choices[determination_type]))
+ available_choices.append(
+ (determination_type, choices[determination_type])
+ )
return available_choices
def save(self, commit=True):
@@ -136,15 +139,17 @@ class BaseBatchDeterminationForm(BaseDeterminationForm, forms.Form):
def data_fields(self):
return [
- field for field in self.fields
- if field not in ['submissions', 'outcome', 'author', 'send_notice', 'message']
+ field
+ for field in self.fields
+ if field
+ not in ["submissions", "outcome", "author", "send_notice", "message"]
]
def _post_clean(self):
- submissions = self.cleaned_data['submissions'].undetermined()
+ submissions = self.cleaned_data["submissions"].undetermined()
data = {
field: self.cleaned_data[field]
- for field in ['author', 'data', 'outcome', 'message']
+ for field in ["author", "data", "outcome", "message"]
}
self.instances = [
@@ -165,163 +170,168 @@ def save(self):
class BaseConceptDeterminationForm(forms.Form):
titles = {
- 1: 'Feedback',
+ 1: "Feedback",
}
outcome = forms.ChoiceField(
choices=DETERMINATION_CHOICES,
- label=_('Determination'),
- help_text='Do you recommend requesting a proposal based on this concept note?',
+ label=_("Determination"),
+ help_text="Do you recommend requesting a proposal based on this concept note?",
)
outcome.group = 1
message = RichTextField(
- label=_('Determination message'),
- help_text='This text will be e-mailed to the applicant. '
- 'Ones when text is first added and then every time the text is changed.'
+ label=_("Determination message"),
+ help_text="This text will be e-mailed to the applicant. "
+ "Ones when text is first added and then every time the text is changed.",
)
message.group = 1
principles = RichTextField(
- label=_('Goals and principles'),
- help_text='Does the project contribute and/or have relevance to OTF goals and principles?'
- 'Are the goals and objectives of the project clear? Is it a technology research, development, or deployment '
- 'project? Can project’s effort be explained to external audiences and non-technical people? What problem are '
- 'they trying to solve and is the solution strategical or tactical? Is the project strategically or tactically '
- 'important to OTF’s goals, principles and rationale and other OTF efforts? Is it clear how? What tools, if any, '
- 'currently exist to solve this problem? How is this project different? Does the effort have any overlap with '
- 'existing OTF and/or USG supported projects? Is the overlap complementary or duplicative? If complementary, '
- 'can it be explained clearly? I.e. geographic focus, technology, organization profile, etc. What are the '
- 'liabilities and risks of taking on this project? I.e. political personalities, financial concerns, technical '
- 'controversial, etc. Is the organization or its members known within any relevant communities? If yes, what is '
- 'their reputation and why? What is the entity’s motivation and principles? What are the entity member(s) '
- 'motivations and principles? Where is the organization physically and legally based? If the organization is '
- 'distributed, where is the main point of contact? Does the organization have any conflicts of interest with '
- 'RFA, OTF, the Advisory Council, or other RFA-OTF projects? Is the project team an organization, community '
- 'or an individual?'
+ label=_("Goals and principles"),
+ help_text="Does the project contribute and/or have relevance to OTF goals and principles?"
+ "Are the goals and objectives of the project clear? Is it a technology research, development, or deployment "
+ "project? Can project’s effort be explained to external audiences and non-technical people? What problem are "
+ "they trying to solve and is the solution strategical or tactical? Is the project strategically or tactically "
+ "important to OTF’s goals, principles and rationale and other OTF efforts? Is it clear how? What tools, if any, "
+ "currently exist to solve this problem? How is this project different? Does the effort have any overlap with "
+ "existing OTF and/or USG supported projects? Is the overlap complementary or duplicative? If complementary, "
+ "can it be explained clearly? I.e. geographic focus, technology, organization profile, etc. What are the "
+ "liabilities and risks of taking on this project? I.e. political personalities, financial concerns, technical "
+ "controversial, etc. Is the organization or its members known within any relevant communities? If yes, what is "
+ "their reputation and why? What is the entity’s motivation and principles? What are the entity member(s) "
+ "motivations and principles? Where is the organization physically and legally based? If the organization is "
+ "distributed, where is the main point of contact? Does the organization have any conflicts of interest with "
+ "RFA, OTF, the Advisory Council, or other RFA-OTF projects? Is the project team an organization, community "
+ "or an individual?",
)
principles.group = 1
technical = RichTextField(
- label=_('Technical merit'),
- help_text='Does the project clearly articulate the technical problem, solution, and approach? '
- 'Is the problem clearly justifiable? Does the project clearly articulate the technological objectives? '
- 'Is it an open or closed development project? I.e. Open source like Android or open source like Firefox OS '
- 'or closed like iOS. Does a similar technical solution already exist? If so, what are the differentiating '
- 'factors? Is the effort to sustain an existing technical approach? If so, are these considered successful? '
- 'Is the effort a new technical approach or improvement to an existing solution? If so, how? Is the effort '
- 'a completely new technical approach fostering new solutions in the field? Does the project’s technical '
- 'approach solve the problem? What are the limitations of the project’s technical approach and solution? '
- 'What are the unintended or illicit uses and consequences of this technology? Has the project identified '
- 'and/or developed any safeguards for these consequences?'
+ label=_("Technical merit"),
+ help_text="Does the project clearly articulate the technical problem, solution, and approach? "
+ "Is the problem clearly justifiable? Does the project clearly articulate the technological objectives? "
+ "Is it an open or closed development project? I.e. Open source like Android or open source like Firefox OS "
+ "or closed like iOS. Does a similar technical solution already exist? If so, what are the differentiating "
+ "factors? Is the effort to sustain an existing technical approach? If so, are these considered successful? "
+ "Is the effort a new technical approach or improvement to an existing solution? If so, how? Is the effort "
+ "a completely new technical approach fostering new solutions in the field? Does the project’s technical "
+ "approach solve the problem? What are the limitations of the project’s technical approach and solution? "
+ "What are the unintended or illicit uses and consequences of this technology? Has the project identified "
+ "and/or developed any safeguards for these consequences?",
)
technical.group = 1
sustainable = RichTextField(
- label=_('Reasonable, realistic and sustainable'),
- help_text='Is the requested amount reasonable, realistic, and justified? If OTF doesn’t support the project, '
- 'is it likely to be realized? Does the project provide a detailed and realistic description of effort and '
- 'schedule? I.e. is the project capable of creating a work plan including objectives, activities, and '
- 'deliverable(s)? Does the project have a clear support model? Is there a known sustainability plan for the '
- 'future? What in-kind support or other revenue streams is the project receiving? I.e. volunteer developers, '
- 'service or product sales. Is the project receiving any financial support from the USG? Is this information '
- 'disclosed? Is the project receiving any other financial support? Is this information disclosed? Are existing '
- 'supporters approachable? Are they likely aware and/or comfortable with the Intellectual property language '
- 'within USG contracts?'
+ label=_("Reasonable, realistic and sustainable"),
+ help_text="Is the requested amount reasonable, realistic, and justified? If OTF doesn’t support the project, "
+ "is it likely to be realized? Does the project provide a detailed and realistic description of effort and "
+ "schedule? I.e. is the project capable of creating a work plan including objectives, activities, and "
+ "deliverable(s)? Does the project have a clear support model? Is there a known sustainability plan for the "
+ "future? What in-kind support or other revenue streams is the project receiving? I.e. volunteer developers, "
+ "service or product sales. Is the project receiving any financial support from the USG? Is this information "
+ "disclosed? Is the project receiving any other financial support? Is this information disclosed? Are existing "
+ "supporters approachable? Are they likely aware and/or comfortable with the Intellectual property language "
+ "within USG contracts?",
)
sustainable.group = 1
- comments = RichTextField(
- label=_('Other comments'),
- help_text=''
- )
+ comments = RichTextField(label=_("Other comments"), help_text="")
comments.group = 1
class BaseProposalDeterminationForm(forms.Form):
titles = {
- 1: 'A. Determination',
- 2: 'B. General thoughts',
- 3: 'C. Specific aspects',
- 4: 'D. Rationale and appropriateness consideration',
- 5: 'E. General recommendation',
+ 1: "A. Determination",
+ 2: "B. General thoughts",
+ 3: "C. Specific aspects",
+ 4: "D. Rationale and appropriateness consideration",
+ 5: "E. General recommendation",
}
# A. Determination
outcome = forms.ChoiceField(
choices=DETERMINATION_CHOICES,
- label=_('Determination'),
- help_text='Do you recommend requesting a proposal based on this concept note?'
+ label=_("Determination"),
+ help_text="Do you recommend requesting a proposal based on this concept note?",
)
outcome.group = 1
message = RichTextField(
- label=_('Determination message'),
- help_text='This text will be e-mailed to the applicant. '
- 'Ones when text is first added and then every time the text is changed.'
+ label=_("Determination message"),
+ help_text="This text will be e-mailed to the applicant. "
+ "Ones when text is first added and then every time the text is changed.",
)
message.group = 1
# B. General thoughts
liked = RichTextField(
- label=_('Positive aspects'),
- help_text='Any general or specific aspects that got you really excited or that you like about this proposal.'
+ label=_("Positive aspects"),
+ help_text="Any general or specific aspects that got you really excited or that you like about this proposal.",
)
liked.group = 2
concerns = RichTextField(
- label=_('Concerns'),
- help_text='Any general or specific aspects that concern you or leave you feeling uneasy about this proposal.'
+ label=_("Concerns"),
+ help_text="Any general or specific aspects that concern you or leave you feeling uneasy about this proposal.",
)
concerns.group = 2
red_flags = RichTextField(
- label=_('Items that must be addressed'),
- help_text='Anything you think should be flagged for our attention.'
+ label=_("Items that must be addressed"),
+ help_text="Anything you think should be flagged for our attention.",
)
red_flags.group = 2
# C. Specific aspects
- overview = RichTextField(label=_('Project overview questions and comments'))
+ overview = RichTextField(label=_("Project overview questions and comments"))
overview.group = 3
- objectives = RichTextField(label=_('Objectives questions and comments'))
+ objectives = RichTextField(label=_("Objectives questions and comments"))
objectives.group = 3
- strategy = RichTextField(label=_('Methods and strategy questions and comments'))
+ strategy = RichTextField(label=_("Methods and strategy questions and comments"))
strategy.group = 3
- technical = RichTextField(label=_('Technical feasibility questions and comments'))
+ technical = RichTextField(label=_("Technical feasibility questions and comments"))
technical.group = 3
- alternative = RichTextField(label=_('Alternative analysis - "red teaming" questions and comments'))
+ alternative = RichTextField(
+ label=_('Alternative analysis - "red teaming" questions and comments')
+ )
alternative.group = 3
- usability = RichTextField(label=_('Usability questions and comments'))
+ usability = RichTextField(label=_("Usability questions and comments"))
usability.group = 3
- sustainability = RichTextField(label=_('Sustainability questions and comments'))
+ sustainability = RichTextField(label=_("Sustainability questions and comments"))
sustainability.group = 3
- collaboration = RichTextField(label=_('Collaboration questions and comments'))
+ collaboration = RichTextField(label=_("Collaboration questions and comments"))
collaboration.group = 3
- realism = RichTextField(label=_('Cost realism questions and comments'))
+ realism = RichTextField(label=_("Cost realism questions and comments"))
realism.group = 3
- qualifications = RichTextField(label=_('Qualifications questions and comments'))
+ qualifications = RichTextField(label=_("Qualifications questions and comments"))
qualifications.group = 3
- evaluation = RichTextField(label=_('Evaluation questions and comments'))
+ evaluation = RichTextField(label=_("Evaluation questions and comments"))
evaluation.group = 3
# D. Rationale and appropriateness consideration
- rationale = RichTextField(label=_('Rationale and appropriateness questions and comments'))
+ rationale = RichTextField(
+ label=_("Rationale and appropriateness questions and comments")
+ )
rationale.group = 4
-class ConceptDeterminationForm(BaseConceptDeterminationForm, BaseNormalDeterminationForm):
- def __init__(self, *args, submission, user, edit=False, initial=None, instance=None, **kwargs):
+class ConceptDeterminationForm(
+ BaseConceptDeterminationForm, BaseNormalDeterminationForm
+):
+ def __init__(
+ self, *args, submission, user, edit=False, initial=None, instance=None, **kwargs
+ ):
initial = initial or {}
initial.update(submission=submission.id)
@@ -330,7 +340,9 @@ def __init__(self, *args, submission, user, edit=False, initial=None, instance=N
if key not in self._meta.fields:
initial[key] = value
- super(BaseNormalDeterminationForm, self).__init__(*args, initial=initial, user=user, instance=instance, edit=edit, **kwargs)
+ super(BaseNormalDeterminationForm, self).__init__(
+ *args, initial=initial, user=user, instance=instance, edit=edit, **kwargs
+ )
# convert a python dict to orderedDict, to use move_to_end method
self.fields = OrderedDict(self.fields)
@@ -338,46 +350,58 @@ def __init__(self, *args, submission, user, edit=False, initial=None, instance=N
for field in self._meta.widgets:
self.fields[field].disabled = True
- self.fields['outcome'].choices = self.outcome_choices_for_phase(submission, user)
+ self.fields["outcome"].choices = self.outcome_choices_for_phase(
+ submission, user
+ )
if self.draft_button_name in self.data:
for field in self.fields.values():
field.required = False
- self.fields = self.apply_form_settings('concept', self.fields)
- self.fields.move_to_end('send_notice')
+ self.fields = self.apply_form_settings("concept", self.fields)
+ self.fields.move_to_end("send_notice")
- action = kwargs.get('action')
+ action = kwargs.get("action")
stages_num = len(submission.workflow.stages)
if stages_num > 1:
- second_stage_forms = submission.get_from_parent('forms').filter(stage=2)
+ second_stage_forms = submission.get_from_parent("forms").filter(stage=2)
if second_stage_forms.count() > 1:
proposal_form_choices = [
(index, form.form.name)
for index, form in enumerate(second_stage_forms)
]
- proposal_form_choices.insert(0, ('', _('-- No proposal form selected -- ')))
- proposal_form_help_text = _('Select the proposal form only for determination approval')
- if action == 'invited_to_proposal':
- proposal_form_help_text = _('Select the proposal form to use for proposal stage.')
- self.fields['proposal_form'] = forms.ChoiceField(
- label=_('Proposal Form'),
+ proposal_form_choices.insert(
+ 0, ("", _("-- No proposal form selected -- "))
+ )
+ proposal_form_help_text = _(
+ "Select the proposal form only for determination approval"
+ )
+ if action == "invited_to_proposal":
+ proposal_form_help_text = _(
+ "Select the proposal form to use for proposal stage."
+ )
+ self.fields["proposal_form"] = forms.ChoiceField(
+ label=_("Proposal Form"),
choices=proposal_form_choices,
help_text=proposal_form_help_text,
- required=True if action == 'invited_to_proposal' else False,
- disabled=False if action == 'invited_to_proposal' else True,
+ required=True if action == "invited_to_proposal" else False,
+ disabled=False if action == "invited_to_proposal" else True,
)
- self.fields['proposal_form'].group = 1
- self.fields.move_to_end('proposal_form', last=False)
+ self.fields["proposal_form"].group = 1
+ self.fields.move_to_end("proposal_form", last=False)
if edit:
- self.fields.pop('outcome')
+ self.fields.pop("outcome")
self.draft_button_name = None
-class ProposalDeterminationForm(BaseProposalDeterminationForm, BaseNormalDeterminationForm):
- def __init__(self, *args, submission, user, edit=False, initial=None, instance=None, **kwargs):
+class ProposalDeterminationForm(
+ BaseProposalDeterminationForm, BaseNormalDeterminationForm
+):
+ def __init__(
+ self, *args, submission, user, edit=False, initial=None, instance=None, **kwargs
+ ):
if initial is None:
initial = {}
initial.update(submission=submission.id)
@@ -387,7 +411,9 @@ def __init__(self, *args, submission, user, edit=False, initial=None, instance=N
if key not in self._meta.fields:
initial[key] = value
- super(BaseNormalDeterminationForm, self).__init__(*args, initial=initial, user=user, instance=instance, edit=edit, **kwargs)
+ super(BaseNormalDeterminationForm, self).__init__(
+ *args, initial=initial, user=user, instance=instance, edit=edit, **kwargs
+ )
# convert a python dict to orderedDict, to use move_to_end method
self.fields = OrderedDict(self.fields)
@@ -395,40 +421,50 @@ def __init__(self, *args, submission, user, edit=False, initial=None, instance=N
for field in self._meta.widgets:
self.fields[field].disabled = True
- self.fields['outcome'].choices = self.outcome_choices_for_phase(submission, user)
- self.fields.move_to_end('send_notice')
+ self.fields["outcome"].choices = self.outcome_choices_for_phase(
+ submission, user
+ )
+ self.fields.move_to_end("send_notice")
if self.draft_button_name in self.data:
for field in self.fields.values():
field.required = False
- self.fields = self.apply_form_settings('proposal', self.fields)
+ self.fields = self.apply_form_settings("proposal", self.fields)
if edit:
- self.fields.pop('outcome')
+ self.fields.pop("outcome")
self.draft_button_name = None
-class BatchConceptDeterminationForm(BaseConceptDeterminationForm, BaseBatchDeterminationForm):
+class BatchConceptDeterminationForm(
+ BaseConceptDeterminationForm, BaseBatchDeterminationForm
+):
def __init__(self, *args, submissions, initial=None, **kwargs):
if initial is None:
initial = {}
- initial.update(submissions=submissions.values_list('id', flat=True))
- super(BaseBatchDeterminationForm, self).__init__(*args, initial=initial, **kwargs)
- self.fields['outcome'].widget = forms.HiddenInput()
+ initial.update(submissions=submissions.values_list("id", flat=True))
+ super(BaseBatchDeterminationForm, self).__init__(
+ *args, initial=initial, **kwargs
+ )
+ self.fields["outcome"].widget = forms.HiddenInput()
- self.fields = self.apply_form_settings('concept', self.fields)
+ self.fields = self.apply_form_settings("concept", self.fields)
-class BatchProposalDeterminationForm(BaseProposalDeterminationForm, BaseBatchDeterminationForm):
+class BatchProposalDeterminationForm(
+ BaseProposalDeterminationForm, BaseBatchDeterminationForm
+):
def __init__(self, *args, submissions, initial=None, **kwargs):
if initial is None:
initial = {}
- initial.update(submissions=submissions.values_list('id', flat=True))
- super(BaseBatchDeterminationForm, self).__init__(*args, initial=initial, **kwargs)
- self.fields['outcome'].widget = forms.HiddenInput()
+ initial.update(submissions=submissions.values_list("id", flat=True))
+ super(BaseBatchDeterminationForm, self).__init__(
+ *args, initial=initial, **kwargs
+ )
+ self.fields["outcome"].widget = forms.HiddenInput()
- self.fields = self.apply_form_settings('proposal', self.fields)
+ self.fields = self.apply_form_settings("proposal", self.fields)
class MixedMetaClass(type(StreamBaseForm), type(forms.ModelForm)):
@@ -440,26 +476,33 @@ class DeterminationModelForm(StreamBaseForm, forms.ModelForm, metaclass=MixedMet
class Meta:
model = Determination
- fields = ['outcome', 'message', 'submission', 'author', 'send_notice']
+ fields = ["outcome", "message", "submission", "author", "send_notice"]
widgets = {
- 'outcome': forms.HiddenInput(),
- 'message': forms.HiddenInput(),
- 'submission': forms.HiddenInput(),
- 'author': forms.HiddenInput(),
- 'send_notice': forms.HiddenInput(),
+ "outcome": forms.HiddenInput(),
+ "message": forms.HiddenInput(),
+ "submission": forms.HiddenInput(),
+ "author": forms.HiddenInput(),
+ "send_notice": forms.HiddenInput(),
}
error_messages = {
NON_FIELD_ERRORS: {
- 'unique_together': "You have already created a determination for this submission",
+ "unique_together": "You have already created a determination for this submission",
}
}
def __init__(
- self, *args, submission, action, user=None,
- edit=False, initial=None, instance=None, site=None,
- **kwargs
+ self,
+ *args,
+ submission,
+ action,
+ user=None,
+ edit=False,
+ initial=None,
+ instance=None,
+ site=None,
+ **kwargs,
):
if initial is None:
initial = {}
@@ -481,12 +524,12 @@ def __init__(
field.required = False
if edit:
- self.fields.pop('outcome')
+ self.fields.pop("outcome")
self.draft_button_name = None
def clean(self):
cleaned_data = super().clean()
- cleaned_data['form_data'] = {
+ cleaned_data["form_data"] = {
key: value
for key, value in cleaned_data.items()
if key not in self._meta.fields
@@ -497,16 +540,19 @@ def clean(self):
def save(self, commit=True):
self.instance.send_notice = (
self.cleaned_data[self.instance.send_notice_field.id]
- if self.instance.send_notice_field else True
+ if self.instance.send_notice_field
+ else True
)
self.instance.message = self.cleaned_data[self.instance.message_field.id]
try:
- self.instance.outcome = int(self.cleaned_data[self.instance.determination_field.id])
+ self.instance.outcome = int(
+ self.cleaned_data[self.instance.determination_field.id]
+ )
# Need to catch KeyError as outcome field would not exist in case of edit.
except KeyError:
pass
self.instance.is_draft = self.draft_button_name in self.data
- self.instance.form_data = self.cleaned_data['form_data']
+ self.instance.form_data = self.cleaned_data["form_data"]
return super().save(commit)
@@ -526,37 +572,45 @@ class BatchDeterminationForm(StreamBaseForm, forms.Form, metaclass=FormMixedMeta
)
outcome = forms.ChoiceField(
choices=DETERMINATION_CHOICES,
- label=_('Determination'),
- help_text='Do you recommend requesting a proposal based on this concept note?',
- widget=forms.HiddenInput()
+ label=_("Determination"),
+ help_text="Do you recommend requesting a proposal based on this concept note?",
+ widget=forms.HiddenInput(),
)
def __init__(
- self, *args, user, submissions, action, initial=None,
- edit=False, site=None, **kwargs
+ self,
+ *args,
+ user,
+ submissions,
+ action,
+ initial=None,
+ edit=False,
+ site=None,
+ **kwargs,
):
if initial is None:
initial = {}
- initial.update(submissions=submissions.values_list('id', flat=True))
+ initial.update(submissions=submissions.values_list("id", flat=True))
try:
initial.update(outcome=TRANSITION_DETERMINATION[action])
except KeyError:
pass
initial.update(author=user.id)
super().__init__(*args, initial=initial, **kwargs)
- self.fields['submissions'].disabled = True
- self.fields['author'].disabled = True
- self.fields['outcome'].disabled = True
+ self.fields["submissions"].disabled = True
+ self.fields["author"].disabled = True
+ self.fields["outcome"].disabled = True
def data_fields(self):
return [
- field for field in self.fields
- if field not in ['submissions', 'outcome', 'author', 'send_notice']
+ field
+ for field in self.fields
+ if field not in ["submissions", "outcome", "author", "send_notice"]
]
def clean(self):
cleaned_data = super().clean()
- cleaned_data['form_data'] = {
+ cleaned_data["form_data"] = {
key: value
for key, value in cleaned_data.items()
if key in self.data_fields()
@@ -565,13 +619,13 @@ def clean(self):
def clean_outcome(self):
# Enforce outcome as an int
- return int(self.cleaned_data['outcome'])
+ return int(self.cleaned_data["outcome"])
def _post_clean(self):
- submissions = self.cleaned_data['submissions'].undetermined()
+ submissions = self.cleaned_data["submissions"].undetermined()
data = {
field: self.cleaned_data[field]
- for field in ['author', 'form_data', 'outcome']
+ for field in ["author", "form_data", "outcome"]
}
self.instances = [
diff --git a/hypha/apply/determinations/management/commands/migrate_concept_determinations.py b/hypha/apply/determinations/management/commands/migrate_concept_determinations.py
index 48078e6c69..3c1eafe1cb 100644
--- a/hypha/apply/determinations/management/commands/migrate_concept_determinations.py
+++ b/hypha/apply/determinations/management/commands/migrate_concept_determinations.py
@@ -44,11 +44,13 @@ class Command(BaseCommand):
}
def add_arguments(self, parser):
- parser.add_argument('source', type=argparse.FileType('r'), help='Migration source JSON file')
+ parser.add_argument(
+ "source", type=argparse.FileType("r"), help="Migration source JSON file"
+ )
@transaction.atomic
def handle(self, *args, **options):
- with options['source'] as json_data:
+ with options["source"] as json_data:
self.data = json.load(json_data)
blacklist = {"8104"}
@@ -62,9 +64,9 @@ def process(self, id):
form_data = {}
try:
- determination = Determination.objects.get(drupal_id=node['nid'])
+ determination = Determination.objects.get(drupal_id=node["nid"])
except Determination.DoesNotExist:
- determination = Determination(drupal_id=node['nid'])
+ determination = Determination(drupal_id=node["nid"])
# Disable auto_* on date fields so imported dates are used.
for field in determination._meta.local_fields:
@@ -74,18 +76,24 @@ def process(self, id):
field.auto_now = False
# TODO timezone?
- determination.created_at = datetime.fromtimestamp(int(node['created']), timezone.utc)
- determination.updated_at = datetime.fromtimestamp(int(node['changed']), timezone.utc)
- determination.author = self.get_user(node['uid'])
+ determination.created_at = datetime.fromtimestamp(
+ int(node["created"]), timezone.utc
+ )
+ determination.updated_at = datetime.fromtimestamp(
+ int(node["changed"]), timezone.utc
+ )
+ determination.author = self.get_user(node["uid"])
determination.submission = self.get_submission(node)
determination.outcome = self.get_determination(node)
- determination.message = self.get_field_value('field_cnsr_determination_message', node)
+ determination.message = self.get_field_value(
+ "field_cnsr_determination_message", node
+ )
for field in node:
if field in self.STREAMFIELD_MAP:
try:
- id = self.STREAMFIELD_MAP[field]['id']
- if id != 'message':
+ id = self.STREAMFIELD_MAP[field]["id"]
+ if id != "message":
form_data[id] = self.get_field_value(field, node)
except TypeError:
pass
@@ -96,7 +104,9 @@ def process(self, id):
determination.save()
self.stdout.write(f"Processed \"{node['title']}\" ({node['nid']})")
except IntegrityError:
- self.stdout.write(f"Skipped \"{node['title']}\" ({node['nid']}) due to IntegrityError")
+ self.stdout.write(
+ f"Skipped \"{node['title']}\" ({node['nid']}) due to IntegrityError"
+ )
pass
def get_field_value(self, field, node):
@@ -109,32 +119,32 @@ def get_field_value(self, field, node):
field: [{value|target_id|tid: VALUE},]
"""
mapping = self.STREAMFIELD_MAP[field]
- mapping_type = mapping['type']
- key = mapping.get('key', 'value')
+ mapping_type = mapping["type"]
+ key = mapping.get("key", "value")
source_value = node[field]
value = None
if mapping_type == "direct":
value = source_value
- elif mapping_type == 'value':
+ elif mapping_type == "value":
if key in source_value:
- value = self.nl2br(source_value[key]) if source_value else ''
+ value = self.nl2br(source_value[key]) if source_value else ""
else:
- value = self.nl2br(source_value['value']) if source_value else ''
- elif mapping_type == 'map' and 'map' in 'mapping':
- value = mapping['map'].get(source_value[key])
- elif mapping_type == 'address' and 'map' in mapping:
+ value = self.nl2br(source_value["value"]) if source_value else ""
+ elif mapping_type == "map" and "map" in "mapping":
+ value = mapping["map"].get(source_value[key])
+ elif mapping_type == "address" and "map" in mapping:
try:
- value_map = mapping['map']
+ value_map = mapping["map"]
value = {}
for item in value_map:
value[value_map[item]] = source_value[item]
value = json.dumps(value)
except TypeError:
value = {}
- elif mapping_type == 'boolean':
- value = source_value[key] == '1' if source_value else False
- elif mapping_type == 'category':
+ elif mapping_type == "boolean":
+ value = source_value[key] == "1" if source_value else False
+ elif mapping_type == "category":
if not source_value:
value = []
else:
@@ -147,7 +157,7 @@ def get_field_value(self, field, node):
option = self.get_referenced_term(item[key])
if option:
value.append(option)
- elif mapping_type == 'file':
+ elif mapping_type == "file":
# TODO finish mapping. Requires access to the files.
value = {}
@@ -162,10 +172,10 @@ def get_user(self, uid):
def get_submission(self, node):
try:
- nid = node['field_submission_concept_note']['target_id']
+ nid = node["field_submission_concept_note"]["target_id"]
return ApplicationSubmission.objects.get(drupal_id=nid)
except ApplicationSubmission.DoesNotExist:
- return 'None'
+ return "None"
def get_determination(self, node):
choices = {
@@ -173,15 +183,15 @@ def get_determination(self, node):
"approved": 2,
"dropped": 0,
"unapproved": 0,
- "undetermined": 1
+ "undetermined": 1,
}
try:
- determination = choices.get(node['field_cnsr_determination']['value'], 1)
+ determination = choices.get(node["field_cnsr_determination"]["value"], 1)
except TypeError:
determination = 1
return determination
def nl2br(self, value):
- return value.replace('\r\n', '
-
+ {% if paf_waiting_for_assignment.count %}
+ - {% trans "Your active submissions" %} -
- {% for submission in my_submissions %} - - {% endif %} + {% endif %} - {% if paf_waiting_for_assignment.count %} -
-
- {% endif %}
+ {% if my_submissions %}
+ - {% trans "PAF waiting for assignee" %} -
- {% render_table paf_waiting_for_assignment.table %} -
+
+ {% endif %}
- {% if my_inactive_submissions.data %}
- + {% trans "Your active submissions" %} +
+ {% for submission in my_submissions %} + + {% endfor %} +
-
- {% endif %}
-- {% trans "Submission history" %} -
- {% render_table my_inactive_submissions %} -
+
+ {% endif %}
+
+ {% if my_inactive_submissions.data %}
+ + {% trans "PAF waiting for assignee" %} +
+ {% render_table paf_waiting_for_assignment.table %} +
+
+ {% endif %}
+ + {% trans "Submission history" %} +
+ {% render_table my_inactive_submissions %} +\n') + return value.replace("\r\n", "
\n") diff --git a/hypha/apply/determinations/management/commands/migrate_proposal_determinations.py b/hypha/apply/determinations/management/commands/migrate_proposal_determinations.py index 4333565d77..dca0549646 100644 --- a/hypha/apply/determinations/management/commands/migrate_proposal_determinations.py +++ b/hypha/apply/determinations/management/commands/migrate_proposal_determinations.py @@ -99,11 +99,13 @@ class Command(BaseCommand): } def add_arguments(self, parser): - parser.add_argument('source', type=argparse.FileType('r'), help='Migration source JSON file') + parser.add_argument( + "source", type=argparse.FileType("r"), help="Migration source JSON file" + ) @transaction.atomic def handle(self, *args, **options): - with options['source'] as json_data: + with options["source"] as json_data: self.data = json.load(json_data) for id in self.data: @@ -114,9 +116,9 @@ def process(self, id): form_data = {} try: - determination = Determination.objects.get(drupal_id=node['nid']) + determination = Determination.objects.get(drupal_id=node["nid"]) except Determination.DoesNotExist: - determination = Determination(drupal_id=node['nid']) + determination = Determination(drupal_id=node["nid"]) # Disable auto_* on date fields so imported dates are used. for field in determination._meta.local_fields: @@ -126,18 +128,24 @@ def process(self, id): field.auto_now = False # TODO timezone? - determination.created_at = datetime.fromtimestamp(int(node['created']), timezone.utc) - determination.updated_at = datetime.fromtimestamp(int(node['changed']), timezone.utc) - determination.author = self.get_user(node['uid']) + determination.created_at = datetime.fromtimestamp( + int(node["created"]), timezone.utc + ) + determination.updated_at = datetime.fromtimestamp( + int(node["changed"]), timezone.utc + ) + determination.author = self.get_user(node["uid"]) determination.submission = self.get_submission(node) determination.outcome = self.get_determination(node) - determination.message = self.get_field_value('field_psr_determination_message', node) + determination.message = self.get_field_value( + "field_psr_determination_message", node + ) for field in node: if field in self.STREAMFIELD_MAP: try: - id = self.STREAMFIELD_MAP[field]['id'] - if id != 'message': + id = self.STREAMFIELD_MAP[field]["id"] + if id != "message": form_data[id] = self.get_field_value(field, node) except TypeError: pass @@ -149,8 +157,11 @@ def process(self, id): self.stdout.write(f"Processed \"{node['title']}\" ({node['nid']})") except IntegrityError: import pprint + pprint.pprint(determination.submission) - self.stdout.write(f"Skipped \"{node['title']}\" ({node['nid']}) due to IntegrityError") + self.stdout.write( + f"Skipped \"{node['title']}\" ({node['nid']}) due to IntegrityError" + ) pass def get_field_value(self, field, node): @@ -163,32 +174,32 @@ def get_field_value(self, field, node): field: [{value|target_id|tid: VALUE},] """ mapping = self.STREAMFIELD_MAP[field] - mapping_type = mapping['type'] - key = mapping.get('key', 'value') + mapping_type = mapping["type"] + key = mapping.get("key", "value") source_value = node[field] value = None if mapping_type == "direct": value = source_value - elif mapping_type == 'value': + elif mapping_type == "value": if key in source_value: - value = self.nl2br(source_value[key]) if source_value else '' + value = self.nl2br(source_value[key]) if source_value else "" else: - value = self.nl2br(source_value['value']) if source_value else '' - elif mapping_type == 'map' and 'map' in 'mapping': - value = mapping['map'].get(source_value[key]) - elif mapping_type == 'address' and 'map' in mapping: + value = self.nl2br(source_value["value"]) if source_value else "" + elif mapping_type == "map" and "map" in "mapping": + value = mapping["map"].get(source_value[key]) + elif mapping_type == "address" and "map" in mapping: try: - value_map = mapping['map'] + value_map = mapping["map"] value = {} for item in value_map: value[value_map[item]] = source_value[item] value = json.dumps(value) except TypeError: value = {} - elif mapping_type == 'boolean': - value = source_value[key] == '1' if source_value else False - elif mapping_type == 'category': + elif mapping_type == "boolean": + value = source_value[key] == "1" if source_value else False + elif mapping_type == "category": if not source_value: value = [] else: @@ -201,7 +212,7 @@ def get_field_value(self, field, node): option = self.get_referenced_term(item[key]) if option: value.append(option) - elif mapping_type == 'file': + elif mapping_type == "file": # TODO finish mapping. Requires access to the files. value = {} @@ -210,8 +221,8 @@ def get_field_value(self, field, node): def get_user(self, uid): # Dan Blah hade one extra admin account uid 52 in old system, # all content should be set to uid 2 in the new system. - if uid == '52': - uid = '2' + if uid == "52": + uid = "2" try: User = get_user_model() return User.objects.get(drupal_id=uid) @@ -220,10 +231,10 @@ def get_user(self, uid): def get_submission(self, node): try: - nid = node['field_submission_proposal']['target_id'] + nid = node["field_submission_proposal"]["target_id"] return ApplicationSubmission.objects.get(drupal_id=nid) except ApplicationSubmission.DoesNotExist: - return 'None' + return "None" def get_determination(self, node): choices = { @@ -231,15 +242,15 @@ def get_determination(self, node): "approved": 2, "dropped": 0, "unapproved": 0, - "undetermined": 1 + "undetermined": 1, } try: - determination = choices.get(node['field_psr_determination']['value'], 1) + determination = choices.get(node["field_psr_determination"]["value"], 1) except TypeError: determination = 1 return determination def nl2br(self, value): - return value.replace('\r\n', '
\n') + return value.replace("\r\n", "
\n") diff --git a/hypha/apply/determinations/migrations/0001_initial.py b/hypha/apply/determinations/migrations/0001_initial.py index 4729c5a3ee..1653ae5034 100644 --- a/hypha/apply/determinations/migrations/0001_initial.py +++ b/hypha/apply/determinations/migrations/0001_initial.py @@ -7,28 +7,62 @@ class Migration(migrations.Migration): - initial = True dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('funds', '0032_make_reviewers_optional_in_all_instances'), + ("funds", "0032_make_reviewers_optional_in_all_instances"), ] operations = [ migrations.CreateModel( - name='Determination', + name="Determination", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('determination_data', django.contrib.postgres.fields.jsonb.JSONField()), - ('determination', models.IntegerField(choices=[(0, 'Unapproved'), (1, 'Undetermined'), (2, 'Approved')], default=0, verbose_name='Determination')), - ('is_draft', models.BooleanField(default=False, verbose_name='Draft')), - ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), - ('submission', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='determination', to='funds.ApplicationSubmission')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "determination_data", + django.contrib.postgres.fields.jsonb.JSONField(), + ), + ( + "determination", + models.IntegerField( + choices=[ + (0, "Unapproved"), + (1, "Undetermined"), + (2, "Approved"), + ], + default=0, + verbose_name="Determination", + ), + ), + ("is_draft", models.BooleanField(default=False, verbose_name="Draft")), + ( + "author", + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + to=settings.AUTH_USER_MODEL, + ), + ), + ( + "submission", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + related_name="determination", + to="funds.ApplicationSubmission", + ), + ), ], ), migrations.AlterUniqueTogether( - name='determination', - unique_together={('author', 'submission')}, + name="determination", + unique_together={("author", "submission")}, ), ] diff --git a/hypha/apply/determinations/migrations/0002_add_fields.py b/hypha/apply/determinations/migrations/0002_add_fields.py index 648e297fd9..23344d6079 100644 --- a/hypha/apply/determinations/migrations/0002_add_fields.py +++ b/hypha/apply/determinations/migrations/0002_add_fields.py @@ -6,49 +6,56 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0001_initial'), + ("determinations", "0001_initial"), ] operations = [ migrations.AddField( - model_name='determination', - name='created_at', - field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now, verbose_name='Creation time'), + model_name="determination", + name="created_at", + field=models.DateTimeField( + auto_now_add=True, + default=django.utils.timezone.now, + verbose_name="Creation time", + ), preserve_default=False, ), migrations.AddField( - model_name='determination', - name='data', + model_name="determination", + name="data", field=django.contrib.postgres.fields.jsonb.JSONField(blank=True), preserve_default=False, ), migrations.AddField( - model_name='determination', - name='message', - field=models.TextField(blank=True, verbose_name='Determination message'), + model_name="determination", + name="message", + field=models.TextField(blank=True, verbose_name="Determination message"), ), migrations.AddField( - model_name='determination', - name='outcome', - field=models.IntegerField(choices=[(0, 'Rejected'), (1, 'Needs more info'), (2, 'Accepted')], default=1, verbose_name='Determination'), + model_name="determination", + name="outcome", + field=models.IntegerField( + choices=[(0, "Rejected"), (1, "Needs more info"), (2, "Accepted")], + default=1, + verbose_name="Determination", + ), ), migrations.AddField( - model_name='determination', - name='updated_at', - field=models.DateTimeField(auto_now=True, verbose_name='Update time'), + model_name="determination", + name="updated_at", + field=models.DateTimeField(auto_now=True, verbose_name="Update time"), ), migrations.AlterUniqueTogether( - name='determination', + name="determination", unique_together=set(), ), migrations.RemoveField( - model_name='determination', - name='determination', + model_name="determination", + name="determination", ), migrations.RemoveField( - model_name='determination', - name='determination_data', + model_name="determination", + name="determination_data", ), ] diff --git a/hypha/apply/determinations/migrations/0003_message_template_settings.py b/hypha/apply/determinations/migrations/0003_message_template_settings.py index 0ba59cffd5..180dd9e98a 100644 --- a/hypha/apply/determinations/migrations/0003_message_template_settings.py +++ b/hypha/apply/determinations/migrations/0003_message_template_settings.py @@ -6,30 +6,71 @@ class Migration(migrations.Migration): - dependencies = [ - ('wagtailcore', '0040_page_draft_title'), - ('determinations', '0002_add_fields'), + ("wagtailcore", "0040_page_draft_title"), + ("determinations", "0002_add_fields"), ] operations = [ migrations.CreateModel( - name='DeterminationMessageSettings', + name="DeterminationMessageSettings", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('request_accepted', wagtail.fields.RichTextField(verbose_name='Accepted')), - ('request_rejected', wagtail.fields.RichTextField(verbose_name='Rejected')), - ('request_more_info', wagtail.fields.RichTextField(verbose_name='Needs more info')), - ('concept_accepted', wagtail.fields.RichTextField(verbose_name='Accepted')), - ('concept_rejected', wagtail.fields.RichTextField(verbose_name='Rejected')), - ('concept_more_info', wagtail.fields.RichTextField(verbose_name='Needs more info')), - ('proposal_accepted', wagtail.fields.RichTextField(verbose_name='Accepted')), - ('proposal_rejected', wagtail.fields.RichTextField(verbose_name='Rejected')), - ('proposal_more_info', wagtail.fields.RichTextField(verbose_name='Needs more info')), - ('site', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, to='wagtailcore.Site')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "request_accepted", + wagtail.fields.RichTextField(verbose_name="Accepted"), + ), + ( + "request_rejected", + wagtail.fields.RichTextField(verbose_name="Rejected"), + ), + ( + "request_more_info", + wagtail.fields.RichTextField(verbose_name="Needs more info"), + ), + ( + "concept_accepted", + wagtail.fields.RichTextField(verbose_name="Accepted"), + ), + ( + "concept_rejected", + wagtail.fields.RichTextField(verbose_name="Rejected"), + ), + ( + "concept_more_info", + wagtail.fields.RichTextField(verbose_name="Needs more info"), + ), + ( + "proposal_accepted", + wagtail.fields.RichTextField(verbose_name="Accepted"), + ), + ( + "proposal_rejected", + wagtail.fields.RichTextField(verbose_name="Rejected"), + ), + ( + "proposal_more_info", + wagtail.fields.RichTextField(verbose_name="Needs more info"), + ), + ( + "site", + models.OneToOneField( + editable=False, + on_delete=django.db.models.deletion.CASCADE, + to="wagtailcore.Site", + ), + ), ], options={ - 'verbose_name': 'determination messages', + "verbose_name": "determination messages", }, ), ] diff --git a/hypha/apply/determinations/migrations/0004_change_labels.py b/hypha/apply/determinations/migrations/0004_change_labels.py index ece3150b24..d7b1826408 100644 --- a/hypha/apply/determinations/migrations/0004_change_labels.py +++ b/hypha/apply/determinations/migrations/0004_change_labels.py @@ -5,45 +5,48 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0003_message_template_settings'), + ("determinations", "0003_message_template_settings"), ] operations = [ migrations.AlterField( - model_name='determination', - name='outcome', - field=models.IntegerField(choices=[(0, 'Dismissed'), (1, 'Needs more info'), (2, 'Approved')], default=1, verbose_name='Determination'), + model_name="determination", + name="outcome", + field=models.IntegerField( + choices=[(0, "Dismissed"), (1, "Needs more info"), (2, "Approved")], + default=1, + verbose_name="Determination", + ), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='concept_accepted', - field=wagtail.fields.RichTextField(verbose_name='Approved'), + model_name="determinationmessagesettings", + name="concept_accepted", + field=wagtail.fields.RichTextField(verbose_name="Approved"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='concept_rejected', - field=wagtail.fields.RichTextField(verbose_name='Dismissed'), + model_name="determinationmessagesettings", + name="concept_rejected", + field=wagtail.fields.RichTextField(verbose_name="Dismissed"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='proposal_accepted', - field=wagtail.fields.RichTextField(verbose_name='Approved'), + model_name="determinationmessagesettings", + name="proposal_accepted", + field=wagtail.fields.RichTextField(verbose_name="Approved"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='proposal_rejected', - field=wagtail.fields.RichTextField(verbose_name='Dismissed'), + model_name="determinationmessagesettings", + name="proposal_rejected", + field=wagtail.fields.RichTextField(verbose_name="Dismissed"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='request_accepted', - field=wagtail.fields.RichTextField(verbose_name='Approved'), + model_name="determinationmessagesettings", + name="request_accepted", + field=wagtail.fields.RichTextField(verbose_name="Approved"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='request_rejected', - field=wagtail.fields.RichTextField(verbose_name='Dismissed'), + model_name="determinationmessagesettings", + name="request_rejected", + field=wagtail.fields.RichTextField(verbose_name="Dismissed"), ), ] diff --git a/hypha/apply/determinations/migrations/0005_determination_drupal_id.py b/hypha/apply/determinations/migrations/0005_determination_drupal_id.py index 5b3c5626e3..580b15ee48 100644 --- a/hypha/apply/determinations/migrations/0005_determination_drupal_id.py +++ b/hypha/apply/determinations/migrations/0005_determination_drupal_id.py @@ -4,15 +4,14 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0004_change_labels'), + ("determinations", "0004_change_labels"), ] operations = [ migrations.AddField( - model_name='determination', - name='drupal_id', + model_name="determination", + name="drupal_id", field=models.IntegerField(blank=True, editable=False, null=True), ), ] diff --git a/hypha/apply/determinations/migrations/0006_allow_multiple_determinations.py b/hypha/apply/determinations/migrations/0006_allow_multiple_determinations.py index 7a4bddebee..7a35dd97b1 100644 --- a/hypha/apply/determinations/migrations/0006_allow_multiple_determinations.py +++ b/hypha/apply/determinations/migrations/0006_allow_multiple_determinations.py @@ -5,15 +5,18 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0005_determination_drupal_id'), + ("determinations", "0005_determination_drupal_id"), ] operations = [ migrations.AlterField( - model_name='determination', - name='submission', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='determinations', to='funds.ApplicationSubmission'), + model_name="determination", + name="submission", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="determinations", + to="funds.ApplicationSubmission", + ), ), ] diff --git a/hypha/apply/determinations/migrations/0007_add_determinationformsettings.py b/hypha/apply/determinations/migrations/0007_add_determinationformsettings.py index c71c2876bb..dd9a005fc9 100644 --- a/hypha/apply/determinations/migrations/0007_add_determinationformsettings.py +++ b/hypha/apply/determinations/migrations/0007_add_determinationformsettings.py @@ -5,55 +5,233 @@ class Migration(migrations.Migration): - dependencies = [ - ('wagtailcore', '0040_page_draft_title'), - ('determinations', '0006_allow_multiple_determinations'), + ("wagtailcore", "0040_page_draft_title"), + ("determinations", "0006_allow_multiple_determinations"), ] operations = [ migrations.CreateModel( - name='DeterminationFormSettings', + name="DeterminationFormSettings", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('concept_principles_label', models.CharField(default='Goals and principles', max_length=255, verbose_name='label')), - ('concept_principles_help_text', models.TextField(blank=True, verbose_name='help text')), - ('concept_technical_label', models.CharField(default='Technical merit', max_length=255, verbose_name='label')), - ('concept_technical_help_text', models.TextField(blank=True, verbose_name='help text')), - ('concept_sustainable_label', models.CharField(default='Reasonable, realistic and sustainable', max_length=255, verbose_name='label')), - ('concept_sustainable_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_liked_label', models.CharField(default='Positive aspects', max_length=255, verbose_name='label')), - ('proposal_liked_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_concerns_label', models.CharField(default='Concerns', max_length=255, verbose_name='label')), - ('proposal_concerns_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_red_flags_label', models.CharField(default='Items that must be addressed', max_length=255, verbose_name='label')), - ('proposal_red_flags_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_overview_label', models.CharField(default='Project overview questions and comments', max_length=255, verbose_name='label')), - ('proposal_overview_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_objectives_label', models.CharField(default='Objectives questions and comments', max_length=255, verbose_name='label')), - ('proposal_objectives_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_strategy_label', models.CharField(default='Methods and strategy questions and comments', max_length=255, verbose_name='label')), - ('proposal_strategy_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_technical_label', models.CharField(default='Technical feasibility questions and comments', max_length=255, verbose_name='label')), - ('proposal_technical_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_alternative_label', models.CharField(default='Alternative analysis - "red teaming" questions and comments', max_length=255, verbose_name='label')), - ('proposal_alternative_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_usability_label', models.CharField(default='Usability questions and comments', max_length=255, verbose_name='label')), - ('proposal_usability_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_sustainability_label', models.CharField(default='Sustainability questions and comments', max_length=255, verbose_name='label')), - ('proposal_sustainability_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_collaboration_label', models.CharField(default='Collaboration questions and comments', max_length=255, verbose_name='label')), - ('proposal_collaboration_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_realism_label', models.CharField(default='Cost realism questions and comments', max_length=255, verbose_name='label')), - ('proposal_realism_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_qualifications_label', models.CharField(default='Qualifications questions and comments', max_length=255, verbose_name='label')), - ('proposal_qualifications_help_text', models.TextField(blank=True, verbose_name='help text')), - ('proposal_evaluation_label', models.CharField(default='Evaluation questions and comments', max_length=255, verbose_name='label')), - ('proposal_evaluation_help_text', models.TextField(blank=True, verbose_name='help text')), - ('site', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, to='wagtailcore.Site')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "concept_principles_label", + models.CharField( + default="Goals and principles", + max_length=255, + verbose_name="label", + ), + ), + ( + "concept_principles_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "concept_technical_label", + models.CharField( + default="Technical merit", max_length=255, verbose_name="label" + ), + ), + ( + "concept_technical_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "concept_sustainable_label", + models.CharField( + default="Reasonable, realistic and sustainable", + max_length=255, + verbose_name="label", + ), + ), + ( + "concept_sustainable_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_liked_label", + models.CharField( + default="Positive aspects", max_length=255, verbose_name="label" + ), + ), + ( + "proposal_liked_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_concerns_label", + models.CharField( + default="Concerns", max_length=255, verbose_name="label" + ), + ), + ( + "proposal_concerns_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_red_flags_label", + models.CharField( + default="Items that must be addressed", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_red_flags_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_overview_label", + models.CharField( + default="Project overview questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_overview_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_objectives_label", + models.CharField( + default="Objectives questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_objectives_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_strategy_label", + models.CharField( + default="Methods and strategy questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_strategy_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_technical_label", + models.CharField( + default="Technical feasibility questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_technical_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_alternative_label", + models.CharField( + default='Alternative analysis - "red teaming" questions and comments', + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_alternative_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_usability_label", + models.CharField( + default="Usability questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_usability_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_sustainability_label", + models.CharField( + default="Sustainability questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_sustainability_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_collaboration_label", + models.CharField( + default="Collaboration questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_collaboration_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_realism_label", + models.CharField( + default="Cost realism questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_realism_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_qualifications_label", + models.CharField( + default="Qualifications questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_qualifications_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "proposal_evaluation_label", + models.CharField( + default="Evaluation questions and comments", + max_length=255, + verbose_name="label", + ), + ), + ( + "proposal_evaluation_help_text", + models.TextField(blank=True, verbose_name="help text"), + ), + ( + "site", + models.OneToOneField( + editable=False, + on_delete=django.db.models.deletion.CASCADE, + to="wagtailcore.Site", + ), + ), ], options={ - 'verbose_name': 'determination settings', + "verbose_name": "determination settings", }, ), ] diff --git a/hypha/apply/determinations/migrations/0008_rename_more_info.py b/hypha/apply/determinations/migrations/0008_rename_more_info.py index f397dc4d8f..b2ad8a4365 100644 --- a/hypha/apply/determinations/migrations/0008_rename_more_info.py +++ b/hypha/apply/determinations/migrations/0008_rename_more_info.py @@ -4,15 +4,22 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0007_add_determinationformsettings'), + ("determinations", "0007_add_determinationformsettings"), ] operations = [ migrations.AlterField( - model_name='determination', - name='outcome', - field=models.IntegerField(choices=[(0, 'Dismissed'), (1, 'More information requested'), (2, 'Approved')], default=1, verbose_name='Determination'), + model_name="determination", + name="outcome", + field=models.IntegerField( + choices=[ + (0, "Dismissed"), + (1, "More information requested"), + (2, "Approved"), + ], + default=1, + verbose_name="Determination", + ), ), ] diff --git a/hypha/apply/determinations/migrations/0009_add_send_notice_field.py b/hypha/apply/determinations/migrations/0009_add_send_notice_field.py index 330519e11a..10562d01a3 100644 --- a/hypha/apply/determinations/migrations/0009_add_send_notice_field.py +++ b/hypha/apply/determinations/migrations/0009_add_send_notice_field.py @@ -4,15 +4,16 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0008_rename_more_info'), + ("determinations", "0008_rename_more_info"), ] operations = [ migrations.AddField( - model_name='determination', - name='send_notice', - field=models.BooleanField(default=True, verbose_name='Send message to applicant'), + model_name="determination", + name="send_notice", + field=models.BooleanField( + default=True, verbose_name="Send message to applicant" + ), ), ] diff --git a/hypha/apply/determinations/migrations/0010_add_determination_stream_field_forms.py b/hypha/apply/determinations/migrations/0010_add_determination_stream_field_forms.py index b747186fe6..3e5ccbcf3c 100644 --- a/hypha/apply/determinations/migrations/0010_add_determination_stream_field_forms.py +++ b/hypha/apply/determinations/migrations/0010_add_determination_stream_field_forms.py @@ -9,36 +9,725 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0009_add_send_notice_field'), + ("determinations", "0009_add_send_notice_field"), ] operations = [ migrations.CreateModel( - name='DeterminationForm', + name="DeterminationForm", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('form_fields', wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Section text/header')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('send_notice', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('determination', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('message', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], default=[])), - ('name', models.CharField(max_length=255)), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "form_fields", + wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[ + ("email", "Email"), + ("url", "URL"), + ], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock( + group="Fields", label="Section text/header" + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "send_notice", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "determination", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "info", + wagtail.blocks.static_block.StaticBlock(), + ), + ], + group=" Required", + ), + ), + ( + "message", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "info", + wagtail.blocks.static_block.StaticBlock(), + ), + ], + group=" Required", + ), + ), + ], + default=[], + ), + ), + ("name", models.CharField(max_length=255)), ], options={ - 'abstract': False, + "abstract": False, }, ), migrations.AddField( - model_name='determination', - name='form_data', - field=django.contrib.postgres.fields.jsonb.JSONField(default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder), + model_name="determination", + name="form_data", + field=django.contrib.postgres.fields.jsonb.JSONField( + default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder + ), ), migrations.AddField( - model_name='determination', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Section text/header')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('send_notice', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('determination', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('message', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], default=[]), + model_name="determination", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock( + group="Fields", label="Section text/header" + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "send_notice", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "determination", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "message", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ], + default=[], + ), ), migrations.AlterField( - model_name='determination', - name='data', + model_name="determination", + name="data", field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True), ), ] diff --git a/hypha/apply/determinations/migrations/0011_auto_20220111_1314.py b/hypha/apply/determinations/migrations/0011_auto_20220111_1314.py index b2ca4b01ae..4b4e906c85 100644 --- a/hypha/apply/determinations/migrations/0011_auto_20220111_1314.py +++ b/hypha/apply/determinations/migrations/0011_auto_20220111_1314.py @@ -5,20 +5,21 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0010_add_determination_stream_field_forms'), + ("determinations", "0010_add_determination_stream_field_forms"), ] operations = [ migrations.AlterField( - model_name='determination', - name='data', + model_name="determination", + name="data", field=models.JSONField(blank=True, null=True), ), migrations.AlterField( - model_name='determination', - name='form_data', - field=models.JSONField(default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder), + model_name="determination", + name="form_data", + field=models.JSONField( + default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder + ), ), ] diff --git a/hypha/apply/determinations/migrations/0012_auto_20220509_1136.py b/hypha/apply/determinations/migrations/0012_auto_20220509_1136.py index 044519ade4..3467152c92 100644 --- a/hypha/apply/determinations/migrations/0012_auto_20220509_1136.py +++ b/hypha/apply/determinations/migrations/0012_auto_20220509_1136.py @@ -5,55 +5,60 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0011_auto_20220111_1314'), + ("determinations", "0011_auto_20220111_1314"), ] operations = [ migrations.AlterField( - model_name='determinationmessagesettings', - name='concept_accepted', - field=wagtail.fields.RichTextField(blank=True, verbose_name='Approved'), + model_name="determinationmessagesettings", + name="concept_accepted", + field=wagtail.fields.RichTextField(blank=True, verbose_name="Approved"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='concept_more_info', - field=wagtail.fields.RichTextField(blank=True, verbose_name='Needs more info'), + model_name="determinationmessagesettings", + name="concept_more_info", + field=wagtail.fields.RichTextField( + blank=True, verbose_name="Needs more info" + ), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='concept_rejected', - field=wagtail.fields.RichTextField(blank=True, verbose_name='Dismissed'), + model_name="determinationmessagesettings", + name="concept_rejected", + field=wagtail.fields.RichTextField(blank=True, verbose_name="Dismissed"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='proposal_accepted', - field=wagtail.fields.RichTextField(blank=True, verbose_name='Approved'), + model_name="determinationmessagesettings", + name="proposal_accepted", + field=wagtail.fields.RichTextField(blank=True, verbose_name="Approved"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='proposal_more_info', - field=wagtail.fields.RichTextField(blank=True, verbose_name='Needs more info'), + model_name="determinationmessagesettings", + name="proposal_more_info", + field=wagtail.fields.RichTextField( + blank=True, verbose_name="Needs more info" + ), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='proposal_rejected', - field=wagtail.fields.RichTextField(blank=True, verbose_name='Dismissed'), + model_name="determinationmessagesettings", + name="proposal_rejected", + field=wagtail.fields.RichTextField(blank=True, verbose_name="Dismissed"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='request_accepted', - field=wagtail.fields.RichTextField(blank=True, verbose_name='Approved'), + model_name="determinationmessagesettings", + name="request_accepted", + field=wagtail.fields.RichTextField(blank=True, verbose_name="Approved"), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='request_more_info', - field=wagtail.fields.RichTextField(blank=True, verbose_name='Needs more info'), + model_name="determinationmessagesettings", + name="request_more_info", + field=wagtail.fields.RichTextField( + blank=True, verbose_name="Needs more info" + ), ), migrations.AlterField( - model_name='determinationmessagesettings', - name='request_rejected', - field=wagtail.fields.RichTextField(blank=True, verbose_name='Dismissed'), + model_name="determinationmessagesettings", + name="request_rejected", + field=wagtail.fields.RichTextField(blank=True, verbose_name="Dismissed"), ), ] diff --git a/hypha/apply/determinations/migrations/0013_auto_20220722_0844.py b/hypha/apply/determinations/migrations/0013_auto_20220722_0844.py index be5e5086b0..ec4af3333a 100644 --- a/hypha/apply/determinations/migrations/0013_auto_20220722_0844.py +++ b/hypha/apply/determinations/migrations/0013_auto_20220722_0844.py @@ -7,20 +7,689 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0012_auto_20220509_1136'), + ("determinations", "0012_auto_20220509_1136"), ] operations = [ migrations.AlterField( - model_name='determination', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Section text/header')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('send_notice', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('determination', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('message', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], default=[], use_json_field=True), + model_name="determination", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock( + group="Fields", label="Section text/header" + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "send_notice", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "determination", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "message", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ], + default=[], + use_json_field=True, + ), ), migrations.AlterField( - model_name='determinationform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Section text/header')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('send_notice', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('determination', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('message', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], default=[], use_json_field=True), + model_name="determinationform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock( + group="Fields", label="Section text/header" + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "send_notice", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "determination", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "message", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ], + default=[], + use_json_field=True, + ), ), ] diff --git a/hypha/apply/determinations/migrations/0014_alter_determination_formfield_send_notice.py b/hypha/apply/determinations/migrations/0014_alter_determination_formfield_send_notice.py index 3c539916ce..98daae3ceb 100644 --- a/hypha/apply/determinations/migrations/0014_alter_determination_formfield_send_notice.py +++ b/hypha/apply/determinations/migrations/0014_alter_determination_formfield_send_notice.py @@ -7,20 +7,683 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0013_auto_20220722_0844'), + ("determinations", "0013_auto_20220722_0844"), ] operations = [ migrations.AlterField( - model_name='determination', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Section text/header')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('determination', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('message', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('send_notice', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('default_value', wagtail.blocks.BooleanBlock(default=True, required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], default=[], use_json_field=True), + model_name="determination", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock( + group="Fields", label="Section text/header" + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "determination", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "message", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "send_notice", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock( + default=True, required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ], + default=[], + use_json_field=True, + ), ), migrations.AlterField( - model_name='determinationform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Section text/header')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('determination', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('message', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('send_notice', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('default_value', wagtail.blocks.BooleanBlock(default=True, required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], default=[], use_json_field=True), + model_name="determinationform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock( + group="Fields", label="Section text/header" + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "determination", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "message", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "send_notice", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock( + default=True, required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ], + default=[], + use_json_field=True, + ), ), ] diff --git a/hypha/apply/determinations/migrations/0015_alter_determinationformsettings_options.py b/hypha/apply/determinations/migrations/0015_alter_determinationformsettings_options.py index 4f6775b25d..a18906912c 100644 --- a/hypha/apply/determinations/migrations/0015_alter_determinationformsettings_options.py +++ b/hypha/apply/determinations/migrations/0015_alter_determinationformsettings_options.py @@ -4,14 +4,13 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0014_alter_determination_formfield_send_notice'), + ("determinations", "0014_alter_determination_formfield_send_notice"), ] operations = [ migrations.AlterModelOptions( - name='determinationformsettings', - options={'verbose_name': 'determination form settings'}, + name="determinationformsettings", + options={"verbose_name": "determination form settings"}, ), ] diff --git a/hypha/apply/determinations/migrations/0016_rename_section_text_field.py b/hypha/apply/determinations/migrations/0016_rename_section_text_field.py index f0da11f85f..e8b5420436 100644 --- a/hypha/apply/determinations/migrations/0016_rename_section_text_field.py +++ b/hypha/apply/determinations/migrations/0016_rename_section_text_field.py @@ -7,20 +7,679 @@ class Migration(migrations.Migration): - dependencies = [ - ('determinations', '0015_alter_determinationformsettings_options'), + ("determinations", "0015_alter_determinationformsettings_options"), ] operations = [ migrations.AlterField( - model_name='determination', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('determination', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('message', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('send_notice', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('default_value', wagtail.blocks.BooleanBlock(default=True, required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], default=[], use_json_field=True), + model_name="determination", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "determination", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "message", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "send_notice", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock( + default=True, required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ], + default=[], + use_json_field=True, + ), ), migrations.AlterField( - model_name='determinationform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('determination', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('message', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('send_notice', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('default_value', wagtail.blocks.BooleanBlock(default=True, required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], default=[], use_json_field=True), + model_name="determinationform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "determination", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "message", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "send_notice", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock( + default=True, required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ], + default=[], + use_json_field=True, + ), ), ] diff --git a/hypha/apply/determinations/models.py b/hypha/apply/determinations/models.py index f5ebe09ea8..0707ba0cf6 100644 --- a/hypha/apply/determinations/models.py +++ b/hypha/apply/determinations/models.py @@ -29,21 +29,20 @@ class DeterminationQuerySet(models.QuerySet): def staff(self): # Designed to be used with a queryset related to submissions - return self.all().order_by('-updated_at') + return self.all().order_by("-updated_at") def active(self): # Designed to be used with a queryset related to submissions return self.get(is_draft=True) def submitted(self): - return self.filter(is_draft=False).order_by('-updated_at') + return self.filter(is_draft=False).order_by("-updated_at") def final(self): return self.submitted().filter(outcome__in=[ACCEPTED, REJECTED]) class DeterminationFormFieldsMixin(models.Model): - wagtail_reference_index_ignore = True class Meta: @@ -86,8 +85,8 @@ class DeterminationForm(DeterminationFormFieldsMixin, models.Model): name = models.CharField(max_length=255) panels = [ - FieldPanel('name'), - FieldPanel('form_fields'), + FieldPanel("name"), + FieldPanel("form_fields"), ] def __str__(self): @@ -96,16 +95,18 @@ def __str__(self): class Determination(DeterminationFormFieldsMixin, AccessFormData, models.Model): submission = models.ForeignKey( - 'funds.ApplicationSubmission', + "funds.ApplicationSubmission", on_delete=models.CASCADE, - related_name='determinations' + related_name="determinations", ) author = models.ForeignKey( settings.AUTH_USER_MODEL, on_delete=models.PROTECT, ) - outcome = models.IntegerField(verbose_name=_("Determination"), choices=DETERMINATION_CHOICES, default=1) + outcome = models.IntegerField( + verbose_name=_("Determination"), choices=DETERMINATION_CHOICES, default=1 + ) message = models.TextField(verbose_name=_("Determination message"), blank=True) # Stores old determination forms data @@ -114,9 +115,13 @@ class Determination(DeterminationFormFieldsMixin, AccessFormData, models.Model): # Stores data submitted via streamfield determination forms form_data = models.JSONField(default=dict, encoder=DjangoJSONEncoder) is_draft = models.BooleanField(default=False, verbose_name=_("Draft")) - created_at = models.DateTimeField(verbose_name=_('Creation time'), auto_now_add=True) - updated_at = models.DateTimeField(verbose_name=_('Update time'), auto_now=True) - send_notice = models.BooleanField(default=True, verbose_name=_("Send message to applicant")) + created_at = models.DateTimeField( + verbose_name=_("Creation time"), auto_now_add=True + ) + updated_at = models.DateTimeField(verbose_name=_("Update time"), auto_now=True) + send_notice = models.BooleanField( + default=True, verbose_name=_("Send message to applicant") + ) # Meta: used for migration purposes only drupal_id = models.IntegerField(null=True, blank=True, editable=False) @@ -132,17 +137,20 @@ def clean_outcome(self): return self.get_outcome_display() def get_absolute_url(self): - return reverse('apply:submissions:determinations:detail', args=(self.submission.id, self.id)) + return reverse( + "apply:submissions:determinations:detail", + args=(self.submission.id, self.id), + ) @property def submitted(self): return not self.is_draft def __str__(self): - return f'Determination for {self.submission.title} by {self.author!s}' + return f"Determination for {self.submission.title} by {self.author!s}" def __repr__(self): - return f'<{self.__class__.__name__}: {str(self.form_data)}>' + return f"<{self.__class__.__name__}: {str(self.form_data)}>" @property def use_new_determination_form(self): @@ -162,13 +170,14 @@ def use_new_determination_form(self): def detailed_data(self): if not self.use_new_determination_form: from .views import get_form_for_stage + return get_form_for_stage(self.submission).get_detailed_response(self.data) return self.get_detailed_response() def get_detailed_response(self): data = {} group = 0 - data.setdefault(group, {'title': None, 'questions': []}) + data.setdefault(group, {"title": None, "questions": []}) for field in self.form_fields: if issubclass( field.block.__class__, DeterminationMustIncludeFieldBlock @@ -178,21 +187,18 @@ def get_detailed_response(self): value = self.form_data[field.id] except KeyError: group = group + 1 - data.setdefault(group, {'title': field.value.source, 'questions': []}) + data.setdefault(group, {"title": field.value.source, "questions": []}) else: - data[group]['questions'].append( - (field.value.get('field_label'), value) - ) + data[group]["questions"].append((field.value.get("field_label"), value)) return data @register_setting class DeterminationMessageSettings(BaseSiteSetting): - wagtail_reference_index_ignore = True class Meta: - verbose_name = 'determination messages' + verbose_name = "determination messages" request_accepted = RichTextField("Approved", blank=True) request_rejected = RichTextField("Dismissed", blank=True) @@ -216,151 +222,242 @@ def get_for_stage(self, stage_name): for field in self._meta.get_fields(): if prefix in field.name: - key = field.name.replace(prefix, '') + key = field.name.replace(prefix, "") message_templates[key] = getattr(self, field.name) return message_templates request_tab_panels = [ - FieldPanel('request_accepted'), - FieldPanel('request_rejected'), - FieldPanel('request_more_info'), + FieldPanel("request_accepted"), + FieldPanel("request_rejected"), + FieldPanel("request_more_info"), ] concept_tab_panels = [ - FieldPanel('concept_accepted'), - FieldPanel('concept_rejected'), - FieldPanel('concept_more_info'), + FieldPanel("concept_accepted"), + FieldPanel("concept_rejected"), + FieldPanel("concept_more_info"), ] proposal_tab_panels = [ - FieldPanel('proposal_accepted'), - FieldPanel('proposal_rejected'), - FieldPanel('proposal_more_info'), + FieldPanel("proposal_accepted"), + FieldPanel("proposal_rejected"), + FieldPanel("proposal_more_info"), ] - edit_handler = TabbedInterface([ - ObjectList(request_tab_panels, heading=_('Request')), - ObjectList(concept_tab_panels, heading=_('Concept note')), - ObjectList(proposal_tab_panels, heading=_('Proposal')), - ]) + edit_handler = TabbedInterface( + [ + ObjectList(request_tab_panels, heading=_("Request")), + ObjectList(concept_tab_panels, heading=_("Concept note")), + ObjectList(proposal_tab_panels, heading=_("Proposal")), + ] + ) @register_setting class DeterminationFormSettings(BaseSiteSetting): class Meta: - verbose_name = 'determination form settings' - - concept_principles_label = models.CharField('label', default='Goals and principles', max_length=255) - concept_principles_help_text = models.TextField('help text', blank=True) - concept_technical_label = models.CharField('label', default='Technical merit', max_length=255) - concept_technical_help_text = models.TextField('help text', blank=True) - concept_sustainable_label = models.CharField('label', default='Reasonable, realistic and sustainable', max_length=255) - concept_sustainable_help_text = models.TextField('help text', blank=True) - - proposal_liked_label = models.CharField('label', default='Positive aspects', max_length=255) - proposal_liked_help_text = models.TextField('help text', blank=True) - proposal_concerns_label = models.CharField('label', default='Concerns', max_length=255) - proposal_concerns_help_text = models.TextField('help text', blank=True) - proposal_red_flags_label = models.CharField('label', default='Items that must be addressed', max_length=255) - proposal_red_flags_help_text = models.TextField('help text', blank=True) - proposal_overview_label = models.CharField('label', default='Project overview questions and comments', max_length=255) - proposal_overview_help_text = models.TextField('help text', blank=True) - proposal_objectives_label = models.CharField('label', default='Objectives questions and comments', max_length=255) - proposal_objectives_help_text = models.TextField('help text', blank=True) - proposal_strategy_label = models.CharField('label', default='Methods and strategy questions and comments', max_length=255) - proposal_strategy_help_text = models.TextField('help text', blank=True) - proposal_technical_label = models.CharField('label', default='Technical feasibility questions and comments', max_length=255) - proposal_technical_help_text = models.TextField('help text', blank=True) - proposal_alternative_label = models.CharField('label', default='Alternative analysis - "red teaming" questions and comments', max_length=255) - proposal_alternative_help_text = models.TextField('help text', blank=True) - proposal_usability_label = models.CharField('label', default='Usability questions and comments', max_length=255) - proposal_usability_help_text = models.TextField('help text', blank=True) - proposal_sustainability_label = models.CharField('label', default='Sustainability questions and comments', max_length=255) - proposal_sustainability_help_text = models.TextField('help text', blank=True) - proposal_collaboration_label = models.CharField('label', default='Collaboration questions and comments', max_length=255) - proposal_collaboration_help_text = models.TextField('help text', blank=True) - proposal_realism_label = models.CharField('label', default='Cost realism questions and comments', max_length=255) - proposal_realism_help_text = models.TextField('help text', blank=True) - proposal_qualifications_label = models.CharField('label', default='Qualifications questions and comments', max_length=255) - proposal_qualifications_help_text = models.TextField('help text', blank=True) - proposal_evaluation_label = models.CharField('label', default='Evaluation questions and comments', max_length=255) - proposal_evaluation_help_text = models.TextField('help text', blank=True) + verbose_name = "determination form settings" + + concept_principles_label = models.CharField( + "label", default="Goals and principles", max_length=255 + ) + concept_principles_help_text = models.TextField("help text", blank=True) + concept_technical_label = models.CharField( + "label", default="Technical merit", max_length=255 + ) + concept_technical_help_text = models.TextField("help text", blank=True) + concept_sustainable_label = models.CharField( + "label", default="Reasonable, realistic and sustainable", max_length=255 + ) + concept_sustainable_help_text = models.TextField("help text", blank=True) + + proposal_liked_label = models.CharField( + "label", default="Positive aspects", max_length=255 + ) + proposal_liked_help_text = models.TextField("help text", blank=True) + proposal_concerns_label = models.CharField( + "label", default="Concerns", max_length=255 + ) + proposal_concerns_help_text = models.TextField("help text", blank=True) + proposal_red_flags_label = models.CharField( + "label", default="Items that must be addressed", max_length=255 + ) + proposal_red_flags_help_text = models.TextField("help text", blank=True) + proposal_overview_label = models.CharField( + "label", default="Project overview questions and comments", max_length=255 + ) + proposal_overview_help_text = models.TextField("help text", blank=True) + proposal_objectives_label = models.CharField( + "label", default="Objectives questions and comments", max_length=255 + ) + proposal_objectives_help_text = models.TextField("help text", blank=True) + proposal_strategy_label = models.CharField( + "label", default="Methods and strategy questions and comments", max_length=255 + ) + proposal_strategy_help_text = models.TextField("help text", blank=True) + proposal_technical_label = models.CharField( + "label", default="Technical feasibility questions and comments", max_length=255 + ) + proposal_technical_help_text = models.TextField("help text", blank=True) + proposal_alternative_label = models.CharField( + "label", + default='Alternative analysis - "red teaming" questions and comments', + max_length=255, + ) + proposal_alternative_help_text = models.TextField("help text", blank=True) + proposal_usability_label = models.CharField( + "label", default="Usability questions and comments", max_length=255 + ) + proposal_usability_help_text = models.TextField("help text", blank=True) + proposal_sustainability_label = models.CharField( + "label", default="Sustainability questions and comments", max_length=255 + ) + proposal_sustainability_help_text = models.TextField("help text", blank=True) + proposal_collaboration_label = models.CharField( + "label", default="Collaboration questions and comments", max_length=255 + ) + proposal_collaboration_help_text = models.TextField("help text", blank=True) + proposal_realism_label = models.CharField( + "label", default="Cost realism questions and comments", max_length=255 + ) + proposal_realism_help_text = models.TextField("help text", blank=True) + proposal_qualifications_label = models.CharField( + "label", default="Qualifications questions and comments", max_length=255 + ) + proposal_qualifications_help_text = models.TextField("help text", blank=True) + proposal_evaluation_label = models.CharField( + "label", default="Evaluation questions and comments", max_length=255 + ) + proposal_evaluation_help_text = models.TextField("help text", blank=True) concept_help_text_tab_panels = [ - MultiFieldPanel([ - FieldPanel('concept_principles_label'), - FieldPanel('concept_principles_help_text'), - ], 'concept principles'), - MultiFieldPanel([ - FieldPanel('concept_technical_label'), - FieldPanel('concept_technical_help_text'), - ], 'concept technical'), - MultiFieldPanel([ - FieldPanel('concept_sustainable_label'), - FieldPanel('concept_sustainable_help_text'), - ], 'concept sustainable'), + MultiFieldPanel( + [ + FieldPanel("concept_principles_label"), + FieldPanel("concept_principles_help_text"), + ], + "concept principles", + ), + MultiFieldPanel( + [ + FieldPanel("concept_technical_label"), + FieldPanel("concept_technical_help_text"), + ], + "concept technical", + ), + MultiFieldPanel( + [ + FieldPanel("concept_sustainable_label"), + FieldPanel("concept_sustainable_help_text"), + ], + "concept sustainable", + ), ] proposal_help_text_tab_panels = [ - MultiFieldPanel([ - FieldPanel('proposal_liked_label'), - FieldPanel('proposal_liked_help_text'), - ], 'proposal liked'), - MultiFieldPanel([ - FieldPanel('proposal_concerns_label'), - FieldPanel('proposal_concerns_help_text'), - ], 'proposal concerns'), - MultiFieldPanel([ - FieldPanel('proposal_red_flags_label'), - FieldPanel('proposal_red_flags_help_text'), - ], 'proposal red flags'), - MultiFieldPanel([ - FieldPanel('proposal_overview_label'), - FieldPanel('proposal_overview_help_text'), - ], 'proposal overview'), - MultiFieldPanel([ - FieldPanel('proposal_objectives_label'), - FieldPanel('proposal_objectives_help_text'), - ], 'proposal objectives'), - MultiFieldPanel([ - FieldPanel('proposal_strategy_label'), - FieldPanel('proposal_strategy_help_text'), - ], 'proposal strategy'), - MultiFieldPanel([ - FieldPanel('proposal_technical_label'), - FieldPanel('proposal_technical_help_text'), - ], 'proposal technical'), - MultiFieldPanel([ - FieldPanel('proposal_alternative_label'), - FieldPanel('proposal_alternative_help_text'), - ], 'proposal alternative'), - MultiFieldPanel([ - FieldPanel('proposal_usability_label'), - FieldPanel('proposal_usability_help_text'), - ], 'proposal usability'), - MultiFieldPanel([ - FieldPanel('proposal_sustainability_label'), - FieldPanel('proposal_sustainability_help_text'), - ], 'proposal sustainability'), - MultiFieldPanel([ - FieldPanel('proposal_collaboration_label'), - FieldPanel('proposal_collaboration_help_text'), - ], 'proposal collaboration'), - MultiFieldPanel([ - FieldPanel('proposal_realism_label'), - FieldPanel('proposal_realism_help_text'), - ], 'proposal realism'), - MultiFieldPanel([ - FieldPanel('proposal_qualifications_label'), - FieldPanel('proposal_qualifications_help_text'), - ], 'proposal qualifications'), - MultiFieldPanel([ - FieldPanel('proposal_evaluation_label'), - FieldPanel('proposal_evaluation_help_text'), - ], 'proposal evaluation'), + MultiFieldPanel( + [ + FieldPanel("proposal_liked_label"), + FieldPanel("proposal_liked_help_text"), + ], + "proposal liked", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_concerns_label"), + FieldPanel("proposal_concerns_help_text"), + ], + "proposal concerns", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_red_flags_label"), + FieldPanel("proposal_red_flags_help_text"), + ], + "proposal red flags", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_overview_label"), + FieldPanel("proposal_overview_help_text"), + ], + "proposal overview", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_objectives_label"), + FieldPanel("proposal_objectives_help_text"), + ], + "proposal objectives", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_strategy_label"), + FieldPanel("proposal_strategy_help_text"), + ], + "proposal strategy", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_technical_label"), + FieldPanel("proposal_technical_help_text"), + ], + "proposal technical", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_alternative_label"), + FieldPanel("proposal_alternative_help_text"), + ], + "proposal alternative", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_usability_label"), + FieldPanel("proposal_usability_help_text"), + ], + "proposal usability", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_sustainability_label"), + FieldPanel("proposal_sustainability_help_text"), + ], + "proposal sustainability", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_collaboration_label"), + FieldPanel("proposal_collaboration_help_text"), + ], + "proposal collaboration", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_realism_label"), + FieldPanel("proposal_realism_help_text"), + ], + "proposal realism", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_qualifications_label"), + FieldPanel("proposal_qualifications_help_text"), + ], + "proposal qualifications", + ), + MultiFieldPanel( + [ + FieldPanel("proposal_evaluation_label"), + FieldPanel("proposal_evaluation_help_text"), + ], + "proposal evaluation", + ), ] - edit_handler = TabbedInterface([ - ObjectList(concept_help_text_tab_panels, heading=_('Concept form')), - ObjectList(proposal_help_text_tab_panels, heading=_('Proposal form')), - ]) + edit_handler = TabbedInterface( + [ + ObjectList(concept_help_text_tab_panels, heading=_("Concept form")), + ObjectList(proposal_help_text_tab_panels, heading=_("Proposal form")), + ] + ) diff --git a/hypha/apply/determinations/options.py b/hypha/apply/determinations/options.py index 1da2980b18..c70b8eec9b 100644 --- a/hypha/apply/determinations/options.py +++ b/hypha/apply/determinations/options.py @@ -7,15 +7,15 @@ ACCEPTED = 2 DETERMINATION_CHOICES = ( - (REJECTED, _('Dismissed')), - (NEEDS_MORE_INFO, _('More information requested')), - (ACCEPTED, _('Approved')), + (REJECTED, _("Dismissed")), + (NEEDS_MORE_INFO, _("More information requested")), + (ACCEPTED, _("Approved")), ) DETERMINATION_TO_OUTCOME = { - 'rejected': REJECTED, - 'accepted': ACCEPTED, - 'more_info': NEEDS_MORE_INFO, + "rejected": REJECTED, + "accepted": ACCEPTED, + "more_info": NEEDS_MORE_INFO, } TRANSITION_DETERMINATION = { diff --git a/hypha/apply/determinations/templates/determinations/base_determination_form.html b/hypha/apply/determinations/templates/determinations/base_determination_form.html index 9e1430e680..d575ce5492 100644 --- a/hypha/apply/determinations/templates/determinations/base_determination_form.html +++ b/hypha/apply/determinations/templates/determinations/base_determination_form.html @@ -3,54 +3,54 @@ {% block title %}{% if object %}{% trans "Edit a Determination" %} {% if object.is_draft %}{% trans "draft" %}{% endif %}{% else %}{% trans "Create a Determination" %}{% endif %}{% endblock %} {% block content %} -{% block header %} - {% adminbar %} - {% slot header %}{% if object %}{% trans "Update Determination draft" %}{% else %}{% trans "Create Determination" %}{% endif %}{% endslot %} - {% slot sub_heading %}{% trans "For" %} {{ submission.title }}{% endslot %} - {% endadminbar %} -{% endblock %} + {% block header %} + {% adminbar %} + {% slot header %}{% if object %}{% trans "Update Determination draft" %}{% else %}{% trans "Create Determination" %}{% endif %}{% endslot %} + {% slot sub_heading %}{% trans "For" %} {{ submission.title }}{% endslot %} + {% endadminbar %} + {% endblock %} -{% block form %} -
- {{ message }}
-
- {% endfor %}
- {% endblock %}
+ {% endblock %}
-
{% endblock %}
diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html
index 7eb9d3b252..f7c07d93ed 100644
--- a/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html
+++ b/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html
@@ -2,8 +2,8 @@
{% load i18n static workflow_tags review_tags determination_tags %}
{% block extra_css %}
-
- {{ reviewer_form.media.css }}
+
+ {{ reviewer_form.media.css }}
{% endblock %}
{% block mobile_actions %}
diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html b/hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html
index c70f15744d..a8be354ec1 100644
--- a/hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html
+++ b/hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html
@@ -4,21 +4,21 @@
{% block title %}{% trans "Deleting" %}: {{object.title }}{% endblock %}
{% block content %}
-
{% endblock %}
diff --git a/hypha/apply/funds/templates/funds/reviewer_leaderboard.html b/hypha/apply/funds/templates/funds/reviewer_leaderboard.html
index ba2a70f21c..e2caa5e493 100644
--- a/hypha/apply/funds/templates/funds/reviewer_leaderboard.html
+++ b/hypha/apply/funds/templates/funds/reviewer_leaderboard.html
@@ -13,8 +13,8 @@
{% if request.user.is_apply_staff %}
-
- {% for revision in object_list %}
-
-
- ++
-
+ {% for revision in object_list %}
+
- + + {% if not forloop.first %} + {% trans "Compare" %} {% endif %} - - {% if not forloop.first %} - {% trans "Compare" %} - {% endif %} - - {% endfor %} -
+ {% endfor %}
+
{% trans "All" %}
@@ -31,12 +31,12 @@
{% endif %}
{% endadminbar %}
-
- {% block table %}
- {% trans "All reviewers" as all_reviewers %}
- {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term search_placeholder="reviewers" use_search=True filter_action=filter_action use_batch_actions=False heading=all_reviewers %}
+
{% endblock %}
diff --git a/hypha/apply/funds/templates/funds/rounds.html b/hypha/apply/funds/templates/funds/rounds.html
index 410d9e6507..f3f9f80c54 100644
--- a/hypha/apply/funds/templates/funds/rounds.html
+++ b/hypha/apply/funds/templates/funds/rounds.html
@@ -5,7 +5,7 @@
{% block title %}{% trans "Rounds" %}{% endblock %}
{% block extra_css %}
-{{ filter.form.media.css }}
+ {{ filter.form.media.css }}
{% endblock %}
@@ -16,15 +16,15 @@
{% slot sub_heading %}{% trans "Explore current and past rounds" %}{% endslot %}
{% endadminbar %}
-
+ {% block table %}
+ {% trans "All reviewers" as all_reviewers %}
+ {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term search_placeholder="reviewers" use_search=True filter_action=filter_action use_batch_actions=False heading=all_reviewers %}
- {% render_table table %}
- {% endblock %}
-
+ {% render_table table %}
+ {% endblock %}
+
- {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_batch_actions=False %}
- {% render_table table %}
-
+
+ {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_batch_actions=False %}
+ {% render_table table %}
+
{% endblock %}
{% block extra_js %}
-{{ filter.form.media.js }}
-
-
+ {{ filter.form.media.js }}
+
+
{% endblock %}
diff --git a/hypha/apply/funds/templates/funds/submission_sealed.html b/hypha/apply/funds/templates/funds/submission_sealed.html
index c08b4061b6..4db73b2332 100644
--- a/hypha/apply/funds/templates/funds/submission_sealed.html
+++ b/hypha/apply/funds/templates/funds/submission_sealed.html
@@ -4,28 +4,28 @@
{% block title %}{% trans "Sealed" %}: {{ object.title }}{% endblock %}
{% block content %}
-
-
-
-
{% endblock %}
diff --git a/hypha/apply/funds/templates/funds/submissions.html b/hypha/apply/funds/templates/funds/submissions.html
index 01efc3a9ba..993e0540dd 100644
--- a/hypha/apply/funds/templates/funds/submissions.html
+++ b/hypha/apply/funds/templates/funds/submissions.html
@@ -10,8 +10,8 @@
{% slot header %}
{% trans "All Submissions" %} ({{ table.rows|length }})
{% heroicon_outline "rocket-launch" aria_hidden="true" size=15 stroke_width="2" class="inline align-text-bottom" %}
{% trans "Try newer version" %}
@@ -20,11 +20,11 @@
{% slot sub_heading %}{% trans "Search and filter all submissions" %}{% endslot %}
{% endadminbar %}
-{% trans "This application is sealed until the round is closed" %}
-{% trans "The round ends on" %}: {{ object.round.specific.end_date }}
- {% trans "Go back" %} - {% if can_view_sealed %} -{% trans "As an admin you are allowed to access the application. However, this action will be recorded." %}
- - {% endif %} -
- {% block table %}
- {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=True filter_classes="filters-open" show_archive=show_archive %}
+
{% endblock %}
diff --git a/hypha/apply/funds/templates/funds/submissions_overview.html b/hypha/apply/funds/templates/funds/submissions_overview.html
index 755737935a..3fbb1a2cdb 100644
--- a/hypha/apply/funds/templates/funds/submissions_overview.html
+++ b/hypha/apply/funds/templates/funds/submissions_overview.html
@@ -12,23 +12,23 @@
{% if request.user.is_apply_staff %}
+ {% block table %}
+ {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=True filter_classes="filters-open" show_archive=show_archive %}
- {% render_table table %}
- {% endblock %}
-
+ {% render_table table %}
+ {% endblock %}
+
{% trans "All" %}
{% trans "Staff assignments" %}
{% trans "Reviews" %}
+ href="{% url 'apply:submissions:result' %}">
{% trans "Results" %}
diff --git a/hypha/apply/funds/templates/funds/submissions_result.html b/hypha/apply/funds/templates/funds/submissions_result.html
index ab423a0939..501d5087cf 100644
--- a/hypha/apply/funds/templates/funds/submissions_result.html
+++ b/hypha/apply/funds/templates/funds/submissions_result.html
@@ -27,21 +27,21 @@
{% endadminbar %}
-
-
- {% empty %}
+ {% empty %}
{% trans "No reports submitted" %}
diff --git a/hypha/apply/projects/templates/application_projects/includes/supporting_documents.html b/hypha/apply/projects/templates/application_projects/includes/supporting_documents.html
index 368e33025e..77dd5af2af 100644
--- a/hypha/apply/projects/templates/application_projects/includes/supporting_documents.html
+++ b/hypha/apply/projects/templates/application_projects/includes/supporting_documents.html
@@ -6,293 +6,293 @@
+
+ {% endif %}
+
{% if user.is_apply_staff %}
-
-
+ {% trans "Summary" %}
- {% include "funds/includes/submission_stats.html" %} -
+
{% endblock %}
diff --git a/hypha/apply/funds/templates/funds/tables/column_reviews.html b/hypha/apply/funds/templates/funds/tables/column_reviews.html
index 1b89d74a34..f06b6f9819 100644
--- a/hypha/apply/funds/templates/funds/tables/column_reviews.html
+++ b/hypha/apply/funds/templates/funds/tables/column_reviews.html
@@ -4,7 +4,7 @@
+
- {% trans "Summary" %}
+ {% include "funds/includes/submission_stats.html" %} +{% trans "Filter submissions to calculate values" %}
- {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=False filter_classes="filters-open" %} -
-
- {% if not count_values == object_list.count %}
- {% trans "Number of submission" %}: {{ count_values }}{% if not count_values == object_list.count %} ({{ object_list.count }}){% endif %}
- {% trans "Average value" %}: {{ average_value|format_number_as_currency }}
- {% trans "Total value" %}: {{ total_value|format_number_as_currency }}
+ {% trans "Filter submissions to calculate values" %}
+ {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=False filter_classes="filters-open" %} +
+
+ {% if not count_values == object_list.count %}
+ {% trans "Number of submission" %}: {{ count_values }}{% if not count_values == object_list.count %} ({{ object_list.count }}){% endif %}
+ {% trans "Average value" %}: {{ average_value|format_number_as_currency }}
+ {% trans "Total value" %}: {{ total_value|format_number_as_currency }}
+ {% trans "Some submissions lack values and are not included." %}
+ {% endif %}{% trans "Some submissions lack values and are not included." %}
- {% endif %} -
- {{ record.review_submitted_count|default:'0' }}
+ {{ record.review_submitted_count|default:'0' }}
/
{% if record.stage.has_external_review %}
{{ record.review_count|default:'0' }}
diff --git a/hypha/apply/funds/templates/funds/tables/table.html b/hypha/apply/funds/templates/funds/tables/table.html
index e44777c5c2..4971400454 100644
--- a/hypha/apply/funds/templates/funds/tables/table.html
+++ b/hypha/apply/funds/templates/funds/tables/table.html
@@ -53,13 +53,13 @@
@@ -94,18 +94,18 @@
{% for invoice in object.invoices.rejected %}
- {% display_invoice_status_for_user user invoice as invoice_status %}
-
- {% trans "Date submitted" %}: {{ invoice.requested_at.date }}
- {% trans "Invoice number" %}: {{ invoice.invoice_number }}
- {% trans "Status" %}: {{ invoice_status }}
-
-
-
- {% trans "View" %}
-
-
-
+ {% display_invoice_status_for_user user invoice as invoice_status %}
+
+ {% trans "Date submitted" %}: {{ invoice.requested_at.date }}
+ {% trans "Invoice number" %}: {{ invoice.invoice_number }}
+ {% trans "Status" %}: {{ invoice_status }}
+
+
+
+ {% trans "View" %}
+
+
+
{% endfor %}
diff --git a/hypha/apply/projects/templates/application_projects/includes/report_frequency_config.html b/hypha/apply/projects/templates/application_projects/includes/report_frequency_config.html
index f81ad77348..b559c85b55 100644
--- a/hypha/apply/projects/templates/application_projects/includes/report_frequency_config.html
+++ b/hypha/apply/projects/templates/application_projects/includes/report_frequency_config.html
@@ -37,7 +37,7 @@ {% trans "Change reporting frequency" %}
+ >
{% csrf_token %}
{{ form.media }}
@@ -61,13 +61,13 @@
{% if not current %}
-
+
{% endif %}
diff --git a/hypha/apply/projects/templates/application_projects/includes/reports.html b/hypha/apply/projects/templates/application_projects/includes/reports.html
index 70989a1e56..a703d66488 100644
--- a/hypha/apply/projects/templates/application_projects/includes/reports.html
+++ b/hypha/apply/projects/templates/application_projects/includes/reports.html
@@ -2,35 +2,35 @@
{% user_can_update_project_reports object user as can_update_project_reports %}
{% if can_update_project_reports %}
--
{% endif %}
-
- - - {{ opinion.author }} - {% if opinion.author.role %}{% image opinion.author.role.icon max-12x12 %}{% endif %} - - {{ opinion.get_opinion_display }} - +
- + + {{ opinion.author }} + {% if opinion.author.role %}{% image opinion.author.role.icon max-12x12 %}{% endif %} + + {{ opinion.get_opinion_display }} + {% if forloop.last %}
| {% trans "Linked" %} {{ row.record.previous.stage }} | - {% else %} -{{ column.header }} | - {% endif %} - {% endfor %} + {% for column in row.table.columns %} + {% if forloop.first %} + {% elif forloop.counter == 2 %} +{% trans "Linked" %} {{ row.record.previous.stage }} | + {% else %} +{{ column.header }} | + {% endif %} + {% endfor %}{% if column.localize == None %}{{ cell }}{% else %}{% if column.localize %}{{ cell|localize }}{% else %}{{ cell|unlocalize }}{% endif %}{% endif %} | - {% endif %} + {% endif %} {% endfor %} {% endwith %} @@ -117,7 +117,7 @@ {% endblock %} {% block table.tbody.empty_text %} -
|---|---|---|---|
| {{ table.empty_text }} | |||
| {{ table.empty_text }} |
{% trans "Update Invoice status" %}
{% trans "Change reporting frequency" %}
+ >
{% csrf_token %}
{{ form.media }}
@@ -61,13 +61,13 @@ {% trans "Change reporting frequency" %}
- {% trans "Cancel" %}
-
+
{% endif %}
diff --git a/hypha/apply/projects/templates/application_projects/includes/report_line.html b/hypha/apply/projects/templates/application_projects/includes/report_line.html
index 4f293e594a..d49703d941 100644
--- a/hypha/apply/projects/templates/application_projects/includes/report_line.html
+++ b/hypha/apply/projects/templates/application_projects/includes/report_line.html
@@ -6,7 +6,7 @@
{% else %}
{% trans "A report is due for the period" %}
{% endif %}
- {{ report.start_date }} {% trans "to" %} {{ report.end_date }}
+ {{ report.start_date }} {% trans "to" %} {{ report.end_date }}
{% if report.is_very_late %}
{% endif %}
@@ -18,7 +18,7 @@
class="data-block__button button button--primary"
href="{% url "apply:projects:reports:edit" pk=report.pk %}"
>
- {% if report.draft %}{% trans "Continue Editing" %}{% else %}{% trans "Add Report" %}{% endif %}
+ {% if report.draft %}{% trans "Continue Editing" %}{% else %}{% trans "Add Report" %}{% endif %}
{% endif %}
@@ -34,13 +34,13 @@ {% trans "This will result in a gap in reporting for the project. You can undo this at any time." %}
{% trans "This will result in a gap in reporting for the project. You can undo this at any time." %}
-
-
-
- {% trans "Reports" %}
-
- {% user_can_update_report_config object user as can_update_report_config %}
- {% if can_update_report_config %}
-
{% endif %}
@@ -61,10 +61,10 @@
{% if not report.skipped %}
{% user_can_view_report report user as can_view_report %}
{% if can_view_report %}
-
-
- {% trans "View" %}
-
+
+
+ {% trans "View" %}
+
{% endif %}
{% user_can_update_report report user as can_update_report %}
@@ -84,7 +84,7 @@
{% endif %}
-
-{% trans "Report frequency" %}
-{{ object.report_config.get_frequency_display }}
- +
+
+
+
+ {% trans "Reports" %}
+
+ {% user_can_update_report_config object user as can_update_report_config %}
+ {% if can_update_report_config %}
+
+ {% endif %}
+
+
- {% endif %}
- {% trans "Report frequency" %}
+{{ object.report_config.get_frequency_display }}
+ - {% include 'application_projects/includes/report_frequency_config.html' with form=update_frequency_form extra_classes="form--report-frequency" config=object.report_config %} --
- {% for report in object.report_config.past_due_reports %}
- {% include "application_projects/includes/report_line.html" with report=report %}
- {% endfor %}
- {% with next_report=object.report_config.current_due_report %}
- {% include "application_projects/includes/report_line.html" with report=next_report current=True %}
- {% endwith %}
-
-
+ {% for report in object.report_config.past_due_reports %}
+ {% include "application_projects/includes/report_line.html" with report=report %}
+ {% endfor %}
+ {% with next_report=object.report_config.current_due_report %}
+ {% include "application_projects/includes/report_line.html" with report=next_report current=True %}
+ {% endwith %}
+
{% trans "Project documents" %}
{% if collapsible_header %}
-
-
+
+
{% endif %}
- {% user_can_send_for_approval object user as can_send_to_approve %}
- {% if can_send_to_approve %}
-
- {% if object.paf_approvals.exists %}
- {% trans "Resubmit for approval" %}
+ {% user_can_send_for_approval object user as can_send_to_approve %}
+ {% if can_send_to_approve %}
+
+ {% if object.paf_approvals.exists %}
+ {% trans "Resubmit for approval" %}
+ {% else %}
+ {% trans "Submit for approval" %}
+ {% endif %}
+
+ {% endif %}
+ {% user_can_update_paf_approvers object user request as can_update_paf_approvers %}
+ {% user_can_assign_approvers_to_project object user request as can_assign_paf_approvers %}
+ {% if can_update_paf_approvers %}
+ {% if user == project.lead %}
+
+ {% trans "View/Update Approvers" %}
+
{% else %}
- {% trans "Submit for approval" %}
+
+ {% trans "Change approver" %}
+
{% endif %}
-
- {% endif %}
- {% user_can_update_paf_approvers object user request as can_update_paf_approvers %}
- {% user_can_assign_approvers_to_project object user request as can_assign_paf_approvers %}
- {% if can_update_paf_approvers %}
- {% if user == project.lead %}
-
- {% trans "View/Update Approvers" %}
-
- {% else %}
-
- {% trans "Change approver" %}
-
{% endif %}
- {% endif %}
- {% if can_assign_paf_approvers %}
-
- {% trans "Assign approver" %}
-
- {% endif %}
- {% user_can_update_paf_status object user request=request as can_update_paf_status %}
- {% if object.can_make_approval and can_update_paf_status %}
-
- {% trans "Update Status" %}
-
- {% endif %}
+ {% if can_assign_paf_approvers %}
+
+ {% trans "Assign approver" %}
+
+ {% endif %}
+ {% user_can_update_paf_status object user request=request as can_update_paf_status %}
+ {% if object.can_make_approval and can_update_paf_status %}
+
+ {% trans "Update Status" %}
+
+ {% endif %}
-
+ aria-labelledby="project-documents-section" {% endif %}>
-
-
- - --
{% trans "Proposal" %}
-- {% if user.is_applicant %} - - - {% trans "View" %} - - {% else %} - - - {% trans "View" %} - - {% endif %} --
- {% if settings.application_projects.ProjectSettings.vendor_setup_required and project.vendor %}
-
- -
{% trans "Contracting Information" %}
+ +{% trans "Proposal" %}
- {% if editable %} - - {% if project.vendor.user_has_updated_details %} - - {% trans "Edit" %} - {% else %} - {% trans "Fill in" %} - {% endif %} + {% if user.is_applicant %} + + + {% trans "View" %} - {% endif %} - {% if project.vendor.user_has_updated_details %} - + {% else %} + {% trans "View" %} {% endif %}
- {% endif %}
-
- -
- - --
{% trans "Approval Form" %}
-- {% if editable and not user.is_applicant %} - - {% if object.user_has_updated_details %} - - {% trans "Edit" %} - {% else %} - {% trans "Fill in" %} + {% if settings.application_projects.ProjectSettings.vendor_setup_required and project.vendor %} ++- +
+ ++{% trans "Contracting Information" %}
++ {% if editable %} + + {% if project.vendor.user_has_updated_details %} + + {% trans "Edit" %} + {% else %} + {% trans "Fill in" %} + {% endif %} + {% endif %} - - {% endif %} - {% if object.user_has_updated_details and not user.is_applicant %} - - - {% trans "View" %} - - {% endif %} -- {% has_project_sow_form object as project_sow %} - {% if project_sow and object.user_has_updated_details and not user.is_applicant %} --
-
-
- -- -
{% trans "Scope of work (SOW)" %}
-
-
{% endif %}
-
-
- {% if supporting_documents_configured %}
- - +
-
- - -- - {% if all_document_categories %} -
{% trans "Supporting documents" %}
-- -- {% endif %} +-
- {% for document_category in all_document_categories %}
+
-
+ + ++
{% trans "Approval Form" %}
++ {% if editable and not user.is_applicant %} + + {% if object.user_has_updated_details %} + + {% trans "Edit" %} + {% else %} + {% trans "Fill in" %} + {% endif %} + + {% endif %} + {% if object.user_has_updated_details and not user.is_applicant %} + + + {% trans "View" %} + + {% endif %} ++ {% has_project_sow_form object as project_sow %} + {% if project_sow and object.user_has_updated_details and not user.is_applicant %} +-
-+ - {% if document_category in remaining_document_categories %} - - {% else %} - {% category_latest_file project document_category as latest_file %} - {% if latest_file %} -
{{ document_category.name }} - {% if document_category.required %}*{% endif %} - {% if document_category.template %} - {% trans "View template" %} - - {% endif %} -
- {% if document_category not in remaining_document_categories %} - {% category_latest_file project document_category as latest_file %} -{{ latest_file.title }} - {{ latest_file.created_at }}
- {% endif %} +{% trans "Scope of work (SOW)" %}
+- - - {% trans "View" %} - - {% user_can_remove_supporting_documents object user as can_remove_supporting_doc %} - {% if can_remove_supporting_doc %} - - {% endif %} -- {% endif %} - {% endif %}
- {% endfor %}
-
-
-
+
+
+
+
+ {% if all_document_categories %}
+
+ {% trans "Supporting documents" %}
+
+
+
+ {% endif %}
+
+ -
+ {% for document_category in all_document_categories %}
+
-
+ ++ {% if document_category in remaining_document_categories %} + + {% else %} + {% category_latest_file project document_category as latest_file %} + {% if latest_file %} +
{{ document_category.name }} + {% if document_category.required %}*{% endif %} + {% if document_category.template %} + {% trans "View template" %} + + {% endif %} +
+ {% if document_category not in remaining_document_categories %} + {% category_latest_file project document_category as latest_file %} +{{ latest_file.title }} - {{ latest_file.created_at }}
+ {% endif %} ++ + + {% trans "View" %} + + {% user_can_remove_supporting_documents object user as can_remove_supporting_doc %} + {% if can_remove_supporting_doc %} + + {% endif %} ++ {% endif %} + {% endif %} +
+ {% endfor %}
+
-
+ {% trans "Upload supporting documents" %}
- - {% trans "Submit" as submit %} - {% include 'funds/includes/delegated_form_base.html' with form=document_form value=submit %} -
+
{% endif %}
{% if can_send_to_approve %}
-{% trans "Upload supporting documents" %}
+ + {% trans "Submit" as submit %} + {% include 'funds/includes/delegated_form_base.html' with form=document_form value=submit %} +
-
{% endif %}
{% if can_update_paf_approvers %}
-{% trans "Submit for Approval" %}
+
+
+ {% trans "Submit for Approval" %}
- {% if remaining_document_categories %} -{% trans "Are you sure you're ready to submit the project documents to be approved in" %} - {% if project_settings.paf_approval_sequential %}{% trans "sequential order?" %}{% else %}{% trans "parallel order?" %}{% endif %}
+ {% if remaining_document_categories %} +{% trans "Are you sure you're ready to submit the project documents to be approved in" %} + {% if project_settings.paf_approval_sequential %}{% trans "sequential order?" %}{% else %}{% trans "parallel order?" %}{% endif %}
-{% trans "This project is missing the following documents" %}:
+{% trans "This project is missing the following documents" %}:
--
- {% for missing_category in remaining_document_categories %}
-
- {{ missing_category.name }} - {% endfor %} -
{% trans "Are you ready to submit the project documents to be approved in" %} - {% if project_settings.paf_approval_sequential %}{% trans "sequential order?" %}{% else %}{% trans "parallel order?" %}{% endif %}
- {% trans "Submit" as submit %} - {% endif %} - {% if project_settings.paf_reviewers_roles.all %} +-
+ {% for missing_category in remaining_document_categories %}
+
- {{ missing_category.name }} + {% endfor %} +
{% trans "Are you ready to submit the project documents to be approved in" %} + {% if project_settings.paf_approval_sequential %}{% trans "sequential order?" %}{% else %}{% trans "parallel order?" %}{% endif %}
+ {% trans "Submit" as submit %} + {% endif %} + {% if project_settings.paf_reviewers_roles.all %} -{% trans "By default all the members are notified when an approver is not selected. Optionally, you may select specific approvers to assign and notify them." %}
-
-
+ Optional
- -{% trans "By default all the members are notified when an approver is not selected. Optionally, you may select specific approvers to assign and notify them." %}
+
+
- Optional
+ +{% trans "Please note that in "%}{% if project_settings.paf_approval_sequential %}{%trans "sequential order, approvers will approve PAF one after the other."%}{% else %}{% trans "parallel order, approvers can approve PAF anytime." %}{% endif %}
- {% include 'funds/includes/delegated_form_base.html' with form=request_approval_form value=submit %} - {% else %} -{% trans "No PAF Reviewer Roles created yet, please create these in " %} - {% trans " project settings" %} -
- {% endif %} -{% trans "Please note that in "%}{% if project_settings.paf_approval_sequential %}{%trans "sequential order, approvers will approve PAF one after the other."%}{% else %}{% trans "parallel order, approvers can approve PAF anytime." %}{% endif %}
+ {% include 'funds/includes/delegated_form_base.html' with form=request_approval_form value=submit %} + {% else %} +{% trans "No PAF Reviewer Roles created yet, please create these in " %} + {% trans " project settings" %} +
+ {% endif %} +
-
+ {% include 'funds/includes/delegated_form_base.html' with form=update_approvers_form value=submit %} + {% else %} +
-{% trans "View/Update Approvers" %}
+
+
- {% include 'funds/includes/delegated_form_base.html' with form=update_approvers_form value=submit %} - {% else %} -
+ {% trans "Submit" as submit %}
+ {% if project_settings.paf_reviewers_roles.all %}
+ {% trans "View/Update Approvers" %}
- {% trans "Submit" as submit %} - {% if project_settings.paf_reviewers_roles.all %} -{% trans "Are you sure you want to update the approvers?" %} {% if project_settings.paf_approval_sequential %} {% trans "The uppermost active approver will be notified via email." %} {% else %}{% trans "All approvers will be notified via email." %}{% endif %}
-- {% include 'funds/includes/delegated_form_base.html' with form=update_approvers_form value=submit %} - {% else %} -
{% trans "No PAF Reviewer Roles created yet, please create these in " %} - {% trans " project settings" %} -
- {% endif %} -{% trans "Are you sure you want to update the approvers?" %} {% if project_settings.paf_approval_sequential %} {% trans "The uppermost active approver will be notified via email." %} {% else %}{% trans "All approvers will be notified via email." %}{% endif %}
++ {% include 'funds/includes/delegated_form_base.html' with form=update_approvers_form value=submit %} + {% else %} +
{% trans "No PAF Reviewer Roles created yet, please create these in " %} + {% trans " project settings" %} +
+ {% endif %} +
+
{% trans "Change Approver" %}
{% trans "Selected approver will be notified. On unselecting, every listed member here will be notified." %}
{% trans "Submit" as submit %} diff --git a/hypha/apply/projects/templates/application_projects/invoice_admin_detail.html b/hypha/apply/projects/templates/application_projects/invoice_admin_detail.html index a301b33ff5..658da1acd2 100644 --- a/hypha/apply/projects/templates/application_projects/invoice_admin_detail.html +++ b/hypha/apply/projects/templates/application_projects/invoice_admin_detail.html @@ -22,22 +22,22 @@ {% trans "Update Invoice Status" %} {% if user_can_change_status %} -
-
+ {% trans "Update Invoice status" %}
-{% trans "Current status" %}: {{ object.status_display }}
- {% trans "Update Status" as update %} - {% include 'funds/includes/delegated_form_base.html' with form=change_invoice_status value=update %} -
+
{% endif %}
{% endblock %}
{% block extra_css %}
-
+
{% endblock %}
{% block extra_js %}
-{{ block.super }}
-
-
-
+ {{ block.super }}
+
+
+
{% endblock %}
diff --git a/hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html b/hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html
index 2367122d37..12136e3e88 100644
--- a/hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html
+++ b/hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html
@@ -3,36 +3,36 @@
{% block title %} {% trans "Invoice" %}: {{ object.project.title }}{% endblock %}
{% block content %}
-{% display_invoice_status_for_user user object as invoice_status %}
-{% trans "Update Invoice status" %}
+{% trans "Current status" %}: {{ object.status_display }}
+ {% trans "Update Status" as update %} + {% include 'funds/includes/delegated_form_base.html' with form=change_invoice_status value=update %} +
-
-
-
+
{% endblock %}
diff --git a/hypha/apply/projects/templates/application_projects/invoice_detail.html b/hypha/apply/projects/templates/application_projects/invoice_detail.html
index f1cb022e7c..01ad8ead45 100644
--- a/hypha/apply/projects/templates/application_projects/invoice_detail.html
+++ b/hypha/apply/projects/templates/application_projects/invoice_detail.html
@@ -3,29 +3,29 @@
{% block title %}{% trans "Invoice" %}: {{ object.project.title }}{% endblock %}
{% block content %}
-{% display_invoice_status_for_user user object as invoice_status %}
-
-
-
-
-
-
- {% trans "Invoice number" %}: {{ object.invoice_number }}
- {% is_vendor_setup request as show_vendor_information %} - {% if show_vendor_information %} -{% trans "Vendor" %}: {{ object.project.vendor.name }}
- {% endif %} -{% trans "Lead" %}: {{ object.project.lead }}
-{% trans "Fund" %}: {{ object.project.submission.page }}
-
+
+
+
{% endblock %}
diff --git a/hypha/apply/projects/templates/application_projects/invoice_form.html b/hypha/apply/projects/templates/application_projects/invoice_form.html
index a8702e38a1..7f75f61418 100644
--- a/hypha/apply/projects/templates/application_projects/invoice_form.html
+++ b/hypha/apply/projects/templates/application_projects/invoice_form.html
@@ -3,35 +3,35 @@
{% block title %}{% if object %}{% trans "Edit" %}{% else %}{% trans "Add" %}{% endif %} {% trans "Invoice" %}: {% if object %}{{ object.project.title }}{% else %}{{ project.title }}{% endif %}{% endblock %}
{% block content %}
-
-
-{% include "forms/includes/form_errors.html" with form=form %}
+ {% include "forms/includes/form_errors.html" with form=form %}
-
-
{% endblock %}
diff --git a/hypha/apply/projects/templates/application_projects/invoice_list.html b/hypha/apply/projects/templates/application_projects/invoice_list.html
index 9f8b746bdc..8982e3caee 100644
--- a/hypha/apply/projects/templates/application_projects/invoice_list.html
+++ b/hypha/apply/projects/templates/application_projects/invoice_list.html
@@ -12,15 +12,15 @@
{% slot sub_heading %}{% trans "View, search and filter all project invoices" %}{% endslot %}
{% endadminbar %}
-
- {% if table %}
- {% trans "invoices" as search_placeholder %}
- {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=True search_placeholder=search_placeholder %}
- {% render_table table %}
- {% else %}
-
+ {% trans "No Invoices available" %}
- {% endif %} -
+ {% if table %}
+ {% trans "invoices" as search_placeholder %}
+ {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=True search_placeholder=search_placeholder %}
+ {% render_table table %}
+ {% else %}
+
{% endblock content %}
diff --git a/hypha/apply/projects/templates/application_projects/overview.html b/hypha/apply/projects/templates/application_projects/overview.html
index e55190b017..74f5b796fc 100644
--- a/hypha/apply/projects/templates/application_projects/overview.html
+++ b/hypha/apply/projects/templates/application_projects/overview.html
@@ -6,8 +6,8 @@
{% block title %}{% trans "Projects" %}{% endblock %}
{% block extra_css %}
-
-{{ projects.filterset.form.media.css }}
+
+ {{ projects.filterset.form.media.css }}
{% endblock %}
{% block content %}
@@ -18,54 +18,54 @@
{% endadminbar %}
-{% trans "No Invoices available" %}
+ {% endif %} +
+ {{ title|default:"" }}
+
+ {{ title|default:"" }}
- {% block style_base %}
+ {% block style_base %}
{% comment %}
See DEFAULT_CSS in https://github.com/chrisglass/xhtml2pdf/blob/master/xhtml2pdf/default.py
for base style.
{% endcomment %}
- {% block layout_style %}
-
+ {%endblock%}
+
- {%endblock%}
-
- {% block extra_style %}{% endblock %}
- {% endblock %}
-
-
-
- {% include "funds/includes/status-block.html" with type="Projects" %}
+ {% include "funds/includes/status-block.html" with type="Projects" %}
- {% if projects.table.data %}
-
{% endblock %}
diff --git a/hypha/apply/projects/templates/application_projects/paf_export.html b/hypha/apply/projects/templates/application_projects/paf_export.html
index 01452e7c4b..56a23d796b 100644
--- a/hypha/apply/projects/templates/application_projects/paf_export.html
+++ b/hypha/apply/projects/templates/application_projects/paf_export.html
@@ -1,148 +1,148 @@
-
-
+ {% if projects.table.data %}
+
+ {% endif %}
- {% if reports.table.data %}
-
- {% trans "Projects" as heading %}
- {% include "funds/includes/table_filter_and_search.html" with filter=projects.filterset filter_action=projects.url search_term=search_term search_placeholder=heading search_action=projects.url use_search=True use_batch_actions=False heading=heading %}
+ {% trans "Projects" as heading %}
+ {% include "funds/includes/table_filter_and_search.html" with filter=projects.filterset filter_action=projects.url search_term=search_term search_placeholder=heading search_action=projects.url use_search=True use_batch_actions=False heading=heading %}
- {% render_table projects.table %}
+ {% render_table projects.table %}
-
+
-
- {% endif %}
- {% if invoices.table.data %}
-
+
+ {% endif %}
+ {% if invoices.table.data %}
+
- {% trans "Project Invoices" as heading %}
- {% include "funds/includes/table_filter_and_search.html" with filter=invoices.filterset filter_action=invoices.url heading=heading %}
+ {% trans "Project Invoices" as heading %}
+ {% include "funds/includes/table_filter_and_search.html" with filter=invoices.filterset filter_action=invoices.url heading=heading %}
- {% render_table invoices.table %}
+ {% render_table invoices.table %}
-
+
-
- {% endif %}
+
+ {% if reports.table.data %}
+
- {% endif %}
-
- {% trans "Reports" as heading %}
- {% include "funds/includes/table_filter_and_search.html" with filter=reports.filterset filter_action=reports.url heading=heading filter_classes="filters--dates" %}
+ {% trans "Reports" as heading %}
+ {% include "funds/includes/table_filter_and_search.html" with filter=reports.filterset filter_action=reports.url heading=heading filter_classes="filters--dates" %}
- {% render_table reports.table %}
+ {% render_table reports.table %}
-
+
+
+ {% endif %}
- {%block page_header%}
-
{{ org_name }}(Project Approval Form | {{ title }})
- {%endblock%} + {% block extra_style %}{% endblock %} + {% endblock %} + + +
+ {%block page_header%}
+
+ {%block content%}
+
-
+
+
+ Contractor: {{ contractor_name|default:"None" }}
+
+
+
- {% for field_name, field_value in paf_data.items %}
-
-
- {% if show_footer %}
-
- {% endif %}
-
+
+ {% if show_footer %}
+
+ {% endif %}
+
diff --git a/hypha/apply/projects/templates/application_projects/project_admin_detail.html b/hypha/apply/projects/templates/application_projects/project_admin_detail.html
index 56eaa2d977..15cf645736 100644
--- a/hypha/apply/projects/templates/application_projects/project_admin_detail.html
+++ b/hypha/apply/projects/templates/application_projects/project_admin_detail.html
@@ -4,26 +4,26 @@
{% block admin_assignments %}
-{% if object.is_in_progress %}
-{{ org_name }}(Project Approval Form | {{ title }})
+ {%endblock%} - {%block content%} -| - Project Title - | -- Project ID - | -
| - {{ title }} - | -- {{ id }} - | -
| + Project Title + | ++ Project ID + | +
| + {{ title }} + | ++ {{ id }} + | +
| - Contractor: {{ contractor_name|default:"None" }} - | -
{{ field_name }}
-{{ field_value|default:"-" }}
- {% endfor %} + {% for field_name, field_value in paf_data.items %} +{{ field_name }}
+{{ field_value|default:"-" }}
+ {% endfor %} - {% for field_name, field_value in sow_data.items %} -{{ field_name }}
-{{ field_value|default:"-" }}
- {% endfor %} + {% for field_name, field_value in sow_data.items %} +{{ field_name }}
+{{ field_value|default:"-" }}
+ {% endfor %} -Approvals
- {% if approvals %} - {% for approval in approvals %} +Approvals
+ {% if approvals %} + {% for approval in approvals %}{{ approval.paf_reviewer_role.label }} - {% if approval.approved %} Approved {% else %} Pending{% endif %} {% if approval.user %}({{ approval.user }}){% endif %}
- {% endfor %} - {% else %} --
- {% endif %} + {% endfor %} + {% else %} +-
+ {% endif %}Supporting Documents
- {% if supporting_documents %} - {% for document, document_link in supporting_documents.items %} + {% if supporting_documents %} + {% for document, document_link in supporting_documents.items %} - {% endfor %} - {% else %} --
- {% endif %} + {% endfor %} + {% else %} +-
+ {% endif %}Submission
- {%endblock%} -
+ {% if object.is_in_progress %}
+
-{% endif %}
{% endblock %}
diff --git a/hypha/apply/projects/templates/application_projects/project_approval_detail.html b/hypha/apply/projects/templates/application_projects/project_approval_detail.html
index 4f8d7a2949..1b27a780de 100644
--- a/hypha/apply/projects/templates/application_projects/project_approval_detail.html
+++ b/hypha/apply/projects/templates/application_projects/project_approval_detail.html
@@ -4,8 +4,8 @@
{% block title %}{{ object.title }}{% endblock %}
{% block extra_css %}
-
- {{ reviewer_form.media.css }}
+
+ {{ reviewer_form.media.css }}
{% endblock %}
{% block content %}
@@ -28,114 +28,114 @@
{% endslot %}
{% endadminbar %}
-
-
-
-
-
{% trans "Project Information" %}
-
+
+
{% endblock content %}
{% block extra_js %}
diff --git a/hypha/apply/projects/templates/application_projects/project_approval_form.html b/hypha/apply/projects/templates/application_projects/project_approval_form.html
index b2c70d2254..e127b9860e 100644
--- a/hypha/apply/projects/templates/application_projects/project_approval_form.html
+++ b/hypha/apply/projects/templates/application_projects/project_approval_form.html
@@ -2,51 +2,32 @@
{% load i18n static %}
{% block title %}{% trans "Editing" %}: {{object.title }}{% endblock %}
{% block content %}
-
+
-
-
-
-{% if approval_form_exists %}
- {% include "forms/includes/form_errors.html" with form=paf_form %}
- {% if sow_form_exists %}
- {% include "forms/includes/form_errors.html" with form=sow_form %}
- {% endif %}
+ {% if approval_form_exists %}
-
-
-{% else %}
-
-
-{% endif %}
+ {% endif %}
{% endblock %}
@@ -100,6 +100,6 @@
{% trans "Proposal attachments" %}
{% if not show_all_group_fields %} - + {% endif %} {% endblock %} diff --git a/hypha/apply/projects/templates/application_projects/project_detail.html b/hypha/apply/projects/templates/application_projects/project_detail.html index 901972f405..e566323670 100644 --- a/hypha/apply/projects/templates/application_projects/project_detail.html +++ b/hypha/apply/projects/templates/application_projects/project_detail.html @@ -7,45 +7,45 @@ {% block body_class %}{% endblock %} {% block content %} -{% show_closing_banner object as show_banner %} -{% display_project_status object request.user as project_status %} -{% if show_banner %} - -{% endif %} -
-
-
{{ object.title }}
- - -
-
- {% block notifications %}
- {% endblock %}
-
- {% project_can_have_report object as can_have_reports %}
- {% if can_have_reports %}
-
- {% include "application_projects/includes/reports.html" %}
+
+
+ {% block notifications %}
+ {% endblock %}
+
-
{# Tab 2 #}
-
-
- {% include "activity/include/comment_form.html" %}
- {% include "activity/include/comment_list.html" with editable=False %}
+
{# Tab 3 #}
-
+
-
+ {% include "activity/include/comment_form.html" %}
+ {% include "activity/include/comment_list.html" with editable=False %}
+
-
{% endblock content %}
{% block extra_css %}
diff --git a/hypha/apply/projects/templates/application_projects/project_form.html b/hypha/apply/projects/templates/application_projects/project_form.html
index c020941b2b..24ab8c832c 100644
--- a/hypha/apply/projects/templates/application_projects/project_form.html
+++ b/hypha/apply/projects/templates/application_projects/project_form.html
@@ -5,38 +5,38 @@
{% block title %}{% trans "Editing" %}: {{ object.title }}{% endblock %}
{% block content %}
-
+
-
+
{% comment %} Loaded using the htmx via alpine's custom event "open-tab-3"{% endcomment %}
-
Loading...
+Loading...
+
-
-{% include "forms/includes/form_errors.html" with form=form %}
+ {% include "forms/includes/form_errors.html" with form=form %}
-
-
{% endblock %}
{% block extra_css %}
diff --git a/hypha/apply/projects/templates/application_projects/project_list.html b/hypha/apply/projects/templates/application_projects/project_list.html
index 78162663bd..95bea43e97 100644
--- a/hypha/apply/projects/templates/application_projects/project_list.html
+++ b/hypha/apply/projects/templates/application_projects/project_list.html
@@ -12,14 +12,14 @@
{% slot sub_heading %}{% trans "View, Search and filter all projects" %}{% endslot %}
{% endadminbar %}
-
- {% if table %}
- {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term search_placeholder="projects" use_search=True filter_action=filter_action use_batch_actions=True filter_classes="filters-open" %}
- {% render_table table %}
- {% else %}
-
+ {% trans "No Projects Available." %}
- {% endif %} -
+ {% if table %}
+ {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term search_placeholder="projects" use_search=True filter_action=filter_action use_batch_actions=True filter_classes="filters-open" %}
+ {% render_table table %}
+ {% else %}
+
{% endblock content %}
diff --git a/hypha/apply/projects/templates/application_projects/project_sow_detail.html b/hypha/apply/projects/templates/application_projects/project_sow_detail.html
index fb64366de8..dd77ece6ba 100644
--- a/hypha/apply/projects/templates/application_projects/project_sow_detail.html
+++ b/hypha/apply/projects/templates/application_projects/project_sow_detail.html
@@ -4,47 +4,47 @@
{% block title %}{{ object.title }}{% endblock %}
{% block content %}
-{% trans "No Projects Available." %}
+ {% endif %} +
-
-
diff --git a/hypha/apply/projects/templates/application_projects/report_form.html b/hypha/apply/projects/templates/application_projects/report_form.html
index c259e3a2a7..00fab9e021 100644
--- a/hypha/apply/projects/templates/application_projects/report_form.html
+++ b/hypha/apply/projects/templates/application_projects/report_form.html
@@ -2,76 +2,76 @@
{% load i18n static %}
{% block extra_css %}
-{{ block.super }}
-
+ {{ block.super }}
+
{% endblock %}
{% block title %}{% trans "Edit Report" %} | {{ object.project.title }}{% endblock %}
{% block content %}
-
-
-{% include "forms/includes/form_errors.html" with form=form %}
+ {% include "forms/includes/form_errors.html" with form=form %}
-
-
+
+
{% endblock %}
{% block extra_js %}
-
-
+
+
{% endblock %}
diff --git a/hypha/apply/projects/templates/application_projects/report_list.html b/hypha/apply/projects/templates/application_projects/report_list.html
index 29c4c583f7..144ccee672 100644
--- a/hypha/apply/projects/templates/application_projects/report_list.html
+++ b/hypha/apply/projects/templates/application_projects/report_list.html
@@ -12,14 +12,14 @@
{% slot sub_heading %}{% trans "View and filter all Submitted Reports" %}{% endslot %}
{% endadminbar %}
-{{ title|default:"" }}
+
+ {{ title|default:"" }}
- {% block style_base %}
+ {% block style_base %}
{% comment %}
See DEFAULT_CSS in https://github.com/chrisglass/xhtml2pdf/blob/master/xhtml2pdf/default.py
for base style.
{% endcomment %}
- {% block layout_style %}
-
+ {%endblock%}
+
- {%endblock%}
-
- {% block extra_style %}{% endblock %}
- {% endblock %}
-
-
-
- {% if table %}
- {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form use_search=False filter_action=filter_action filter_classes="filters--dates" %}
- {% render_table table %}
- {% else %}
-
+ {% trans "No Reports Available." %}
- {% endif %} -
+ {% if table %}
+ {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form use_search=False filter_action=filter_action filter_classes="filters--dates" %}
+ {% render_table table %}
+ {% else %}
+
{% endblock content %}
diff --git a/hypha/apply/projects/templates/application_projects/sow_export.html b/hypha/apply/projects/templates/application_projects/sow_export.html
index 3e68948159..7bbd835796 100644
--- a/hypha/apply/projects/templates/application_projects/sow_export.html
+++ b/hypha/apply/projects/templates/application_projects/sow_export.html
@@ -1,94 +1,94 @@
-
- {% trans "No Reports Available." %}
+ {% endif %} +
- {%block page_header%}
-
{{ org_name }}(Scope of Work | {{ title }})
- {%endblock%} + {% block extra_style %}{% endblock %} + {% endblock %} + + +
+ {%block page_header%}
+
-
- {% if show_footer %}
-
- {% endif %}
-
+
+ {% if show_footer %}
+
+ {% endif %}
+
diff --git a/hypha/apply/projects/templates/application_projects/vendor_detail.html b/hypha/apply/projects/templates/application_projects/vendor_detail.html
index 22bf091d81..5dedc1eacb 100644
--- a/hypha/apply/projects/templates/application_projects/vendor_detail.html
+++ b/hypha/apply/projects/templates/application_projects/vendor_detail.html
@@ -4,48 +4,48 @@
{% block title %}{% trans "Contracting Information for" %} {{ project.title }} {% endblock %}
{% block content %}
-{{ org_name }}(Scope of Work | {{ title }})
+ {%endblock%} - {%block content%} + {%block content%} - {% for field_name, field_value in sow_data.items %} -{{ field_name }}
-{{ field_value|default:"-" }}
- {% endfor %} - {%endblock%} -
-
-
-
-
-
{% endblock %}
diff --git a/hypha/apply/projects/templates/application_projects/vendor_form.html b/hypha/apply/projects/templates/application_projects/vendor_form.html
index e6079e0c85..b14651f71f 100644
--- a/hypha/apply/projects/templates/application_projects/vendor_form.html
+++ b/hypha/apply/projects/templates/application_projects/vendor_form.html
@@ -3,31 +3,31 @@
{% block title %}{% trans "Update Contracting Information" %}{% endblock %}
{% block content %}
-
-
- {% if editable %}
+ {% trans "Last Updated" %}: {{ vendor.updated_at|date:'DATE_FORMAT' }}
-
-
- {% trans "Edit" %}
-
-
+
- {% endif %}
-{% trans "Last Updated" %}: {{ vendor.updated_at|date:'DATE_FORMAT' }}
- {% for group in vendor_detailed_response.values %}
- {% if group.title %}
- {{ group.title|bleach }}
+ {% if editable %}
+
{% endif %}
- {% for question, answer in group.questions %}
-
+
+ {{ group.title|bleach }}
+ {% if editable %}
+
{% endif %}
- {% for question, answer in group.questions %}
- {{ question }}
- {% if question == 'Due Diligence Documents' %}
-
-
- {% for document in due_diligence_documents %}
-
- {% endfor %}
-
-
- {% else %}
-
- {% for document in due_diligence_documents %}
-
- {% endfor %}
-
- {% if answer == True or answer == False %}{{ answer|yesno:"Yes,No" }}{% else %}{% if answer %}{{ answer|bleach }}{% else %}-{% endif %}{% endif %}
+
+ {% for group in vendor_detailed_response.values %}
+ {% if group.title %}
+ {{ group.title|bleach }}
{% endif %}
+ {% for question, answer in group.questions %}
+
+ {{ group.title|bleach }}
{% endif %}
+ {% for question, answer in group.questions %}
+ {{ question }}
+ {% if question == 'Due Diligence Documents' %}
+
+
+ {% for document in due_diligence_documents %}
+
+ {% endfor %}
+
+
+ {% else %}
+
+ {% for document in due_diligence_documents %}
+
+ {% endfor %}
+
+ {% if answer == True or answer == False %}{{ answer|yesno:"Yes,No" }}{% else %}{% if answer %}{{ answer|bleach }}{% else %}-{% endif %}{% endif %}
+ {% endif %} + {% endfor %} {% endfor %} - {% endfor %} -
-
-{% include "forms/includes/form_errors.html" with form=form %}
+ {% include "forms/includes/form_errors.html" with form=form %}
-
-
{% endblock %}
{% block extra_css %}
diff --git a/hypha/apply/projects/templates/application_projects/vendor_success.html b/hypha/apply/projects/templates/application_projects/vendor_success.html
index 297b4a6f0d..8eccfba26c 100644
--- a/hypha/apply/projects/templates/application_projects/vendor_success.html
+++ b/hypha/apply/projects/templates/application_projects/vendor_success.html
@@ -3,18 +3,18 @@
{% block title %}{% trans "Contractor Setup Completed" %}{% endblock %}
{% block content %}
-
-
-/', include([
- path('', ProjectDetailView.as_view(), name='detail'),
- path('partial/activities/', partial_project_activities, name="partial-activities"),
- path('edit/', ProjectApprovalFormEditView.as_view(), name="edit"),
- path('documents//', ProjectPrivateMediaView.as_view(), name="document"),
- path('category///template/', CategoryTemplatePrivateMediaView.as_view(), name="category_template"),
- path('contract//', ContractPrivateMediaView.as_view(), name="contract"),
- path('contract/documents//', ContractDocumentPrivateMediaView.as_view(), name="contract_document"),
- path('download//', ProjectDetailDownloadView.as_view(), name='download'),
- path('approval/', ProjectDetailApprovalView.as_view(), name='approval'),
- path('sow/', ProjectSOWView.as_view(), name='sow'),
- path('sow/download//', ProjectSOWDownloadView.as_view(), name='download-sow'),
- path('invoice/', CreateInvoiceView.as_view(), name='invoice'),
- path('vendor/', CreateVendorView.as_view(), name='vendor'),
- path('vendor//', VendorDetailView.as_view(), name='vendor-detail'),
- path('vendor//documents//', VendorPrivateMediaView.as_view(), name='vendor-documents'),
- path('invoices//', include([
- path('', InvoiceView.as_view(), name='invoice-detail'),
-
- path('edit/', EditInvoiceView.as_view(), name='invoice-edit'),
- path('delete/', DeleteInvoiceView.as_view(), name='invoice-delete'),
- path('documents/invoice/', InvoicePrivateMedia.as_view(), name="invoice-document"),
- path('documents/supporting//', InvoicePrivateMedia.as_view(), name="invoice-supporting-document"),
- ])),
- ])),
-
- path('reports/', include(([
- path('', ReportListView.as_view(), name='all'),
- path('/', include([
- path('', ReportDetailView.as_view(), name='detail'),
- path('skip/', ReportSkipView.as_view(), name='skip'),
- path('edit/', ReportUpdateView.as_view(), name='edit'),
- path('documents//', ReportPrivateMedia.as_view(), name="document"),
- ])),
- ], 'reports'))),
- path('vendor/', include(([
- path('', ReportListView.as_view(), name='all'),
- path('/', include([
- path('', ReportDetailView.as_view(), name='detail'),
- path('skip/', ReportSkipView.as_view(), name='skip'),
- path('edit/', ReportUpdateView.as_view(), name='edit'),
- path('documents//', ReportPrivateMedia.as_view(), name="document"),
- ])),
- ], 'reports'))),
+ path("", ProjectOverviewView.as_view(), name="overview"),
+ path("all/", ProjectListView.as_view(), name="all"),
+ path("invoices/", InvoiceListView.as_view(), name="invoices"),
+ path(
+ "/",
+ include(
+ [
+ path("", ProjectDetailView.as_view(), name="detail"),
+ path(
+ "partial/activities/",
+ partial_project_activities,
+ name="partial-activities",
+ ),
+ path("edit/", ProjectApprovalFormEditView.as_view(), name="edit"),
+ path(
+ "documents//",
+ ProjectPrivateMediaView.as_view(),
+ name="document",
+ ),
+ path(
+ "category///template/",
+ CategoryTemplatePrivateMediaView.as_view(),
+ name="category_template",
+ ),
+ path(
+ "contract//",
+ ContractPrivateMediaView.as_view(),
+ name="contract",
+ ),
+ path(
+ "contract/documents//",
+ ContractDocumentPrivateMediaView.as_view(),
+ name="contract_document",
+ ),
+ path(
+ "download//",
+ ProjectDetailDownloadView.as_view(),
+ name="download",
+ ),
+ path("approval/", ProjectDetailApprovalView.as_view(), name="approval"),
+ path("sow/", ProjectSOWView.as_view(), name="sow"),
+ path(
+ "sow/download//",
+ ProjectSOWDownloadView.as_view(),
+ name="download-sow",
+ ),
+ path("invoice/", CreateInvoiceView.as_view(), name="invoice"),
+ path("vendor/", CreateVendorView.as_view(), name="vendor"),
+ path(
+ "vendor//",
+ VendorDetailView.as_view(),
+ name="vendor-detail",
+ ),
+ path(
+ "vendor//documents//",
+ VendorPrivateMediaView.as_view(),
+ name="vendor-documents",
+ ),
+ path(
+ "invoices//",
+ include(
+ [
+ path("", InvoiceView.as_view(), name="invoice-detail"),
+ path(
+ "edit/", EditInvoiceView.as_view(), name="invoice-edit"
+ ),
+ path(
+ "delete/",
+ DeleteInvoiceView.as_view(),
+ name="invoice-delete",
+ ),
+ path(
+ "documents/invoice/",
+ InvoicePrivateMedia.as_view(),
+ name="invoice-document",
+ ),
+ path(
+ "documents/supporting//",
+ InvoicePrivateMedia.as_view(),
+ name="invoice-supporting-document",
+ ),
+ ]
+ ),
+ ),
+ ]
+ ),
+ ),
+ path(
+ "reports/",
+ include(
+ (
+ [
+ path("", ReportListView.as_view(), name="all"),
+ path(
+ "/",
+ include(
+ [
+ path("", ReportDetailView.as_view(), name="detail"),
+ path("skip/", ReportSkipView.as_view(), name="skip"),
+ path("edit/", ReportUpdateView.as_view(), name="edit"),
+ path(
+ "documents//",
+ ReportPrivateMedia.as_view(),
+ name="document",
+ ),
+ ]
+ ),
+ ),
+ ],
+ "reports",
+ )
+ ),
+ ),
+ path(
+ "vendor/",
+ include(
+ (
+ [
+ path("", ReportListView.as_view(), name="all"),
+ path(
+ "/",
+ include(
+ [
+ path("", ReportDetailView.as_view(), name="detail"),
+ path("skip/", ReportSkipView.as_view(), name="skip"),
+ path("edit/", ReportUpdateView.as_view(), name="edit"),
+ path(
+ "documents//",
+ ReportPrivateMedia.as_view(),
+ name="document",
+ ),
+ ]
+ ),
+ ),
+ ],
+ "reports",
+ )
+ ),
+ ),
]
diff --git a/hypha/apply/projects/utils.py b/hypha/apply/projects/utils.py
index f8a6f820e1..aab11ecce9 100644
--- a/hypha/apply/projects/utils.py
+++ b/hypha/apply/projects/utils.py
@@ -27,6 +27,7 @@ def fetch_and_save_deliverables(project_id):
"""
if settings.INTACCT_ENABLED:
from hypha.apply.projects.services.sageintacct.utils import fetch_deliverables
+
project = Project.objects.get(id=project_id)
program_project_id = project.program_project_id
deliverables = fetch_deliverables(program_project_id)
@@ -34,11 +35,11 @@ def fetch_and_save_deliverables(project_id):
def save_deliverables(project_id, deliverables=None):
- '''
+ """
TODO: List of deliverables coming from IntAcct is
not verified yet from the team. This method may need
revision when that is done.
- '''
+ """
if deliverables is None:
deliverables = []
if deliverables:
@@ -46,18 +47,18 @@ def save_deliverables(project_id, deliverables=None):
project = Project.objects.get(id=project_id)
new_deliverable_list = []
for deliverable in deliverables:
- item_id = deliverable['ITEMID']
- item_name = deliverable['ITEMNAME']
- qty_remaining = int(float(deliverable['QTY_REMAINING']))
- price = deliverable['PRICE']
+ item_id = deliverable["ITEMID"]
+ item_name = deliverable["ITEMNAME"]
+ qty_remaining = int(float(deliverable["QTY_REMAINING"]))
+ price = deliverable["PRICE"]
extra_information = {
- 'UNIT': deliverable['UNIT'],
- 'DEPARTMENTID': deliverable['DEPARTMENTID'],
- 'PROJECTID': deliverable['PROJECTID'],
- 'LOCATIONID': deliverable['LOCATIONID'],
- 'CLASSID': deliverable['CLASSID'],
- 'BILLABLE': deliverable['BILLABLE'],
- 'CUSTOMERID': deliverable['CUSTOMERID'],
+ "UNIT": deliverable["UNIT"],
+ "DEPARTMENTID": deliverable["DEPARTMENTID"],
+ "PROJECTID": deliverable["PROJECTID"],
+ "LOCATIONID": deliverable["LOCATIONID"],
+ "CLASSID": deliverable["CLASSID"],
+ "BILLABLE": deliverable["BILLABLE"],
+ "CUSTOMERID": deliverable["CUSTOMERID"],
}
new_deliverable_list.append(
Deliverable(
@@ -66,7 +67,7 @@ def save_deliverables(project_id, deliverables=None):
available_to_invoice=qty_remaining,
unit_price=price,
extra_information=extra_information,
- project=project
+ project=project,
)
)
Deliverable.objects.bulk_create(new_deliverable_list)
@@ -81,13 +82,14 @@ def remove_deliverables_from_project(project_id):
def fetch_and_save_project_details(project_id, external_projectid):
- '''
+ """
Fetch and save project contract information from enabled payment service.
- '''
+ """
if settings.INTACCT_ENABLED:
from hypha.apply.projects.services.sageintacct.utils import (
fetch_project_details,
)
+
data = fetch_project_details(external_projectid)
save_project_details(project_id, data)
@@ -99,13 +101,14 @@ def save_project_details(project_id, data):
def create_invoice(invoice):
- '''
+ """
Creates invoice at enabled payment service.
- '''
+ """
if settings.INTACCT_ENABLED:
from hypha.apply.projects.services.sageintacct.utils import (
create_intacct_invoice,
)
+
create_intacct_invoice(invoice)
@@ -115,20 +118,24 @@ def get_paf_status_display(paf_status):
# Invoices public statuses
def get_invoice_public_status(invoice_status):
- if (invoice_status in [SUBMITTED, RESUBMITTED, APPROVED_BY_STAFF, CHANGES_REQUESTED_BY_FINANCE_1]) or\
- (invoice_status in [APPROVED_BY_FINANCE_1, CHANGES_REQUESTED_BY_FINANCE_2]
- and settings.INVOICE_EXTENDED_WORKFLOW
+ if (
+ invoice_status
+ in [SUBMITTED, RESUBMITTED, APPROVED_BY_STAFF, CHANGES_REQUESTED_BY_FINANCE_1]
+ ) or (
+ invoice_status in [APPROVED_BY_FINANCE_1, CHANGES_REQUESTED_BY_FINANCE_2]
+ and settings.INVOICE_EXTENDED_WORKFLOW
+ ):
+ return _("Pending Approval")
+ if (invoice_status == APPROVED_BY_FINANCE_1) or (
+ invoice_status == APPROVED_BY_FINANCE_2 and settings.INVOICE_EXTENDED_WORKFLOW
):
- return _('Pending Approval')
- if (invoice_status == APPROVED_BY_FINANCE_1) or\
- (invoice_status == APPROVED_BY_FINANCE_2 and settings.INVOICE_EXTENDED_WORKFLOW):
- return _('Approved')
+ return _("Approved")
if invoice_status == CHANGES_REQUESTED_BY_STAFF:
- return _('Request for change or more information')
+ return _("Request for change or more information")
if invoice_status == DECLINED:
- return _('Declined')
+ return _("Declined")
if invoice_status == PAID:
- return _('Paid')
+ return _("Paid")
def get_project_status_display_value(project_status):
diff --git a/hypha/apply/projects/views/__init__.py b/hypha/apply/projects/views/__init__.py
index e8d953b11b..256135879c 100644
--- a/hypha/apply/projects/views/__init__.py
+++ b/hypha/apply/projects/views/__init__.py
@@ -43,43 +43,43 @@
from .vendor import CreateVendorView, VendorDetailView, VendorPrivateMediaView
__all__ = [
- 'partial_project_activities',
- 'ChangeInvoiceStatusView',
- 'SendForApprovalView',
- 'UploadDocumentView',
- 'RemoveDocumentView',
- 'SelectDocumentView',
- 'UpdateLeadView',
- 'ApproveContractView',
- 'UploadContractView',
- 'ContractDocumentPrivateMediaView',
- 'BaseProjectDetailView',
- 'AdminProjectDetailView',
- 'ApplicantProjectDetailView',
- 'ProjectDetailView',
- 'ProjectPrivateMediaView',
- 'CategoryTemplatePrivateMediaView',
- 'ContractPrivateMediaView',
- 'ProjectDetailApprovalView',
- 'ProjectDetailDownloadView',
- 'ProjectSOWView',
- 'ProjectSOWDownloadView',
- 'ProjectApprovalFormEditView',
- 'ProjectListView',
- 'ProjectOverviewView',
- 'ReportDetailView',
- 'ReportUpdateView',
- 'ReportPrivateMedia',
- 'ReportSkipView',
- 'ReportFrequencyUpdate',
- 'ReportListView',
- 'CreateVendorView',
- 'VendorDetailView',
- 'VendorPrivateMediaView',
- 'CreateInvoiceView',
- 'InvoiceListView',
- 'InvoiceView',
- 'EditInvoiceView',
- 'DeleteInvoiceView',
- 'InvoicePrivateMedia',
+ "partial_project_activities",
+ "ChangeInvoiceStatusView",
+ "SendForApprovalView",
+ "UploadDocumentView",
+ "RemoveDocumentView",
+ "SelectDocumentView",
+ "UpdateLeadView",
+ "ApproveContractView",
+ "UploadContractView",
+ "ContractDocumentPrivateMediaView",
+ "BaseProjectDetailView",
+ "AdminProjectDetailView",
+ "ApplicantProjectDetailView",
+ "ProjectDetailView",
+ "ProjectPrivateMediaView",
+ "CategoryTemplatePrivateMediaView",
+ "ContractPrivateMediaView",
+ "ProjectDetailApprovalView",
+ "ProjectDetailDownloadView",
+ "ProjectSOWView",
+ "ProjectSOWDownloadView",
+ "ProjectApprovalFormEditView",
+ "ProjectListView",
+ "ProjectOverviewView",
+ "ReportDetailView",
+ "ReportUpdateView",
+ "ReportPrivateMedia",
+ "ReportSkipView",
+ "ReportFrequencyUpdate",
+ "ReportListView",
+ "CreateVendorView",
+ "VendorDetailView",
+ "VendorPrivateMediaView",
+ "CreateInvoiceView",
+ "InvoiceListView",
+ "InvoiceView",
+ "EditInvoiceView",
+ "DeleteInvoiceView",
+ "InvoicePrivateMedia",
]
diff --git a/hypha/apply/projects/views/payment.py b/hypha/apply/projects/views/payment.py
index fca53a1b26..1a876dd47a 100644
--- a/hypha/apply/projects/views/payment.py
+++ b/hypha/apply/projects/views/payment.py
@@ -30,13 +30,13 @@
from ..tables import InvoiceListTable
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
class InvoiceAccessMixin(UserPassesTestMixin):
model = Invoice
def get_object(self):
- project = get_object_or_404(Project, pk=self.kwargs['pk'])
- return get_object_or_404(project.invoices.all(), pk=self.kwargs['invoice_pk'])
+ project = get_object_or_404(Project, pk=self.kwargs["pk"])
+ return get_object_or_404(project.invoices.all(), pk=self.kwargs["invoice_pk"])
def test_func(self):
if self.request.user.is_apply_staff:
@@ -51,17 +51,19 @@ def test_func(self):
return False
-@method_decorator(staff_or_finance_required, name='dispatch')
+@method_decorator(staff_or_finance_required, name="dispatch")
class ChangeInvoiceStatusView(DelegatedViewMixin, InvoiceAccessMixin, UpdateView):
form_class = ChangeInvoiceStatusForm
- context_name = 'change_invoice_status'
+ context_name = "change_invoice_status"
model = Invoice
def form_valid(self, form):
response = super().form_valid(form)
- if form.cleaned_data['comment']:
- invoice_status_change = _('
'.join( - [VISIBILITY[choice] + ': ' + VISIBILILTY_HELP_TEXT[choice] for choice in VISIBILITY] - )) + kwargs["choices"] = VISIBILITY.items() + kwargs["initial"] = PRIVATE + kwargs["help_text"] = mark_safe( + "
".join( + [ + VISIBILITY[choice] + ": " + VISIBILILTY_HELP_TEXT[choice] + for choice in VISIBILITY + ] + ) + ) return kwargs class ReviewCustomFormFieldsBlock(CustomFormFieldsBlock): - char = CharFieldBlock(group=_('Fields')) - text = TextFieldBlock(group=_('Fields')) - text_markup = RichTextBlock(group=_('Fields'), label=_('Paragraph')) - score = ScoreFieldBlock(group=_('Fields')) - score_without_text = ScoreFieldWithoutTextBlock(group=_('Fields')) - checkbox = CheckboxFieldBlock(group=_('Fields')) - dropdown = DropdownFieldBlock(group=_('Fields')) + char = CharFieldBlock(group=_("Fields")) + text = TextFieldBlock(group=_("Fields")) + text_markup = RichTextBlock(group=_("Fields"), label=_("Paragraph")) + score = ScoreFieldBlock(group=_("Fields")) + score_without_text = ScoreFieldWithoutTextBlock(group=_("Fields")) + checkbox = CheckboxFieldBlock(group=_("Fields")) + dropdown = DropdownFieldBlock(group=_("Fields")) required_blocks = ReviewMustIncludeFieldBlock.__subclasses__() diff --git a/hypha/apply/review/fields.py b/hypha/apply/review/fields.py index 8bd3b636d1..079e01478d 100644 --- a/hypha/apply/review/fields.py +++ b/hypha/apply/review/fields.py @@ -26,12 +26,14 @@ def render(self, name, value, attrs=None, renderer=None): rendered = [] # We need to explicitly call the render method on the tinymce widget # MultiValueWidget just passes all the context into the template - for kwargs, widget in zip(context['widget']['subwidgets'], self.widgets, strict=False): - name = kwargs['name'] - value = kwargs['value'] - attrs = kwargs['attrs'] + for kwargs, widget in zip( + context["widget"]["subwidgets"], self.widgets, strict=False + ): + name = kwargs["name"] + value = kwargs["value"] + attrs = kwargs["attrs"] rendered.append(widget.render(name, value, attrs, renderer)) - return mark_safe(''.join(list(rendered))) + return mark_safe("".join(list(rendered))) class ScoredAnswerField(forms.MultiValueField): @@ -49,4 +51,4 @@ def compress(self, data_list): if data_list: return [data_list[0], int(data_list[1])] else: - return ['', NA] + return ["", NA] diff --git a/hypha/apply/review/forms.py b/hypha/apply/review/forms.py index 60bd1ec7a2..122be1db3c 100644 --- a/hypha/apply/review/forms.py +++ b/hypha/apply/review/forms.py @@ -18,22 +18,24 @@ class ReviewModelForm(StreamBaseForm, forms.ModelForm, metaclass=MixedMetaClass) class Meta: model = Review - fields = ['recommendation', 'visibility', 'score', 'submission'] + fields = ["recommendation", "visibility", "score", "submission"] widgets = { - 'recommendation': forms.HiddenInput(), - 'score': forms.HiddenInput(), - 'submission': forms.HiddenInput(), - 'visibility': forms.HiddenInput(), + "recommendation": forms.HiddenInput(), + "score": forms.HiddenInput(), + "submission": forms.HiddenInput(), + "visibility": forms.HiddenInput(), } error_messages = { NON_FIELD_ERRORS: { - 'unique_together': "You have already posted a review for this submission", + "unique_together": "You have already posted a review for this submission", } } - def __init__(self, *args, submission, user=None, initial=None, instance=None, **kwargs): + def __init__( + self, *args, submission, user=None, initial=None, instance=None, **kwargs + ): if initial is None: initial = {} @@ -54,7 +56,7 @@ def __init__(self, *args, submission, user=None, initial=None, instance=None, ** def clean(self): cleaned_data = super().clean() - cleaned_data['form_data'] = { + cleaned_data["form_data"] = { key: value for key, value in cleaned_data.items() if key not in self._meta.fields @@ -64,16 +66,20 @@ def clean(self): def save(self, commit=True): self.instance.score = self.calculate_score(self.cleaned_data) - self.instance.recommendation = int(self.cleaned_data[self.instance.recommendation_field.id]) + self.instance.recommendation = int( + self.cleaned_data[self.instance.recommendation_field.id] + ) self.instance.is_draft = self.draft_button_name in self.data # Old review forms do not have the requred visability field. # This will set visibility to PRIVATE by default. try: - self.instance.visibility = self.cleaned_data[self.instance.visibility_field.id] + self.instance.visibility = self.cleaned_data[ + self.instance.visibility_field.id + ] except AttributeError: self.instance.visibility = PRIVATE - self.instance.form_data = self.cleaned_data['form_data'] + self.instance.form_data = self.cleaned_data["form_data"] if not self.instance.is_draft: # Capture the revision against which the user was reviewing @@ -94,7 +100,7 @@ def calculate_score(self, data): for field in self.instance.score_fields_without_text: score = data.get(field.id) # Include '' answers as 0. - if score == '': + if score == "": score = 0 scores.append(int(score)) @@ -106,7 +112,7 @@ def calculate_score(self, data): class SubmitButtonWidget(forms.Widget): def render(self, name, value, attrs=None, renderer=None): - disabled = 'disabled' if attrs.get('disabled') else '' + disabled = "disabled" if attrs.get("disabled") else "" return ''.format( disabled=disabled, name=escape(name), @@ -118,7 +124,7 @@ class OpinionField(forms.IntegerField): def __init__(self, *args, opinion, **kwargs): kwargs["widget"] = SubmitButtonWidget self.opinion = opinion - kwargs['label'] = '' + kwargs["label"] = "" super().__init__(*args, **kwargs) def clean(self, value): @@ -131,7 +137,7 @@ class ReviewOpinionForm(forms.ModelForm): class Meta: model = ReviewOpinion - fields = ('opinion',) + fields = ("opinion",) def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -147,8 +153,8 @@ def clean(self): opinions = [cleaned_data.get(opinion.lower()) for _, opinion in OPINION_CHOICES] valid_opinions = [opinion for opinion in opinions if opinion is not None] if len(valid_opinions) > 1: - self.add_error(None, 'Cant submit both an agreement and disagreement') - cleaned_data = {'opinion': valid_opinions[0]} + self.add_error(None, "Cant submit both an agreement and disagreement") + cleaned_data = {"opinion": valid_opinions[0]} return cleaned_data def save(self, *args, **kwargs): diff --git a/hypha/apply/review/management/commands/export_reviews_csv.py b/hypha/apply/review/management/commands/export_reviews_csv.py index de5ab62763..2829674c9d 100644 --- a/hypha/apply/review/management/commands/export_reviews_csv.py +++ b/hypha/apply/review/management/commands/export_reviews_csv.py @@ -9,9 +9,18 @@ class Command(BaseCommand): help = "Export reviews stats to a csv file.." def handle(self, *args, **options): - with open('export_reviews.csv', 'w', newline='') as csvfile: + with open("export_reviews.csv", "w", newline="") as csvfile: writer = csv.writer(csvfile, quoting=csv.QUOTE_ALL) - writer.writerow(['Review author', 'Reviewer type', 'Review date', 'Submission', 'Submission date', 'Round/Lab/Fellowship']) + writer.writerow( + [ + "Review author", + "Reviewer type", + "Review date", + "Submission", + "Submission date", + "Round/Lab/Fellowship", + ] + ) for review in Review.objects.submitted(): if review.submission.round: submission_type = review.submission.round @@ -19,12 +28,21 @@ def handle(self, *args, **options): submission_type = review.submission.page if review.author.reviewer.is_apply_staff: - reviewer_type = 'Staff' + reviewer_type = "Staff" elif review.author.reviewer.is_reviewer: - reviewer_type = 'Reviewer' + reviewer_type = "Reviewer" elif review.author.reviewer.is_partner: - reviewer_type = 'Partner' + reviewer_type = "Partner" elif review.author.reviewer.is_community_reviewer: - reviewer_type = 'Community' + reviewer_type = "Community" - writer.writerow([review.author, reviewer_type, review.created_at.strftime('%Y-%m-%d'), review.submission.title, review.submission.submit_time.strftime('%Y-%m-%d'), submission_type]) + writer.writerow( + [ + review.author, + reviewer_type, + review.created_at.strftime("%Y-%m-%d"), + review.submission.title, + review.submission.submit_time.strftime("%Y-%m-%d"), + submission_type, + ] + ) diff --git a/hypha/apply/review/management/commands/fix_stream_field_ids.py b/hypha/apply/review/management/commands/fix_stream_field_ids.py index 14d35aca0d..c42dc6aab7 100644 --- a/hypha/apply/review/management/commands/fix_stream_field_ids.py +++ b/hypha/apply/review/management/commands/fix_stream_field_ids.py @@ -11,7 +11,7 @@ class Command(BaseCommand): @transaction.atomic def handle(self, *args, **options): with connection.cursor() as cursor: - cursor.execute('SELECT id, form_fields FROM review_reviewform') + cursor.execute("SELECT id, form_fields FROM review_reviewform") form_fields = cursor.fetchall() for row in form_fields: @@ -19,11 +19,14 @@ def handle(self, *args, **options): form = json.loads(review_form) updated = False for field in form: - if field['id'] == '976386e1-3a66-490f-9e82-bfbe1f134cf2': - field['id'] = str(uuid.uuid4()) + if field["id"] == "976386e1-3a66-490f-9e82-bfbe1f134cf2": + field["id"] = str(uuid.uuid4()) updated = True if updated: updated_form = json.dumps(form) with connection.cursor() as cursor: - cursor.execute('UPDATE review_reviewform SET form_fields = %s WHERE id = %s', [updated_form, review_id]) + cursor.execute( + "UPDATE review_reviewform SET form_fields = %s WHERE id = %s", + [updated_form, review_id], + ) diff --git a/hypha/apply/review/management/commands/migration_review_base.py b/hypha/apply/review/management/commands/migration_review_base.py index 7ef22d250d..712fdc9001 100644 --- a/hypha/apply/review/management/commands/migration_review_base.py +++ b/hypha/apply/review/management/commands/migration_review_base.py @@ -78,15 +78,39 @@ class MigrateCommand(BaseCommand): } def add_arguments(self, parser): - parser.add_argument('source', type=argparse.FileType('r'), help='Migration source JSON file') + parser.add_argument( + "source", type=argparse.FileType("r"), help="Migration source JSON file" + ) @transaction.atomic def handle(self, *args, **options): - with options['source'] as json_data: + with options["source"] as json_data: self.data = json.load(json_data) # A user can only submitt a single review in the new system so pick the latest one. - blacklist = {"7574", "7413", "7412", "5270", "6468", "6436", "5511", "3490", "2840", "2837", "2737", "9362", "9203", "8958", "13313", "4868", "4867", "5863", "5770", "3962", "3747"} + blacklist = { + "7574", + "7413", + "7412", + "5270", + "6468", + "6436", + "5511", + "3490", + "2840", + "2837", + "2737", + "9362", + "9203", + "8958", + "13313", + "4868", + "4867", + "5863", + "5770", + "3962", + "3747", + } counter = 0 for id in self.data: @@ -100,9 +124,9 @@ def process(self, id): node = self.data[id] try: - review = Review.objects.get(drupal_id=node['nid']) + review = Review.objects.get(drupal_id=node["nid"]) except Review.DoesNotExist: - review = Review(drupal_id=node['nid']) + review = Review(drupal_id=node["nid"]) # Disable auto_* on date fields so imported dates are used. for field in review._meta.local_fields: @@ -112,9 +136,9 @@ def process(self, id): field.auto_now = False # TODO timezone? - review.created_at = datetime.fromtimestamp(int(node['created']), timezone.utc) - review.updated_at = datetime.fromtimestamp(int(node['changed']), timezone.utc) - review.author = self.get_user(node['uid']) + review.created_at = datetime.fromtimestamp(int(node["created"]), timezone.utc) + review.updated_at = datetime.fromtimestamp(int(node["changed"]), timezone.utc) + review.author = self.get_user(node["uid"]) review.recommendation = self.get_recommendation(node) review.submission = self.get_submission(node) review.revision = review.submission.live_revision @@ -138,7 +162,7 @@ def process(self, id): for field in node: if field in self.STREAMFIELD_MAP: try: - id = self.STREAMFIELD_MAP[field]['id'] + id = self.STREAMFIELD_MAP[field]["id"] form_data[id] = self.get_field_value(field, node) except TypeError: pass @@ -150,7 +174,11 @@ def process(self, id): review.form_data = form_data - scores = [review.data(field.id)[1] for field in review.score_fields if review.data(field.id)[1] != NA] + scores = [ + review.data(field.id)[1] + for field in review.score_fields + if review.data(field.id)[1] != NA + ] try: review.score = sum(scores) / len(scores) except ZeroDivisionError: @@ -160,7 +188,9 @@ def process(self, id): review.save() self.stdout.write(f"Processed \"{node['title']}\" ({node['nid']})") except IntegrityError: - self.stdout.write(f"*** Skipped \"{node['title']}\" ({node['nid']}) due to IntegrityError") + self.stdout.write( + f"*** Skipped \"{node['title']}\" ({node['nid']}) due to IntegrityError" + ) def get_user(self, uid): try: @@ -179,65 +209,73 @@ def get_field_value(self, field, node): field: [{value|target_id|tid: VALUE},] """ mapping = self.STREAMFIELD_MAP[field] - mapping_type = mapping['type'] - key = mapping.get('key', 'value') + mapping_type = mapping["type"] + key = mapping.get("key", "value") source_value = node[field] value = None if mapping_type == "direct": value = source_value - elif mapping_type == 'value': + elif mapping_type == "value": if key in source_value: - value = self.nl2br(source_value[key]) if source_value else '' + value = self.nl2br(source_value[key]) if source_value else "" else: - value = self.nl2br(source_value['value']) if source_value else '' - elif mapping_type == 'merge_value': + value = self.nl2br(source_value["value"]) if source_value else "" + elif mapping_type == "merge_value": values = [] i = 0 for item in source_value: - question = self.REQUEST_QUESTION_MAP[node['request_nid']] + question = self.REQUEST_QUESTION_MAP[node["request_nid"]] if i in question: values.append(f"{question[i]}{item[key]}
\n") i += 1 - merged_values = ''.join(values) - value = self.nl2br(merged_values) if source_value else '' - elif mapping_type == 'score': + merged_values = "".join(values) + value = self.nl2br(merged_values) if source_value else "" + elif mapping_type == "score": value_rate = int(source_value[key]) if source_value else NA - value_text = '' + value_text = "" if "_rate" in field: - field = field.replace('field_field_', 'field_') + field = field.replace("field_field_", "field_") text_field = field[:-5] if text_field in self.STREAMFIELD_MAP: value_text_field = node[text_field] - if 'safe_value' in value_text_field: - value_text = self.nl2br(value_text_field['safe_value']) if value_text_field else '' + if "safe_value" in value_text_field: + value_text = ( + self.nl2br(value_text_field["safe_value"]) + if value_text_field + else "" + ) else: - value_text = self.nl2br(value_text_field['value']) if value_text_field else '' + value_text = ( + self.nl2br(value_text_field["value"]) + if value_text_field + else "" + ) value = [value_text, value_rate] - elif mapping_type == 'map' and 'map' in 'mapping': - value = mapping['map'].get(source_value[key]) - elif mapping_type == 'boolean': - value = source_value[key] == '1' if source_value else False + elif mapping_type == "map" and "map" in "mapping": + value = mapping["map"].get(source_value[key]) + elif mapping_type == "boolean": + value = source_value[key] == "1" if source_value else False return value def get_recommendation(self, node): - mapping = self.REVIEWFIELD_MAP[node['type']] - field_name = mapping['recommendation'] - rec_map = mapping.get('rec_map') + mapping = self.REVIEWFIELD_MAP[node["type"]] + field_name = mapping["recommendation"] + rec_map = mapping.get("rec_map") try: - return rec_map[node[field_name]['value']] + return rec_map[node[field_name]["value"]] except TypeError: return 0 def get_submission(self, node): - mapping = self.REVIEWFIELD_MAP[node['type']] - field_name = mapping['submission'] + mapping = self.REVIEWFIELD_MAP[node["type"]] + field_name = mapping["submission"] try: - nid = node[field_name]['target_id'] + nid = node[field_name]["target_id"] return ApplicationSubmission.objects.get(drupal_id=nid) except ApplicationSubmission.DoesNotExist: return None def nl2br(self, value): - return value.replace('\r\n', '
\n') + return value.replace("\r\n", "
\n") diff --git a/hypha/apply/review/migrations/0001_initial.py b/hypha/apply/review/migrations/0001_initial.py index 0f1ae8337a..89df7f4959 100644 --- a/hypha/apply/review/migrations/0001_initial.py +++ b/hypha/apply/review/migrations/0001_initial.py @@ -6,26 +6,46 @@ class Migration(migrations.Migration): - initial = True dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('funds', '0028_update_on_delete_django2'), + ("funds", "0028_update_on_delete_django2"), ] operations = [ migrations.CreateModel( - name='Review', + name="Review", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('review', models.TextField()), - ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), - ('submission', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='funds.ApplicationSubmission', related_name='reviews')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("review", models.TextField()), + ( + "author", + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + to=settings.AUTH_USER_MODEL, + ), + ), + ( + "submission", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to="funds.ApplicationSubmission", + related_name="reviews", + ), + ), ], ), migrations.AlterUniqueTogether( - name='review', - unique_together={('author', 'submission')}, + name="review", + unique_together={("author", "submission")}, ), ] diff --git a/hypha/apply/review/migrations/0002_add_common_fields.py b/hypha/apply/review/migrations/0002_add_common_fields.py index f1c3bc8b7e..b52769287f 100644 --- a/hypha/apply/review/migrations/0002_add_common_fields.py +++ b/hypha/apply/review/migrations/0002_add_common_fields.py @@ -5,34 +5,57 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0001_initial'), + ("review", "0001_initial"), ] operations = [ migrations.CreateModel( - name='ConceptReview', + name="ConceptReview", fields=[ - ('review_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='review.Review')), + ( + "review_ptr", + models.OneToOneField( + auto_created=True, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + serialize=False, + to="review.Review", + ), + ), ], - bases=('review.review',), + bases=("review.review",), ), migrations.CreateModel( - name='ProposalReview', + name="ProposalReview", fields=[ - ('review_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='review.Review')), + ( + "review_ptr", + models.OneToOneField( + auto_created=True, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + serialize=False, + to="review.Review", + ), + ), ], - bases=('review.review',), + bases=("review.review",), ), migrations.AddField( - model_name='review', - name='recommendation', - field=models.IntegerField(choices=[(0, 'No'), (1, 'Maybe'), (2, 'Yes')], default=0, verbose_name='Recommendation'), + model_name="review", + name="recommendation", + field=models.IntegerField( + choices=[(0, "No"), (1, "Maybe"), (2, "Yes")], + default=0, + verbose_name="Recommendation", + ), ), migrations.AddField( - model_name='review', - name='score', + model_name="review", + name="score", field=models.DecimalField(decimal_places=1, default=0, max_digits=10), ), ] diff --git a/hypha/apply/review/migrations/0003_review_json_field.py b/hypha/apply/review/migrations/0003_review_json_field.py index 6318c1850d..403eefdb5f 100644 --- a/hypha/apply/review/migrations/0003_review_json_field.py +++ b/hypha/apply/review/migrations/0003_review_json_field.py @@ -5,29 +5,28 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0002_add_common_fields'), + ("review", "0002_add_common_fields"), ] operations = [ migrations.RemoveField( - model_name='conceptreview', - name='review_ptr', + model_name="conceptreview", + name="review_ptr", ), migrations.RemoveField( - model_name='proposalreview', - name='review_ptr', + model_name="proposalreview", + name="review_ptr", ), migrations.AlterField( - model_name='review', - name='review', + model_name="review", + name="review", field=django.contrib.postgres.fields.jsonb.JSONField(), ), migrations.DeleteModel( - name='ConceptReview', + name="ConceptReview", ), migrations.DeleteModel( - name='ProposalReview', + name="ProposalReview", ), ] diff --git a/hypha/apply/review/migrations/0004_review_is_draft.py b/hypha/apply/review/migrations/0004_review_is_draft.py index 4e802ee1fa..516ca2eeea 100644 --- a/hypha/apply/review/migrations/0004_review_is_draft.py +++ b/hypha/apply/review/migrations/0004_review_is_draft.py @@ -4,15 +4,14 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0003_review_json_field'), + ("review", "0003_review_json_field"), ] operations = [ migrations.AddField( - model_name='review', - name='is_draft', - field=models.BooleanField(default=False, verbose_name='Draft'), + model_name="review", + name="is_draft", + field=models.BooleanField(default=False, verbose_name="Draft"), ), ] diff --git a/hypha/apply/review/migrations/0005_streamform.py b/hypha/apply/review/migrations/0005_streamform.py index d911e2a9fa..0609864087 100644 --- a/hypha/apply/review/migrations/0005_streamform.py +++ b/hypha/apply/review/migrations/0005_streamform.py @@ -9,29 +9,386 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0004_review_is_draft'), + ("review", "0004_review_is_draft"), ] operations = [ migrations.CreateModel( - name='ReviewForm', + name="ReviewForm", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255)), - ('form_fields', wagtail.fields.StreamField((('rich_text', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))), group='Fields')), ('char', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))), group='Fields')), ('text', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))), group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))), group='Fields')), ('Recommendation', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())), group='Required')), ('Comments', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())), group='Required'))))), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("name", models.CharField(max_length=255)), + ( + "form_fields", + wagtail.fields.StreamField( + ( + ( + "rich_text", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[ + ("email", "Email"), + ("url", "URL"), + ], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock( + group="Fields", label="Paragraph" + ), + ), + ( + "score", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "Recommendation", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "info", + wagtail.blocks.static_block.StaticBlock(), + ), + ), + group="Required", + ), + ), + ( + "Comments", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "info", + wagtail.blocks.static_block.StaticBlock(), + ), + ), + group="Required", + ), + ), + ) + ), + ), ], ), migrations.AddField( - model_name='review', - name='form_data', - field=django.contrib.postgres.fields.jsonb.JSONField(default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder), + model_name="review", + name="form_data", + field=django.contrib.postgres.fields.jsonb.JSONField( + default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder + ), ), migrations.AddField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField((('rich_text', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))), group='Fields')), ('char', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))), group='Fields')), ('text', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))), group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))), group='Fields')), ('Recommendation', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())), group='Required')), ('Comments', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())), group='Required')))), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + ( + ( + "rich_text", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "Recommendation", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ), + group="Required", + ), + ), + ( + "Comments", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ), + group="Required", + ), + ), + ) + ), preserve_default=False, ), ] diff --git a/hypha/apply/review/migrations/0006_remove_review_review.py b/hypha/apply/review/migrations/0006_remove_review_review.py index 5103383b2f..2ddf15bad0 100644 --- a/hypha/apply/review/migrations/0006_remove_review_review.py +++ b/hypha/apply/review/migrations/0006_remove_review_review.py @@ -4,14 +4,13 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0005_streamform'), + ("review", "0005_streamform"), ] operations = [ migrations.RemoveField( - model_name='review', - name='review', + model_name="review", + name="review", ), ] diff --git a/hypha/apply/review/migrations/0007_review_revision.py b/hypha/apply/review/migrations/0007_review_revision.py index 7c58d56bd3..bf9e4abe1e 100644 --- a/hypha/apply/review/migrations/0007_review_revision.py +++ b/hypha/apply/review/migrations/0007_review_revision.py @@ -5,16 +5,20 @@ class Migration(migrations.Migration): - dependencies = [ - ('funds', '0041_roundbasereviewform'), - ('review', '0006_remove_review_review'), + ("funds", "0041_roundbasereviewform"), + ("review", "0006_remove_review_review"), ] operations = [ migrations.AddField( - model_name='review', - name='revision', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='reviews', to='funds.ApplicationRevision'), + model_name="review", + name="revision", + field=models.ForeignKey( + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name="reviews", + to="funds.ApplicationRevision", + ), ), ] diff --git a/hypha/apply/review/migrations/0008_update_fields_for_tweaks.py b/hypha/apply/review/migrations/0008_update_fields_for_tweaks.py index 08add10934..1af821158a 100644 --- a/hypha/apply/review/migrations/0008_update_fields_for_tweaks.py +++ b/hypha/apply/review/migrations/0008_update_fields_for_tweaks.py @@ -7,20 +7,353 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0007_review_revision'), + ("review", "0007_review_revision"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField((('rich_text', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))), group='Fields')), ('char', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))), group='Fields')), ('text', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))), group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))), group='Fields')), ('recommendation', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())), group='Required')), ('comments', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())), group='Required')))), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + ( + ( + "rich_text", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ), + group="Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ), + group="Required", + ), + ), + ) + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField((('rich_text', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))), group='Fields')), ('char', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))), group='Fields')), ('text', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))), group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))), group='Fields')), ('recommendation', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())), group='Required')), ('comments', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())), group='Required')))), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + ( + ( + "rich_text", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ), + group="Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ), + group="Required", + ), + ), + ) + ), ), ] diff --git a/hypha/apply/review/migrations/0009_auto_20180823_0918.py b/hypha/apply/review/migrations/0009_auto_20180823_0918.py index fb913379ec..3b5e66d3e9 100644 --- a/hypha/apply/review/migrations/0009_auto_20180823_0918.py +++ b/hypha/apply/review/migrations/0009_auto_20180823_0918.py @@ -7,20 +7,457 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0008_update_fields_for_tweaks'), + ("review", "0008_update_fields_for_tweaks"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group='Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group='Required'))]), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group="Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group="Required", + ), + ), + ] + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group='Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group='Required'))]), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group="Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group="Required", + ), + ), + ] + ), ), ] diff --git a/hypha/apply/review/migrations/0010_review_drupal_id.py b/hypha/apply/review/migrations/0010_review_drupal_id.py index 4917631402..a5b4461235 100644 --- a/hypha/apply/review/migrations/0010_review_drupal_id.py +++ b/hypha/apply/review/migrations/0010_review_drupal_id.py @@ -4,15 +4,14 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0009_auto_20180823_0918'), + ("review", "0009_auto_20180823_0918"), ] operations = [ migrations.AddField( - model_name='review', - name='drupal_id', + model_name="review", + name="drupal_id", field=models.IntegerField(blank=True, editable=False, null=True), ), ] diff --git a/hypha/apply/review/migrations/0011_add_date_fields.py b/hypha/apply/review/migrations/0011_add_date_fields.py index 7758db9f85..39b1279e97 100644 --- a/hypha/apply/review/migrations/0011_add_date_fields.py +++ b/hypha/apply/review/migrations/0011_add_date_fields.py @@ -5,21 +5,24 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0010_review_drupal_id'), + ("review", "0010_review_drupal_id"), ] operations = [ migrations.AddField( - model_name='review', - name='created_at', - field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now, verbose_name='Creation time'), + model_name="review", + name="created_at", + field=models.DateTimeField( + auto_now_add=True, + default=django.utils.timezone.now, + verbose_name="Creation time", + ), preserve_default=False, ), migrations.AddField( - model_name='review', - name='updated_at', - field=models.DateTimeField(auto_now=True, verbose_name='Update time'), + model_name="review", + name="updated_at", + field=models.DateTimeField(auto_now=True, verbose_name="Update time"), ), ] diff --git a/hypha/apply/review/migrations/0012_auto_20180926_0948.py b/hypha/apply/review/migrations/0012_auto_20180926_0948.py index a5da5235d7..3d172e7bd1 100644 --- a/hypha/apply/review/migrations/0012_auto_20180926_0948.py +++ b/hypha/apply/review/migrations/0012_auto_20180926_0948.py @@ -7,20 +7,469 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0011_add_date_fields'), + ("review", "0011_add_date_fields"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group='Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group='Required'))]), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group="Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group="Required", + ), + ), + ] + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group='Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group='Required'))]), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group="Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group="Required", + ), + ), + ] + ), ), ] diff --git a/hypha/apply/review/migrations/0013_rename_fields.py b/hypha/apply/review/migrations/0013_rename_fields.py index 9e18d0489a..e1eed3a2ee 100644 --- a/hypha/apply/review/migrations/0013_rename_fields.py +++ b/hypha/apply/review/migrations/0013_rename_fields.py @@ -7,20 +7,469 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0012_auto_20180926_0948'), + ("review", "0012_auto_20180926_0948"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), ] diff --git a/hypha/apply/review/migrations/0014_add_markdown.py b/hypha/apply/review/migrations/0014_add_markdown.py index 914d4e429a..311e5b1559 100644 --- a/hypha/apply/review/migrations/0014_add_markdown.py +++ b/hypha/apply/review/migrations/0014_add_markdown.py @@ -7,20 +7,529 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0013_rename_fields'), + ("review", "0013_rename_fields"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), ] diff --git a/hypha/apply/review/migrations/0015_review_opinion.py b/hypha/apply/review/migrations/0015_review_opinion.py index d96d7c5611..ea69c86a9e 100644 --- a/hypha/apply/review/migrations/0015_review_opinion.py +++ b/hypha/apply/review/migrations/0015_review_opinion.py @@ -6,24 +6,47 @@ class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('review', '0014_add_markdown'), + ("review", "0014_add_markdown"), ] operations = [ migrations.CreateModel( - name='ReviewOpinion', + name="ReviewOpinion", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('opinion', models.IntegerField(choices=[(1, 'Agree'), (0, 'Disagree')])), - ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), - ('review', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='opinions', to='review.Review')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "opinion", + models.IntegerField(choices=[(1, "Agree"), (0, "Disagree")]), + ), + ( + "author", + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + to=settings.AUTH_USER_MODEL, + ), + ), + ( + "review", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="opinions", + to="review.Review", + ), + ), ], ), migrations.AlterUniqueTogether( - name='reviewopinion', - unique_together={('author', 'review')}, + name="reviewopinion", + unique_together={("author", "review")}, ), ] diff --git a/hypha/apply/review/migrations/0016_review_visibility.py b/hypha/apply/review/migrations/0016_review_visibility.py index ab408d9418..26e4436a90 100644 --- a/hypha/apply/review/migrations/0016_review_visibility.py +++ b/hypha/apply/review/migrations/0016_review_visibility.py @@ -7,25 +7,577 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0015_review_opinion'), + ("review", "0015_review_opinion"), ] operations = [ migrations.AddField( - model_name='review', - name='visibility', - field=models.CharField(choices=[('private', 'Private'), ('reviewers', 'Reviewers and Staff')], default='private', max_length=10, verbose_name='Visibility'), + model_name="review", + name="visibility", + field=models.CharField( + choices=[("private", "Private"), ("reviewers", "Reviewers and Staff")], + default="private", + max_length=10, + verbose_name="Visibility", + ), ), migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), ] diff --git a/hypha/apply/review/migrations/0017_add_temp_author_field.py b/hypha/apply/review/migrations/0017_add_temp_author_field.py index 7a5e44a4a2..748ba78fd4 100644 --- a/hypha/apply/review/migrations/0017_add_temp_author_field.py +++ b/hypha/apply/review/migrations/0017_add_temp_author_field.py @@ -5,21 +5,29 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0016_review_visibility'), + ("review", "0016_review_visibility"), ] operations = [ migrations.AddField( - model_name='review', - name='author_temp', - field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='review', to='funds.AssignedReviewers', null=True), + model_name="review", + name="author_temp", + field=models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + related_name="review", + to="funds.AssignedReviewers", + null=True, + ), ), migrations.AddField( - model_name='reviewopinion', - name='author_temp', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='opinions', to='funds.AssignedReviewers', null=True), + model_name="reviewopinion", + name="author_temp", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="opinions", + to="funds.AssignedReviewers", + null=True, + ), ), - ] diff --git a/hypha/apply/review/migrations/0018_migrate_author_data.py b/hypha/apply/review/migrations/0018_migrate_author_data.py index 8d541dabf4..fa6a948933 100644 --- a/hypha/apply/review/migrations/0018_migrate_author_data.py +++ b/hypha/apply/review/migrations/0018_migrate_author_data.py @@ -7,25 +7,32 @@ # importing and creating a future dependency. Changes to Group names should # be handled in another migration -STAFF_GROUP_NAME = 'Staff' -REVIEWER_GROUP_NAME = 'Reviewer' -PARTNER_GROUP_NAME = 'Partner' -COMMUNITY_REVIEWER_GROUP_NAME = 'Community reviewer' +STAFF_GROUP_NAME = "Staff" +REVIEWER_GROUP_NAME = "Reviewer" +PARTNER_GROUP_NAME = "Partner" +COMMUNITY_REVIEWER_GROUP_NAME = "Community reviewer" -REVIEWER_GROUPS = {STAFF_GROUP_NAME, +REVIEWER_GROUPS = { + STAFF_GROUP_NAME, REVIEWER_GROUP_NAME, COMMUNITY_REVIEWER_GROUP_NAME, - PARTNER_GROUP_NAME,} + PARTNER_GROUP_NAME, +} def add_to_assigned_reviewers(apps, schema_editor): - Review = apps.get_model('review', 'Review') - AssignedReviewer = apps.get_model('funds', 'AssignedReviewers') - Group = apps.get_model('auth', 'Group') - for review in Review.objects.select_related('author'): - groups = set(review.author.groups.values_list('name', flat=True)) & REVIEWER_GROUPS + Review = apps.get_model("review", "Review") + AssignedReviewer = apps.get_model("funds", "AssignedReviewers") + Group = apps.get_model("auth", "Group") + for review in Review.objects.select_related("author"): + groups = ( + set(review.author.groups.values_list("name", flat=True)) & REVIEWER_GROUPS + ) if len(groups) > 1: - if PARTNER_GROUP_NAME in groups and review.author in review.submission.partners.all(): + if ( + PARTNER_GROUP_NAME in groups + and review.author in review.submission.partners.all() + ): groups = {PARTNER_GROUP_NAME} elif COMMUNITY_REVIEWER_GROUP_NAME in groups: groups = {COMMUNITY_REVIEWER_GROUP_NAME} @@ -44,22 +51,22 @@ def add_to_assigned_reviewers(apps, schema_editor): assignment, _ = AssignedReviewer.objects.update_or_create( submission=review.submission, reviewer=review.author, - defaults={'type': group}, + defaults={"type": group}, ) review.author_temp = assignment review.save() - for opinion in review.opinions.select_related('author'): + for opinion in review.opinions.select_related("author"): opinion_assignment, _ = AssignedReviewer.objects.update_or_create( submission=review.submission, reviewer=opinion.author, - defaults={'type': Group.objects.get(name=STAFF_GROUP_NAME)}, + defaults={"type": Group.objects.get(name=STAFF_GROUP_NAME)}, ) opinion.author_temp = opinion_assignment opinion.save() def add_to_review_and_opinion(apps, schema_editor): - AssignedReviewer = apps.get_model('funds', 'AssignedReviewers') + AssignedReviewer = apps.get_model("funds", "AssignedReviewers") for assigned in AssignedReviewer.objects.all(): try: assigned.review.author = assigned.reviewer @@ -73,11 +80,10 @@ def add_to_review_and_opinion(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ - ('review', '0017_add_temp_author_field'), - ('funds', '0063_make_reviewer_type_required'), - ('users', '0010_add_community_reviewer_group'), + ("review", "0017_add_temp_author_field"), + ("funds", "0063_make_reviewer_type_required"), + ("users", "0010_add_community_reviewer_group"), ] operations = [ diff --git a/hypha/apply/review/migrations/0019_replace_existing_author_field.py b/hypha/apply/review/migrations/0019_replace_existing_author_field.py index a5de51876c..a0a56ed2f6 100644 --- a/hypha/apply/review/migrations/0019_replace_existing_author_field.py +++ b/hypha/apply/review/migrations/0019_replace_existing_author_field.py @@ -5,38 +5,45 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0018_migrate_author_data'), + ("review", "0018_migrate_author_data"), ] operations = [ migrations.RemoveField( - model_name='review', - name='author', + model_name="review", + name="author", ), migrations.RenameField( - model_name='review', - old_name='author_temp', - new_name='author', + model_name="review", + old_name="author_temp", + new_name="author", ), migrations.AlterField( - model_name='review', - name='author', - field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='review', to='funds.AssignedReviewers'), + model_name="review", + name="author", + field=models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + related_name="review", + to="funds.AssignedReviewers", + ), ), migrations.RemoveField( - model_name='reviewopinion', - name='author', + model_name="reviewopinion", + name="author", ), migrations.RenameField( - model_name='reviewopinion', - old_name='author_temp', - new_name='author', + model_name="reviewopinion", + old_name="author_temp", + new_name="author", ), migrations.AlterField( - model_name='reviewopinion', - name='author', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='opinions', to='funds.AssignedReviewers'), + model_name="reviewopinion", + name="author", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="opinions", + to="funds.AssignedReviewers", + ), ), ] diff --git a/hypha/apply/review/migrations/0020_review_score_calc_update.py b/hypha/apply/review/migrations/0020_review_score_calc_update.py index f31dd48245..922026c41c 100644 --- a/hypha/apply/review/migrations/0020_review_score_calc_update.py +++ b/hypha/apply/review/migrations/0020_review_score_calc_update.py @@ -10,7 +10,7 @@ def review_score_update(apps, schema_editor): for review in Review.objects.all(): # Disable auto_now on "updated_at" field so date is not changed. for field in review._meta.local_fields: - if field.name == 'updated_at': + if field.name == "updated_at": field.auto_now = False # Update the score and save. scores = [] @@ -33,7 +33,7 @@ def review_score_revert(apps, schema_editor): for review in Review.objects.all(): # Disable auto_now on "updated_at" field so date is not changed. for field in review._meta.local_fields: - if field.name == 'updated_at': + if field.name == "updated_at": field.auto_now = False # Update the score and save. scores = [] @@ -52,9 +52,8 @@ def review_score_revert(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ - ('review', '0019_replace_existing_author_field'), + ("review", "0019_replace_existing_author_field"), ] operations = [ diff --git a/hypha/apply/review/migrations/0021_add_help_link_field.py b/hypha/apply/review/migrations/0021_add_help_link_field.py index 3e89675f43..e6ead2f083 100644 --- a/hypha/apply/review/migrations/0021_add_help_link_field.py +++ b/hypha/apply/review/migrations/0021_add_help_link_field.py @@ -7,20 +7,687 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0020_review_score_calc_update'), + ("review", "0020_review_score_calc_update"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), ] diff --git a/hypha/apply/review/migrations/0022_add_word_limit_to_text_blocks.py b/hypha/apply/review/migrations/0022_add_word_limit_to_text_blocks.py index 7c2e3d67f7..f8fade9c7b 100644 --- a/hypha/apply/review/migrations/0022_add_word_limit_to_text_blocks.py +++ b/hypha/apply/review/migrations/0022_add_word_limit_to_text_blocks.py @@ -7,20 +7,723 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0021_add_help_link_field'), + ("review", "0021_add_help_link_field"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), ] diff --git a/hypha/apply/review/migrations/0023_add_score_without_text_block.py b/hypha/apply/review/migrations/0023_add_score_without_text_block.py index 0a7873d5ab..645652641f 100644 --- a/hypha/apply/review/migrations/0023_add_score_without_text_block.py +++ b/hypha/apply/review/migrations/0023_add_score_without_text_block.py @@ -7,20 +7,783 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0022_add_word_limit_to_text_blocks'), + ("review", "0022_add_word_limit_to_text_blocks"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('score_without_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "score_without_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('score_without_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "score_without_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), ] diff --git a/hypha/apply/review/migrations/0024_auto_20220111_1314.py b/hypha/apply/review/migrations/0024_auto_20220111_1314.py index f42ea70e5e..4a8d64a065 100644 --- a/hypha/apply/review/migrations/0024_auto_20220111_1314.py +++ b/hypha/apply/review/migrations/0024_auto_20220111_1314.py @@ -5,15 +5,16 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0023_add_score_without_text_block'), + ("review", "0023_add_score_without_text_block"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_data', - field=models.JSONField(default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder), + model_name="review", + name="form_data", + field=models.JSONField( + default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder + ), ), ] diff --git a/hypha/apply/review/migrations/0025_auto_20220722_0844.py b/hypha/apply/review/migrations/0025_auto_20220722_0844.py index 0b1ddaf48c..d8ca94b73e 100644 --- a/hypha/apply/review/migrations/0025_auto_20220722_0844.py +++ b/hypha/apply/review/migrations/0025_auto_20220722_0844.py @@ -7,20 +7,785 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0024_auto_20220111_1314'), + ("review", "0024_auto_20220111_1314"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('score_without_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], use_json_field=True), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "score_without_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ], + use_json_field=True, + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('score_without_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], use_json_field=True), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "score_without_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ], + use_json_field=True, + ), ), ] diff --git a/hypha/apply/review/models.py b/hypha/apply/review/models.py index 1afbdaa2f6..a78f2b1494 100644 --- a/hypha/apply/review/models.py +++ b/hypha/apply/review/models.py @@ -37,7 +37,6 @@ class ReviewFormFieldsMixin(models.Model): - wagtail_reference_index_ignore = True class Meta: @@ -84,8 +83,8 @@ class ReviewForm(ReviewFormFieldsMixin, models.Model): name = models.CharField(max_length=255) panels = [ - FieldPanel('name'), - FieldPanel('form_fields'), + FieldPanel("name"), + FieldPanel("form_fields"), ] def __str__(self): @@ -97,7 +96,7 @@ def submitted(self): return self.filter(is_draft=False) def _by_group(self, group): - return self.select_related('author__type').filter(author__type__name=group) + return self.select_related("author__type").filter(author__type__name=group) def by_staff(self): return self.submitted()._by_group(STAFF_GROUP_NAME) @@ -109,7 +108,7 @@ def by_partners(self): return self.submitted()._by_group(PARTNER_GROUP_NAME) def by_user(self, user): - return self.submitted().filter(author__reviewer=user).order_by('-created_at') + return self.submitted().filter(author__reviewer=user).order_by("-created_at") def staff_score(self): return self.by_staff().score() @@ -124,15 +123,15 @@ def reviewers_recommendation(self): return self.by_reviewers().recommendation() def score(self): - return self.exclude(score=NA).aggregate(models.Avg('score'))['score__avg'] + return self.exclude(score=NA).aggregate(models.Avg("score"))["score__avg"] def recommendation(self): - opinions = self.values_list('opinions__opinion', flat=True) + opinions = self.values_list("opinions__opinion", flat=True) if any(opinion == DISAGREE for opinion in opinions): return MAYBE - recommendations = self.values_list('recommendation', flat=True) + recommendations = self.values_list("recommendation", flat=True) try: recommendation = sum(recommendations) / len(recommendations) except ZeroDivisionError: @@ -145,26 +144,42 @@ def recommendation(self): return MAYBE def opinions(self): - return ReviewOpinion.objects.filter(review__id__in=self.values_list('id')) + return ReviewOpinion.objects.filter(review__id__in=self.values_list("id")) class Review(ReviewFormFieldsMixin, BaseStreamForm, AccessFormData, models.Model): - submission = models.ForeignKey('funds.ApplicationSubmission', on_delete=models.CASCADE, related_name='reviews') - revision = models.ForeignKey('funds.ApplicationRevision', on_delete=models.SET_NULL, related_name='reviews', null=True) + submission = models.ForeignKey( + "funds.ApplicationSubmission", on_delete=models.CASCADE, related_name="reviews" + ) + revision = models.ForeignKey( + "funds.ApplicationRevision", + on_delete=models.SET_NULL, + related_name="reviews", + null=True, + ) author = models.OneToOneField( - 'funds.AssignedReviewers', - related_name='review', + "funds.AssignedReviewers", + related_name="review", on_delete=models.CASCADE, ) form_data = models.JSONField(default=dict, encoder=DjangoJSONEncoder) - recommendation = models.IntegerField(verbose_name=_("Recommendation"), choices=RECOMMENDATION_CHOICES, default=0) + recommendation = models.IntegerField( + verbose_name=_("Recommendation"), choices=RECOMMENDATION_CHOICES, default=0 + ) score = models.DecimalField(max_digits=10, decimal_places=1, default=0) is_draft = models.BooleanField(default=False, verbose_name=_("Draft")) - created_at = models.DateTimeField(verbose_name=_("Creation time"), auto_now_add=True) + created_at = models.DateTimeField( + verbose_name=_("Creation time"), auto_now_add=True + ) updated_at = models.DateTimeField(verbose_name=_("Update time"), auto_now=True) - visibility = models.CharField(verbose_name=_("Visibility"), choices=VISIBILITY.items(), default=PRIVATE, max_length=10) + visibility = models.CharField( + verbose_name=_("Visibility"), + choices=VISIBILITY.items(), + default=PRIVATE, + max_length=10, + ) # Meta: used for migration purposes only drupal_id = models.IntegerField(null=True, blank=True, editable=False) @@ -172,27 +187,35 @@ class Review(ReviewFormFieldsMixin, BaseStreamForm, AccessFormData, models.Model objects = ReviewQuerySet.as_manager() class Meta: - unique_together = ('author', 'submission') + unique_together = ("author", "submission") @property def outcome(self): return self.get_recommendation_display() def get_comments_display(self, include_question=True): - return self.render_answer(self.comment_field.id, include_question=include_question) + return self.render_answer( + self.comment_field.id, include_question=include_question + ) @property def get_score_display(self): - return '{:.1f}'.format(self.score) if self.score != NA else 'NA' + return "{:.1f}".format(self.score) if self.score != NA else "NA" def get_absolute_url(self): - return reverse('apply:submissions:reviews:review', args=(self.submission.pk, self.id,)) + return reverse( + "apply:submissions:reviews:review", + args=( + self.submission.pk, + self.id, + ), + ) def __str__(self): - return f'Review for {self.submission.title} by {self.author!s}' + return f"Review for {self.submission.title} by {self.author!s}" def __repr__(self): - return f'<{self.__class__.__name__}: {str(self.form_data)}>' + return f"<{self.__class__.__name__}: {str(self.form_data)}>" @property def for_latest(self): @@ -212,16 +235,18 @@ def is_updated(self): class ReviewOpinion(models.Model): - review = models.ForeignKey(Review, on_delete=models.CASCADE, related_name='opinions') + review = models.ForeignKey( + Review, on_delete=models.CASCADE, related_name="opinions" + ) author = models.ForeignKey( - 'funds.AssignedReviewers', - related_name='opinions', + "funds.AssignedReviewers", + related_name="opinions", on_delete=models.CASCADE, ) opinion = models.IntegerField(choices=OPINION_CHOICES) class Meta: - unique_together = ('author', 'review') + unique_together = ("author", "review") @property def opinion_display(self): diff --git a/hypha/apply/review/options.py b/hypha/apply/review/options.py index ebf99ae28e..aad50ced30 100644 --- a/hypha/apply/review/options.py +++ b/hypha/apply/review/options.py @@ -3,13 +3,13 @@ NA = 99 RATE_CHOICES = ( - (0, _('0. Need more info')), - (1, _('1. Poor')), - (2, _('2. Not so good')), - (3, _('3. Is o.k.')), - (4, _('4. Good')), - (5, _('5. Excellent')), - (NA, _('n/a - choose not to answer')), + (0, _("0. Need more info")), + (1, _("1. Poor")), + (2, _("2. Not so good")), + (3, _("3. Is o.k.")), + (4, _("4. Good")), + (5, _("5. Excellent")), + (NA, _("n/a - choose not to answer")), ) RATE_CHOICES_DICT = dict(RATE_CHOICES) @@ -20,28 +20,28 @@ YES = 2 RECOMMENDATION_CHOICES = ( - (NO, _('No')), - (MAYBE, _('Maybe')), - (YES, _('Yes')), + (NO, _("No")), + (MAYBE, _("Maybe")), + (YES, _("Yes")), ) DISAGREE = 0 AGREE = 1 OPINION_CHOICES = ( - (AGREE, _('Agree')), - (DISAGREE, _('Disagree')), + (AGREE, _("Agree")), + (DISAGREE, _("Disagree")), ) -PRIVATE = 'private' -REVIEWER = 'reviewers' +PRIVATE = "private" +REVIEWER = "reviewers" VISIBILILTY_HELP_TEXT = { - PRIVATE: _('Visible only to staff.'), - REVIEWER: _('Visible to other reviewers and staff.'), + PRIVATE: _("Visible only to staff."), + REVIEWER: _("Visible to other reviewers and staff."), } VISIBILITY = { - PRIVATE: _('Private'), - REVIEWER: _('Reviewers and Staff'), + PRIVATE: _("Private"), + REVIEWER: _("Reviewers and Staff"), } diff --git a/hypha/apply/review/templates/review/includes/review_opinions_list.html b/hypha/apply/review/templates/review/includes/review_opinions_list.html index 0cc942d17b..e186ced5b3 100644 --- a/hypha/apply/review/templates/review/includes/review_opinions_list.html +++ b/hypha/apply/review/templates/review/includes/review_opinions_list.html @@ -1,13 +1,13 @@ {% load wagtailimages_tags %} {% if opinions %} -
-
{% endblock %}
diff --git a/hypha/apply/projects/templatetags/approval_tools.py b/hypha/apply/projects/templatetags/approval_tools.py
index 84cb2d8ce3..2038404515 100644
--- a/hypha/apply/projects/templatetags/approval_tools.py
+++ b/hypha/apply/projects/templatetags/approval_tools.py
@@ -24,21 +24,39 @@ def user_can_send_for_approval(project, user):
@register.simple_tag
def user_can_update_paf_approvers(project, user, request):
- permission, _ = has_permission('paf_approvers_update', user, object=project, raise_exception=False, request=request)
+ permission, _ = has_permission(
+ "paf_approvers_update",
+ user,
+ object=project,
+ raise_exception=False,
+ request=request,
+ )
return permission
@register.simple_tag
def user_can_assign_approvers_to_project(project, user, request):
- permission, _ = has_permission('paf_approvers_assign', user, object=project, raise_exception=False, request=request)
+ permission, _ = has_permission(
+ "paf_approvers_assign",
+ user,
+ object=project,
+ raise_exception=False,
+ request=request,
+ )
return permission
@register.simple_tag
def user_can_update_paf_status(project, user, **kwargs):
- request = kwargs.get('request')
+ request = kwargs.get("request")
if request:
- permission, _ = has_permission('paf_status_update', user, object=project, raise_exception=False, request=request)
+ permission, _ = has_permission(
+ "paf_status_update",
+ user,
+ object=project,
+ raise_exception=False,
+ request=request,
+ )
return permission
return False
@@ -50,28 +68,34 @@ def user_can_edit_project(project, user):
@register.simple_tag
def project_rejected_by_user(project, user):
- """ Using for paf approvals sidebar section"""
+ """Using for paf approvals sidebar section"""
# todo: need to find a better way to know request change action on PAF.
from hypha.apply.activity.models import Activity
if not user:
return False
- message = 'Requested changes for acceptance' # picked from activity.adapters.activity_feed.ActivityAdapter messages
- return Activity.actions.filter(source_content_type__model="project", source_object_id=project.id,
- user__id=user.id, message__icontains=message).exists()
+ message = "Requested changes for acceptance" # picked from activity.adapters.activity_feed.ActivityAdapter messages
+ return Activity.actions.filter(
+ source_content_type__model="project",
+ source_object_id=project.id,
+ user__id=user.id,
+ message__icontains=message,
+ ).exists()
@register.simple_tag
def get_comment_for_requested_approval(requested_approval):
from hypha.apply.activity.models import Activity
+
if requested_approval.updated_at:
- comment = Activity.comments.filter(user__id=requested_approval.user.id,
- source_content_type__model="project",
- source_object_id=requested_approval.project.id,
- timestamp__range=(
- requested_approval.updated_at - timedelta(minutes=2),
- requested_approval.updated_at + timedelta(minutes=2)
- )).first()
+ comment = Activity.comments.filter(
+ user__id=requested_approval.user.id,
+ source_content_type__model="project",
+ source_object_id=requested_approval.project.id,
+ timestamp__range=(
+ requested_approval.updated_at - timedelta(minutes=2),
+ requested_approval.updated_at + timedelta(minutes=2),
+ ),
+ ).first()
return comment if comment else None
return None
-
diff --git a/hypha/apply/projects/templatetags/contract_tools.py b/hypha/apply/projects/templatetags/contract_tools.py
index d3cc8a556c..6373b9ab89 100644
--- a/hypha/apply/projects/templatetags/contract_tools.py
+++ b/hypha/apply/projects/templatetags/contract_tools.py
@@ -9,13 +9,15 @@
@register.simple_tag
def user_can_approve_contract(user, project):
- can_approve, _ = has_permission('contract_approve', user, object=project, raise_exception=False)
+ can_approve, _ = has_permission(
+ "contract_approve", user, object=project, raise_exception=False
+ )
return can_approve
@register.simple_tag
def is_project_contract_approved(project):
- contract = project.contracts.order_by('-created_at').first()
+ contract = project.contracts.order_by("-created_at").first()
if contract and contract.approver:
return True
return False
@@ -23,7 +25,7 @@ def is_project_contract_approved(project):
@register.simple_tag
def contract_uploaded_by_contracting(project):
- contract = project.contracts.order_by('-created_at').first()
+ contract = project.contracts.order_by("-created_at").first()
if contract:
return True
return False
@@ -31,7 +33,7 @@ def contract_uploaded_by_contracting(project):
@register.simple_tag
def contract_reuploaded_by_applicant(project):
- contract = project.contracts.order_by('-created_at').first()
+ contract = project.contracts.order_by("-created_at").first()
if contract and contract.signed_by_applicant:
return True
return False
@@ -39,13 +41,21 @@ def contract_reuploaded_by_applicant(project):
@register.simple_tag
def user_can_submit_contract(project, user, contract):
- can_submit, _ = has_permission('submit_contract_documents', user, object=project, raise_exception=False, contract=contract)
+ can_submit, _ = has_permission(
+ "submit_contract_documents",
+ user,
+ object=project,
+ raise_exception=False,
+ contract=contract,
+ )
return can_submit
@register.simple_tag
def user_can_upload_contract(project, user):
- can_upload, _ = has_permission('contract_upload', user, object=project, raise_exception=False)
+ can_upload, _ = has_permission(
+ "contract_upload", user, object=project, raise_exception=False
+ )
return can_upload
diff --git a/hypha/apply/projects/templatetags/invoice_tools.py b/hypha/apply/projects/templatetags/invoice_tools.py
index 1ae2e0a37d..49bdcbb432 100644
--- a/hypha/apply/projects/templatetags/invoice_tools.py
+++ b/hypha/apply/projects/templatetags/invoice_tools.py
@@ -38,7 +38,7 @@ def percentage(value, total):
# round using Decimal since we're dealing with currency
rounded_total = unrounded_total.quantize(
- decimal.Decimal('0.0'),
+ decimal.Decimal("0.0"),
rounding=decimal.ROUND_DOWN,
)
@@ -59,7 +59,9 @@ def user_can_view_invoices(project, user):
@register.simple_tag
def user_can_add_invoices(project, user):
- if project.status == INVOICING_AND_REPORTING and (user.is_apply_staff or user == project.user):
+ if project.status == INVOICING_AND_REPORTING and (
+ user.is_apply_staff or user == project.user
+ ):
return True
return False
@@ -73,6 +75,7 @@ def is_vendor_setup(request):
@register.simple_tag
def get_invoice_form(invoice, user):
from hypha.apply.projects.views.payment import ChangeInvoiceStatusForm
+
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
if form:
form.name = "change_invoice_status"
@@ -82,15 +85,17 @@ def get_invoice_form(invoice, user):
@register.simple_tag
def get_invoice_form_id(form, invoice):
- return f'{form.name}-{invoice.id}'
+ return f"{form.name}-{invoice.id}"
@register.simple_tag
def extract_status(activity, user):
if activity and user:
invoice_activity_message = display_for(activity, user)
- return invoice_activity_message.replace("Updated Invoice status to: ", "").replace(".", "")
- return ''
+ return invoice_activity_message.replace(
+ "Updated Invoice status to: ", ""
+ ).replace(".", "")
+ return ""
@register.simple_tag
diff --git a/hypha/apply/projects/templatetags/project_tags.py b/hypha/apply/projects/templatetags/project_tags.py
index 49c5bdf644..e68e10b293 100644
--- a/hypha/apply/projects/templatetags/project_tags.py
+++ b/hypha/apply/projects/templatetags/project_tags.py
@@ -28,6 +28,7 @@ def project_can_have_report(project):
@register.simple_tag
def user_next_step_on_project(project, user, request=None):
from hypha.apply.projects.models.project import PAFReviewersRole, ProjectSettings
+
if project.status == DRAFT:
if user.is_apply_staff:
if not project.user_has_updated_details:
@@ -36,22 +37,26 @@ def user_next_step_on_project(project, user, request=None):
return _("Resubmit project documents for approval")
return _("Submit project documents for approval")
elif user.is_applicant:
- return _("Awaiting project documents to be created and approved by {org_short_name} internally. "
- "Please check back when the project has moved to contracting stage.").format(
- org_short_name=settings.ORG_SHORT_NAME)
+ return _(
+ "Awaiting project documents to be created and approved by {org_short_name} internally. "
+ "Please check back when the project has moved to contracting stage."
+ ).format(org_short_name=settings.ORG_SHORT_NAME)
if project.paf_approvals.exists():
return _("Changes requested. Awaiting documents to be resubmitted.")
return _("Awaiting approval form to be created.")
elif project.status == INTERNAL_APPROVAL:
if user.is_applicant:
- return _("Awaiting project documents to be created and approved by {org_short_name} internally. "
- "Please check back when the project has moved to contracting stage.").format(
- org_short_name=settings.ORG_SHORT_NAME)
+ return _(
+ "Awaiting project documents to be created and approved by {org_short_name} internally. "
+ "Please check back when the project has moved to contracting stage."
+ ).format(org_short_name=settings.ORG_SHORT_NAME)
if request:
project_settings = ProjectSettings.for_request(request=request)
if project_settings.paf_approval_sequential:
- latest_unapproved_approval = project.paf_approvals.filter(approved=False).first()
+ latest_unapproved_approval = project.paf_approvals.filter(
+ approved=False
+ ).first()
if latest_unapproved_approval:
if latest_unapproved_approval.user:
return _("Awaiting approval. Assigned to {approver}").format(
@@ -61,32 +66,40 @@ def user_next_step_on_project(project, user, request=None):
reviewer_role=latest_unapproved_approval.paf_reviewer_role.label
)
else:
- matched_roles = PAFReviewersRole.objects.annotate(roles_count=Count('user_roles')).filter(
- roles_count=len(user.groups.all()))
+ matched_roles = PAFReviewersRole.objects.annotate(
+ roles_count=Count("user_roles")
+ ).filter(roles_count=len(user.groups.all()))
for group in user.groups.all():
matched_roles = matched_roles.filter(user_roles__id=group.id)
if not matched_roles:
return _("Awaiting PAF approval form to be approved")
else:
- matched_unapproved_approval = project.paf_approvals.filter(approved=False, paf_reviewer_role__in=matched_roles)
+ matched_unapproved_approval = project.paf_approvals.filter(
+ approved=False, paf_reviewer_role__in=matched_roles
+ )
if not matched_unapproved_approval.exists():
return _("Awaiting approval from other approvers teams")
else:
if matched_unapproved_approval.first().user:
- return _("Awaiting approval. Assigned to {approver}").format(
- approver=matched_unapproved_approval.first().user)
- return _("Awaiting {reviewer_role} to assign an approver").format(
- reviewer_role=matched_unapproved_approval.first().paf_reviewer_role.label)
+ return _(
+ "Awaiting approval. Assigned to {approver}"
+ ).format(approver=matched_unapproved_approval.first().user)
+ return _(
+ "Awaiting {reviewer_role} to assign an approver"
+ ).format(
+ reviewer_role=matched_unapproved_approval.first().paf_reviewer_role.label
+ )
return _("Awaiting project approval from assigned approvers")
elif project.status == CONTRACTING:
if not project.contracts.exists():
if user.is_applicant:
return _("Awaiting signed contract from {org_short_name}").format(
- org_short_name=settings.ORG_SHORT_NAME)
+ org_short_name=settings.ORG_SHORT_NAME
+ )
return _("Awaiting signed contract from Contracting team")
else:
- contract = project.contracts.order_by('-created_at').first()
+ contract = project.contracts.order_by("-created_at").first()
if not contract.signed_by_applicant:
if user.is_applicant:
return _("Awaiting contract documents to be submitted by you.")
@@ -97,10 +110,13 @@ def user_next_step_on_project(project, user, request=None):
return _("Awaiting contract documents submission from Vendor")
else:
if user.is_apply_staff:
- return _("Review the contract for all relevant details and approve.")
+ return _(
+ "Review the contract for all relevant details and approve."
+ )
if user.is_applicant:
return _("Awaiting contract approval from {org_short_name}").format(
- org_short_name=settings.ORG_SHORT_NAME)
+ org_short_name=settings.ORG_SHORT_NAME
+ )
return _("Awaiting contract approval from Staff")
elif project.status == INVOICING_AND_REPORTING:
if user.is_applicant and not project.invoices.exists():
@@ -115,38 +131,55 @@ def user_next_step_instructions(project, user):
"""
To provide instructions incase next step is not enough like 'contracting documents submitted by an applicant'
"""
- if project.status == CONTRACTING and user == project.user and project.contracts.exists():
- contract = project.contracts.order_by('-created_at').first()
+ if (
+ project.status == CONTRACTING
+ and user == project.user
+ and project.contracts.exists()
+ ):
+ contract = project.contracts.order_by("-created_at").first()
if contract and not contract.signed_by_applicant:
- return [_('Please download the signed contract uploaded by {org_short_name}').format(
- org_short_name=settings.ORG_SHORT_NAME),
- _('Countersign'),
- _('Upload it back'),
- _('Please also make sure to upload other required contracting documents')]
+ return [
+ _(
+ "Please download the signed contract uploaded by {org_short_name}"
+ ).format(org_short_name=settings.ORG_SHORT_NAME),
+ _("Countersign"),
+ _("Upload it back"),
+ _(
+ "Please also make sure to upload other required contracting documents"
+ ),
+ ]
return False
@register.simple_tag
def user_can_update_project_reports(project, user):
- permission, _ = has_permission('project_reports_update', user, object=project, raise_exception=False)
+ permission, _ = has_permission(
+ "project_reports_update", user, object=project, raise_exception=False
+ )
return permission
@register.simple_tag
def user_can_update_report_config(project, user):
- permission, _ = has_permission('report_config_update', user, object=project, raise_exception=False)
+ permission, _ = has_permission(
+ "report_config_update", user, object=project, raise_exception=False
+ )
return permission
@register.simple_tag
def user_can_update_report(report, user):
- permission, _ = has_permission('report_update', user, object=report, raise_exception=False)
+ permission, _ = has_permission(
+ "report_update", user, object=report, raise_exception=False
+ )
return permission
@register.simple_tag
def user_can_view_report(report, user):
- permission, _ = has_permission('report_view', user, object=report, raise_exception=False)
+ permission, _ = has_permission(
+ "report_view", user, object=report, raise_exception=False
+ )
return permission
@@ -173,7 +206,9 @@ def show_closing_banner(project):
@register.simple_tag
def user_can_update_project_status(project, user):
- can_update_status, _ = has_permission('project_status_update', user, object=project, raise_exception=False)
+ can_update_status, _ = has_permission(
+ "project_status_update", user, object=project, raise_exception=False
+ )
return can_update_status
@@ -191,9 +226,16 @@ def project_settings_url(instance):
@register.simple_tag
def allow_collapsible_header(project, header_type):
- if header_type == 'project_documents' and project.status not in [DRAFT, INTERNAL_APPROVAL]:
+ if header_type == "project_documents" and project.status not in [
+ DRAFT,
+ INTERNAL_APPROVAL,
+ ]:
return True
- if header_type == 'contracting_documents' and project.status not in [DRAFT, INTERNAL_APPROVAL, CONTRACTING]:
+ if header_type == "contracting_documents" and project.status not in [
+ DRAFT,
+ INTERNAL_APPROVAL,
+ CONTRACTING,
+ ]:
return True
return False
@@ -212,7 +254,7 @@ def user_can_take_actions(project, user):
"""
if user.is_apply_staff or user.is_contracting:
return True
- if user.id in project.paf_approvals.values_list('user', flat=True):
+ if user.id in project.paf_approvals.values_list("user", flat=True):
return True
return False
diff --git a/hypha/apply/projects/tests/factories.py b/hypha/apply/projects/tests/factories.py
index f11eb73214..f65f243f94 100644
--- a/hypha/apply/projects/tests/factories.py
+++ b/hypha/apply/projects/tests/factories.py
@@ -29,14 +29,16 @@
from ..models.report import Report, ReportConfig, ReportVersion
ADDRESS = {
- 'country': 'GB',
- 'thoroughfare': factory.Faker('street_name').evaluate(None, None, {'locale': None}),
- 'premise': factory.Faker('building_number').evaluate(None, None, {'locale': None}),
- 'locality': {
- 'localityname': factory.Faker('city').evaluate(None, None, {'locale': None}),
- 'administrativearea': factory.Faker('city').evaluate(None, None, {'locale': None}),
- 'postal_code': 'SW1 4AQ',
- }
+ "country": "GB",
+ "thoroughfare": factory.Faker("street_name").evaluate(None, None, {"locale": None}),
+ "premise": factory.Faker("building_number").evaluate(None, None, {"locale": None}),
+ "locality": {
+ "localityname": factory.Faker("city").evaluate(None, None, {"locale": None}),
+ "administrativearea": factory.Faker("city").evaluate(
+ None, None, {"locale": None}
+ ),
+ "postal_code": "SW1 4AQ",
+ },
}
@@ -45,17 +47,17 @@ def address_to_form_data():
Generate a AddressField compatible dictionary from the address data
"""
return {
- 'contact_address_0': ADDRESS['country'],
- 'contact_address_1': ADDRESS['thoroughfare'],
- 'contact_address_2': ADDRESS['premise'],
- 'contact_address_3_0': ADDRESS['locality']['localityname'],
- 'contact_address_3_1': ADDRESS['locality']['administrativearea'],
- 'contact_address_3_2': ADDRESS['locality']['postal_code'],
+ "contact_address_0": ADDRESS["country"],
+ "contact_address_1": ADDRESS["thoroughfare"],
+ "contact_address_2": ADDRESS["premise"],
+ "contact_address_3_0": ADDRESS["locality"]["localityname"],
+ "contact_address_3_1": ADDRESS["locality"]["administrativearea"],
+ "contact_address_3_2": ADDRESS["locality"]["postal_code"],
}
class DocumentCategoryFactory(factory.django.DjangoModelFactory):
- name = factory.Sequence('name {}'.format)
+ name = factory.Sequence("name {}".format)
recommended_minimum = 1
class Meta:
@@ -66,7 +68,7 @@ class ProjectApprovalFormFactory(factory.django.DjangoModelFactory):
class Meta:
model = ProjectApprovalForm
- name = factory.Faker('word')
+ name = factory.Faker("word")
form_fields = FormFieldsBlockFactory
@@ -74,7 +76,7 @@ class ProjectSOWFormFactory(factory.django.DjangoModelFactory):
class Meta:
model = ProjectSOWForm
- name = factory.Faker('word')
+ name = factory.Faker("word")
form_fields = FormFieldsBlockFactory
@@ -86,9 +88,9 @@ class ProjectFactory(factory.django.DjangoModelFactory):
submission = factory.SubFactory(ApplicationSubmissionFactory)
user = factory.SubFactory(UserFactory)
- title = factory.Sequence('name {}'.format)
+ title = factory.Sequence("name {}".format)
lead = factory.SubFactory(StaffFactory)
- value = decimal.Decimal('100')
+ value = decimal.Decimal("100")
proposed_start = factory.LazyFunction(timezone.now)
proposed_end = factory.LazyFunction(timezone.now)
@@ -97,7 +99,7 @@ class ProjectFactory(factory.django.DjangoModelFactory):
form_fields = FormFieldsBlockFactory
form_data = factory.SubFactory(
ProjectApprovalFormDataFactory,
- form_fields=factory.SelfAttribute('..form_fields'),
+ form_fields=factory.SelfAttribute("..form_fields"),
)
class Meta:
@@ -116,7 +118,7 @@ class Params:
class PAFReviewerRoleFactory(factory.django.DjangoModelFactory):
- label = factory.Faker('name')
+ label = factory.Faker("name")
class Meta:
model = PAFReviewersRole
@@ -155,7 +157,7 @@ class PacketFileFactory(factory.django.DjangoModelFactory):
category = factory.SubFactory(DocumentCategoryFactory)
project = factory.SubFactory(ProjectFactory)
- title = factory.Sequence('name {}'.format)
+ title = factory.Sequence("name {}".format)
document = factory.django.FileField()
class Meta:
@@ -163,8 +165,8 @@ class Meta:
class InvoiceFactory(factory.django.DjangoModelFactory):
- invoice_number = factory.Faker('name')
- invoice_amount = decimal.Decimal('10')
+ invoice_number = factory.Faker("name")
+ invoice_amount = decimal.Decimal("10")
project = factory.SubFactory(ProjectFactory)
by = factory.SubFactory(UserFactory)
document = factory.django.FileField()
@@ -190,7 +192,7 @@ class ReportConfigFactory(factory.django.DjangoModelFactory):
class Meta:
model = ReportConfig
- django_get_or_create = ('project',)
+ django_get_or_create = ("project",)
class Params:
weeks = factory.Trait(
@@ -201,8 +203,8 @@ class Params:
class ReportVersionFactory(factory.django.DjangoModelFactory):
report = factory.SubFactory("hypha.apply.projects.tests.factories.ReportFactory")
submitted = factory.LazyFunction(timezone.now)
- public_content = factory.Faker('paragraph')
- private_content = factory.Faker('paragraph')
+ public_content = factory.Faker("paragraph")
+ private_content = factory.Faker("paragraph")
draft = True
class Meta:
@@ -223,7 +225,9 @@ def relate(obj, create, should_relate, **kwargs):
class ReportFactory(factory.django.DjangoModelFactory):
- project = factory.SubFactory("hypha.apply.projects.tests.factories.ApprovedProjectFactory")
+ project = factory.SubFactory(
+ "hypha.apply.projects.tests.factories.ApprovedProjectFactory"
+ )
end_date = factory.LazyFunction(timezone.now)
class Meta:
@@ -231,24 +235,28 @@ class Meta:
class Params:
past_due = factory.Trait(
- end_date=factory.LazyFunction(lambda: timezone.now() - relativedelta(days=1))
+ end_date=factory.LazyFunction(
+ lambda: timezone.now() - relativedelta(days=1)
+ )
)
is_submitted = factory.Trait(
- version=factory.RelatedFactory(ReportVersionFactory, 'report', draft=False, relate=True)
+ version=factory.RelatedFactory(
+ ReportVersionFactory, "report", draft=False, relate=True
+ )
)
is_draft = factory.Trait(
- version=factory.RelatedFactory(ReportVersionFactory, 'report', relate=True),
+ version=factory.RelatedFactory(ReportVersionFactory, "report", relate=True),
)
class ApprovedProjectFactory(ProjectFactory):
- contract = factory.RelatedFactory(ContractFactory, 'project')
- report_config = factory.RelatedFactory(ReportConfigFactory, 'project')
+ contract = factory.RelatedFactory(ContractFactory, "project")
+ report_config = factory.RelatedFactory(ReportConfigFactory, "project")
class DeliverableFactory(factory.django.DjangoModelFactory):
- name = factory.Sequence('name {}'.format)
- unit_price = decimal.Decimal('100')
+ name = factory.Sequence("name {}".format)
+ unit_price = decimal.Decimal("100")
project = factory.SubFactory(ProjectFactory)
class Meta:
diff --git a/hypha/apply/projects/tests/test_commands.py b/hypha/apply/projects/tests/test_commands.py
index e3b8852886..a94de7e40d 100644
--- a/hypha/apply/projects/tests/test_commands.py
+++ b/hypha/apply/projects/tests/test_commands.py
@@ -10,50 +10,58 @@
from .factories import ProjectFactory, ReportConfigFactory, ReportFactory
-@override_settings(ROOT_URLCONF='hypha.apply.urls')
+@override_settings(ROOT_URLCONF="hypha.apply.urls")
class TestNotifyReportDue(TestCase):
def test_notify_report_due_in_7_days(self):
in_a_week = timezone.now() + relativedelta(days=7)
ReportConfigFactory(schedule_start=in_a_week, project__in_progress=True)
out = StringIO()
- with self.settings(ALLOWED_HOSTS=[ApplyHomePage.objects.first().get_site().hostname]):
- call_command('notify_report_due', 7, stdout=out)
- self.assertIn('Notified project', out.getvalue())
+ with self.settings(
+ ALLOWED_HOSTS=[ApplyHomePage.objects.first().get_site().hostname]
+ ):
+ call_command("notify_report_due", 7, stdout=out)
+ self.assertIn("Notified project", out.getvalue())
def test_dont_notify_report_due_in_7_days_already_submitted(self):
in_a_week = timezone.now() + relativedelta(days=7)
- config = ReportConfigFactory(schedule_start=in_a_week, project__in_progress=True)
+ config = ReportConfigFactory(
+ schedule_start=in_a_week, project__in_progress=True
+ )
ReportFactory(
project=config.project,
is_submitted=True,
end_date=config.schedule_start,
)
out = StringIO()
- with self.settings(ALLOWED_HOSTS=[ApplyHomePage.objects.first().get_site().hostname]):
- call_command('notify_report_due', 7, stdout=out)
- self.assertNotIn('Notified project', out.getvalue())
+ with self.settings(
+ ALLOWED_HOSTS=[ApplyHomePage.objects.first().get_site().hostname]
+ ):
+ call_command("notify_report_due", 7, stdout=out)
+ self.assertNotIn("Notified project", out.getvalue())
def test_dont_notify_already_notified(self):
in_a_week = timezone.now() + relativedelta(days=7)
- config = ReportConfigFactory(schedule_start=in_a_week, project__in_progress=True)
+ config = ReportConfigFactory(
+ schedule_start=in_a_week, project__in_progress=True
+ )
ReportFactory(
project=config.project,
end_date=config.schedule_start,
notified=timezone.now(),
)
out = StringIO()
- call_command('notify_report_due', 7, stdout=out)
- self.assertNotIn('Notified project', out.getvalue())
+ call_command("notify_report_due", 7, stdout=out)
+ self.assertNotIn("Notified project", out.getvalue())
def test_dont_notify_project_not_in_progress(self):
ProjectFactory()
out = StringIO()
- call_command('notify_report_due', 7, stdout=out)
- self.assertNotIn('Notified project', out.getvalue())
+ call_command("notify_report_due", 7, stdout=out)
+ self.assertNotIn("Notified project", out.getvalue())
def test_dont_notify_project_complete(self):
ProjectFactory(is_complete=True)
out = StringIO()
- call_command('notify_report_due', 7, stdout=out)
- self.assertNotIn('Notified project', out.getvalue())
+ call_command("notify_report_due", 7, stdout=out)
+ self.assertNotIn("Notified project", out.getvalue())
diff --git a/hypha/apply/projects/tests/test_forms.py b/hypha/apply/projects/tests/test_forms.py
index acbefdf22a..a1d85c869b 100644
--- a/hypha/apply/projects/tests/test_forms.py
+++ b/hypha/apply/projects/tests/test_forms.py
@@ -57,8 +57,13 @@ def test_staff_choices_with_submitted_status(self):
user = StaffFactory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([CHANGES_REQUESTED_BY_STAFF, APPROVED_BY_STAFF, DECLINED], invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices(
+ [CHANGES_REQUESTED_BY_STAFF, APPROVED_BY_STAFF, DECLINED],
+ invoice_status_user_choices(user),
+ )
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
def test_finance1_choices_with_submitted_status(self):
@@ -66,8 +71,13 @@ def test_finance1_choices_with_submitted_status(self):
user = FinanceFactory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([CHANGES_REQUESTED_BY_STAFF, APPROVED_BY_STAFF, DECLINED], invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices(
+ [CHANGES_REQUESTED_BY_STAFF, APPROVED_BY_STAFF, DECLINED],
+ invoice_status_user_choices(user),
+ )
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
def test_finance2_choices_with_submitted_status(self):
@@ -75,8 +85,13 @@ def test_finance2_choices_with_submitted_status(self):
user = Finance2Factory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([CHANGES_REQUESTED_BY_STAFF, APPROVED_BY_STAFF, DECLINED], invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices(
+ [CHANGES_REQUESTED_BY_STAFF, APPROVED_BY_STAFF, DECLINED],
+ invoice_status_user_choices(user),
+ )
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
def test_staff_choices_with_resubmitted_status(self):
@@ -84,9 +99,13 @@ def test_staff_choices_with_resubmitted_status(self):
user = StaffFactory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([CHANGES_REQUESTED_BY_STAFF, APPROVED_BY_STAFF, DECLINED],
- invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices(
+ [CHANGES_REQUESTED_BY_STAFF, APPROVED_BY_STAFF, DECLINED],
+ invoice_status_user_choices(user),
+ )
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
def test_finance1_choices_with_resubmitted_status(self):
@@ -94,9 +113,13 @@ def test_finance1_choices_with_resubmitted_status(self):
user = FinanceFactory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([CHANGES_REQUESTED_BY_STAFF, APPROVED_BY_STAFF, DECLINED],
- invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices(
+ [CHANGES_REQUESTED_BY_STAFF, APPROVED_BY_STAFF, DECLINED],
+ invoice_status_user_choices(user),
+ )
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
def test_finance2_choices_with_resubmitted_status(self):
@@ -104,9 +127,13 @@ def test_finance2_choices_with_resubmitted_status(self):
user = Finance2Factory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([CHANGES_REQUESTED_BY_STAFF, APPROVED_BY_STAFF, DECLINED],
- invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices(
+ [CHANGES_REQUESTED_BY_STAFF, APPROVED_BY_STAFF, DECLINED],
+ invoice_status_user_choices(user),
+ )
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
def test_staff_choices_with_changes_requested_by_staff_status(self):
@@ -114,8 +141,10 @@ def test_staff_choices_with_changes_requested_by_staff_status(self):
user = StaffFactory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([DECLINED], invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices([DECLINED], invoice_status_user_choices(user))
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
def test_finance1_choices_with_changes_requested_by_staff_status(self):
@@ -123,8 +152,10 @@ def test_finance1_choices_with_changes_requested_by_staff_status(self):
user = FinanceFactory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([DECLINED], invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices([DECLINED], invoice_status_user_choices(user))
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
def test_finance2_choices_with_changes_requested_by_staff_status(self):
@@ -132,8 +163,10 @@ def test_finance2_choices_with_changes_requested_by_staff_status(self):
user = Finance2Factory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([DECLINED], invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices([DECLINED], invoice_status_user_choices(user))
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
def test_staff_choices_with_approved_by_staff_status(self):
@@ -141,9 +174,13 @@ def test_staff_choices_with_approved_by_staff_status(self):
user = StaffFactory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([CHANGES_REQUESTED_BY_FINANCE_1, APPROVED_BY_FINANCE_1],
- invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices(
+ [CHANGES_REQUESTED_BY_FINANCE_1, APPROVED_BY_FINANCE_1],
+ invoice_status_user_choices(user),
+ )
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
def test_finance1_choices_with_approved_by_staff_status(self):
@@ -151,9 +188,13 @@ def test_finance1_choices_with_approved_by_staff_status(self):
user = FinanceFactory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([CHANGES_REQUESTED_BY_FINANCE_1, APPROVED_BY_FINANCE_1],
- invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices(
+ [CHANGES_REQUESTED_BY_FINANCE_1, APPROVED_BY_FINANCE_1],
+ invoice_status_user_choices(user),
+ )
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
def test_finance2_choices_with_approved_by_staff_status(self):
@@ -161,9 +202,13 @@ def test_finance2_choices_with_approved_by_staff_status(self):
user = Finance2Factory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([CHANGES_REQUESTED_BY_FINANCE_1, APPROVED_BY_FINANCE_1],
- invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices(
+ [CHANGES_REQUESTED_BY_FINANCE_1, APPROVED_BY_FINANCE_1],
+ invoice_status_user_choices(user),
+ )
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
def test_staff_choices_with_changes_requested_by_finance1_status(self):
@@ -171,9 +216,13 @@ def test_staff_choices_with_changes_requested_by_finance1_status(self):
user = StaffFactory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([CHANGES_REQUESTED_BY_STAFF, DECLINED],
- invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices(
+ [CHANGES_REQUESTED_BY_STAFF, DECLINED],
+ invoice_status_user_choices(user),
+ )
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
def test_finance1_choices_with_changes_requested_by_finance1_status(self):
@@ -181,9 +230,13 @@ def test_finance1_choices_with_changes_requested_by_finance1_status(self):
user = FinanceFactory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([CHANGES_REQUESTED_BY_STAFF, DECLINED],
- invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices(
+ [CHANGES_REQUESTED_BY_STAFF, DECLINED],
+ invoice_status_user_choices(user),
+ )
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
def test_finance2_choices_with_changes_requested_by_finance1_status(self):
@@ -191,9 +244,13 @@ def test_finance2_choices_with_changes_requested_by_finance1_status(self):
user = Finance2Factory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([CHANGES_REQUESTED_BY_STAFF, DECLINED],
- invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices(
+ [CHANGES_REQUESTED_BY_STAFF, DECLINED],
+ invoice_status_user_choices(user),
+ )
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
def test_staff_choices_with_approved_by_finance1_status(self):
@@ -201,9 +258,13 @@ def test_staff_choices_with_approved_by_finance1_status(self):
user = StaffFactory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([CHANGES_REQUESTED_BY_FINANCE_2, APPROVED_BY_FINANCE_2],
- invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices(
+ [CHANGES_REQUESTED_BY_FINANCE_2, APPROVED_BY_FINANCE_2],
+ invoice_status_user_choices(user),
+ )
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
@override_settings(INVOICE_EXTENDED_WORKFLOW=True)
@@ -212,9 +273,13 @@ def test_finance1_choices_with_approved_by_finance1_status_with_extended_flow(se
user = FinanceFactory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([CHANGES_REQUESTED_BY_FINANCE_2, APPROVED_BY_FINANCE_2],
- invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices(
+ [CHANGES_REQUESTED_BY_FINANCE_2, APPROVED_BY_FINANCE_2],
+ invoice_status_user_choices(user),
+ )
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
@override_settings(INVOICE_EXTENDED_WORKFLOW=False)
@@ -223,9 +288,10 @@ def test_finance1_choices_with_approved_by_finance1_status(self):
user = FinanceFactory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([PAID],
- invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices([PAID], invoice_status_user_choices(user))
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
@override_settings(INVOICE_EXTENDED_WORKFLOW=True)
@@ -234,9 +300,13 @@ def test_finance2_choices_with_approved_by_finance1_status(self):
user = Finance2Factory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([CHANGES_REQUESTED_BY_FINANCE_2, APPROVED_BY_FINANCE_2],
- invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices(
+ [CHANGES_REQUESTED_BY_FINANCE_2, APPROVED_BY_FINANCE_2],
+ invoice_status_user_choices(user),
+ )
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
@override_settings(INVOICE_EXTENDED_WORKFLOW=True)
@@ -245,9 +315,13 @@ def test_staff_choices_with_changes_requested_by_finance2_status(self):
user = StaffFactory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([CHANGES_REQUESTED_BY_FINANCE_1, APPROVED_BY_FINANCE_1],
- invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices(
+ [CHANGES_REQUESTED_BY_FINANCE_1, APPROVED_BY_FINANCE_1],
+ invoice_status_user_choices(user),
+ )
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
@override_settings(INVOICE_EXTENDED_WORKFLOW=True)
@@ -256,9 +330,13 @@ def test_finance1_choices_with_changes_requested_by_finance2_status(self):
user = FinanceFactory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([CHANGES_REQUESTED_BY_FINANCE_1, APPROVED_BY_FINANCE_1],
- invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices(
+ [CHANGES_REQUESTED_BY_FINANCE_1, APPROVED_BY_FINANCE_1],
+ invoice_status_user_choices(user),
+ )
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
@override_settings(INVOICE_EXTENDED_WORKFLOW=True)
@@ -267,19 +345,24 @@ def test_finance2_choices_with_changes_requested_by_finance2_status(self):
user = Finance2Factory()
form = ChangeInvoiceStatusForm(instance=invoice, user=user)
- expected = set(filter_request_choices([CHANGES_REQUESTED_BY_FINANCE_1, APPROVED_BY_FINANCE_1],
- invoice_status_user_choices(user)))
- actual = set(form.fields['status'].choices)
+ expected = set(
+ filter_request_choices(
+ [CHANGES_REQUESTED_BY_FINANCE_1, APPROVED_BY_FINANCE_1],
+ invoice_status_user_choices(user),
+ )
+ )
+ actual = set(form.fields["status"].choices)
self.assertEqual(expected, actual)
class TestChangePAFStatusForm(TestCase):
-
@classmethod
def setUpTestData(cls):
super().setUpTestData()
apply_site = ApplySiteFactory()
- cls.project_setting, _ = ProjectSettings.objects.get_or_create(site_id=apply_site.id)
+ cls.project_setting, _ = ProjectSettings.objects.get_or_create(
+ site_id=apply_site.id
+ )
cls.project_setting.use_settings = True
cls.project_setting.save()
cls.role = PAFReviewerRoleFactory(page=cls.project_setting)
@@ -287,14 +370,18 @@ def setUpTestData(cls):
def test_paf_status_is_required(self):
project = ProjectFactory(in_approval=True)
user = StaffFactory()
- form = ChangePAFStatusForm(data={'comment': 'comment'}, instance=project, user=user)
+ form = ChangePAFStatusForm(
+ data={"comment": "comment"}, instance=project, user=user
+ )
self.assertFalse(form.is_valid())
- self.assertIn('paf_status', form.errors.keys())
+ self.assertIn("paf_status", form.errors.keys())
def test_comment_is_not_required(self):
project = ProjectFactory(in_approval=True)
user = StaffFactory()
- form = ChangePAFStatusForm(data={'paf_status': APPROVE}, instance=project, user=user)
+ form = ChangePAFStatusForm(
+ data={"paf_status": APPROVE}, instance=project, user=user
+ )
self.assertTrue(form.is_valid())
self.assertEqual(form.errors, {})
@@ -306,14 +393,16 @@ def test_updating_fields_sets_changed_flag(self):
self.assertFalse(project.user_has_updated_details)
# Use querydict for request.POST
- data = QueryDict('').copy()
-
- data.update({
- 'title': f'{project.title} test',
- 'value': project.value,
- 'proposed_start': project.proposed_start,
- 'proposed_end': project.proposed_end,
- })
+ data = QueryDict("").copy()
+
+ data.update(
+ {
+ "title": f"{project.title} test",
+ "value": project.value,
+ "proposed_start": project.proposed_start,
+ "proposed_end": project.proposed_end,
+ }
+ )
data.update(address_to_form_data())
form = ProjectApprovalForm(instance=project, data=data)
self.assertTrue(form.is_valid(), form.errors.as_text())
@@ -326,18 +415,17 @@ def test_updating_fields_sets_changed_flag(self):
class TestCreateInvoiceForm(TestCase):
def test_adding_invoice(self):
data = {
- 'invoice_number': '00INV_NUM',
- 'invoice_amount': '10',
- 'paid_value': '10',
- 'comment': 'test comment',
+ "invoice_number": "00INV_NUM",
+ "invoice_amount": "10",
+ "paid_value": "10",
+ "comment": "test comment",
}
- document = SimpleUploadedFile('invoice.pdf', BytesIO(b'somebinarydata').read())
- supporting_documents = [SimpleUploadedFile('invoice.pdf', BytesIO(b'somebinarydata').read())]
- files = {
- 'document': document,
- 'supporting_documents': supporting_documents
- }
+ document = SimpleUploadedFile("invoice.pdf", BytesIO(b"somebinarydata").read())
+ supporting_documents = [
+ SimpleUploadedFile("invoice.pdf", BytesIO(b"somebinarydata").read())
+ ]
+ files = {"document": document, "supporting_documents": supporting_documents}
form = CreateInvoiceForm(data=data, files=files)
self.assertTrue(form.is_valid(), msg=form.errors)
@@ -352,16 +440,15 @@ def test_adding_invoice(self):
def test_supporting_documents_not_required(self):
data = {
- 'invoice_number': '00INV_NUM',
- 'invoice_amount': '10',
- 'paid_value': '10',
- 'comment': 'test comment',
-
+ "invoice_number": "00INV_NUM",
+ "invoice_amount": "10",
+ "paid_value": "10",
+ "comment": "test comment",
}
- document = SimpleUploadedFile('invoice.pdf', BytesIO(b'somebinarydata').read())
+ document = SimpleUploadedFile("invoice.pdf", BytesIO(b"somebinarydata").read())
files = {
- 'document': document,
+ "document": document,
}
form = CreateInvoiceForm(data=data, files=files)
@@ -375,7 +462,6 @@ def test_supporting_documents_not_required(self):
class TestEditInvoiceForm(TestCase):
-
def test_remove_existing_supporting_document(self):
invoice = InvoiceFactory()
SupportingDocumentFactory(invoice=invoice, document=invoice.document)
@@ -383,15 +469,16 @@ def test_remove_existing_supporting_document(self):
form = EditInvoiceForm(
data={
- 'invoice_number': invoice.invoice_number,
- 'invoice_amount': invoice.invoice_amount,
- 'document': invoice.document,
- 'supporting_documents-uploads': '[]',
+ "invoice_number": invoice.invoice_number,
+ "invoice_amount": invoice.invoice_amount,
+ "document": invoice.document,
+ "supporting_documents-uploads": "[]",
},
files={
- 'supporting_documents': [],
+ "supporting_documents": [],
},
- instance=invoice)
+ instance=invoice,
+ )
self.assertTrue(form.is_valid())
form.save()
@@ -404,16 +491,21 @@ def test_keep_existing_supporting_document(self):
form = EditInvoiceForm(
data={
- 'invoice_number': invoice.invoice_number,
- 'invoice_amount': invoice.invoice_amount,
- 'document': invoice.document,
- 'supporting_documents-uploads': json.dumps(
- [{"name": supporting_document.document.name,
- "size": supporting_document.document.size,
- "type": "existing"}]
+ "invoice_number": invoice.invoice_number,
+ "invoice_amount": invoice.invoice_amount,
+ "document": invoice.document,
+ "supporting_documents-uploads": json.dumps(
+ [
+ {
+ "name": supporting_document.document.name,
+ "size": supporting_document.document.size,
+ "type": "existing",
+ }
+ ]
),
},
- instance=invoice)
+ instance=invoice,
+ )
self.assertTrue(form.is_valid())
invoice = form.save()
@@ -423,16 +515,18 @@ def test_add_new_supporting_document(self):
invoice = InvoiceFactory()
self.assertEqual(invoice.supporting_documents.count(), 0)
- supporting_document = [SimpleUploadedFile('invoice.pdf', BytesIO(b'somebinarydata').read())]
+ supporting_document = [
+ SimpleUploadedFile("invoice.pdf", BytesIO(b"somebinarydata").read())
+ ]
form = EditInvoiceForm(
data={
- 'invoice_number': invoice.invoice_number,
- 'invoice_amount': invoice.invoice_amount,
- 'document': invoice.document,
- 'supporting_documents-uploads': '[]',
+ "invoice_number": invoice.invoice_number,
+ "invoice_amount": invoice.invoice_amount,
+ "document": invoice.document,
+ "supporting_documents-uploads": "[]",
},
files={
- 'supporting_documents': supporting_document,
+ "supporting_documents": supporting_document,
},
instance=invoice,
)
@@ -442,7 +536,7 @@ def test_add_new_supporting_document(self):
self.assertEqual(invoice.supporting_documents.count(), 1)
-@override_settings(ROOT_URLCONF='hypha.apply.urls')
+@override_settings(ROOT_URLCONF="hypha.apply.urls")
class TestSelectDocumentForm(TestCase):
def test_copying_files(self):
category = DocumentCategoryFactory()
@@ -457,42 +551,46 @@ def test_copying_files(self):
form = SelectDocumentForm(
files,
- data={'category': category.id, 'document': url},
+ data={"category": category.id, "document": url},
)
self.assertTrue(form.is_valid(), form.errors)
form.instance.project = project
form.save()
- packet_files = project.packet_files.order_by('id')
+ packet_files = project.packet_files.order_by("id")
self.assertEqual(len(packet_files), 1)
self.assertEqual(packet_files.first().document.read(), files[3].read())
class TestStaffContractUploadForm(TestCase):
- mock_file = SimpleUploadedFile('contract.pdf', BytesIO(b'somebinarydata').read())
+ mock_file = SimpleUploadedFile("contract.pdf", BytesIO(b"somebinarydata").read())
def test_staff_can_upload_unsigned(self):
- form = StaffUploadContractForm(data={}, files={'file': self.mock_file})
+ form = StaffUploadContractForm(data={}, files={"file": self.mock_file})
self.assertTrue(form.is_valid(), form.errors)
- self.assertFalse(form.cleaned_data.get('signed_by_applicant'))
+ self.assertFalse(form.cleaned_data.get("signed_by_applicant"))
def test_staff_can_upload_signed(self):
- form = StaffUploadContractForm(data={'signed_by_applicant': True}, files={'file': self.mock_file})
+ form = StaffUploadContractForm(
+ data={"signed_by_applicant": True}, files={"file": self.mock_file}
+ )
self.assertTrue(form.is_valid(), form.errors)
- self.assertTrue(form.cleaned_data.get('signed_by_applicant'))
+ self.assertTrue(form.cleaned_data.get("signed_by_applicant"))
class TestContractUploadForm(TestCase):
- mock_file = SimpleUploadedFile('contract.pdf', BytesIO(b'somebinarydata').read())
+ mock_file = SimpleUploadedFile("contract.pdf", BytesIO(b"somebinarydata").read())
def test_applicant_cant_upload_unsigned(self):
- form = UploadContractForm(data={}, files={'file': self.mock_file})
+ form = UploadContractForm(data={}, files={"file": self.mock_file})
self.assertTrue(form.is_valid(), form.errors)
- self.assertIsNone(form.cleaned_data.get('signed_by_applicant'))
+ self.assertIsNone(form.cleaned_data.get("signed_by_applicant"))
def test_applicant_can_upload_signed(self):
- form = UploadContractForm(data={'signed_by_applicant': True}, files={'file': self.mock_file})
+ form = UploadContractForm(
+ data={"signed_by_applicant": True}, files={"file": self.mock_file}
+ )
self.assertTrue(form.is_valid(), form.errors)
- self.assertIsNone(form.cleaned_data.get('signed_by_applicant'))
+ self.assertIsNone(form.cleaned_data.get("signed_by_applicant"))
diff --git a/hypha/apply/projects/tests/test_models.py b/hypha/apply/projects/tests/test_models.py
index 80367b6d97..4a2199decc 100644
--- a/hypha/apply/projects/tests/test_models.py
+++ b/hypha/apply/projects/tests/test_models.py
@@ -133,30 +133,37 @@ def test_paid_value_used_when_no_paid_value(self):
invoice = InvoiceFactory(
paid_value=None,
)
- self.assertNotEqual(invoice.value, Decimal('1'))
+ self.assertNotEqual(invoice.value, Decimal("1"))
def test_paid_value_overrides_paid_value(self):
invoice = InvoiceFactory(
- paid_value=Decimal('2'),
+ paid_value=Decimal("2"),
)
- self.assertEqual(invoice.value, Decimal('2'))
+ self.assertEqual(invoice.value, Decimal("2"))
invoice = InvoiceFactory(
- paid_value=Decimal('2'),
+ paid_value=Decimal("2"),
)
- self.assertEqual(invoice.value, Decimal('2'))
+ self.assertEqual(invoice.value, Decimal("2"))
def test_deliverables_total_amount(self):
deliverable = DeliverableFactory(unit_price=100)
- invoice_deliverable = InvoiceDeliverableFactory(deliverable=deliverable, quantity=2)
+ invoice_deliverable = InvoiceDeliverableFactory(
+ deliverable=deliverable, quantity=2
+ )
self.assertEqual(invoice_deliverable.deliverable.unit_price, 100.00)
invoice = InvoiceFactory(status=APPROVED_BY_STAFF)
invoice.deliverables.add(invoice_deliverable)
- self.assertEqual(invoice.deliverables_total_amount['total'], 200.00)
+ self.assertEqual(invoice.deliverables_total_amount["total"], 200.00)
def test_staff_can_change_status(self):
- statuses = [SUBMITTED, RESUBMITTED, CHANGES_REQUESTED_BY_STAFF, CHANGES_REQUESTED_BY_FINANCE_1]
+ statuses = [
+ SUBMITTED,
+ RESUBMITTED,
+ CHANGES_REQUESTED_BY_STAFF,
+ CHANGES_REQUESTED_BY_FINANCE_1,
+ ]
user = StaffFactory()
for status in statuses:
invoice = InvoiceFactory(status=status)
@@ -164,8 +171,12 @@ def test_staff_can_change_status(self):
def test_staff_cant_change_status(self):
statuses = [
- APPROVED_BY_STAFF, APPROVED_BY_FINANCE_1, APPROVED_BY_FINANCE_2,
- CHANGES_REQUESTED_BY_FINANCE_2, DECLINED, PAID
+ APPROVED_BY_STAFF,
+ APPROVED_BY_FINANCE_1,
+ APPROVED_BY_FINANCE_2,
+ CHANGES_REQUESTED_BY_FINANCE_2,
+ DECLINED,
+ PAID,
]
user = StaffFactory()
for status in statuses:
@@ -191,8 +202,14 @@ def test_finance1_can_change_status(self):
@override_settings(INVOICE_EXTENDED_WORKFLOW=True)
def test_finance1_cant_change_status_with_extended_flow(self):
statuses = [
- APPROVED_BY_FINANCE_1, APPROVED_BY_FINANCE_2, CHANGES_REQUESTED_BY_STAFF,
- CHANGES_REQUESTED_BY_FINANCE_1, DECLINED, PAID, RESUBMITTED, SUBMITTED
+ APPROVED_BY_FINANCE_1,
+ APPROVED_BY_FINANCE_2,
+ CHANGES_REQUESTED_BY_STAFF,
+ CHANGES_REQUESTED_BY_FINANCE_1,
+ DECLINED,
+ PAID,
+ RESUBMITTED,
+ SUBMITTED,
]
user = FinanceFactory()
for status in statuses:
@@ -202,8 +219,12 @@ def test_finance1_cant_change_status_with_extended_flow(self):
@override_settings(INVOICE_EXTENDED_WORKFLOW=False)
def test_finance1_cant_change_status(self):
statuses = [
- CHANGES_REQUESTED_BY_STAFF, CHANGES_REQUESTED_BY_FINANCE_1,
- DECLINED, PAID, RESUBMITTED, SUBMITTED
+ CHANGES_REQUESTED_BY_STAFF,
+ CHANGES_REQUESTED_BY_FINANCE_1,
+ DECLINED,
+ PAID,
+ RESUBMITTED,
+ SUBMITTED,
]
user = FinanceFactory()
for status in statuses:
@@ -221,8 +242,14 @@ def test_finance2_can_change_status_with_extended_flow(self):
@override_settings(INVOICE_EXTENDED_WORKFLOW=True)
def test_finance2_cant_change_status(self):
statuses = [
- APPROVED_BY_STAFF, CHANGES_REQUESTED_BY_FINANCE_1, CHANGES_REQUESTED_BY_FINANCE_2,
- CHANGES_REQUESTED_BY_STAFF, DECLINED, PAID, RESUBMITTED, SUBMITTED
+ APPROVED_BY_STAFF,
+ CHANGES_REQUESTED_BY_FINANCE_1,
+ CHANGES_REQUESTED_BY_FINANCE_2,
+ CHANGES_REQUESTED_BY_STAFF,
+ DECLINED,
+ PAID,
+ RESUBMITTED,
+ SUBMITTED,
]
user = Finance2Factory()
for status in statuses:
@@ -238,8 +265,13 @@ def test_applicant_can_edit_invoice(self):
def test_applicant_cant_edit_invoice(self):
statuses = [
- APPROVED_BY_FINANCE_1, APPROVED_BY_FINANCE_2, APPROVED_BY_STAFF, CHANGES_REQUESTED_BY_FINANCE_1,
- CHANGES_REQUESTED_BY_FINANCE_2, DECLINED, PAID
+ APPROVED_BY_FINANCE_1,
+ APPROVED_BY_FINANCE_2,
+ APPROVED_BY_STAFF,
+ CHANGES_REQUESTED_BY_FINANCE_1,
+ CHANGES_REQUESTED_BY_FINANCE_2,
+ DECLINED,
+ PAID,
]
user = ApplicantFactory()
for status in statuses:
@@ -255,8 +287,13 @@ def test_staff_can_edit_invoice(self):
def test_staff_cant_edit_invoice(self):
statuses = [
- APPROVED_BY_FINANCE_1, APPROVED_BY_FINANCE_2, APPROVED_BY_STAFF,
- CHANGES_REQUESTED_BY_FINANCE_2, CHANGES_REQUESTED_BY_STAFF, DECLINED, PAID
+ APPROVED_BY_FINANCE_1,
+ APPROVED_BY_FINANCE_2,
+ APPROVED_BY_STAFF,
+ CHANGES_REQUESTED_BY_FINANCE_2,
+ CHANGES_REQUESTED_BY_STAFF,
+ DECLINED,
+ PAID,
]
user = StaffFactory()
for status in statuses:
@@ -265,8 +302,16 @@ def test_staff_cant_edit_invoice(self):
def test_applicant_cant_edit_deliverables(self):
statuses = [
- SUBMITTED, RESUBMITTED, CHANGES_REQUESTED_BY_STAFF, APPROVED_BY_STAFF, CHANGES_REQUESTED_BY_FINANCE_1,
- APPROVED_BY_FINANCE_1, CHANGES_REQUESTED_BY_FINANCE_2, APPROVED_BY_FINANCE_2, DECLINED, PAID
+ SUBMITTED,
+ RESUBMITTED,
+ CHANGES_REQUESTED_BY_STAFF,
+ APPROVED_BY_STAFF,
+ CHANGES_REQUESTED_BY_FINANCE_1,
+ APPROVED_BY_FINANCE_1,
+ CHANGES_REQUESTED_BY_FINANCE_2,
+ APPROVED_BY_FINANCE_2,
+ DECLINED,
+ PAID,
]
user = ApplicantFactory()
for status in statuses:
@@ -282,8 +327,13 @@ def test_staff_can_edit_deliverables(self):
def test_staff_cant_edit_deliverables(self):
statuses = [
- APPROVED_BY_FINANCE_1, APPROVED_BY_FINANCE_2, APPROVED_BY_STAFF,
- CHANGES_REQUESTED_BY_FINANCE_2, CHANGES_REQUESTED_BY_STAFF, DECLINED, PAID
+ APPROVED_BY_FINANCE_1,
+ APPROVED_BY_FINANCE_2,
+ APPROVED_BY_STAFF,
+ CHANGES_REQUESTED_BY_FINANCE_2,
+ CHANGES_REQUESTED_BY_STAFF,
+ DECLINED,
+ PAID,
]
user = StaffFactory()
for status in statuses:
@@ -308,8 +358,14 @@ def test_finance1_can_edit_deliverables(self):
def test_finance1_cant_edit_deliverables(self):
statuses = [
- APPROVED_BY_FINANCE_1, APPROVED_BY_FINANCE_2, CHANGES_REQUESTED_BY_FINANCE_1, CHANGES_REQUESTED_BY_STAFF,
- DECLINED, PAID, SUBMITTED, RESUBMITTED,
+ APPROVED_BY_FINANCE_1,
+ APPROVED_BY_FINANCE_2,
+ CHANGES_REQUESTED_BY_FINANCE_1,
+ CHANGES_REQUESTED_BY_STAFF,
+ DECLINED,
+ PAID,
+ SUBMITTED,
+ RESUBMITTED,
]
user = FinanceFactory()
for status in statuses:
@@ -327,8 +383,15 @@ def test_finance2_can_edit_deliverables(self):
@override_settings(INVOICE_EXTENDED_WORKFLOW=True)
def test_finance2_cant_edit_deliverables(self):
statuses = [
- APPROVED_BY_FINANCE_2, APPROVED_BY_STAFF, CHANGES_REQUESTED_BY_FINANCE_1,
- CHANGES_REQUESTED_BY_FINANCE_2, CHANGES_REQUESTED_BY_STAFF, DECLINED, PAID, SUBMITTED, RESUBMITTED
+ APPROVED_BY_FINANCE_2,
+ APPROVED_BY_STAFF,
+ CHANGES_REQUESTED_BY_FINANCE_1,
+ CHANGES_REQUESTED_BY_FINANCE_2,
+ CHANGES_REQUESTED_BY_STAFF,
+ DECLINED,
+ PAID,
+ SUBMITTED,
+ RESUBMITTED,
]
user = Finance2Factory()
for status in statuses:
@@ -462,12 +525,16 @@ def test_no_report_creates_report(self):
# length (31st Oct to 30th Nov)
# combined => 31th + 1 month = 30th - 1 day = 29th (wrong)
# separate => 31th - 1 day = 30th + 1 month = 30th (correct)
- next_due = report.project.start_date - relativedelta(days=1) + relativedelta(months=1)
+ next_due = (
+ report.project.start_date - relativedelta(days=1) + relativedelta(months=1)
+ )
self.assertEqual(Report.objects.count(), 1)
self.assertEqual(report.end_date, next_due)
def test_no_report_creates_report_not_in_past(self):
- config = ReportConfigFactory(schedule_start=self.today - relativedelta(months=3))
+ config = ReportConfigFactory(
+ schedule_start=self.today - relativedelta(months=3)
+ )
report = config.current_due_report()
self.assertEqual(Report.objects.count(), 1)
self.assertEqual(report.end_date, self.today)
@@ -487,7 +554,9 @@ def test_no_report_schedule_in_future_creates_report(self):
def test_past_due_report_creates_report(self):
config = ReportConfigFactory(schedule_start=self.today - relativedelta(days=2))
- ReportFactory(project=config.project, end_date=self.today - relativedelta(days=1))
+ ReportFactory(
+ project=config.project, end_date=self.today - relativedelta(days=1)
+ )
# Separate day from month for case where start date + 1 month would exceed next month
# length (31st Oct to 30th Nov)
@@ -505,7 +574,9 @@ def test_today_schedule_gets_report_today(self):
def test_past_due_report_future_schedule_creates_report(self):
config = ReportConfigFactory(schedule_start=self.today + relativedelta(days=3))
- ReportFactory(project=config.project, end_date=self.today - relativedelta(days=1))
+ ReportFactory(
+ project=config.project, end_date=self.today - relativedelta(days=1)
+ )
report = config.current_due_report()
self.assertEqual(Report.objects.count(), 2)
@@ -513,19 +584,27 @@ def test_past_due_report_future_schedule_creates_report(self):
def test_submitted_report_unaffected(self):
config = ReportConfigFactory()
- report = ReportFactory(is_submitted=True, project=config.project, end_date=self.today + relativedelta(days=1))
+ report = ReportFactory(
+ is_submitted=True,
+ project=config.project,
+ end_date=self.today + relativedelta(days=1),
+ )
next_report = config.current_due_report()
self.assertNotEqual(report, next_report)
def test_past_due(self):
report = ReportFactory(past_due=True)
config = report.project.report_config
- self.assertQuerysetEqual(config.past_due_reports(), [report], transform=lambda x: x)
+ self.assertQuerysetEqual(
+ config.past_due_reports(), [report], transform=lambda x: x
+ )
def test_past_due_has_drafts(self):
report = ReportFactory(past_due=True, is_draft=True)
config = report.project.report_config
- self.assertQuerysetEqual(config.past_due_reports(), [report], transform=lambda x: x)
+ self.assertQuerysetEqual(
+ config.past_due_reports(), [report], transform=lambda x: x
+ )
def test_past_due_no_submitted(self):
report = ReportFactory(is_submitted=True, past_due=True)
diff --git a/hypha/apply/projects/tests/test_settings.py b/hypha/apply/projects/tests/test_settings.py
index ef4e94f1df..b006647fa6 100644
--- a/hypha/apply/projects/tests/test_settings.py
+++ b/hypha/apply/projects/tests/test_settings.py
@@ -8,8 +8,8 @@ class TestProjectFeatureFlag(TestCase):
def test_urls_404_when_turned_off(self):
self.client.force_login(StaffFactory())
- response = self.client.get('/apply/projects/', follow=True)
+ response = self.client.get("/apply/projects/", follow=True)
self.assertEqual(response.status_code, 404)
- response = self.client.get('/apply/projects/1/', follow=True)
+ response = self.client.get("/apply/projects/1/", follow=True)
self.assertEqual(response.status_code, 404)
diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py
index d59aee143b..688f9d2119 100644
--- a/hypha/apply/projects/tests/test_views.py
+++ b/hypha/apply/projects/tests/test_views.py
@@ -52,18 +52,20 @@
class TestUpdateLeadView(BaseViewTestCase):
- base_view_name = 'detail'
- url_name = 'funds:projects:{}'
+ base_view_name = "detail"
+ url_name = "funds:projects:{}"
user_factory = ApproverFactory
def get_kwargs(self, instance):
- return {'pk': instance.id}
+ return {"pk": instance.id}
def test_update_lead(self):
project = ProjectFactory()
new_lead = self.user_factory()
- response = self.post_page(project, {'form-submitted-lead_form': '', 'lead': new_lead.id})
+ response = self.post_page(
+ project, {"form-submitted-lead_form": "", "lead": new_lead.id}
+ )
self.assertEqual(response.status_code, 200)
project.refresh_from_db()
@@ -73,7 +75,9 @@ def test_update_lead_from_none(self):
project = ProjectFactory(lead=None)
new_lead = self.user_factory()
- response = self.post_page(project, {'form-submitted-lead_form': '', 'lead': new_lead.id})
+ response = self.post_page(
+ project, {"form-submitted-lead_form": "", "lead": new_lead.id}
+ )
self.assertEqual(response.status_code, 200)
project.refresh_from_db()
@@ -81,20 +85,22 @@ def test_update_lead_from_none(self):
class TestSendForApprovalView(BaseViewTestCase):
- base_view_name = 'detail'
- url_name = 'funds:projects:{}'
+ base_view_name = "detail"
+ url_name = "funds:projects:{}"
user_factory = StaffFactory
def setUp(self):
super().setUp()
apply_site = ApplySiteFactory()
- self.project_setting, _ = ProjectSettings.objects.get_or_create(site_id=apply_site.id)
+ self.project_setting, _ = ProjectSettings.objects.get_or_create(
+ site_id=apply_site.id
+ )
self.project_setting.use_settings = True
self.project_setting.save()
self.role = PAFReviewerRoleFactory(page=self.project_setting)
def get_kwargs(self, instance):
- return {'pk': instance.id}
+ return {"pk": instance.id}
def test_send_for_approval_fails_when_project_is_locked(self):
project = ProjectFactory(is_locked=True)
@@ -115,7 +121,7 @@ def test_send_for_approval_fails_when_project_is_not_in_draft_state(self):
def test_send_for_approval_happy_path(self):
project = ProjectFactory(is_locked=False, status=DRAFT)
- response = self.post_page(project, {'form-submitted-request_approval_form': ''})
+ response = self.post_page(project, {"form-submitted-request_approval_form": ""})
self.assertEqual(response.status_code, 200)
project.refresh_from_db()
@@ -125,29 +131,35 @@ def test_send_for_approval_happy_path(self):
class TestChangePAFStatusView(BaseViewTestCase):
- base_view_name = 'detail'
- url_name = 'funds:projects:{}'
+ base_view_name = "detail"
+ url_name = "funds:projects:{}"
user_factory = ApproverFactory
def setUp(self):
super().setUp()
apply_site = ApplySiteFactory()
- self.project_setting, _ = ProjectSettings.objects.get_or_create(site_id=apply_site.id)
+ self.project_setting, _ = ProjectSettings.objects.get_or_create(
+ site_id=apply_site.id
+ )
self.project_setting.use_settings = True
self.project_setting.save()
self.role = PAFReviewerRoleFactory(page=self.project_setting)
def get_kwargs(self, instance):
- return {'pk': instance.id}
+ return {"pk": instance.id}
def test_unassigned_applicant_cant_update_paf_status(self):
user = ApplicantFactory()
self.client.force_login(user=user)
project = ProjectFactory(status=INTERNAL_APPROVAL)
- PAFApprovalsFactory(project=project, user=ApplicantFactory(), paf_reviewer_role=self.role)
+ PAFApprovalsFactory(
+ project=project, user=ApplicantFactory(), paf_reviewer_role=self.role
+ )
- response = self.post_page(project, {'form-submitted-change_paf_status': '', 'paf_status': APPROVE})
+ response = self.post_page(
+ project, {"form-submitted-change_paf_status": "", "paf_status": APPROVE}
+ )
self.assertEqual(response.status_code, 403)
def test_unassigned_staff_cant_update_paf_status(self):
@@ -155,9 +167,13 @@ def test_unassigned_staff_cant_update_paf_status(self):
self.client.force_login(user=user)
project = ProjectFactory(status=INTERNAL_APPROVAL)
- PAFApprovalsFactory(project=project, user=StaffFactory(), paf_reviewer_role=self.role)
+ PAFApprovalsFactory(
+ project=project, user=StaffFactory(), paf_reviewer_role=self.role
+ )
- response = self.post_page(project, {'form-submitted-change_paf_status': '', 'paf_status': APPROVE})
+ response = self.post_page(
+ project, {"form-submitted-change_paf_status": "", "paf_status": APPROVE}
+ )
self.assertEqual(response.status_code, 403)
def test_unassigned_finance_cant_update_paf_status(self):
@@ -165,9 +181,13 @@ def test_unassigned_finance_cant_update_paf_status(self):
self.client.force_login(user=user)
project = ProjectFactory(status=INTERNAL_APPROVAL)
- PAFApprovalsFactory(project=project, user=FinanceFactory(), paf_reviewer_role=self.role)
+ PAFApprovalsFactory(
+ project=project, user=FinanceFactory(), paf_reviewer_role=self.role
+ )
- response = self.post_page(project, {'form-submitted-change_paf_status': '', 'paf_status': APPROVE})
+ response = self.post_page(
+ project, {"form-submitted-change_paf_status": "", "paf_status": APPROVE}
+ )
self.assertEqual(response.status_code, 403)
def test_unassigned_contracting_cant_update_paf_status(self):
@@ -175,18 +195,26 @@ def test_unassigned_contracting_cant_update_paf_status(self):
self.client.force_login(user=user)
project = ProjectFactory(status=INTERNAL_APPROVAL)
- PAFApprovalsFactory(project=project, user=ContractingFactory(), paf_reviewer_role=self.role)
+ PAFApprovalsFactory(
+ project=project, user=ContractingFactory(), paf_reviewer_role=self.role
+ )
- response = self.post_page(project, {'form-submitted-change_paf_status': '', 'paf_status': APPROVE})
+ response = self.post_page(
+ project, {"form-submitted-change_paf_status": "", "paf_status": APPROVE}
+ )
self.assertEqual(response.status_code, 403)
def test_assigned_approvers_can_approve_paf(self):
# reviewer can be staff, finance or contracting
project = ProjectFactory(status=INTERNAL_APPROVAL)
- approval = PAFApprovalsFactory(project=project, user=self.user, paf_reviewer_role=self.role)
+ approval = PAFApprovalsFactory(
+ project=project, user=self.user, paf_reviewer_role=self.role
+ )
- response = self.post_page(project, {'form-submitted-change_paf_status': '', 'paf_status': APPROVE})
+ response = self.post_page(
+ project, {"form-submitted-change_paf_status": "", "paf_status": APPROVE}
+ )
self.assertEqual(response.status_code, 200)
@@ -200,9 +228,14 @@ def test_assigned_approvers_can_reject_paf(self):
# reviewer can be staff, finance or contracting, or any assigned role
project = ProjectFactory(status=INTERNAL_APPROVAL)
- approval = PAFApprovalsFactory(project=project, user=self.user, paf_reviewer_role=self.role)
+ approval = PAFApprovalsFactory(
+ project=project, user=self.user, paf_reviewer_role=self.role
+ )
- response = self.post_page(project, {'form-submitted-change_paf_status': '', 'paf_status': REQUEST_CHANGE})
+ response = self.post_page(
+ project,
+ {"form-submitted-change_paf_status": "", "paf_status": REQUEST_CHANGE},
+ )
self.assertEqual(response.status_code, 200)
project.refresh_from_db()
@@ -214,11 +247,11 @@ def test_assigned_approvers_can_reject_paf(self):
class BaseProjectDetailTestCase(BaseViewTestCase):
- url_name = 'funds:projects:{}'
- base_view_name = 'detail'
+ url_name = "funds:projects:{}"
+ base_view_name = "detail"
def get_kwargs(self, instance):
- return {'pk': instance.id}
+ return {"pk": instance.id}
class TestStaffProjectDetailView(BaseProjectDetailTestCase):
@@ -243,9 +276,10 @@ def test_has_access(self):
response = self.get_page(project)
self.assertEqual(response.status_code, 200)
-
def test_lab_project_renders(self):
- project = ProjectFactory(submission=LabSubmissionFactory(), status=INTERNAL_APPROVAL)
+ project = ProjectFactory(
+ submission=LabSubmissionFactory(), status=INTERNAL_APPROVAL
+ )
response = self.get_page(project)
self.assertEqual(response.status_code, 200)
@@ -283,70 +317,84 @@ def test_doesnt_have_access(self):
class TestRemoveDocumentView(BaseViewTestCase):
- base_view_name = 'detail'
- url_name = 'funds:projects:{}'
+ base_view_name = "detail"
+ url_name = "funds:projects:{}"
user_factory = StaffFactory
def get_kwargs(self, instance):
- return {'pk': instance.id}
+ return {"pk": instance.id}
def test_remove_document(self):
project = ProjectFactory()
document = PacketFileFactory()
- response = self.post_page(project, {
- 'form-submitted-remove_document_form': '',
- 'id': document.id,
- })
+ response = self.post_page(
+ project,
+ {
+ "form-submitted-remove_document_form": "",
+ "id": document.id,
+ },
+ )
project.refresh_from_db()
self.assertEqual(response.status_code, 200)
- self.assertNotIn(document.pk, project.packet_files.values_list('pk', flat=True))
+ self.assertNotIn(document.pk, project.packet_files.values_list("pk", flat=True))
def test_remove_non_existent_document(self):
- response = self.post_page(ProjectFactory(), {
- 'form-submitted-remove_document_form': '',
- 'id': 1,
- })
+ response = self.post_page(
+ ProjectFactory(),
+ {
+ "form-submitted-remove_document_form": "",
+ "id": 1,
+ },
+ )
self.assertEqual(response.status_code, 200)
class TestApplicantUploadContractView(BaseViewTestCase):
- base_view_name = 'detail'
- url_name = 'funds:projects:{}'
+ base_view_name = "detail"
+ url_name = "funds:projects:{}"
user_factory = ApplicantFactory
def get_kwargs(self, instance):
- return {'pk': instance.id}
+ return {"pk": instance.id}
def test_owner_upload_contract(self):
project = ProjectFactory(status=CONTRACTING, user=self.user)
ContractFactory(project=project)
- test_doc = BytesIO(b'somebinarydata')
- test_doc.name = 'contract.pdf'
+ test_doc = BytesIO(b"somebinarydata")
+ test_doc.name = "contract.pdf"
- response = self.post_page(project, {
- 'form-submitted-contract_form': '',
- 'file': test_doc,
- })
+ response = self.post_page(
+ project,
+ {
+ "form-submitted-contract_form": "",
+ "file": test_doc,
+ },
+ )
self.assertEqual(response.status_code, 200)
project.refresh_from_db()
- self.assertTrue(project.contracts.order_by('-created_at').first().signed_by_applicant)
+ self.assertTrue(
+ project.contracts.order_by("-created_at").first().signed_by_applicant
+ )
def test_non_owner_upload_contract(self):
project = ProjectFactory(status=CONTRACTING)
contract_count = project.contracts.count()
- test_doc = BytesIO(b'somebinarydata')
- test_doc.name = 'contract.pdf'
+ test_doc = BytesIO(b"somebinarydata")
+ test_doc.name = "contract.pdf"
- response = self.post_page(project, {
- 'form-submitted-contract_form': '',
- 'file': test_doc,
- })
+ response = self.post_page(
+ project,
+ {
+ "form-submitted-contract_form": "",
+ "file": test_doc,
+ },
+ )
self.assertEqual(response.status_code, 403)
project.refresh_from_db()
@@ -354,12 +402,12 @@ def test_non_owner_upload_contract(self):
class TestStaffSelectDocumentView(BaseViewTestCase):
- base_view_name = 'detail'
- url_name = 'funds:projects:{}'
+ base_view_name = "detail"
+ url_name = "funds:projects:{}"
user_factory = StaffFactory
def get_kwargs(self, instance):
- return {'pk': instance.id}
+ return {"pk": instance.id}
def test_can_choose(self):
category = DocumentCategoryFactory()
@@ -367,11 +415,14 @@ def test_can_choose(self):
files = get_files(project)
- response = self.post_page(project, {
- 'form-submitted-select_document_form': '',
- 'category': category.id,
- 'document': files[0].url,
- })
+ response = self.post_page(
+ project,
+ {
+ "form-submitted-select_document_form": "",
+ "category": category.id,
+ "document": files[0].url,
+ },
+ )
self.assertEqual(response.status_code, 200)
project.refresh_from_db()
@@ -380,12 +431,12 @@ def test_can_choose(self):
class TestApplicantSelectDocumentView(BaseViewTestCase):
- base_view_name = 'detail'
- url_name = 'funds:projects:{}'
+ base_view_name = "detail"
+ url_name = "funds:projects:{}"
user_factory = ApplicantFactory
def get_kwargs(self, instance):
- return {'pk': instance.id}
+ return {"pk": instance.id}
def test_can_choose(self):
category = DocumentCategoryFactory()
@@ -393,11 +444,14 @@ def test_can_choose(self):
files = get_files(project)
- response = self.post_page(project, {
- 'form-submitted-select_document_form': '',
- 'category': category.id,
- 'document': files[0].url,
- })
+ response = self.post_page(
+ project,
+ {
+ "form-submitted-select_document_form": "",
+ "category": category.id,
+ "document": files[0].url,
+ },
+ )
self.assertEqual(response.status_code, 200)
project.refresh_from_db()
@@ -406,26 +460,29 @@ def test_can_choose(self):
class TestUploadDocumentView(BaseViewTestCase):
- base_view_name = 'detail'
- url_name = 'funds:projects:{}'
+ base_view_name = "detail"
+ url_name = "funds:projects:{}"
user_factory = StaffFactory
def get_kwargs(self, instance):
- return {'pk': instance.id}
+ return {"pk": instance.id}
def test_upload_document(self):
category = DocumentCategoryFactory()
project = ProjectFactory()
- test_doc = BytesIO(b'somebinarydata')
- test_doc.name = 'document.pdf'
-
- response = self.post_page(project, {
- 'form-submitted-document_form': '',
- 'title': 'test document',
- 'category': category.id,
- 'document': test_doc,
- })
+ test_doc = BytesIO(b"somebinarydata")
+ test_doc.name = "document.pdf"
+
+ response = self.post_page(
+ project,
+ {
+ "form-submitted-document_form": "",
+ "title": "test document",
+ "category": category.id,
+ "document": test_doc,
+ },
+ )
self.assertEqual(response.status_code, 200)
project.refresh_from_db()
@@ -452,7 +509,7 @@ def test_all_signed_and_approved_contracts_appear(self):
ContractFactory(project=project, signed_by_applicant=True, approver=user)
ContractFactory(project=project, signed_by_applicant=True, approver=user)
- contracts = self.DummyContractsView(project).get_context_data()['contracts']
+ contracts = self.DummyContractsView(project).get_context_data()["contracts"]
self.assertEqual(len(contracts), 3)
@@ -463,7 +520,7 @@ def test_mixture_with_latest_signed_returns_no_unsigned(self):
ContractFactory(project=project, signed_by_applicant=False, approver=None)
ContractFactory(project=project, signed_by_applicant=True, approver=user)
- contracts = self.DummyContractsView(project).get_context_data()['contracts']
+ contracts = self.DummyContractsView(project).get_context_data()["contracts"]
self.assertEqual(len(contracts), 2)
for contract in contracts:
@@ -471,7 +528,7 @@ def test_mixture_with_latest_signed_returns_no_unsigned(self):
def test_no_contracts_returns_nothing(self):
project = ProjectFactory()
- contracts = self.DummyContractsView(project).get_context_data()['contracts']
+ contracts = self.DummyContractsView(project).get_context_data()["contracts"]
self.assertEqual(len(contracts), 0)
@@ -479,13 +536,15 @@ def test_all_unsigned_and_unapproved_returns_only_latest(self):
project = ProjectFactory()
ContractFactory(project=project, signed_by_applicant=False, approver=None)
ContractFactory(project=project, signed_by_applicant=False, approver=None)
- latest = ContractFactory(project=project, signed_by_applicant=False, approver=None)
+ latest = ContractFactory(
+ project=project, signed_by_applicant=False, approver=None
+ )
context = self.DummyContractsView(project).get_context_data()
- contracts = context['contracts']
- to_approve = context['contract_to_approve']
- to_sign = context['contract_to_sign']
+ contracts = context["contracts"]
+ to_approve = context["contract_to_approve"]
+ to_sign = context["contract_to_sign"]
self.assertEqual(len(contracts), 0)
self.assertEqual(latest, to_sign)
@@ -495,13 +554,15 @@ def test_all_signed_and_unapproved_returns_latest(self):
project = ProjectFactory()
ContractFactory(project=project, signed_by_applicant=True, approver=None)
ContractFactory(project=project, signed_by_applicant=True, approver=None)
- latest = ContractFactory(project=project, signed_by_applicant=True, approver=None)
+ latest = ContractFactory(
+ project=project, signed_by_applicant=True, approver=None
+ )
context = self.DummyContractsView(project).get_context_data()
- contracts = context['contracts']
- to_approve = context['contract_to_approve']
- to_sign = context['contract_to_sign']
+ contracts = context["contracts"]
+ to_approve = context["contract_to_approve"]
+ to_sign = context["contract_to_sign"]
self.assertEqual(len(contracts), 0)
self.assertEqual(latest, to_approve)
@@ -514,13 +575,15 @@ def test_mixture_of_both_latest_unsigned_and_unapproved(self):
ContractFactory(project=project, signed_by_applicant=True, approver=user)
ContractFactory(project=project, signed_by_applicant=False, approver=None)
ContractFactory(project=project, signed_by_applicant=True, approver=user)
- latest = ContractFactory(project=project, signed_by_applicant=False, approver=None)
+ latest = ContractFactory(
+ project=project, signed_by_applicant=False, approver=None
+ )
context = self.DummyContractsView(project).get_context_data()
- contracts = context['contracts']
- to_approve = context['contract_to_approve']
- to_sign = context['contract_to_sign']
+ contracts = context["contracts"]
+ to_approve = context["contract_to_approve"]
+ to_sign = context["contract_to_sign"]
self.assertEqual(len(contracts), 2)
self.assertEqual(latest, to_sign)
@@ -533,13 +596,15 @@ def test_mixture_of_both_latest_signed_and_unapproved(self):
ContractFactory(project=project, signed_by_applicant=True, approver=user)
ContractFactory(project=project, signed_by_applicant=False, approver=None)
ContractFactory(project=project, signed_by_applicant=True, approver=user)
- latest = ContractFactory(project=project, signed_by_applicant=True, approver=None)
+ latest = ContractFactory(
+ project=project, signed_by_applicant=True, approver=None
+ )
context = self.DummyContractsView(project).get_context_data()
- contracts = context['contracts']
- to_approve = context['contract_to_approve']
- to_sign = context['contract_to_sign']
+ contracts = context["contracts"]
+ to_approve = context["contract_to_approve"]
+ to_sign = context["contract_to_sign"]
self.assertEqual(len(contracts), 2)
self.assertEqual(latest, to_approve)
@@ -556,9 +621,9 @@ def test_mixture_of_both_latest_signed_and_approved(self):
context = self.DummyContractsView(project).get_context_data()
- contracts = context['contracts']
- to_approve = context['contract_to_approve']
- to_sign = context['contract_to_sign']
+ contracts = context["contracts"]
+ to_approve = context["contract_to_approve"]
+ to_sign = context["contract_to_sign"]
self.assertEqual(len(contracts), 3)
self.assertIsNone(to_approve)
@@ -566,21 +631,26 @@ def test_mixture_of_both_latest_signed_and_approved(self):
class TestApproveContractView(BaseViewTestCase):
- base_view_name = 'detail'
- url_name = 'funds:projects:{}'
+ base_view_name = "detail"
+ url_name = "funds:projects:{}"
user_factory = StaffFactory
def get_kwargs(self, instance):
- return {'pk': instance.id}
+ return {"pk": instance.id}
def test_approve_unapproved_contract(self):
project = ProjectFactory(status=CONTRACTING)
- contract = ContractFactory(project=project, signed_by_applicant=True, approver=None)
+ contract = ContractFactory(
+ project=project, signed_by_applicant=True, approver=None
+ )
- response = self.post_page(project, {
- 'form-submitted-approve_contract_form': '',
- 'id': contract.id,
- })
+ response = self.post_page(
+ project,
+ {
+ "form-submitted-approve_contract_form": "",
+ "id": contract.id,
+ },
+ )
self.assertEqual(response.status_code, 200)
contract.refresh_from_db()
@@ -592,12 +662,17 @@ def test_approve_unapproved_contract(self):
def test_approve_already_approved_contract(self):
project = ProjectFactory(status=INVOICING_AND_REPORTING)
user = StaffFactory()
- contract = ContractFactory(project=project, signed_by_applicant=True, approver=user)
+ contract = ContractFactory(
+ project=project, signed_by_applicant=True, approver=user
+ )
- response = self.post_page(project, {
- 'form-submitted-approve_contract_form': '',
- 'id': contract.id,
- })
+ response = self.post_page(
+ project,
+ {
+ "form-submitted-approve_contract_form": "",
+ "id": contract.id,
+ },
+ )
self.assertEqual(response.status_code, 200)
contract.refresh_from_db()
@@ -608,29 +683,41 @@ def test_approve_already_approved_contract(self):
def test_approve_unsigned_contract(self):
project = ProjectFactory()
- contract = ContractFactory(project=project, signed_by_applicant=False, approver=None)
+ contract = ContractFactory(
+ project=project, signed_by_applicant=False, approver=None
+ )
- response = self.post_page(project, {
- 'form-submitted-approve_contract_form': '',
- 'id': contract.id,
- })
+ response = self.post_page(
+ project,
+ {
+ "form-submitted-approve_contract_form": "",
+ "id": contract.id,
+ },
+ )
self.assertEqual(response.status_code, 200)
- messages = list(response.context['messages'])
+ messages = list(response.context["messages"])
self.assertEqual(len(messages), 1)
def test_attempt_to_approve_non_latest(self):
project = ProjectFactory()
- contract_attempt = ContractFactory(project=project, signed_by_applicant=True, approver=None)
- contract_meant = ContractFactory(project=project, signed_by_applicant=True, approver=None)
+ contract_attempt = ContractFactory(
+ project=project, signed_by_applicant=True, approver=None
+ )
+ contract_meant = ContractFactory(
+ project=project, signed_by_applicant=True, approver=None
+ )
- response = self.post_page(project, {
- 'form-submitted-approve_contract_form': '',
- 'id': contract_attempt.id,
- })
+ response = self.post_page(
+ project,
+ {
+ "form-submitted-approve_contract_form": "",
+ "id": contract_attempt.id,
+ },
+ )
self.assertEqual(response.status_code, 200)
- messages = list(response.context['messages'])
+ messages = list(response.context["messages"])
self.assertEqual(len(messages), 1)
contract_attempt.refresh_from_db()
contract_meant.refresh_from_db()
@@ -639,13 +726,13 @@ def test_attempt_to_approve_non_latest(self):
class BasePacketFileViewTestCase(BaseViewTestCase):
- url_name = 'funds:projects:{}'
- base_view_name = 'document'
+ url_name = "funds:projects:{}"
+ base_view_name = "document"
def get_kwargs(self, instance):
return {
- 'pk': instance.project.pk,
- 'file_pk': instance.id,
+ "pk": instance.project.pk,
+ "file_pk": instance.id,
}
@@ -684,7 +771,7 @@ def test_anonymous_can_not_access(self):
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.redirect_chain), 2)
for path, _ in response.redirect_chain:
- self.assertIn(reverse('users_public:login'), path)
+ self.assertIn(reverse("users_public:login"), path)
class TestProjectDetailApprovalView(TestCase):
@@ -692,7 +779,7 @@ def test_staff_only(self):
factory = RequestFactory()
project = ProjectFactory()
- request = factory.get(f'/project/{project.pk}')
+ request = factory.get(f"/project/{project.pk}")
request.user = StaffFactory()
response = ProjectDetailApprovalView.as_view()(request, pk=project.pk)
@@ -704,60 +791,60 @@ def test_staff_only(self):
class TestStaffDetailInvoiceStatus(BaseViewTestCase):
- base_view_name = 'invoice-detail'
- url_name = 'funds:projects:{}'
+ base_view_name = "invoice-detail"
+ url_name = "funds:projects:{}"
user_factory = StaffFactory
def get_kwargs(self, instance):
return {
- 'pk': instance.project.pk,
- 'invoice_pk': instance.pk,
+ "pk": instance.project.pk,
+ "invoice_pk": instance.pk,
}
def test_can(self):
invoice = InvoiceFactory()
- response = self.get_page(invoice, url_kwargs={'pk': invoice.project.pk})
+ response = self.get_page(invoice, url_kwargs={"pk": invoice.project.pk})
self.assertEqual(response.status_code, 200)
def test_wrong_project_cant(self):
other_project = ProjectFactory()
invoice = InvoiceFactory()
- response = self.get_page(invoice, url_kwargs={'pk': other_project.pk})
+ response = self.get_page(invoice, url_kwargs={"pk": other_project.pk})
self.assertEqual(response.status_code, 404)
class TestFinanceDetailInvoiceStatus(BaseViewTestCase):
- base_view_name = 'invoice-detail'
- url_name = 'funds:projects:{}'
+ base_view_name = "invoice-detail"
+ url_name = "funds:projects:{}"
user_factory = FinanceFactory
def get_kwargs(self, instance):
return {
- 'pk': instance.project.pk,
- 'invoice_pk': instance.pk,
+ "pk": instance.project.pk,
+ "invoice_pk": instance.pk,
}
def test_can(self):
invoice = InvoiceFactory()
- response = self.get_page(invoice, url_kwargs={'pk': invoice.project.pk})
+ response = self.get_page(invoice, url_kwargs={"pk": invoice.project.pk})
self.assertEqual(response.status_code, 200)
def test_wrong_project_cant(self):
other_project = ProjectFactory()
invoice = InvoiceFactory()
- response = self.get_page(invoice, url_kwargs={'pk': other_project.pk})
+ response = self.get_page(invoice, url_kwargs={"pk": other_project.pk})
self.assertEqual(response.status_code, 404)
class TestApplicantDetailInvoiceStatus(BaseViewTestCase):
- base_view_name = 'invoice-detail'
- url_name = 'funds:projects:{}'
+ base_view_name = "invoice-detail"
+ url_name = "funds:projects:{}"
user_factory = ApplicantFactory
def get_kwargs(self, instance):
return {
- 'pk': instance.project.pk,
- 'invoice_pk': instance.pk,
+ "pk": instance.project.pk,
+ "invoice_pk": instance.pk,
}
def test_can(self):
@@ -772,14 +859,14 @@ def test_other_cant(self):
class TestApplicantEditInvoiceView(BaseViewTestCase):
- base_view_name = 'invoice-edit'
- url_name = 'funds:projects:{}'
+ base_view_name = "invoice-edit"
+ url_name = "funds:projects:{}"
user_factory = ApplicantFactory
def get_kwargs(self, instance):
return {
- 'pk': instance.project.pk,
- 'invoice_pk': instance.pk,
+ "pk": instance.project.pk,
+ "invoice_pk": instance.pk,
}
def test_editing_invoice_remove_supporting_document(self):
@@ -788,13 +875,16 @@ def test_editing_invoice_remove_supporting_document(self):
self.assertTrue(invoice.supporting_documents.exists())
- response = self.post_page(invoice, {
- 'invoice_number': invoice.invoice_number,
- 'invoice_amount': invoice.invoice_amount,
- 'comment': 'test comment',
- 'invoice': '',
- 'supporting_documents-uploads': '[]',
- })
+ response = self.post_page(
+ invoice,
+ {
+ "invoice_number": invoice.invoice_number,
+ "invoice_amount": invoice.invoice_amount,
+ "comment": "test comment",
+ "invoice": "",
+ "supporting_documents-uploads": "[]",
+ },
+ )
self.assertEqual(response.status_code, 200)
self.assertFalse(invoice.supporting_documents.exists())
@@ -804,13 +894,24 @@ def test_editing_payment_keeps_receipts(self):
invoice = InvoiceFactory(project=project)
supporting_document = SupportingDocumentFactory(invoice=invoice)
- response = self.post_page(invoice, {
- 'invoice_number': invoice.invoice_number,
- 'invoice_amount': invoice.invoice_amount,
- 'comment': 'test comment',
- 'invoice': '',
- 'supporting_documents-uploads': json.dumps([{"name": supporting_document.document.name, "size": supporting_document.document.size, "type": "existing"}]),
- })
+ response = self.post_page(
+ invoice,
+ {
+ "invoice_number": invoice.invoice_number,
+ "invoice_amount": invoice.invoice_amount,
+ "comment": "test comment",
+ "invoice": "",
+ "supporting_documents-uploads": json.dumps(
+ [
+ {
+ "name": supporting_document.document.name,
+ "size": supporting_document.document.size,
+ "type": "existing",
+ }
+ ]
+ ),
+ },
+ )
self.assertEqual(response.status_code, 200)
self.assertEqual(project.invoices.count(), 1)
@@ -818,31 +919,36 @@ def test_editing_payment_keeps_receipts(self):
invoice.refresh_from_db()
self.assertEqual(project.invoices.first().pk, invoice.pk)
- self.assertEqual(invoice.supporting_documents.first().document, supporting_document.document)
+ self.assertEqual(
+ invoice.supporting_documents.first().document, supporting_document.document
+ )
class TestStaffEditInvoiceView(BaseViewTestCase):
- base_view_name = 'invoice-edit'
- url_name = 'funds:projects:{}'
+ base_view_name = "invoice-edit"
+ url_name = "funds:projects:{}"
user_factory = StaffFactory
def get_kwargs(self, instance):
return {
- 'pk': instance.project.pk,
- 'invoice_pk': instance.pk,
+ "pk": instance.project.pk,
+ "invoice_pk": instance.pk,
}
def test_editing_invoice_remove_supporting_document(self):
invoice = InvoiceFactory()
SupportingDocumentFactory(invoice=invoice)
- response = self.post_page(invoice, {
- 'invoice_number': invoice.invoice_number,
- 'invoice_amount': invoice.invoice_amount,
- 'comment': 'test comment',
- 'invoice': '',
- 'supporting_documents-uploads': '[]',
- })
+ response = self.post_page(
+ invoice,
+ {
+ "invoice_number": invoice.invoice_number,
+ "invoice_amount": invoice.invoice_amount,
+ "comment": "test comment",
+ "invoice": "",
+ "supporting_documents-uploads": "[]",
+ },
+ )
self.assertEqual(response.status_code, 200)
@@ -853,16 +959,27 @@ def test_editing_invoice_keeps_supprting_document(self):
invoice = InvoiceFactory(project=project)
supporting_document = SupportingDocumentFactory(invoice=invoice)
- document = BytesIO(b'somebinarydata')
- document.name = 'invoice.pdf'
-
- response = self.post_page(invoice, {
- 'invoice_number': invoice.invoice_number,
- 'invoice_amount': invoice.invoice_amount,
- 'comment': 'test comment',
- 'document': document,
- 'supporting_documents-uploads': json.dumps([{"name": supporting_document.document.name, "size": supporting_document.document.size, "type": "existing"}]),
- })
+ document = BytesIO(b"somebinarydata")
+ document.name = "invoice.pdf"
+
+ response = self.post_page(
+ invoice,
+ {
+ "invoice_number": invoice.invoice_number,
+ "invoice_amount": invoice.invoice_amount,
+ "comment": "test comment",
+ "document": document,
+ "supporting_documents-uploads": json.dumps(
+ [
+ {
+ "name": supporting_document.document.name,
+ "size": supporting_document.document.size,
+ "type": "existing",
+ }
+ ]
+ ),
+ },
+ )
self.assertEqual(response.status_code, 200)
self.assertEqual(project.invoices.count(), 1)
@@ -871,97 +988,99 @@ def test_editing_invoice_keeps_supprting_document(self):
self.assertEqual(project.invoices.first().pk, invoice.pk)
- self.assertEqual(invoice.supporting_documents.first().document, supporting_document.document)
+ self.assertEqual(
+ invoice.supporting_documents.first().document, supporting_document.document
+ )
class TestStaffChangeInvoiceStatus(BaseViewTestCase):
- base_view_name = 'invoice-detail'
- url_name = 'funds:projects:{}'
+ base_view_name = "invoice-detail"
+ url_name = "funds:projects:{}"
user_factory = StaffFactory
def get_kwargs(self, instance):
return {
- 'pk': instance.project.pk,
- 'invoice_pk': instance.pk,
+ "pk": instance.project.pk,
+ "invoice_pk": instance.pk,
}
def test_can(self):
invoice = InvoiceFactory()
- response = self.post_page(invoice, {
- 'form-submitted-change_invoice_status': '',
- 'status': CHANGES_REQUESTED_BY_STAFF,
- 'comment': 'this is a comment',
- })
+ response = self.post_page(
+ invoice,
+ {
+ "form-submitted-change_invoice_status": "",
+ "status": CHANGES_REQUESTED_BY_STAFF,
+ "comment": "this is a comment",
+ },
+ )
self.assertEqual(response.status_code, 200)
invoice.refresh_from_db()
self.assertEqual(invoice.status, CHANGES_REQUESTED_BY_STAFF)
class TestApplicantChangeInoviceStatus(BaseViewTestCase):
- base_view_name = 'invoice-detail'
- url_name = 'funds:projects:{}'
+ base_view_name = "invoice-detail"
+ url_name = "funds:projects:{}"
user_factory = ApplicantFactory
def get_kwargs(self, instance):
- return {
- 'pk': instance.project.pk,
- 'invoice_pk': instance.pk
- }
+ return {"pk": instance.project.pk, "invoice_pk": instance.pk}
def test_can(self):
invoice = InvoiceFactory(project__user=self.user)
- response = self.post_page(invoice, {
- 'form-submitted-change_invoice_status': '',
- 'status': CHANGES_REQUESTED_BY_STAFF,
- })
+ response = self.post_page(
+ invoice,
+ {
+ "form-submitted-change_invoice_status": "",
+ "status": CHANGES_REQUESTED_BY_STAFF,
+ },
+ )
self.assertEqual(response.status_code, 200)
invoice.refresh_from_db()
self.assertEqual(invoice.status, SUBMITTED)
def test_other_cant(self):
invoice = InvoiceFactory()
- response = self.post_page(invoice, {
- 'form-submitted-change_invoice_status': '',
- 'status': CHANGES_REQUESTED_BY_STAFF,
- })
+ response = self.post_page(
+ invoice,
+ {
+ "form-submitted-change_invoice_status": "",
+ "status": CHANGES_REQUESTED_BY_STAFF,
+ },
+ )
self.assertEqual(response.status_code, 403)
invoice.refresh_from_db()
self.assertEqual(invoice.status, SUBMITTED)
class TestStaffInoviceDocumentPrivateMedia(BaseViewTestCase):
- base_view_name = 'invoice-document'
- url_name = 'funds:projects:{}'
+ base_view_name = "invoice-document"
+ url_name = "funds:projects:{}"
user_factory = StaffFactory
def get_kwargs(self, instance):
- return {
- 'pk': instance.project.pk,
- 'invoice_pk': instance.pk
- }
+ return {"pk": instance.project.pk, "invoice_pk": instance.pk}
def test_can_access(self):
invoice = InvoiceFactory()
- response = self.get_page(invoice, url_kwargs={'pk': invoice.project.pk})
+ response = self.get_page(invoice, url_kwargs={"pk": invoice.project.pk})
self.assertContains(response, invoice.document.read())
def test_cant_access_if_project_wrong(self):
other_project = ProjectFactory()
invoice = InvoiceFactory()
- response = self.get_page(invoice, url_kwargs={'pk': other_project.pk})
+ response = self.get_page(invoice, url_kwargs={"pk": other_project.pk})
self.assertEqual(response.status_code, 404)
class TestApplicantInvoiceDocumentPrivateMedia(BaseViewTestCase):
- base_view_name = 'invoice-document'
- url_name = 'funds:projects:{}'
+ base_view_name = "invoice-document"
+ url_name = "funds:projects:{}"
user_factory = ApplicantFactory
def get_kwargs(self, instance):
- return {
- 'pk': instance.project.pk,
- 'invoice_pk': instance.pk
- }
+ return {"pk": instance.project.pk, "invoice_pk": instance.pk}
def test_can_access_own(self):
invoice = InvoiceFactory(project__user=self.user)
@@ -975,15 +1094,15 @@ def test_cant_access_other(self):
class TestStaffInvoiceSupportingDocumentPrivateMedia(BaseViewTestCase):
- base_view_name = 'invoice-supporting-document'
- url_name = 'funds:projects:{}'
+ base_view_name = "invoice-supporting-document"
+ url_name = "funds:projects:{}"
user_factory = StaffFactory
def get_kwargs(self, instance):
return {
- 'pk': instance.invoice.project.pk,
- 'invoice_pk': instance.invoice.pk,
- 'file_pk': instance.pk,
+ "pk": instance.invoice.project.pk,
+ "invoice_pk": instance.invoice.pk,
+ "file_pk": instance.pk,
}
def test_can_access(self):
@@ -993,19 +1112,21 @@ def test_can_access(self):
class TestApplicantSupportingDocumentPrivateMedia(BaseViewTestCase):
- base_view_name = 'invoice-supporting-document'
- url_name = 'funds:projects:{}'
+ base_view_name = "invoice-supporting-document"
+ url_name = "funds:projects:{}"
user_factory = ApplicantFactory
def get_kwargs(self, instance):
return {
- 'pk': instance.invoice.project.pk,
- 'invoice_pk': instance.invoice.pk,
- 'file_pk': instance.pk,
+ "pk": instance.invoice.project.pk,
+ "invoice_pk": instance.invoice.pk,
+ "file_pk": instance.pk,
}
def test_can_access_own(self):
- supporting_document = SupportingDocumentFactory(invoice__project__user=self.user)
+ supporting_document = SupportingDocumentFactory(
+ invoice__project__user=self.user
+ )
response = self.get_page(supporting_document)
self.assertContains(response, supporting_document.document.read())
@@ -1015,7 +1136,7 @@ def test_cant_access_other(self):
self.assertEqual(response.status_code, 403)
-@override_settings(ROOT_URLCONF='hypha.apply.urls')
+@override_settings(ROOT_URLCONF="hypha.apply.urls")
class TestProjectListView(TestCase):
def test_staff_can_access_project_list_page(self):
ProjectFactory(status=CONTRACTING)
@@ -1023,7 +1144,7 @@ def test_staff_can_access_project_list_page(self):
self.client.force_login(StaffFactory())
- url = reverse('apply:projects:all')
+ url = reverse("apply:projects:all")
response = self.client.get(url, follow=True)
self.assertEqual(response.status_code, 200)
@@ -1034,13 +1155,13 @@ def test_applicants_cannot_access_project_list_page(self):
self.client.force_login(UserFactory())
- url = reverse('apply:projects:all')
+ url = reverse("apply:projects:all")
response = self.client.get(url, follow=True)
self.assertEqual(response.status_code, 403)
-@override_settings(ROOT_URLCONF='hypha.apply.urls')
+@override_settings(ROOT_URLCONF="hypha.apply.urls")
class TestProjectOverviewView(TestCase):
def test_staff_can_access(self):
ProjectFactory(status=CONTRACTING)
@@ -1048,7 +1169,7 @@ def test_staff_can_access(self):
self.client.force_login(StaffFactory())
- url = reverse('apply:projects:overview')
+ url = reverse("apply:projects:overview")
response = self.client.get(url, follow=True)
self.assertEqual(response.status_code, 200)
@@ -1059,20 +1180,20 @@ def test_applicants_cannot_access(self):
self.client.force_login(UserFactory())
- url = reverse('apply:projects:overview')
+ url = reverse("apply:projects:overview")
response = self.client.get(url, follow=True)
self.assertEqual(response.status_code, 403)
class TestStaffSubmitReport(BaseViewTestCase):
- base_view_name = 'edit'
- url_name = 'funds:projects:reports:{}'
+ base_view_name = "edit"
+ url_name = "funds:projects:reports:{}"
user_factory = StaffFactory
def get_kwargs(self, instance):
return {
- 'pk': instance.pk,
+ "pk": instance.pk,
}
def test_get_page_for_inprogress_project(self):
@@ -1091,29 +1212,33 @@ def test_cant_get_page_for_closing_and_complete_project(self):
def test_submit_report(self):
report = ReportFactory(project__status=INVOICING_AND_REPORTING)
- response = self.post_page(report, {'public_content': 'Some text'})
+ response = self.post_page(report, {"public_content": "Some text"})
report.refresh_from_db()
- self.assertRedirects(response, self.absolute_url(report.project.get_absolute_url()))
- self.assertEqual(report.versions.first().public_content, 'Some text')
+ self.assertRedirects(
+ response, self.absolute_url(report.project.get_absolute_url())
+ )
+ self.assertEqual(report.versions.first().public_content, "Some text")
self.assertEqual(report.versions.first(), report.current)
self.assertEqual(report.current.author, self.user)
self.assertIsNone(report.draft)
def test_cant_submit_report_for_closing_and_complete_project(self):
report = ReportFactory(project__status=CLOSING)
- response = self.post_page(report, {'public_content': 'Some text'})
+ response = self.post_page(report, {"public_content": "Some text"})
self.assertEqual(response.status_code, 403)
report = ReportFactory(project__status=COMPLETE)
- response = self.post_page(report, {'public_content': 'Some text'})
+ response = self.post_page(report, {"public_content": "Some text"})
self.assertEqual(response.status_code, 403)
def test_submit_private_report(self):
report = ReportFactory(project__status=INVOICING_AND_REPORTING)
- response = self.post_page(report, {'private_content': 'Some text'})
+ response = self.post_page(report, {"private_content": "Some text"})
report.refresh_from_db()
- self.assertRedirects(response, self.absolute_url(report.project.get_absolute_url()))
- self.assertEqual(report.versions.first().private_content, 'Some text')
+ self.assertRedirects(
+ response, self.absolute_url(report.project.get_absolute_url())
+ )
+ self.assertEqual(report.versions.first().private_content, "Some text")
self.assertEqual(report.versions.first(), report.current)
self.assertEqual(report.current.author, self.user)
self.assertIsNone(report.draft)
@@ -1127,46 +1252,62 @@ def test_cant_submit_blank_report(self):
def test_save_report_draft(self):
report = ReportFactory(project__status=INVOICING_AND_REPORTING)
- response = self.post_page(report, {'public_content': 'Some text', 'save': 'Save'})
+ response = self.post_page(
+ report, {"public_content": "Some text", "save": "Save"}
+ )
report.refresh_from_db()
- self.assertRedirects(response, self.absolute_url(report.project.get_absolute_url()))
- self.assertEqual(report.versions.first().public_content, 'Some text')
+ self.assertRedirects(
+ response, self.absolute_url(report.project.get_absolute_url())
+ )
+ self.assertEqual(report.versions.first().public_content, "Some text")
self.assertEqual(report.versions.first(), report.draft)
self.assertIsNone(report.current)
def test_save_report_with_draft(self):
report = ReportFactory(is_draft=True, project__status=INVOICING_AND_REPORTING)
self.assertEqual(report.versions.first(), report.draft)
- response = self.post_page(report, {'public_content': 'Some text'})
+ response = self.post_page(report, {"public_content": "Some text"})
report.refresh_from_db()
- self.assertRedirects(response, self.absolute_url(report.project.get_absolute_url()))
- self.assertEqual(report.versions.last().public_content, 'Some text')
+ self.assertRedirects(
+ response, self.absolute_url(report.project.get_absolute_url())
+ )
+ self.assertEqual(report.versions.last().public_content, "Some text")
self.assertEqual(report.versions.last(), report.current)
self.assertIsNone(report.draft)
def test_edit_submitted_report(self):
- report = ReportFactory(is_submitted=True, project__status=INVOICING_AND_REPORTING)
+ report = ReportFactory(
+ is_submitted=True, project__status=INVOICING_AND_REPORTING
+ )
self.assertEqual(report.versions.first(), report.current)
- response = self.post_page(report, {'public_content': 'Some text', 'save': ' Save'})
+ response = self.post_page(
+ report, {"public_content": "Some text", "save": " Save"}
+ )
report.refresh_from_db()
- self.assertRedirects(response, self.absolute_url(report.project.get_absolute_url()))
- self.assertEqual(report.versions.last().public_content, 'Some text')
+ self.assertRedirects(
+ response, self.absolute_url(report.project.get_absolute_url())
+ )
+ self.assertEqual(report.versions.last().public_content, "Some text")
self.assertEqual(report.versions.last(), report.draft)
self.assertEqual(report.versions.first(), report.current)
def test_resubmit_submitted_report(self):
yesterday = timezone.now() - relativedelta(days=1)
- version = ReportVersionFactory(report__project__status=INVOICING_AND_REPORTING, submitted=yesterday)
+ version = ReportVersionFactory(
+ report__project__status=INVOICING_AND_REPORTING, submitted=yesterday
+ )
report = version.report
report.current = version
report.submitted = version.submitted
report.save()
self.assertEqual(report.submitted, yesterday)
self.assertEqual(report.versions.first(), report.current)
- response = self.post_page(report, {'public_content': 'Some text'})
+ response = self.post_page(report, {"public_content": "Some text"})
report.refresh_from_db()
- self.assertRedirects(response, self.absolute_url(report.project.get_absolute_url()))
- self.assertEqual(report.versions.last().public_content, 'Some text')
+ self.assertRedirects(
+ response, self.absolute_url(report.project.get_absolute_url())
+ )
+ self.assertEqual(report.versions.last().public_content, "Some text")
self.assertEqual(report.versions.last(), report.current)
self.assertIsNone(report.draft)
self.assertEqual(report.submitted.date(), yesterday.date())
@@ -1175,28 +1316,31 @@ def test_resubmit_submitted_report(self):
def test_cant_submit_future_report(self):
submitted_report = ReportFactory(
end_date=timezone.now() + relativedelta(days=1),
- is_submitted=True, project__status=INVOICING_AND_REPORTING,
+ is_submitted=True,
+ project__status=INVOICING_AND_REPORTING,
)
future_report = ReportFactory(
end_date=timezone.now() + relativedelta(days=3),
project=submitted_report.project,
)
- response = self.post_page(future_report, {'public_content': 'Some text'})
+ response = self.post_page(future_report, {"public_content": "Some text"})
self.assertEqual(response.status_code, 403)
class TestApplicantSubmitReport(BaseViewTestCase):
- base_view_name = 'edit'
- url_name = 'funds:projects:reports:{}'
+ base_view_name = "edit"
+ url_name = "funds:projects:reports:{}"
user_factory = ApplicantFactory
def get_kwargs(self, instance):
return {
- 'pk': instance.pk,
+ "pk": instance.pk,
}
def test_get_own_report_for_inprogress_project(self):
- report = ReportFactory(project__status=INVOICING_AND_REPORTING, project__user=self.user)
+ report = ReportFactory(
+ project__status=INVOICING_AND_REPORTING, project__user=self.user
+ )
response = self.get_page(report)
self.assertContains(response, report.project.title)
@@ -1215,75 +1359,105 @@ def test_cant_get_other_report(self):
self.assertEqual(response.status_code, 403)
def test_submit_own_report(self):
- report = ReportFactory(project__status=INVOICING_AND_REPORTING, project__user=self.user)
- response = self.post_page(report, {'public_content': 'Some text'})
+ report = ReportFactory(
+ project__status=INVOICING_AND_REPORTING, project__user=self.user
+ )
+ response = self.post_page(report, {"public_content": "Some text"})
report.refresh_from_db()
- self.assertRedirects(response, self.absolute_url(report.project.get_absolute_url()))
- self.assertEqual(report.versions.first().public_content, 'Some text')
+ self.assertRedirects(
+ response, self.absolute_url(report.project.get_absolute_url())
+ )
+ self.assertEqual(report.versions.first().public_content, "Some text")
self.assertEqual(report.versions.first(), report.current)
self.assertEqual(report.current.author, self.user)
def test_submit_private_report(self):
- report = ReportFactory(project__status=INVOICING_AND_REPORTING, project__user=self.user)
- response = self.post_page(report, {'private_content': 'Some text'})
+ report = ReportFactory(
+ project__status=INVOICING_AND_REPORTING, project__user=self.user
+ )
+ response = self.post_page(report, {"private_content": "Some text"})
report.refresh_from_db()
- self.assertRedirects(response, self.absolute_url(report.project.get_absolute_url()))
- self.assertEqual(report.versions.first().private_content, 'Some text')
+ self.assertRedirects(
+ response, self.absolute_url(report.project.get_absolute_url())
+ )
+ self.assertEqual(report.versions.first().private_content, "Some text")
self.assertEqual(report.versions.first(), report.current)
self.assertEqual(report.current.author, self.user)
self.assertIsNone(report.draft)
def test_cant_submit_blank_report(self):
- report = ReportFactory(project__status=INVOICING_AND_REPORTING, project__user=self.user)
+ report = ReportFactory(
+ project__status=INVOICING_AND_REPORTING, project__user=self.user
+ )
response = self.post_page(report, {})
report.refresh_from_db()
self.assertEqual(response.status_code, 200)
self.assertEqual(report.versions.count(), 0)
def test_save_report_draft(self):
- report = ReportFactory(project__status=INVOICING_AND_REPORTING, project__user=self.user)
- response = self.post_page(report, {'public_content': 'Some text', 'save': 'Save'})
+ report = ReportFactory(
+ project__status=INVOICING_AND_REPORTING, project__user=self.user
+ )
+ response = self.post_page(
+ report, {"public_content": "Some text", "save": "Save"}
+ )
report.refresh_from_db()
- self.assertRedirects(response, self.absolute_url(report.project.get_absolute_url()))
- self.assertEqual(report.versions.first().public_content, 'Some text')
+ self.assertRedirects(
+ response, self.absolute_url(report.project.get_absolute_url())
+ )
+ self.assertEqual(report.versions.first().public_content, "Some text")
self.assertEqual(report.versions.first(), report.draft)
self.assertIsNone(report.current)
def test_save_report_with_draft(self):
- report = ReportFactory(project__status=INVOICING_AND_REPORTING, is_draft=True, project__user=self.user)
+ report = ReportFactory(
+ project__status=INVOICING_AND_REPORTING,
+ is_draft=True,
+ project__user=self.user,
+ )
self.assertEqual(report.versions.first(), report.draft)
- response = self.post_page(report, {'public_content': 'Some text'})
+ response = self.post_page(report, {"public_content": "Some text"})
report.refresh_from_db()
- self.assertRedirects(response, self.absolute_url(report.project.get_absolute_url()))
- self.assertEqual(report.versions.last().public_content, 'Some text')
+ self.assertRedirects(
+ response, self.absolute_url(report.project.get_absolute_url())
+ )
+ self.assertEqual(report.versions.last().public_content, "Some text")
self.assertEqual(report.versions.last(), report.current)
self.assertIsNone(report.draft)
def test_cant_edit_submitted_report(self):
# :todo: need to check if applicant can edit submitted report or not.
- report = ReportFactory(project__status=INVOICING_AND_REPORTING, is_submitted=True, project__user=self.user)
+ report = ReportFactory(
+ project__status=INVOICING_AND_REPORTING,
+ is_submitted=True,
+ project__user=self.user,
+ )
self.assertEqual(report.versions.first(), report.current)
- response = self.post_page(report, {'public_content': 'Some text', 'save': ' Save'})
+ response = self.post_page(
+ report, {"public_content": "Some text", "save": " Save"}
+ )
self.assertEqual(response.status_code, 403)
def test_cant_submit_other_report(self):
report = ReportFactory(project__status=INVOICING_AND_REPORTING)
- response = self.post_page(report, {'public_content': 'Some text'})
+ response = self.post_page(report, {"public_content": "Some text"})
self.assertEqual(response.status_code, 403)
class TestStaffReportDetail(BaseViewTestCase):
- base_view_name = 'detail'
- url_name = 'funds:projects:reports:{}'
+ base_view_name = "detail"
+ url_name = "funds:projects:reports:{}"
user_factory = StaffFactory
def get_kwargs(self, instance):
return {
- 'pk': instance.pk,
+ "pk": instance.pk,
}
def test_can_access_submitted_report(self):
- report = ReportFactory(project__status=INVOICING_AND_REPORTING, is_submitted=True)
+ report = ReportFactory(
+ project__status=INVOICING_AND_REPORTING, is_submitted=True
+ )
response = self.get_page(report)
self.assertEqual(response.status_code, 200)
@@ -1306,39 +1480,55 @@ def test_cant_access_draft_report(self):
self.assertEqual(response.status_code, 403)
def test_cant_access_future_report(self):
- report = ReportFactory(project__status=INVOICING_AND_REPORTING, end_date=timezone.now() + relativedelta(days=1))
+ report = ReportFactory(
+ project__status=INVOICING_AND_REPORTING,
+ end_date=timezone.now() + relativedelta(days=1),
+ )
response = self.get_page(report)
self.assertEqual(response.status_code, 403)
class TestApplicantReportDetail(BaseViewTestCase):
- base_view_name = 'detail'
- url_name = 'funds:projects:reports:{}'
+ base_view_name = "detail"
+ url_name = "funds:projects:reports:{}"
user_factory = StaffFactory
def get_kwargs(self, instance):
return {
- 'pk': instance.pk,
+ "pk": instance.pk,
}
def test_can_access_own_submitted_report(self):
- report = ReportFactory(project__status=INVOICING_AND_REPORTING, is_submitted=True, project__user=self.user)
+ report = ReportFactory(
+ project__status=INVOICING_AND_REPORTING,
+ is_submitted=True,
+ project__user=self.user,
+ )
response = self.get_page(report)
self.assertEqual(response.status_code, 200)
def test_cant_access_own_draft_report(self):
- report = ReportFactory(project__status=INVOICING_AND_REPORTING, is_draft=True, project__user=self.user)
+ report = ReportFactory(
+ project__status=INVOICING_AND_REPORTING,
+ is_draft=True,
+ project__user=self.user,
+ )
response = self.get_page(report)
self.assertEqual(response.status_code, 403)
def test_cant_access_own_future_report(self):
- report = ReportFactory(project__status=INVOICING_AND_REPORTING, end_date=timezone.now() + relativedelta(days=1),
- project__user=self.user)
+ report = ReportFactory(
+ project__status=INVOICING_AND_REPORTING,
+ end_date=timezone.now() + relativedelta(days=1),
+ project__user=self.user,
+ )
response = self.get_page(report)
self.assertEqual(response.status_code, 403)
def test_cant_access_other_submitted_report(self):
- report = ReportFactory(project__status=INVOICING_AND_REPORTING, is_submitted=True)
+ report = ReportFactory(
+ project__status=INVOICING_AND_REPORTING, is_submitted=True
+ )
response = self.get_page(report)
self.assertEqual(response.status_code, 200)
@@ -1348,19 +1538,22 @@ def test_cant_access_other_draft_report(self):
self.assertEqual(response.status_code, 403)
def test_cant_access_other_future_report(self):
- report = ReportFactory(project__status=INVOICING_AND_REPORTING, end_date=timezone.now() + relativedelta(days=1))
+ report = ReportFactory(
+ project__status=INVOICING_AND_REPORTING,
+ end_date=timezone.now() + relativedelta(days=1),
+ )
response = self.get_page(report)
self.assertEqual(response.status_code, 403)
class TestSkipReport(BaseViewTestCase):
- base_view_name = 'skip'
- url_name = 'funds:projects:reports:{}'
+ base_view_name = "skip"
+ url_name = "funds:projects:reports:{}"
user_factory = StaffFactory
def get_kwargs(self, instance):
return {
- 'pk': instance.pk,
+ "pk": instance.pk,
}
def test_can_skip_report(self):
@@ -1371,28 +1564,37 @@ def test_can_skip_report(self):
self.assertTrue(report.skipped)
def test_can_unskip_report(self):
- report = ReportFactory(project__status=INVOICING_AND_REPORTING, skipped=True, past_due=True)
+ report = ReportFactory(
+ project__status=INVOICING_AND_REPORTING, skipped=True, past_due=True
+ )
response = self.post_page(report)
self.assertEqual(response.status_code, 200)
report.refresh_from_db()
self.assertFalse(report.skipped)
def test_cant_skip_current_report(self):
- report = ReportFactory(project__status=INVOICING_AND_REPORTING, end_date=timezone.now() + relativedelta(days=1))
+ report = ReportFactory(
+ project__status=INVOICING_AND_REPORTING,
+ end_date=timezone.now() + relativedelta(days=1),
+ )
response = self.post_page(report)
self.assertEqual(response.status_code, 200)
report.refresh_from_db()
self.assertFalse(report.skipped)
def test_cant_skip_submitted_report(self):
- report = ReportFactory(project__status=INVOICING_AND_REPORTING, is_submitted=True)
+ report = ReportFactory(
+ project__status=INVOICING_AND_REPORTING, is_submitted=True
+ )
response = self.post_page(report, data={})
self.assertEqual(response.status_code, 200)
report.refresh_from_db()
self.assertFalse(report.skipped)
def test_can_skip_draft_report(self):
- report = ReportFactory(project__status=INVOICING_AND_REPORTING, is_draft=True, past_due=True)
+ report = ReportFactory(
+ project__status=INVOICING_AND_REPORTING, is_draft=True, past_due=True
+ )
response = self.post_page(report)
self.assertEqual(response.status_code, 200)
report.refresh_from_db()
@@ -1400,52 +1602,56 @@ def test_can_skip_draft_report(self):
class TestStaffProjectDetailDownloadView(BaseViewTestCase):
- base_view_name = 'download'
- url_name = 'funds:projects:{}'
+ base_view_name = "download"
+ url_name = "funds:projects:{}"
user_factory = StaffFactory
def get_kwargs(self, instance):
return {
- 'pk': instance.pk,
+ "pk": instance.pk,
}
def test_can_access_pdf(self):
project = ProjectFactory()
- response = self.get_page(project, url_kwargs={'export_type': 'pdf'})
+ response = self.get_page(project, url_kwargs={"export_type": "pdf"})
self.assertEqual(response.status_code, 200)
def test_can_access_docx(self):
project = ProjectFactory()
- response = self.get_page(project, url_kwargs={'export_type': 'docx'})
+ response = self.get_page(project, url_kwargs={"export_type": "docx"})
self.assertEqual(response.status_code, 200)
def test_response_object_is_pdf(self):
project = ProjectFactory()
- response = self.get_page(project, url_kwargs={'export_type': 'pdf'})
- self.assertIn('.pdf', response.headers['content-disposition'].split('filename=')[1])
+ response = self.get_page(project, url_kwargs={"export_type": "pdf"})
+ self.assertIn(
+ ".pdf", response.headers["content-disposition"].split("filename=")[1]
+ )
def test_response_object_is_docx(self):
project = ProjectFactory()
- response = self.get_page(project, url_kwargs={'export_type': 'docx'})
- self.assertIn('.docx', response.headers['content-disposition'].split('filename=')[1])
+ response = self.get_page(project, url_kwargs={"export_type": "docx"})
+ self.assertIn(
+ ".docx", response.headers["content-disposition"].split("filename=")[1]
+ )
class ApplicantStaffProjectDetailDownloadView(BaseViewTestCase):
- base_view_name = 'download'
- url_name = 'funds:projects:{}'
+ base_view_name = "download"
+ url_name = "funds:projects:{}"
user_factory = ApplicantFactory
def get_kwargs(self, instance):
return {
- 'pk': instance.pk,
+ "pk": instance.pk,
}
def test_cant_access_pdf(self):
project = ProjectFactory()
- response = self.get_page(project, url_kwargs={'export_type': 'pdf'})
+ response = self.get_page(project, url_kwargs={"export_type": "pdf"})
self.assertEqual(response.status_code, 403)
def test_cant_access_docx(self):
project = ProjectFactory()
- response = self.get_page(project, url_kwargs={'export_type': 'docx'})
+ response = self.get_page(project, url_kwargs={"export_type": "docx"})
self.assertEqual(response.status_code, 403)
diff --git a/hypha/apply/projects/urls.py b/hypha/apply/projects/urls.py
index a30caab2f2..774375ee62 100644
--- a/hypha/apply/projects/urls.py
+++ b/hypha/apply/projects/urls.py
@@ -30,55 +30,146 @@
partial_project_activities,
)
-app_name = 'projects'
+app_name = "projects"
urlpatterns = [
- path('', ProjectOverviewView.as_view(), name='overview'),
- path('all/', ProjectListView.as_view(), name='all'),
- path('invoices/', InvoiceListView.as_view(), name='invoices'),
-
- path('{% trans "Thank you for submitting your information." %}
-{% trans "Your {{ ORG_SHORT_NAME }} Programme Manager will be in touch with you if there are any issues." %}
-{% trans "What will happen next?" %}
-{% trans "We will use this information to create the contract for your project." %}
-{% trans "Once this has happened, we will send you a message with your contract." %}
-{% trans "We'll ask you to read it, and if everything is OK, you can sign it." %}
- {% trans "Visit Project Detail Page" %} -Invoice status updated to: {status}.
').format(status=self.object.get_status_display()) - comment = f'{self.object.comment}.
' + if form.cleaned_data["comment"]: + invoice_status_change = _( + "Invoice status updated to: {status}.
" + ).format(status=self.object.get_status_display()) + comment = f"{self.object.comment}.
" message = invoice_status_change + comment @@ -75,9 +77,13 @@ def form_valid(self, form): related_object=self.object, ) - if (self.request.user.is_apply_staff and self.object.status == APPROVED_BY_STAFF) or \ - (settings.INVOICE_EXTENDED_WORKFLOW and self.request.user.is_finance_level_1 and - self.object.status == APPROVED_BY_FINANCE_1): + if ( + self.request.user.is_apply_staff and self.object.status == APPROVED_BY_STAFF + ) or ( + settings.INVOICE_EXTENDED_WORKFLOW + and self.request.user.is_finance_level_1 + and self.object.status == APPROVED_BY_FINANCE_1 + ): messenger( MESSAGES.APPROVE_INVOICE, request=self.request, @@ -101,8 +107,8 @@ class DeleteInvoiceView(DeleteView): model = Invoice def get_object(self): - project = get_object_or_404(Project, pk=self.kwargs['pk']) - return get_object_or_404(project.invoices.all(), pk=self.kwargs['invoice_pk']) + project = get_object_or_404(Project, pk=self.kwargs["pk"]) + return get_object_or_404(project.invoices.all(), pk=self.kwargs["invoice_pk"]) def dispatch(self, request, *args, **kwargs): self.object = self.get_object() @@ -130,17 +136,16 @@ def get_success_url(self): class InvoiceAdminView(InvoiceAccessMixin, DelegateableView, DetailView): - form_views = [ - ChangeInvoiceStatusView - ] - template_name_suffix = '_admin_detail' + form_views = [ChangeInvoiceStatusView] + template_name_suffix = "_admin_detail" def get_context_data(self, **kwargs): invoice = self.get_object() project = invoice.project deliverables = project.deliverables.all() - invoice_activities = Activity.actions.filter(related_content_type__model='invoice', - related_object_id=invoice.id).visible_to(self.request.user) + invoice_activities = Activity.actions.filter( + related_content_type__model="invoice", related_object_id=invoice.id + ).visible_to(self.request.user) return super().get_context_data( **kwargs, deliverables=deliverables, @@ -154,8 +159,9 @@ class InvoiceApplicantView(InvoiceAccessMixin, DelegateableView, DetailView): def get_context_data(self, **kwargs): invoice = self.get_object() - invoice_activities = Activity.actions.filter(related_content_type__model='invoice', - related_object_id=invoice.id).visible_to(self.request.user) + invoice_activities = Activity.actions.filter( + related_content_type__model="invoice", related_object_id=invoice.id + ).visible_to(self.request.user) return super().get_context_data( **kwargs, latest_activity=invoice_activities.first(), @@ -174,16 +180,18 @@ class CreateInvoiceView(CreateView): form_class = CreateInvoiceForm def dispatch(self, request, *args, **kwargs): - self.project = Project.objects.get(pk=kwargs['pk']) + self.project = Project.objects.get(pk=kwargs["pk"]) if not request.user.is_apply_staff and not self.project.user == request.user: return redirect(self.project) return super().dispatch(request, *args, **kwargs) def buttons(self): - yield ('submit', 'primary', _('Save')) + yield ("submit", "primary", _("Save")) def get_context_data(self, **kwargs): - return super().get_context_data(project=self.project, buttons=self.buttons(), **kwargs) + return super().get_context_data( + project=self.project, buttons=self.buttons(), **kwargs + ) def form_valid(self, form): form.instance.project = self.project @@ -191,8 +199,8 @@ def form_valid(self, form): response = super().form_valid(form) - if form.cleaned_data['message_for_pm']: - invoice_status_change = _('Invoice added.
') + if form.cleaned_data["message_for_pm"]: + invoice_status_change = _("Invoice added.
") message_for_pm = f'{form.cleaned_data["message_for_pm"]}
' @@ -215,7 +223,9 @@ def form_valid(self, form): source=self.project, related=self.object, ) - messages.success(self.request, _("Invoice added"), extra_tags=PROJECT_ACTION_MESSAGE_TAG) + messages.success( + self.request, _("Invoice added"), extra_tags=PROJECT_ACTION_MESSAGE_TAG + ) # Required for django-file-form: delete temporary files for the new files # that are uploaded. @@ -233,9 +243,9 @@ def dispatch(self, request, *args, **kwargs): return super().dispatch(request, *args, **kwargs) def buttons(self): - yield ('submit', 'primary', _('Save')) + yield ("submit", "primary", _("Save")) if self.object.can_user_delete(self.request.user): - yield ('delete', 'warning', _('Delete')) + yield ("delete", "warning", _("Delete")) def get_initial(self): initial = super().get_initial() @@ -245,13 +255,19 @@ def get_initial(self): return initial def get_context_data(self, **kwargs): - return super().get_context_data(project=self.object.project, buttons=self.buttons(), **kwargs) + return super().get_context_data( + project=self.object.project, buttons=self.buttons(), **kwargs + ) def post(self, request, *args, **kwargs): self.object = self.get_object() form = self.get_form() - if 'delete' in form.data: - return redirect('apply:projects:invoice-delete', pk=self.object.project.id, invoice_pk=self.object.id) + if "delete" in form.data: + return redirect( + "apply:projects:invoice-delete", + pk=self.object.project.id, + invoice_pk=self.object.id, + ) if form.is_valid(): return self.form_valid(form) else: @@ -264,8 +280,10 @@ def form_valid(self, form): self.object.transition_invoice_to_resubmitted() self.object.save() - if form.cleaned_data['message_for_pm']: - invoice_status_change = _('Invoice status updated to: {status}.
').format(status=self.object.get_status_display()) + if form.cleaned_data["message_for_pm"]: + invoice_status_change = _( + "Invoice status updated to: {status}.
" + ).format(status=self.object.get_status_display()) message_for_pm = f'{form.cleaned_data["message_for_pm"]}
' message = invoice_status_change + message_for_pm @@ -293,20 +311,20 @@ def form_valid(self, form): return response -@method_decorator(login_required, name='dispatch') +@method_decorator(login_required, name="dispatch") class InvoicePrivateMedia(UserPassesTestMixin, PrivateMediaView): raise_exception = True def dispatch(self, *args, **kwargs): - invoice_pk = self.kwargs['invoice_pk'] - project_pk = self.kwargs['pk'] + invoice_pk = self.kwargs["invoice_pk"] + project_pk = self.kwargs["pk"] self.project = get_object_or_404(Project, pk=project_pk) self.invoice = get_object_or_404(self.project.invoices.all(), pk=invoice_pk) return super().dispatch(*args, **kwargs) def get_media(self, *args, **kwargs): - file_pk = kwargs.get('file_pk') + file_pk = kwargs.get("file_pk") if not file_pk: return self.invoice.document @@ -326,9 +344,9 @@ def test_func(self): return False -@method_decorator(staff_or_finance_required, name='dispatch') +@method_decorator(staff_or_finance_required, name="dispatch") class InvoiceListView(SingleTableMixin, FilterView): filterset_class = InvoiceListFilter model = Invoice table_class = InvoiceListTable - template_name = 'application_projects/invoice_list.html' + template_name = "application_projects/invoice_list.html" diff --git a/hypha/apply/projects/views/project.py b/hypha/apply/projects/views/project.py index 49e2128f71..aa58efdd97 100644 --- a/hypha/apply/projects/views/project.py +++ b/hypha/apply/projects/views/project.py @@ -96,14 +96,14 @@ from .report import ReportFrequencyUpdate, ReportingMixin -@method_decorator(staff_required, name='dispatch') +@method_decorator(staff_required, name="dispatch") class SendForApprovalView(DelegatedViewMixin, UpdateView): - context_name = 'request_approval_form' + context_name = "request_approval_form" form_class = SetPendingForm model = Project def form_valid(self, form): - project = self.kwargs['object'] + project = self.kwargs["object"] old_stage = project.status response = super().form_valid(form) @@ -147,7 +147,7 @@ def form_valid(self, form): ) project.status = INTERNAL_APPROVAL - project.save(update_fields=['status']) + project.save(update_fields=["status"]) messenger( MESSAGES.PROJECT_TRANSITION, @@ -157,19 +157,23 @@ def form_valid(self, form): related=old_stage, ) - messages.success(self.request, _("PAF has been submitted for approval"), extra_tags=PROJECT_ACTION_MESSAGE_TAG) + messages.success( + self.request, + _("PAF has been submitted for approval"), + extra_tags=PROJECT_ACTION_MESSAGE_TAG, + ) return response # PROJECT DOCUMENTS -@method_decorator(staff_required, name='dispatch') +@method_decorator(staff_required, name="dispatch") class UploadDocumentView(DelegatedViewMixin, CreateView): - context_name = 'document_form' + context_name = "document_form" form_class = UploadDocumentForm model = Project def form_valid(self, form): - project = self.kwargs['object'] + project = self.kwargs["object"] form.instance.project = project response = super().form_valid(form) @@ -180,33 +184,41 @@ def form_valid(self, form): source=project, ) - messages.success(self.request, _("Document has been uploaded"), extra_tags=PROJECT_ACTION_MESSAGE_TAG) + messages.success( + self.request, + _("Document has been uploaded"), + extra_tags=PROJECT_ACTION_MESSAGE_TAG, + ) return response -@method_decorator(staff_required, name='dispatch') +@method_decorator(staff_required, name="dispatch") class RemoveDocumentView(DelegatedViewMixin, FormView): - context_name = 'remove_document_form' + context_name = "remove_document_form" form_class = RemoveDocumentForm model = Project def form_valid(self, form): document_id = form.cleaned_data["id"] - project = self.kwargs['object'] + project = self.kwargs["object"] try: project.packet_files.get(pk=document_id).delete() except PacketFile.DoesNotExist: pass - messages.success(self.request, _("Document has been removed"), extra_tags=PROJECT_ACTION_MESSAGE_TAG) + messages.success( + self.request, + _("Document has been removed"), + extra_tags=PROJECT_ACTION_MESSAGE_TAG, + ) return redirect(project) -@method_decorator(login_required, name='dispatch') +@method_decorator(login_required, name="dispatch") class RemoveContractDocumentView(DelegatedViewMixin, FormView): - context_name = 'remove_contract_document_form' + context_name = "remove_contract_document_form" form_class = RemoveContractDocumentForm model = Project @@ -217,23 +229,27 @@ def dispatch(self, request, *args, **kwargs): def form_valid(self, form): document_id = form.cleaned_data["id"] - project = self.kwargs['object'] + project = self.kwargs["object"] try: project.contract_packet_files.get(pk=document_id).delete() except ContractPacketFile.DoesNotExist: pass - messages.success(self.request, _("Contracting document has been removed"), extra_tags=PROJECT_ACTION_MESSAGE_TAG) + messages.success( + self.request, + _("Contracting document has been removed"), + extra_tags=PROJECT_ACTION_MESSAGE_TAG, + ) return redirect(project) -@method_decorator(login_required, name='dispatch') +@method_decorator(login_required, name="dispatch") class SelectDocumentView(DelegatedViewMixin, CreateView): # todo: (no role issue) not getting used anywhere form_class = SelectDocumentForm - context_name = 'select_document_form' + context_name = "select_document_form" model = PacketFile @property @@ -241,7 +257,7 @@ def should_show(self): return bool(self.files) def dispatch(self, request, *args, **kwargs): - self.project = get_object_or_404(Project, pk=self.kwargs['pk']) + self.project = get_object_or_404(Project, pk=self.kwargs["pk"]) return super().dispatch(request, *args, **kwargs) def form_invalid(self, form): @@ -267,19 +283,20 @@ def form_valid(self, form): def get_form_kwargs(self): kwargs = super().get_form_kwargs() - kwargs.pop('user') - kwargs.pop('instance') - kwargs['existing_files'] = get_files(self.get_parent_object()) + kwargs.pop("user") + kwargs.pop("instance") + kwargs["existing_files"] = get_files(self.get_parent_object()) return kwargs # GENERAL FORM VIEWS -@method_decorator(staff_required, name='dispatch') + +@method_decorator(staff_required, name="dispatch") class UpdateLeadView(DelegatedViewMixin, UpdateView): model = Project form_class = UpdateProjectLeadForm - context_name = 'lead_form' + context_name = "lead_form" def form_valid(self, form): # Fetch the old lead from the database @@ -293,21 +310,26 @@ def form_valid(self, form): request=self.request, user=self.request.user, source=project, - related=old_lead or 'Unassigned', + related=old_lead or "Unassigned", ) - messages.success(self.request, _('Lead has been updated'), extra_tags=PROJECT_ACTION_MESSAGE_TAG) + messages.success( + self.request, + _("Lead has been updated"), + extra_tags=PROJECT_ACTION_MESSAGE_TAG, + ) return response # CONTRACTS + class ContractsMixin: def get_context_data(self, **kwargs): project = self.get_object() contracts = project.contracts.select_related( - 'approver', - ).order_by('-created_at') + "approver", + ).order_by("-created_at") latest_contract = contracts.first() contract_to_approve = None @@ -319,37 +341,40 @@ def get_context_data(self, **kwargs): contract_to_approve = latest_contract context = super().get_context_data(**kwargs) - context['contract_to_approve'] = contract_to_approve - context['contract_to_sign'] = contract_to_sign - context['contracts'] = contracts.approved() - context['contract'] = latest_contract + context["contract_to_approve"] = contract_to_approve + context["contract_to_sign"] = contract_to_sign + context["contracts"] = contracts.approved() + context["contract"] = latest_contract return context -@method_decorator(staff_required, name='dispatch') +@method_decorator(staff_required, name="dispatch") class ApproveContractView(DelegatedViewMixin, UpdateView): form_class = ApproveContractForm model = Contract - context_name = 'approve_contract_form' + context_name = "approve_contract_form" def get_object(self): project = self.get_parent_object() - latest_contract = project.contracts.order_by('-created_at').first() + latest_contract = project.contracts.order_by("-created_at").first() if latest_contract and not latest_contract.approver: return latest_contract def get_form_kwargs(self): kwargs = super().get_form_kwargs() - kwargs['instance'] = self.get_object() - kwargs.pop('user') + kwargs["instance"] = self.get_object() + kwargs.pop("user") return kwargs def dispatch(self, request, *args, **kwargs): - self.project = get_object_or_404(Project, pk=self.kwargs['pk']) + self.project = get_object_or_404(Project, pk=self.kwargs["pk"]) return super().dispatch(request, *args, **kwargs) def form_invalid(self, form): - messages.error(self.request, mark_safe(_('Sorry something went wrong') + form.errors.as_ul())) + messages.error( + self.request, + mark_safe(_("Sorry something went wrong") + form.errors.as_ul()), + ) return super().form_invalid(form) def form_valid(self, form): @@ -370,7 +395,7 @@ def form_valid(self, form): ) self.project.status = INVOICING_AND_REPORTING - self.project.save(update_fields=['status']) + self.project.save(update_fields=["status"]) messenger( MESSAGES.PROJECT_TRANSITION, @@ -380,48 +405,61 @@ def form_valid(self, form): related=old_stage, ) - messages.success(self.request, _("Contractor documents have been approved." - " You can receive invoices from vendor now."), - extra_tags=PROJECT_ACTION_MESSAGE_TAG) + messages.success( + self.request, + _( + "Contractor documents have been approved." + " You can receive invoices from vendor now." + ), + extra_tags=PROJECT_ACTION_MESSAGE_TAG, + ) return response def get_success_url(self): return self.project.get_absolute_url() -@method_decorator(login_required, name='dispatch') +@method_decorator(login_required, name="dispatch") class UploadContractView(DelegatedViewMixin, CreateView): - context_name = 'contract_form' + context_name = "contract_form" model = Project form_class = UploadContractForm def dispatch(self, request, *args, **kwargs): - project = self.kwargs['object'] - permission, _ = has_permission('contract_upload', request.user, object=project) + project = self.kwargs["object"] + permission, _ = has_permission("contract_upload", request.user, object=project) if permission: return super().dispatch(request, *args, **kwargs) def get_form_kwargs(self): kwargs = super().get_form_kwargs() - kwargs.pop('instance') - kwargs.pop('user') + kwargs.pop("instance") + kwargs.pop("user") return kwargs def form_valid(self, form): - project = self.kwargs['object'] + project = self.kwargs["object"] if project.contracts.exists(): - form.instance = project.contracts.order_by('created_at').first() + form.instance = project.contracts.order_by("created_at").first() form.instance.project = project if self.request.user == project.user: form.instance.signed_by_applicant = True form.instance.uploaded_by_applicant_at = timezone.now() - messages.success(self.request, _("Countersigned contract uploaded"), extra_tags=PROJECT_ACTION_MESSAGE_TAG) + messages.success( + self.request, + _("Countersigned contract uploaded"), + extra_tags=PROJECT_ACTION_MESSAGE_TAG, + ) elif self.request.user.is_contracting: form.instance.uploaded_by_contractor_at = timezone.now() - messages.success(self.request, _("Signed contract uploaded"), extra_tags=PROJECT_ACTION_MESSAGE_TAG) + messages.success( + self.request, + _("Signed contract uploaded"), + extra_tags=PROJECT_ACTION_MESSAGE_TAG, + ) response = super().form_valid(form) @@ -437,27 +475,34 @@ def form_valid(self, form): return response -@method_decorator(login_required, name='dispatch') +@method_decorator(login_required, name="dispatch") class SubmitContractDocumentsView(DelegatedViewMixin, UpdateView): - context_name = 'submit_contract_documents_form' + context_name = "submit_contract_documents_form" model = Project form_class = SubmitContractDocumentsForm def dispatch(self, request, *args, **kwargs): project = self.get_object() - if ContractDocumentCategory.objects.filter(~Q(contract_packet_files__project=project)).exists(): + if ContractDocumentCategory.objects.filter( + ~Q(contract_packet_files__project=project) + ).exists(): raise PermissionDenied - contract = project.contracts.order_by('-created_at').first() - permission, _ = has_permission('submit_contract_documents', request.user, object=project, - raise_exception=True, contract=contract) + contract = project.contracts.order_by("-created_at").first() + permission, _ = has_permission( + "submit_contract_documents", + request.user, + object=project, + raise_exception=True, + contract=contract, + ) return super().dispatch(request, *args, **kwargs) def form_valid(self, form): - project = self.kwargs['object'] + project = self.kwargs["object"] response = super().form_valid(form) project.submitted_contract_documents = True - project.save(update_fields=['submitted_contract_documents']) + project.save(update_fields=["submitted_contract_documents"]) messenger( MESSAGES.SUBMIT_CONTRACT_DOCUMENTS, @@ -466,15 +511,19 @@ def form_valid(self, form): source=project, ) - messages.success(self.request, _("Contract documents submitted"), extra_tags=PROJECT_ACTION_MESSAGE_TAG) + messages.success( + self.request, + _("Contract documents submitted"), + extra_tags=PROJECT_ACTION_MESSAGE_TAG, + ) return response -@method_decorator(login_required, name='dispatch') +@method_decorator(login_required, name="dispatch") class UploadContractDocumentView(DelegatedViewMixin, CreateView): form_class = UploadContractDocumentForm model = Project - context_name = 'contract_document_form' + context_name = "contract_document_form" def dispatch(self, request, *args, **kwargs): if request.user != self.get_object().user or not request.user.is_applicant: @@ -482,7 +531,7 @@ def dispatch(self, request, *args, **kwargs): return super().dispatch(request, *args, **kwargs) def form_valid(self, form): - project = self.kwargs['object'] + project = self.kwargs["object"] form.instance.project = project response = super().form_valid(form) @@ -493,48 +542,68 @@ def form_valid(self, form): source=project, ) - messages.success(self.request, _("Contracting document has been uploaded"), extra_tags=PROJECT_ACTION_MESSAGE_TAG) + messages.success( + self.request, + _("Contracting document has been uploaded"), + extra_tags=PROJECT_ACTION_MESSAGE_TAG, + ) return response # PROJECT VIEW -@method_decorator(login_required, name='dispatch') + +@method_decorator(login_required, name="dispatch") class ChangePAFStatusView(DelegatedViewMixin, UpdateView): form_class = ChangePAFStatusForm - context_name = 'change_paf_status' + context_name = "change_paf_status" model = Project def dispatch(self, request, *args, **kwargs): self.object = self.get_object() permission, _ = has_permission( - 'paf_status_update', self.request.user, object=self.object, raise_exception=True, request=request + "paf_status_update", + self.request.user, + object=self.object, + raise_exception=True, + request=request, ) return super().dispatch(request, *args, **kwargs) def form_valid(self, form): response = super().form_valid(form) project_settings = ProjectSettings.for_request(self.request) - paf_approval = self.request.user.paf_approvals.filter(project=self.object, approved=False).first() + paf_approval = self.request.user.paf_approvals.filter( + project=self.object, approved=False + ).first() if not paf_approval: # get paf approval form for not-assigned case if project_settings.paf_approval_sequential: paf_approval = self.object.paf_approvals.filter(approved=False).first() else: for approval in self.object.paf_approvals.filter(approved=False): - if self.request.user.id in \ - [role_user.id for role_user in get_users_for_groups(list(approval.paf_reviewer_role.user_roles.all()), exact_match=True)]: + if self.request.user.id in [ + role_user.id + for role_user in get_users_for_groups( + list(approval.paf_reviewer_role.user_roles.all()), + exact_match=True, + ) + ]: paf_approval = approval break else: # should never be the case but still to avoid 500. raise PermissionDenied("User don't have PAF approver roles") - paf_status = form.cleaned_data.get('paf_status') - comment = form.cleaned_data.get('comment', '') + paf_status = form.cleaned_data.get("paf_status") + comment = form.cleaned_data.get("comment", "") - paf_status_update_message = _('{role} has updated PAF status to {paf_status}.
').format( - role=paf_approval.paf_reviewer_role.label, paf_status=get_paf_status_display(paf_status).lower()) + paf_status_update_message = _( + "{role} has updated PAF status to {paf_status}.
" + ).format( + role=paf_approval.paf_reviewer_role.label, + paf_status=get_paf_status_display(paf_status).lower(), + ) Activity.objects.create( user=self.request.user, type=ACTION, @@ -546,12 +615,12 @@ def form_valid(self, form): if paf_status == REQUEST_CHANGE: self.object.status = DRAFT - self.object.save(update_fields=['status']) + self.object.save(update_fields=["status"]) paf_approval.save() if not paf_approval.user: paf_approval.user = self.request.user - paf_approval.save(update_fields=['user']) + paf_approval.save(update_fields=["user"]) messenger( MESSAGES.REQUEST_PROJECT_CHANGE, @@ -560,13 +629,16 @@ def form_valid(self, form): source=self.object, comment=comment, ) - messages.success(self.request, _("PAF status has been updated"), - extra_tags=PROJECT_ACTION_MESSAGE_TAG) + messages.success( + self.request, + _("PAF status has been updated"), + extra_tags=PROJECT_ACTION_MESSAGE_TAG, + ) elif paf_status == APPROVE: paf_approval.approved = True paf_approval.approved_at = timezone.now() paf_approval.user = self.request.user - paf_approval.save(update_fields=['approved', 'approved_at', 'user']) + paf_approval.save(update_fields=["approved", "approved_at", "user"]) if project_settings.paf_approval_sequential: # notify next approver if self.object.paf_approvals.filter(approved=False).exists(): @@ -584,11 +656,13 @@ def form_valid(self, form): user=self.request.user, source=self.object, ) - messages.success(self.request, _("PAF has been approved"), - extra_tags=PROJECT_ACTION_MESSAGE_TAG) - - if form.cleaned_data['comment']: + messages.success( + self.request, + _("PAF has been approved"), + extra_tags=PROJECT_ACTION_MESSAGE_TAG, + ) + if form.cleaned_data["comment"]: comment = f"\"{form.cleaned_data['comment']}.\"
" message = paf_status_update_message + comment @@ -606,7 +680,7 @@ def form_valid(self, form): old_stage = self.object.status self.object.is_locked = True self.object.status = CONTRACTING - self.object.save(update_fields=['is_locked', 'status']) + self.object.save(update_fields=["is_locked", "status"]) messenger( MESSAGES.PROJECT_TRANSITION, @@ -622,13 +696,16 @@ class ChangeProjectstatusView(DelegatedViewMixin, UpdateView): """ Project status can be updated manually only in 'IN PROGRESS, CLOSING and COMPLETE' state. """ + form_class = ChangeProjectStatusForm - context_name = 'change_project_status' + context_name = "change_project_status" model = Project def dispatch(self, request, *args, **kwargs): - self.project = get_object_or_404(Project, pk=self.kwargs['pk']) - permission, _ = has_permission('project_status_update', request.user, self.project, raise_exception=True) + self.project = get_object_or_404(Project, pk=self.kwargs["pk"]) + permission, _ = has_permission( + "project_status_update", request.user, self.project, raise_exception=True + ) return super().dispatch(request, *args, **kwargs) def form_valid(self, form): @@ -636,7 +713,7 @@ def form_valid(self, form): response = super().form_valid(form) - comment = form.cleaned_data.get('comment', '') + comment = form.cleaned_data.get("comment", "") if comment: Activity.objects.create( @@ -656,29 +733,41 @@ def form_valid(self, form): related=old_stage, ) - messages.success(self.request, _("Project status has been updated"), extra_tags=PROJECT_ACTION_MESSAGE_TAG) + messages.success( + self.request, + _("Project status has been updated"), + extra_tags=PROJECT_ACTION_MESSAGE_TAG, + ) return response -@method_decorator(login_required, name='dispatch') +@method_decorator(login_required, name="dispatch") class UpdateAssignApproversView(DelegatedViewMixin, UpdateView): - context_name = 'assign_approvers_form' + context_name = "assign_approvers_form" form_class = AssignApproversForm model = Project def dispatch(self, request, *args, **kwargs): - self.project = get_object_or_404(Project, pk=self.kwargs['pk']) - permission, _ = has_permission('update_paf_assigned_approvers', request.user, self.project, - raise_exception=True, request=request) + self.project = get_object_or_404(Project, pk=self.kwargs["pk"]) + permission, _ = has_permission( + "update_paf_assigned_approvers", + request.user, + self.project, + raise_exception=True, + request=request, + ) return super().dispatch(request, *args, **kwargs) def form_valid(self, form): from ..forms.project import get_latest_project_paf_approval_via_roles - project = self.kwargs['object'] + + project = self.kwargs["object"] response = super().form_valid(form) - paf_approval = get_latest_project_paf_approval_via_roles(project=project, roles=self.request.user.groups.all()) + paf_approval = get_latest_project_paf_approval_via_roles( + project=project, roles=self.request.user.groups.all() + ) if paf_approval.user: messenger( @@ -699,22 +788,32 @@ def form_valid(self, form): class UpdatePAFApproversView(DelegatedViewMixin, UpdateView): - context_name = 'update_approvers_form' + context_name = "update_approvers_form" form_class = ApproversForm model = Project def dispatch(self, request, *args, **kwargs): - self.project = get_object_or_404(Project, pk=self.kwargs['pk']) - permission, _ = has_permission('paf_approvers_update', request.user, self.project, raise_exception=True, request=request) + self.project = get_object_or_404(Project, pk=self.kwargs["pk"]) + permission, _ = has_permission( + "paf_approvers_update", + request.user, + self.project, + raise_exception=True, + request=request, + ) return super().dispatch(request, *args, **kwargs) def form_valid(self, form): - project = self.kwargs['object'] + project = self.kwargs["object"] project_settings = ProjectSettings.for_request(self.request) old_approvers = None if self.object.paf_approvals.exists(): - old_approvers = list(project.paf_approvals.filter(approved=False).values_list('user__id', flat=True)) + old_approvers = list( + project.paf_approvals.filter(approved=False).values_list( + "user__id", flat=True + ) + ) response = super().form_valid(form) @@ -770,17 +869,27 @@ def form_valid(self, form): source=self.object, ) - messages.success(self.request, _("PAF approvers have been updated"), extra_tags=PROJECT_ACTION_MESSAGE_TAG) + messages.success( + self.request, + _("PAF approvers have been updated"), + extra_tags=PROJECT_ACTION_MESSAGE_TAG, + ) return response class BaseProjectDetailView(ReportingMixin, DetailView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context['statuses'] = PROJECT_STATUS_CHOICES - context['current_status_index'] = [status for status, _ in PROJECT_STATUS_CHOICES].index(self.object.status) - context['supporting_documents_configured'] = True if DocumentCategory.objects.count() else False - context['contracting_documents_configured'] = True if ContractDocumentCategory.objects.count() else False + context["statuses"] = PROJECT_STATUS_CHOICES + context["current_status_index"] = [ + status for status, _ in PROJECT_STATUS_CHOICES + ].index(self.object.status) + context["supporting_documents_configured"] = ( + True if DocumentCategory.objects.count() else False + ) + context["contracting_documents_configured"] = ( + True if ContractDocumentCategory.objects.count() else False + ) return context @@ -807,38 +916,53 @@ class AdminProjectDetailView( ChangeInvoiceStatusView, ] model = Project - template_name_suffix = '_admin_detail' + template_name_suffix = "_admin_detail" def dispatch(self, *args, **kwargs): project = self.get_object() - permission, _ = has_permission('project_access', self.request.user, object=project, raise_exception=True) + permission, _ = has_permission( + "project_access", self.request.user, object=project, raise_exception=True + ) return super().dispatch(*args, **kwargs) def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context['statuses'] = PROJECT_STATUS_CHOICES - context['current_status_index'] = [status for status, _ in PROJECT_STATUS_CHOICES].index(self.object.status) + context["statuses"] = PROJECT_STATUS_CHOICES + context["current_status_index"] = [ + status for status, _ in PROJECT_STATUS_CHOICES + ].index(self.object.status) project_settings = ProjectSettings.for_request(self.request) - context['project_settings'] = project_settings - context['paf_approvals'] = PAFApprovals.objects.filter(project=self.object) - context['all_document_categories'] = DocumentCategory.objects.all() - context['remaining_document_categories'] = DocumentCategory.objects.filter(~Q(packet_files__project=self.object)) - context['all_contract_document_categories'] = ContractDocumentCategory.objects.all() - context['remaining_contract_document_categories'] = ContractDocumentCategory.objects.filter(~Q(contract_packet_files__project=self.object)) - - if self.object.is_in_progress and not self.object.report_config.disable_reporting: + context["project_settings"] = project_settings + context["paf_approvals"] = PAFApprovals.objects.filter(project=self.object) + context["all_document_categories"] = DocumentCategory.objects.all() + context["remaining_document_categories"] = DocumentCategory.objects.filter( + ~Q(packet_files__project=self.object) + ) + context[ + "all_contract_document_categories" + ] = ContractDocumentCategory.objects.all() + context[ + "remaining_contract_document_categories" + ] = ContractDocumentCategory.objects.filter( + ~Q(contract_packet_files__project=self.object) + ) + + if ( + self.object.is_in_progress + and not self.object.report_config.disable_reporting + ): # Current due report can be none for ONE_TIME, # In case of ONE_TIME, either reporting is already completed(last_report exists) # or there should be a current_due_report. if self.object.report_config.current_due_report(): - context['report_data'] = { - 'startDate': self.object.report_config.current_due_report().start_date, - 'projectEndDate': self.object.end_date, + context["report_data"] = { + "startDate": self.object.report_config.current_due_report().start_date, + "projectEndDate": self.object.end_date, } else: - context['report_data'] = { - 'startDate': self.object.report_config.last_report().start_date, - 'projectEndDate': self.object.end_date, + context["report_data"] = { + "startDate": self.object.report_config.last_report().start_date, + "projectEndDate": self.object.end_date, } return context @@ -860,19 +984,29 @@ class ApplicantProjectDetailView( ] model = Project - template_name_suffix = '_detail' + template_name_suffix = "_detail" def dispatch(self, request, *args, **kwargs): project = self.get_object() - permission, _ = has_permission('project_access', request.user, object=project, raise_exception=True) + permission, _ = has_permission( + "project_access", request.user, object=project, raise_exception=True + ) return super().dispatch(request, *args, **kwargs) def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context['statuses'] = PROJECT_PUBLIC_STATUSES - context['current_status_index'] = [status for status, _ in PROJECT_PUBLIC_STATUSES].index(self.object.status) - context['all_contract_document_categories'] = ContractDocumentCategory.objects.all() - context['remaining_contract_document_categories'] = ContractDocumentCategory.objects.filter(~Q(contract_packet_files__project=self.object)) + context["statuses"] = PROJECT_PUBLIC_STATUSES + context["current_status_index"] = [ + status for status, _ in PROJECT_PUBLIC_STATUSES + ].index(self.object.status) + context[ + "all_contract_document_categories" + ] = ContractDocumentCategory.objects.all() + context[ + "remaining_contract_document_categories" + ] = ContractDocumentCategory.objects.filter( + ~Q(contract_packet_files__project=self.object) + ) return context @@ -883,17 +1017,17 @@ class ProjectDetailView(ViewDispatcher): applicant_view = ApplicantProjectDetailView -@method_decorator(login_required, name='dispatch') +@method_decorator(login_required, name="dispatch") class ProjectPrivateMediaView(UserPassesTestMixin, PrivateMediaView): raise_exception = True def dispatch(self, *args, **kwargs): - project_pk = self.kwargs['pk'] + project_pk = self.kwargs["pk"] self.project = get_object_or_404(Project, pk=project_pk) return super().dispatch(*args, **kwargs) def get_media(self, *args, **kwargs): - document = PacketFile.objects.get(pk=kwargs['file_pk']) + document = PacketFile.objects.get(pk=kwargs["file_pk"]) if document.project != self.project: raise Http404 return document.document @@ -905,28 +1039,35 @@ def test_func(self): if self.request.user == self.project.user: return True - if self.request.user.id in self.project.paf_approvals.filter(approved=False).values_list('user__id', flat=True): + if self.request.user.id in self.project.paf_approvals.filter( + approved=False + ).values_list("user__id", flat=True): return True return False -@method_decorator(login_required, name='dispatch') +@method_decorator(login_required, name="dispatch") class CategoryTemplatePrivateMediaView(PrivateMediaView): raise_exception = True def dispatch(self, *args, **kwargs): - project_pk = self.kwargs['pk'] + project_pk = self.kwargs["pk"] self.project = get_object_or_404(Project, pk=project_pk) - self.category_type = kwargs['type'] - permission, _ = has_permission('project_access', self.request.user, object=self.project, raise_exception=True) + self.category_type = kwargs["type"] + permission, _ = has_permission( + "project_access", + self.request.user, + object=self.project, + raise_exception=True, + ) return super().dispatch(*args, **kwargs) def get_media(self, *args, **kwargs): if self.category_type == "project_document": - category = DocumentCategory.objects.get(pk=kwargs['category_pk']) + category = DocumentCategory.objects.get(pk=kwargs["category_pk"]) elif self.category_type == "contract_document": - category = ContractDocumentCategory.objects.get(pk=kwargs['category_pk']) + category = ContractDocumentCategory.objects.get(pk=kwargs["category_pk"]) else: raise Http404 if not category.template: @@ -934,17 +1075,17 @@ def get_media(self, *args, **kwargs): return category.template -@method_decorator(login_required, name='dispatch') +@method_decorator(login_required, name="dispatch") class ContractPrivateMediaView(UserPassesTestMixin, PrivateMediaView): raise_exception = True def dispatch(self, *args, **kwargs): - project_pk = self.kwargs['pk'] + project_pk = self.kwargs["pk"] self.project = get_object_or_404(Project, pk=project_pk) return super().dispatch(*args, **kwargs) def get_media(self, *args, **kwargs): - document = Contract.objects.get(pk=kwargs['file_pk']) + document = Contract.objects.get(pk=kwargs["file_pk"]) if document.project != self.project: raise Http404 return document.file @@ -959,17 +1100,17 @@ def test_func(self): return False -@method_decorator(login_required, name='dispatch') +@method_decorator(login_required, name="dispatch") class ContractDocumentPrivateMediaView(UserPassesTestMixin, PrivateMediaView): raise_exception = True def dispatch(self, *args, **kwargs): - project_pk = self.kwargs['pk'] + project_pk = self.kwargs["pk"] self.project = get_object_or_404(Project, pk=project_pk) return super().dispatch(*args, **kwargs) def get_media(self, *args, **kwargs): - document = ContractPacketFile.objects.get(pk=kwargs['file_pk']) + document = ContractPacketFile.objects.get(pk=kwargs["file_pk"]) if document.project != self.project: raise Http404 return document.document @@ -986,71 +1127,71 @@ def test_func(self): # PROJECT APPROVAL FORM VIEWS -@method_decorator(staff_or_finance_or_contracting_required, name='dispatch') + +@method_decorator(staff_or_finance_or_contracting_required, name="dispatch") class ProjectDetailApprovalView(DelegateableView, DetailView): - form_views = [ - ChangePAFStatusView - ] + form_views = [ChangePAFStatusView] model = Project - template_name_suffix = '_approval_detail' + template_name_suffix = "_approval_detail" -@method_decorator(staff_or_finance_or_contracting_required, name='dispatch') +@method_decorator(staff_or_finance_or_contracting_required, name="dispatch") class ProjectSOWView(DetailView): model = Project - template_name_suffix = '_sow_detail' + template_name_suffix = "_sow_detail" -@method_decorator(staff_or_finance_or_contracting_required, name='dispatch') +@method_decorator(staff_or_finance_or_contracting_required, name="dispatch") class ProjectSOWDownloadView(SingleObjectMixin, View): model = Project def get(self, request, *args, **kwargs): - export_type = kwargs.get('export_type', 'pdf') + export_type = kwargs.get("export_type", "pdf") self.object = self.get_object() context = {} - context['sow_data'] = self.get_sow_data_with_field(self.object) - context['org_name'] = settings.ORG_LONG_NAME - context['title'] = self.object.title - context['project_link'] = self.request.build_absolute_uri( - reverse('apply:projects:detail', kwargs={'pk': self.object.id}) + context["sow_data"] = self.get_sow_data_with_field(self.object) + context["org_name"] = settings.ORG_LONG_NAME + context["title"] = self.object.title + context["project_link"] = self.request.build_absolute_uri( + reverse("apply:projects:detail", kwargs={"pk": self.object.id}) ) - template_path = 'application_projects/sow_export.html' + template_path = "application_projects/sow_export.html" - if export_type == 'pdf': + if export_type == "pdf": pdf_page_settings = PDFPageSettings.for_request(request) - context['show_footer'] = True - context['export_date'] = datetime.date.today().strftime("%b %d, %Y") - context['export_user'] = request.user - context['pagesize'] = pdf_page_settings.download_page_size + context["show_footer"] = True + context["export_date"] = datetime.date.today().strftime("%b %d, %Y") + context["export_user"] = request.user + context["pagesize"] = pdf_page_settings.download_page_size return self.render_as_pdf( context=context, template=get_template(template_path), - filename=self.get_slugified_file_name(export_type) + filename=self.get_slugified_file_name(export_type), ) - elif export_type == 'docx': - context['show_footer'] = False + elif export_type == "docx": + context["show_footer"] = False return self.render_as_docx( context=context, template=get_template(template_path), - filename=self.get_slugified_file_name(export_type) + filename=self.get_slugified_file_name(export_type), ) else: raise Http404(f"{export_type} type not supported at the moment") def render_as_pdf(self, context, template, filename): html = template.render(context) - response = HttpResponse(content_type='application/pdf') - response['Content-Disposition'] = f'attachment; filename={filename}' + response = HttpResponse(content_type="application/pdf") + response["Content-Disposition"] = f"attachment; filename={filename}" pisa_status = pisa.CreatePDF( - html, dest=response, encoding='utf-8', raise_exception=True) + html, dest=response, encoding="utf-8", raise_exception=True + ) if pisa_status.err: # :todo: needs to handle it in a better way - raise Http404('PDF type not supported at the moment') + raise Http404("PDF type not supported at the moment") return response def render_as_docx(self, context, template, filename): @@ -1062,8 +1203,8 @@ def render_as_docx(self, context, template, filename): new_parser.add_html_to_document(html, document) document.save(buf) - response = HttpResponse(buf.getvalue(), content_type='application/docx') - response['Content-Disposition'] = f'attachment; filename={filename}' + response = HttpResponse(buf.getvalue(), content_type="application/docx") + response["Content-Disposition"] = f"attachment; filename={filename}" return response def get_slugified_file_name(self, export_type): @@ -1074,59 +1215,65 @@ def get_sow_data_with_field(self, project): if project.submission.page.specific.sow_forms.exists() and project.sow: form_data_dict = project.sow.form_data for field in project.sow.form_fields.raw_data: - if field.get('type', None) in ['file', 'multi_file']: + if field.get("type", None) in ["file", "multi_file"]: continue - if field['id'] in form_data_dict.keys(): - if isinstance(field['value'], dict) and 'field_label' in field['value']: - data_dict[field['value']['field_label']] = form_data_dict[field['id']] + if field["id"] in form_data_dict.keys(): + if ( + isinstance(field["value"], dict) + and "field_label" in field["value"] + ): + data_dict[field["value"]["field_label"]] = form_data_dict[ + field["id"] + ] return data_dict -@method_decorator(staff_or_finance_or_contracting_required, name='dispatch') +@method_decorator(staff_or_finance_or_contracting_required, name="dispatch") class ProjectDetailDownloadView(SingleObjectMixin, View): model = Project def get(self, request, *args, **kwargs): - export_type = kwargs.get('export_type', None) + export_type = kwargs.get("export_type", None) self.object = self.get_object() context = self.get_paf_download_context() - template_path = 'application_projects/paf_export.html' + template_path = "application_projects/paf_export.html" - if export_type == 'pdf': + if export_type == "pdf": pdf_page_settings = PDFPageSettings.for_request(request) - context['show_footer'] = True - context['export_date'] = datetime.date.today().strftime("%b %d, %Y") - context['export_user'] = request.user - context['pagesize'] = pdf_page_settings.download_page_size + context["show_footer"] = True + context["export_date"] = datetime.date.today().strftime("%b %d, %Y") + context["export_user"] = request.user + context["pagesize"] = pdf_page_settings.download_page_size return self.render_as_pdf( context=context, template=get_template(template_path), - filename=self.get_slugified_file_name(export_type) + filename=self.get_slugified_file_name(export_type), ) - elif export_type == 'docx': - context['show_footer'] = False + elif export_type == "docx": + context["show_footer"] = False return self.render_as_docx( context=context, template=get_template(template_path), - filename=self.get_slugified_file_name(export_type) + filename=self.get_slugified_file_name(export_type), ) else: raise Http404(f"{export_type} type not supported at the moment") def render_as_pdf(self, context, template, filename): html = template.render(context) - response = HttpResponse(content_type='application/pdf') - response['Content-Disposition'] = f'attachment; filename={filename}' + response = HttpResponse(content_type="application/pdf") + response["Content-Disposition"] = f"attachment; filename={filename}" pisa_status = pisa.CreatePDF( - html, dest=response, encoding='utf-8', raise_exception=True) + html, dest=response, encoding="utf-8", raise_exception=True + ) if pisa_status.err: # :todo: needs to handle it in a better way - raise Http404('PDF type not supported at the moment') + raise Http404("PDF type not supported at the moment") return response def render_as_docx(self, context, template, filename): @@ -1138,8 +1285,8 @@ def render_as_docx(self, context, template, filename): new_parser.add_html_to_document(html, document) document.save(buf) - response = HttpResponse(buf.getvalue(), content_type='application/docx') - response['Content-Disposition'] = f'attachment; filename={filename}' + response = HttpResponse(buf.getvalue(), content_type="application/docx") + response["Content-Disposition"] = f"attachment; filename={filename}" return response def get_slugified_file_name(self, export_type): @@ -1147,33 +1294,39 @@ def get_slugified_file_name(self, export_type): def get_paf_download_context(self): context = {} - context['id'] = self.object.id - context['title'] = self.object.title - context['project_link'] = self.request.build_absolute_uri( - reverse('apply:projects:detail', kwargs={'pk': self.object.id}) + context["id"] = self.object.id + context["title"] = self.object.title + context["project_link"] = self.request.build_absolute_uri( + reverse("apply:projects:detail", kwargs={"pk": self.object.id}) ) - context['contractor_name'] = self.object.vendor.contractor_name if self.object.vendor else None - - context['approvals'] = self.object.paf_approvals.all() - context['paf_data'] = self.get_paf_data_with_field(self.object) - context['sow_data'] = self.get_sow_data_with_field(self.object) - context['submission'] = self.object.submission - context['submission_link'] = self.request.build_absolute_uri( - reverse('apply:submissions:detail', kwargs={'pk': self.object.submission.id}) + context["contractor_name"] = ( + self.object.vendor.contractor_name if self.object.vendor else None ) - context['supporting_documents'] = self.get_supporting_documents(self.object) - context['org_name'] = settings.ORG_LONG_NAME + + context["approvals"] = self.object.paf_approvals.all() + context["paf_data"] = self.get_paf_data_with_field(self.object) + context["sow_data"] = self.get_sow_data_with_field(self.object) + context["submission"] = self.object.submission + context["submission_link"] = self.request.build_absolute_uri( + reverse( + "apply:submissions:detail", kwargs={"pk": self.object.submission.id} + ) + ) + context["supporting_documents"] = self.get_supporting_documents(self.object) + context["org_name"] = settings.ORG_LONG_NAME return context def get_paf_data_with_field(self, project): data_dict = {} form_data_dict = project.form_data for field in project.form_fields.raw_data: - if field.get('type', None) in ['file', 'multi_file']: + if field.get("type", None) in ["file", "multi_file"]: continue - if field['id'] in form_data_dict.keys(): - if isinstance(field['value'], dict) and 'field_label' in field['value']: - data_dict[field['value']['field_label']] = form_data_dict[field['id']] + if field["id"] in form_data_dict.keys(): + if isinstance(field["value"], dict) and "field_label" in field["value"]: + data_dict[field["value"]["field_label"]] = form_data_dict[ + field["id"] + ] return data_dict @@ -1182,11 +1335,16 @@ def get_sow_data_with_field(self, project): if project.submission.page.specific.sow_forms.exists() and project.sow: form_data_dict = project.sow.form_data for field in project.sow.form_fields.raw_data: - if field.get('type', None) in ['file', 'multi_file']: + if field.get("type", None) in ["file", "multi_file"]: continue - if field['id'] in form_data_dict.keys(): - if isinstance(field['value'], dict) and 'field_label' in field['value']: - data_dict[field['value']['field_label']] = form_data_dict[field['id']] + if field["id"] in form_data_dict.keys(): + if ( + isinstance(field["value"], dict) + and "field_label" in field["value"] + ): + data_dict[field["value"]["field_label"]] = form_data_dict[ + field["id"] + ] return data_dict @@ -1194,45 +1352,58 @@ def get_supporting_documents(self, project): documents_dict = {} for packet_file in project.packet_files.all(): documents_dict[packet_file.title] = self.request.build_absolute_uri( - reverse('apply:projects:document', kwargs={'pk': project.id, 'file_pk': packet_file.id}) + reverse( + "apply:projects:document", + kwargs={"pk": project.id, "file_pk": packet_file.id}, + ) ) return documents_dict -@method_decorator(staff_or_finance_or_contracting_required, name='dispatch') +@method_decorator(staff_or_finance_or_contracting_required, name="dispatch") class ProjectApprovalFormEditView(BaseStreamForm, UpdateView): model = Project - template_name = 'application_projects/project_approval_form.html' + template_name = "application_projects/project_approval_form.html" # Remember to assign paf_form first and then sow_form, else get_defined_fields method may provide unexpected results paf_form = None sow_form = None def buttons(self): - yield ('submit', 'primary', _('Save')) + yield ("submit", "primary", _("Save")) def dispatch(self, request, *args, **kwargs): self.object = self.get_object() if not self.object.editable_by(request.user): - messages.info(self.request, _('You are not allowed to edit the project at this time')) + messages.info( + self.request, _("You are not allowed to edit the project at this time") + ) return redirect(self.object) return super().dispatch(request, *args, **kwargs) @cached_property def approval_form(self): # fetching from the fund directly instead of going through round - approval_form = self.object.submission.page.specific.approval_forms.first() # picking up the first one + approval_form = ( + self.object.submission.page.specific.approval_forms.first() + ) # picking up the first one return approval_form @cached_property def approval_sow_form(self): # fetching from the fund directly instead of going through round - approval_sow_form = self.object.submission.page.specific.sow_forms.first() # picking up the first one + approval_sow_form = ( + self.object.submission.page.specific.sow_forms.first() + ) # picking up the first one return approval_sow_form - def get_form_class(self, form_class, draft=False, form_data=None, user=None): - return type('WagtailStreamForm', (form_class,), self.get_form_fields(draft, form_data, user)) + def get_form_class(self, form_class, draft=False, form_data=None, user=None): + return type( + "WagtailStreamForm", + (form_class,), + self.get_form_fields(draft, form_data, user), + ) def get_paf_form(self, form_class=None): if form_class is None: @@ -1264,8 +1435,8 @@ def get_context_data(self, **kwargs): "paf_form": self.paf_form, "sow_form": self.sow_form, "object": self.object, - 'submissions_attachments': submission_attachments, - **kwargs + "submissions_attachments": submission_attachments, + **kwargs, } def get_defined_fields(self): @@ -1284,14 +1455,14 @@ def get_paf_form_kwargs(self): else: fields = {} - kwargs['extra_fields'] = fields + kwargs["extra_fields"] = fields initial = self.object.raw_data for field_id in self.object.file_field_ids: - initial.pop(field_id + '-uploads', False) + initial.pop(field_id + "-uploads", False) initial[field_id] = self.get_placeholder_file( self.object.raw_data.get(field_id) ) - kwargs['initial'].update(initial) + kwargs["initial"].update(initial) return kwargs def get_placeholder_file(self, initial_file): @@ -1309,19 +1480,19 @@ def get_sow_form_kwargs(self): if self.approval_sow_form: fields = self.approval_sow_form.form.get_form_fields() - kwargs['extra_fields'] = fields + kwargs["extra_fields"] = fields try: sow_instance = self.object.sow initial = sow_instance.raw_data for field_id in sow_instance.file_field_ids: - initial.pop(field_id + '-uploads', False) + initial.pop(field_id + "-uploads", False) initial[field_id] = self.get_placeholder_file( sow_instance.raw_data.get(field_id) ) - initial['project'] = self.object - kwargs['initial'].update(initial) + initial["project"] = self.object + kwargs["initial"].update(initial) except ObjectDoesNotExist: - kwargs['initial'].update({'project': self.object}) + kwargs["initial"].update({"project": self.object}) return kwargs def post(self, request, *args, **kwargs): @@ -1367,79 +1538,88 @@ def post(self, request, *args, **kwargs): return self.form_invalid(self.paf_form) -@method_decorator(staff_or_finance_or_contracting_required, name='dispatch') +@method_decorator(staff_or_finance_or_contracting_required, name="dispatch") class ProjectListView(SingleTableMixin, FilterView): filterset_class = ProjectListFilter queryset = Project.objects.for_table() table_class = ProjectsListTable - template_name = 'application_projects/project_list.html' + template_name = "application_projects/project_list.html" -@method_decorator(staff_or_finance_or_contracting_required, name='dispatch') +@method_decorator(staff_or_finance_or_contracting_required, name="dispatch") class ProjectOverviewView(TemplateView): - template_name = 'application_projects/overview.html' + template_name = "application_projects/overview.html" def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context['projects'] = self.get_projects(self.request) - context['invoices'] = self.get_invoices(self.request) - context['reports'] = self.get_reports(self.request) - context['status_counts'] = self.get_status_counts() + context["projects"] = self.get_projects(self.request) + context["invoices"] = self.get_invoices(self.request) + context["reports"] = self.get_reports(self.request) + context["status_counts"] = self.get_status_counts() return context def get_reports(self, request): if request.user.is_contracting: return { - 'filterset': None, - 'table': None, - 'url': None, + "filterset": None, + "table": None, + "url": None, } reports = Report.objects.for_table().submitted()[:10] return { - 'filterset': ReportListFilter(request.GET or None, request=request, queryset=reports), - 'table': ReportListTable(reports, order_by=()), - 'url': reverse('apply:projects:reports:all'), + "filterset": ReportListFilter( + request.GET or None, request=request, queryset=reports + ), + "table": ReportListTable(reports, order_by=()), + "url": reverse("apply:projects:reports:all"), } def get_projects(self, request): projects = Project.objects.for_table()[:10] return { - 'filterset': ProjectListFilter(request.GET or None, request=request, queryset=projects), - 'table': ProjectsListTable(projects, order_by=()), - 'url': reverse('apply:projects:all'), + "filterset": ProjectListFilter( + request.GET or None, request=request, queryset=projects + ), + "table": ProjectsListTable(projects, order_by=()), + "url": reverse("apply:projects:all"), } def get_invoices(self, request): if request.user.is_contracting: return { - 'filterset': None, - 'table': None, - 'url': None, + "filterset": None, + "table": None, + "url": None, } - invoices = Invoice.objects.order_by('-requested_at')[:10] + invoices = Invoice.objects.order_by("-requested_at")[:10] return { - 'filterset': InvoiceListFilter(request.GET or None, request=request, queryset=invoices), - 'table': InvoiceListTable(invoices, order_by=()), - 'url': reverse('apply:projects:invoices'), + "filterset": InvoiceListFilter( + request.GET or None, request=request, queryset=invoices + ), + "table": InvoiceListTable(invoices, order_by=()), + "url": reverse("apply:projects:invoices"), } def get_status_counts(self): status_counts = dict( - Project.objects.all().values('status').annotate( - count=Count('status'), - ).values_list( - 'status', - 'count', + Project.objects.all() + .values("status") + .annotate( + count=Count("status"), + ) + .values_list( + "status", + "count", ) ) return { key: { - 'name': display, - 'count': status_counts.get(key, 0), - 'url': reverse_lazy("funds:projects:all") + '?project_status=' + key, + "name": display, + "count": status_counts.get(key, 0), + "url": reverse_lazy("funds:projects:all") + "?project_status=" + key, } for key, display in PROJECT_STATUS_CHOICES } diff --git a/hypha/apply/projects/views/project_partials.py b/hypha/apply/projects/views/project_partials.py index d0d2b12989..142803b029 100644 --- a/hypha/apply/projects/views/project_partials.py +++ b/hypha/apply/projects/views/project_partials.py @@ -14,8 +14,6 @@ @require_GET def partial_project_activities(request, pk): project = get_object_or_404(Project, pk=pk) - has_permission('project_access', request.user, object=project, raise_exception=True) - ctx = { - 'actions': get_related_actions_for_user(project, request.user) - } - return render(request, 'activity/include/action_list.html', ctx) + has_permission("project_access", request.user, object=project, raise_exception=True) + ctx = {"actions": get_related_actions_for_user(project, request.user)} + return render(request, "activity/include/action_list.html", ctx) diff --git a/hypha/apply/projects/views/report.py b/hypha/apply/projects/views/report.py index b758d6312a..f34341b1ee 100644 --- a/hypha/apply/projects/views/report.py +++ b/hypha/apply/projects/views/report.py @@ -24,13 +24,13 @@ class ReportingMixin: def dispatch(self, *args, **kwargs): project = self.get_object() if project.is_in_progress: - if not hasattr(project, 'report_config'): + if not hasattr(project, "report_config"): ReportConfig.objects.create(project=project) return super().dispatch(*args, **kwargs) -@method_decorator(login_required, name='dispatch') +@method_decorator(login_required, name="dispatch") class ReportAccessMixin(UserPassesTestMixin): model = Report @@ -47,24 +47,28 @@ def test_func(self): return False -@method_decorator(login_required, name='dispatch') +@method_decorator(login_required, name="dispatch") class ReportDetailView(DetailView): model = Report def dispatch(self, *args, **kwargs): report = self.get_object() - permission, _ = has_permission('report_view', self.request.user, object=report, raise_exception=True) + permission, _ = has_permission( + "report_view", self.request.user, object=report, raise_exception=True + ) return super().dispatch(*args, **kwargs) -@method_decorator(login_required, name='dispatch') +@method_decorator(login_required, name="dispatch") class ReportUpdateView(UpdateView): form_class = ReportEditForm model = Report def dispatch(self, *args, **kwargs): report = self.get_object() - permission, _ = has_permission('report_update', self.request.user, object=report, raise_exception=True) + permission, _ = has_permission( + "report_update", self.request.user, object=report, raise_exception=True + ) return super().dispatch(*args, **kwargs) def get_initial(self): @@ -75,16 +79,16 @@ def get_initial(self): if current: return { - 'public_content': current.public_content, - 'private_content': current.private_content, - 'file_list': current.files.all(), + "public_content": current.public_content, + "private_content": current.private_content, + "file_list": current.files.all(), } return {} def get_form_kwargs(self): return { - 'user': self.request.user, + "user": self.request.user, **super().get_form_kwargs(), } @@ -119,18 +123,15 @@ def form_valid(self, form): class ReportPrivateMedia(ReportAccessMixin, PrivateMediaView): - def dispatch(self, *args, **kwargs): - report_pk = self.kwargs['pk'] + report_pk = self.kwargs["pk"] self.report = get_object_or_404(Report, pk=report_pk) - file_pk = kwargs.get('file_pk') + file_pk = kwargs.get("file_pk") self.document = get_object_or_404( - ReportPrivateFiles.objects, - report__report=self.report, - pk=file_pk + ReportPrivateFiles.objects, report__report=self.report, pk=file_pk ) - if not hasattr(self.document.report, 'live_for_report'): + if not hasattr(self.document.report, "live_for_report"): # this is not a document in the live report # send the user to the report page to see latest version return redirect(self.report.get_absolute_url()) @@ -141,7 +142,7 @@ def get_media(self, *args, **kwargs): return self.document.document -@method_decorator(staff_required, name='dispatch') +@method_decorator(staff_required, name="dispatch") class ReportSkipView(SingleObjectMixin, View): model = Report @@ -162,33 +163,33 @@ def post(self, *args, **kwargs): return redirect(report.project.get_absolute_url()) -@method_decorator(staff_required, name='dispatch') +@method_decorator(staff_required, name="dispatch") class ReportFrequencyUpdate(DelegatedViewMixin, UpdateView): form_class = ReportFrequencyForm - context_name = 'update_frequency_form' + context_name = "update_frequency_form" model = ReportConfig def get_form_kwargs(self): kwargs = super().get_form_kwargs() - kwargs.pop('user') - project = kwargs['instance'] + kwargs.pop("user") + project = kwargs["instance"] instance = project.report_config - kwargs['instance'] = instance + kwargs["instance"] = instance if not instance.disable_reporting: # Current due report can be none for ONE_TIME(does not repeat), # In case of ONE_TIME, either reporting is already completed(last_report exists) # or there should be a current_due_report. if instance.current_due_report(): - kwargs['initial'] = { - 'start': instance.current_due_report().end_date, + kwargs["initial"] = { + "start": instance.current_due_report().end_date, } else: - kwargs['initial'] = { - 'start': instance.last_report().end_date, + kwargs["initial"] = { + "start": instance.last_report().end_date, } else: - kwargs['initial'] = { - 'start': project.start_date, + kwargs["initial"] = { + "start": project.start_date, } return kwargs @@ -204,7 +205,9 @@ def get_form(self): def form_valid(self, form): config = form.instance # 'form-submitted-' is set as form_prefix in DelegateBase view - if 'disable-reporting' in self.request.POST.get(f'form-submitted-{self.context_name}'): + if "disable-reporting" in self.request.POST.get( + f"form-submitted-{self.context_name}" + ): form.instance.disable_reporting = True form.instance.schedule_start = None response = super().form_valid(form) @@ -216,7 +219,7 @@ def form_valid(self, form): ) else: form.instance.disable_reporting = False - form.instance.schedule_start = form.cleaned_data['start'] + form.instance.schedule_start = form.cleaned_data["start"] response = super().form_valid(form) messenger( MESSAGES.REPORT_FREQUENCY_CHANGED, @@ -229,9 +232,9 @@ def form_valid(self, form): return response -@method_decorator(staff_or_finance_required, name='dispatch') +@method_decorator(staff_or_finance_required, name="dispatch") class ReportListView(SingleTableMixin, FilterView): queryset = Report.objects.submitted().for_table() filterset_class = ReportListFilter table_class = ReportListTable - template_name = 'application_projects/report_list.html' + template_name = "application_projects/report_list.html" diff --git a/hypha/apply/projects/views/vendor.py b/hypha/apply/projects/views/vendor.py index ce206bb242..cb53405ce5 100644 --- a/hypha/apply/projects/views/vendor.py +++ b/hypha/apply/projects/views/vendor.py @@ -37,9 +37,9 @@ def show_extra_info_form(wizard): # try to get the cleaned data of step where we ask if extra info is needed - cleaned_data = wizard.get_cleaned_data_for_step('extra') or {} + cleaned_data = wizard.get_cleaned_data_for_step("extra") or {} # check if the field ``extra_info`` box was checked. - return cleaned_data.get('need_extra_info', True) + return cleaned_data.get("need_extra_info", True) class CreateVendorAccessMixin: @@ -77,29 +77,29 @@ def dispatch(self, request, *args, **kwargs): class CreateVendorView(CreateVendorAccessMixin, SessionWizardView): file_storage = PrivateStorage() form_list = [ - ('basic', CreateVendorFormStep1), - ('taxes', CreateVendorFormStep2), - ('documents', CreateVendorFormStep3), - ('bank', CreateVendorFormStep4), - ('extra', CreateVendorFormStep5), - ('other', CreateVendorFormStep6), + ("basic", CreateVendorFormStep1), + ("taxes", CreateVendorFormStep2), + ("documents", CreateVendorFormStep3), + ("bank", CreateVendorFormStep4), + ("extra", CreateVendorFormStep5), + ("other", CreateVendorFormStep6), ] - condition_dict = {'other': show_extra_info_form} - template_name = 'application_projects/vendor_form.html' + condition_dict = {"other": show_extra_info_form} + template_name = "application_projects/vendor_form.html" def get_project(self): - return get_object_or_404(Project, pk=self.kwargs['pk']) + return get_object_or_404(Project, pk=self.kwargs["pk"]) def done(self, form_list, **kwargs): vendor_project = self.get_project() cleaned_data = self.get_all_cleaned_data() vendor = vendor_project.vendor - need_extra_info = cleaned_data['need_extra_info'] + need_extra_info = cleaned_data["need_extra_info"] bank_info = vendor.bank_info - account_holder_name = cleaned_data['account_holder_name'] - account_routing_number = cleaned_data['account_routing_number'] - account_number = cleaned_data['account_number'] - account_currency = cleaned_data['account_currency'] + account_holder_name = cleaned_data["account_holder_name"] + account_routing_number = cleaned_data["account_routing_number"] + account_number = cleaned_data["account_number"] + account_currency = cleaned_data["account_currency"] if not bank_info: bank_info = BankInformation.objects.create( account_holder_name=account_holder_name, @@ -114,17 +114,17 @@ def done(self, form_list, **kwargs): bank_info.account_currency = account_currency bank_info.need_extra_info = need_extra_info if need_extra_info: - ib_account_routing_number = cleaned_data['ib_account_routing_number'] - ib_account_number = cleaned_data['ib_account_number'] - ib_account_currency = cleaned_data['ib_account_currency'] - ib_branch_address = cleaned_data['ib_branch_address'] + ib_account_routing_number = cleaned_data["ib_account_routing_number"] + ib_account_number = cleaned_data["ib_account_number"] + ib_account_currency = cleaned_data["ib_account_currency"] + ib_branch_address = cleaned_data["ib_branch_address"] iba_info = bank_info.iba_info if not iba_info: iba_info = BankInformation.objects.create( account_routing_number=ib_account_routing_number, account_number=ib_account_number, account_currency=ib_account_currency, - branch_address=ib_branch_address + branch_address=ib_branch_address, ) else: iba_info.branch_address = ib_branch_address @@ -132,25 +132,26 @@ def done(self, form_list, **kwargs): iba_info.account_number = ib_account_number iba_info.account_currency = ib_account_currency iba_info.save() - bank_info.branch_address = cleaned_data['branch_address'] - bank_info.nid_type = cleaned_data['nid_type'] - bank_info.nid_number = cleaned_data['nid_number'] + bank_info.branch_address = cleaned_data["branch_address"] + bank_info.nid_type = cleaned_data["nid_type"] + bank_info.nid_number = cleaned_data["nid_number"] bank_info.iba_info = iba_info - vendor.other_info = cleaned_data['other_info'] + vendor.other_info = cleaned_data["other_info"] bank_info.save() vendor.bank_info = bank_info - vendor.name = cleaned_data['name'] - vendor.contractor_name = cleaned_data['contractor_name'] - vendor.type = cleaned_data['type'] - vendor.required_to_pay_taxes = cleaned_data['required_to_pay_taxes'] + vendor.name = cleaned_data["name"] + vendor.contractor_name = cleaned_data["contractor_name"] + vendor.type = cleaned_data["type"] + vendor.required_to_pay_taxes = cleaned_data["required_to_pay_taxes"] vendor.updated_at = timezone.now() vendor.user_has_updated_details = True vendor.save() not_deleted_original_filenames = [ - file['name'] for file in json.loads(cleaned_data['due_diligence_documents-uploads']) + file["name"] + for file in json.loads(cleaned_data["due_diligence_documents-uploads"]) ] for f in vendor.due_diligence_documents.all(): if f.document.name not in not_deleted_original_filenames: @@ -163,130 +164,193 @@ def done(self, form_list, **kwargs): DueDiligenceDocument.objects.create(vendor=vendor, document=f) finally: f.close() - form = self.get_form('documents') + form = self.get_form("documents") form.delete_temporary_files() messenger( MESSAGES.UPDATED_VENDOR, request=self.request, user=vendor_project.lead, - source=vendor_project + source=vendor_project, ) - return render(self.request, 'application_projects/vendor_success.html', {'project': vendor_project}) + return render( + self.request, + "application_projects/vendor_success.html", + {"project": vendor_project}, + ) def get_form_initial(self, step): vendor_project = self.get_project() vendor = vendor_project.vendor initial_dict = self.initial_dict.get(step, {}) if vendor: - initial_dict['basic'] = { - 'name': vendor.name, - 'contractor_name': vendor.contractor_name, - 'type': vendor.type + initial_dict["basic"] = { + "name": vendor.name, + "contractor_name": vendor.contractor_name, + "type": vendor.type, } - initial_dict['taxes'] = { - 'required_to_pay_taxes': vendor.required_to_pay_taxes + initial_dict["taxes"] = { + "required_to_pay_taxes": vendor.required_to_pay_taxes } - initial_dict['documents'] = { - 'due_diligence_documents': [ + initial_dict["documents"] = { + "due_diligence_documents": [ f.document for f in vendor.due_diligence_documents.all() ] } bank_info = vendor.bank_info if bank_info: - initial_dict['bank'] = { - 'account_holder_name': bank_info.account_holder_name, - 'account_routing_number': bank_info.account_routing_number, - 'account_number': bank_info.account_number, - 'account_currency': bank_info.account_currency, - } - initial_dict['extra'] = { - 'need_extra_info': bank_info.need_extra_info + initial_dict["bank"] = { + "account_holder_name": bank_info.account_holder_name, + "account_routing_number": bank_info.account_routing_number, + "account_number": bank_info.account_number, + "account_currency": bank_info.account_currency, } - initial_dict['other'] = { - 'branch_address': bank_info.branch_address, - 'nid_type': bank_info.nid_type, - 'nid_number': bank_info.nid_number, - 'other_info': vendor.other_info, + initial_dict["extra"] = {"need_extra_info": bank_info.need_extra_info} + initial_dict["other"] = { + "branch_address": bank_info.branch_address, + "nid_type": bank_info.nid_type, + "nid_number": bank_info.nid_number, + "other_info": vendor.other_info, } iba_info = bank_info.iba_info if iba_info: - initial_dict['other']['ib_account_routing_number'] = iba_info.account_routing_number - initial_dict['other']['ib_account_number'] = iba_info.account_number - initial_dict['other']['ib_account_currency'] = iba_info.account_currency - initial_dict['other']['ib_branch_address'] = iba_info.branch_address + initial_dict["other"][ + "ib_account_routing_number" + ] = iba_info.account_routing_number + initial_dict["other"]["ib_account_number"] = iba_info.account_number + initial_dict["other"][ + "ib_account_currency" + ] = iba_info.account_currency + initial_dict["other"]["ib_branch_address"] = iba_info.branch_address return initial_dict.get(step, {}) def get_form_kwargs(self, step): kwargs = super(CreateVendorView, self).get_form_kwargs(step) - kwargs['site'] = Site.find_for_request(self.request) + kwargs["site"] = Site.find_for_request(self.request) return kwargs class VendorDetailView(DetailVendorAccessMixin, DetailView): model = Vendor - template_name = 'application_projects/vendor_detail.html' + template_name = "application_projects/vendor_detail.html" def get_object(self, queryset=None): - return get_object_or_404(self.model, id=self.kwargs['vendor_pk']) + return get_object_or_404(self.model, id=self.kwargs["vendor_pk"]) def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context['vendor_detailed_response'] = self.get_detailed_response() - context['project'] = self.get_project() + context["vendor_detailed_response"] = self.get_detailed_response() + context["project"] = self.get_project() vendor = self.get_object() - context['due_diligence_documents'] = vendor.due_diligence_documents.all() + context["due_diligence_documents"] = vendor.due_diligence_documents.all() return context def get_project(self): - return get_object_or_404(Project, pk=self.kwargs['pk']) + return get_object_or_404(Project, pk=self.kwargs["pk"]) def get_detailed_response(self): vendor = self.get_object() vendor_form_settings = VendorFormSettings.for_request(self.request) data = {} group = 0 - data.setdefault(group, {'title': str(_('Contracting Information')), 'questions': []}) - data[group]['questions'] = [ + data.setdefault( + group, {"title": str(_("Contracting Information")), "questions": []} + ) + data[group]["questions"] = [ (vendor_form_settings.name_label, vendor.name), (vendor_form_settings.contractor_name_label, vendor.contractor_name), (vendor_form_settings.type_label, vendor.type), - (vendor_form_settings.required_to_pay_taxes_label, vendor.required_to_pay_taxes), - ('Due Diligence Documents', ''), + ( + vendor_form_settings.required_to_pay_taxes_label, + vendor.required_to_pay_taxes, + ), + ("Due Diligence Documents", ""), ] group = group + 1 - data.setdefault(group, {'title': str(_('Bank Account Information')), 'questions': []}) + data.setdefault( + group, {"title": str(_("Bank Account Information")), "questions": []} + ) bank_info = vendor.bank_info - data[group]['questions'] = [ - (vendor_form_settings.account_holder_name_label, bank_info.account_holder_name if bank_info else ''), - (vendor_form_settings.account_routing_number_label, bank_info.account_routing_number if bank_info else ''), - (vendor_form_settings.account_number_label, bank_info.account_number if bank_info else ''), - (vendor_form_settings.account_currency_label, bank_info.account_currency if bank_info else ''), + data[group]["questions"] = [ + ( + vendor_form_settings.account_holder_name_label, + bank_info.account_holder_name if bank_info else "", + ), + ( + vendor_form_settings.account_routing_number_label, + bank_info.account_routing_number if bank_info else "", + ), + ( + vendor_form_settings.account_number_label, + bank_info.account_number if bank_info else "", + ), + ( + vendor_form_settings.account_currency_label, + bank_info.account_currency if bank_info else "", + ), ] group = group + 1 - data.setdefault(group, {'title': str(_('(Optional) Extra Information for Accepting Payments')), 'questions': []}) - data[group]['questions'] = [ - (vendor_form_settings.branch_address_label, self.get_address_display(bank_info.branch_address) if bank_info else ''), + data.setdefault( + group, + { + "title": str(_("(Optional) Extra Information for Accepting Payments")), + "questions": [], + }, + ) + data[group]["questions"] = [ + ( + vendor_form_settings.branch_address_label, + self.get_address_display(bank_info.branch_address) if bank_info else "", + ), ] group = group + 1 - data.setdefault(group, {'title': str(_('Intermediary Bank Account Information')), 'questions': []}) + data.setdefault( + group, + {"title": str(_("Intermediary Bank Account Information")), "questions": []}, + ) iba_info = bank_info.iba_info if bank_info else None - data[group]['questions'] = [ - (vendor_form_settings.ib_account_routing_number_label, iba_info.account_routing_number if iba_info else ''), - (vendor_form_settings.ib_account_number_label, iba_info.account_number if iba_info else ''), - (vendor_form_settings.ib_account_currency_label, iba_info.account_currency if iba_info else ''), - (vendor_form_settings.ib_branch_address_label, self.get_address_display(iba_info.branch_address) if iba_info else ''), + data[group]["questions"] = [ + ( + vendor_form_settings.ib_account_routing_number_label, + iba_info.account_routing_number if iba_info else "", + ), + ( + vendor_form_settings.ib_account_number_label, + iba_info.account_number if iba_info else "", + ), + ( + vendor_form_settings.ib_account_currency_label, + iba_info.account_currency if iba_info else "", + ), + ( + vendor_form_settings.ib_branch_address_label, + self.get_address_display(iba_info.branch_address) if iba_info else "", + ), ] group = group + 1 - data.setdefault(group, {'title': str(_('Account Holder National Identity Document Information')), 'questions': []}) - data[group]['questions'] = [ - (vendor_form_settings.nid_type_label, bank_info.nid_type if bank_info else ''), - (vendor_form_settings.nid_number_label, bank_info.nid_number if bank_info else ''), + data.setdefault( + group, + { + "title": str( + _("Account Holder National Identity Document Information") + ), + "questions": [], + }, + ) + data[group]["questions"] = [ + ( + vendor_form_settings.nid_type_label, + bank_info.nid_type if bank_info else "", + ), + ( + vendor_form_settings.nid_number_label, + bank_info.nid_number if bank_info else "", + ), ] group = group + 1 - data.setdefault(group, {'title': None, 'questions': []}) - data[group]['questions'] = [ + data.setdefault(group, {"title": None, "questions": []}) + data[group]["questions"] = [ (vendor_form_settings.other_info_label, vendor.other_info), ] return data @@ -295,29 +359,29 @@ def get_address_display(self, address): try: address = json.loads(address) except (json.JSONDecodeError, AttributeError): - return '' + return "" else: - return ', '.join( + return ", ".join( address.get(field) for field in ADDRESS_FIELDS_ORDER if address.get(field) ) -@method_decorator(login_required, name='dispatch') +@method_decorator(login_required, name="dispatch") class VendorPrivateMediaView(UserPassesTestMixin, PrivateMediaView): raise_exception = True def dispatch(self, *args, **kwargs): - pk = self.kwargs['pk'] - vendor_pk = self.kwargs['vendor_pk'] + pk = self.kwargs["pk"] + vendor_pk = self.kwargs["vendor_pk"] self.vendor = get_object_or_404(Vendor, pk=vendor_pk) self.project = get_object_or_404(Project, pk=pk) return super().dispatch(*args, **kwargs) def get_media(self, *args, **kwargs): - file_pk = kwargs.get('file_pk') + file_pk = kwargs.get("file_pk") document = get_object_or_404(self.vendor.due_diligence_documents, pk=file_pk) return document.document diff --git a/hypha/apply/review/admin.py b/hypha/apply/review/admin.py index a09cf1743b..f9281c2299 100644 --- a/hypha/apply/review/admin.py +++ b/hypha/apply/review/admin.py @@ -17,17 +17,17 @@ def __init__(self, *args, **kwargs): class ReviewFormAdmin(ListRelatedMixin, ModelAdmin): model = ReviewForm - menu_icon = 'form' - list_display = ('name', 'used_by') + menu_icon = "form" + list_display = ("name", "used_by") button_helper_class = ButtonsWithClone clone_view_class = CloneView create_view_class = CreateReviewFormView edit_view_class = EditReviewFormView related_models = [ - ('applicationbasereviewform', 'application'), - ('roundbasereviewform', 'round'), - ('labbasereviewform', 'lab'), + ("applicationbasereviewform", "application"), + ("roundbasereviewform", "round"), + ("labbasereviewform", "lab"), ] def get_admin_urls_for_registration(self): @@ -35,15 +35,15 @@ def get_admin_urls_for_registration(self): urls += ( re_path( - self.url_helper.get_action_url_pattern('clone'), + self.url_helper.get_action_url_pattern("clone"), self.clone_view, - name=self.url_helper.get_action_url_name('clone') + name=self.url_helper.get_action_url_name("clone"), ), ) return urls def clone_view(self, request, **kwargs): - kwargs.update(**{'model_admin': self}) + kwargs.update(**{"model_admin": self}) view_class = self.clone_view_class return view_class.as_view(**kwargs)(request) diff --git a/hypha/apply/review/admin_helpers.py b/hypha/apply/review/admin_helpers.py index 97d2722259..e36f31b692 100644 --- a/hypha/apply/review/admin_helpers.py +++ b/hypha/apply/review/admin_helpers.py @@ -6,15 +6,18 @@ def clone_button(self, obj, classnames_add, classnames_exclude): classnames = self.copy_button_classnames + classnames_add cn = self.finalise_classname(classnames, classnames_exclude) return { - 'url': self.url_helper.get_action_url('clone', instance_pk=obj.pk), - 'label': 'Clone', - 'classname': cn, - 'title': 'Clone this %s' % self.verbose_name, + "url": self.url_helper.get_action_url("clone", instance_pk=obj.pk), + "label": "Clone", + "classname": cn, + "title": "Clone this %s" % self.verbose_name, } - def get_buttons_for_obj(self, obj, exclude=None, classnames_add=None, - classnames_exclude=None): - btns = super().get_buttons_for_obj(obj, exclude, classnames_add, classnames_exclude) + def get_buttons_for_obj( + self, obj, exclude=None, classnames_add=None, classnames_exclude=None + ): + btns = super().get_buttons_for_obj( + obj, exclude, classnames_add, classnames_exclude + ) # Put preview before delete btns.insert(-1, self.clone_button(obj, classnames_add, classnames_exclude)) diff --git a/hypha/apply/review/admin_views.py b/hypha/apply/review/admin_views.py index 56110e191d..35553c2523 100644 --- a/hypha/apply/review/admin_views.py +++ b/hypha/apply/review/admin_views.py @@ -4,14 +4,12 @@ class CreateReviewFormView(CreateView): - def form_invalid(self, form): show_admin_form_error_messages(self.request, form) return self.render_to_response(self.get_context_data(form=form)) class EditReviewFormView(EditView): - def form_invalid(self, form): show_admin_form_error_messages(self.request, form) return self.render_to_response(self.get_context_data(form=form)) diff --git a/hypha/apply/review/apps.py b/hypha/apply/review/apps.py index 07017424fd..11ff74ab68 100644 --- a/hypha/apply/review/apps.py +++ b/hypha/apply/review/apps.py @@ -2,4 +2,4 @@ class ReviewConfig(AppConfig): - name = 'hypha.apply.review' + name = "hypha.apply.review" diff --git a/hypha/apply/review/blocks.py b/hypha/apply/review/blocks.py index 818def56aa..988bdfc44b 100644 --- a/hypha/apply/review/blocks.py +++ b/hypha/apply/review/blocks.py @@ -31,25 +31,27 @@ class ScoreFieldBlock(OptionalFormFieldBlock): field_class = ScoredAnswerField class Meta: - label = _('Score') - icon = 'order' - template = 'review/render_scored_answer_field.html' + label = _("Score") + icon = "order" + template = "review/render_scored_answer_field.html" def get_field_kwargs(self, struct_value): kwargs = super().get_field_kwargs(struct_value) - kwargs['initial'] = ['', NA] + kwargs["initial"] = ["", NA] return kwargs def render(self, value, context=None): try: - comment, score = context['data'] + comment, score = context["data"] except ValueError: # TODO: Remove json load as data moved away from JSON - comment, score = json.loads(context['data']) - context.update(**{ - 'comment': comment, - 'score': RATE_CHOICES_DICT.get(int(score), RATE_CHOICE_NA) - }) + comment, score = json.loads(context["data"]) + context.update( + **{ + "comment": comment, + "score": RATE_CHOICES_DICT.get(int(score), RATE_CHOICE_NA), + } + ) return super().render(value, context) @@ -69,21 +71,22 @@ class ScoreFieldWithoutTextBlock(OptionalFormFieldBlock): as default to the forms and also when this field is required it automatically handles validation on empty string. """ - name = 'score without text' + + name = "score without text" field_class = forms.ChoiceField class Meta: - icon = 'order' + icon = "order" def get_field_kwargs(self, struct_value): kwargs = super().get_field_kwargs(struct_value) - kwargs['choices'] = self.get_choices(RATE_CHOICES) + kwargs["choices"] = self.get_choices(RATE_CHOICES) return kwargs def render(self, value, context=None): - data = int(context['data']) + data = int(context["data"]) choices = dict(self.get_choices(RATE_CHOICES)) - context['data'] = choices[data] + context["data"] = choices[data] return super().render(value, context) @@ -93,7 +96,7 @@ def get_choices(self, choices): """ rate_choices = list(choices) rate_choices.pop(-1) - rate_choices.append(('', 'n/a - choose not to answer')) + rate_choices.append(("", "n/a - choose not to answer")) return tuple(rate_choices) @@ -102,67 +105,72 @@ class ReviewMustIncludeFieldBlock(MustIncludeFieldBlock): class RecommendationBlock(ReviewMustIncludeFieldBlock): - name = 'recommendation' - description = 'Overall recommendation' + name = "recommendation" + description = "Overall recommendation" field_class = forms.ChoiceField class Meta: - icon = 'pick' + icon = "pick" def get_field_kwargs(self, struct_value): kwargs = super().get_field_kwargs(struct_value) - kwargs['choices'] = RECOMMENDATION_CHOICES + kwargs["choices"] = RECOMMENDATION_CHOICES return kwargs def render(self, value, context=None): - data = int(context['data']) + data = int(context["data"]) choices = dict(RECOMMENDATION_CHOICES) - context['data'] = choices[data] + context["data"] = choices[data] return super().render(value, context) class RecommendationCommentsBlock(ReviewMustIncludeFieldBlock): - name = 'comments' - description = 'Recommendation comments' + name = "comments" + description = "Recommendation comments" widget = RICH_TEXT_WIDGET_SHORT class Meta: - icon = 'openquote' - template = 'stream_forms/render_unsafe_field.html' + icon = "openquote" + template = "stream_forms/render_unsafe_field.html" def get_field_kwargs(self, struct_value): kwargs = super().get_field_kwargs(struct_value) - kwargs['required'] = False + kwargs["required"] = False return kwargs class VisibilityBlock(ReviewMustIncludeFieldBlock): - name = 'visibility' - description = 'Visibility' + name = "visibility" + description = "Visibility" field_class = forms.ChoiceField widget = forms.RadioSelect() class Meta: - icon = 'radio-empty' + icon = "radio-empty" def get_field_kwargs(self, struct_value): kwargs = super(VisibilityBlock, self).get_field_kwargs(struct_value) - kwargs['choices'] = VISIBILITY.items() - kwargs['initial'] = PRIVATE - kwargs['help_text'] = mark_safe(''.join( - [VISIBILITY[choice] + ': ' + VISIBILILTY_HELP_TEXT[choice] for choice in VISIBILITY] - )) + kwargs["choices"] = VISIBILITY.items() + kwargs["initial"] = PRIVATE + kwargs["help_text"] = mark_safe( + "
".join( + [ + VISIBILITY[choice] + ": " + VISIBILILTY_HELP_TEXT[choice] + for choice in VISIBILITY + ] + ) + ) return kwargs class ReviewCustomFormFieldsBlock(CustomFormFieldsBlock): - char = CharFieldBlock(group=_('Fields')) - text = TextFieldBlock(group=_('Fields')) - text_markup = RichTextBlock(group=_('Fields'), label=_('Paragraph')) - score = ScoreFieldBlock(group=_('Fields')) - score_without_text = ScoreFieldWithoutTextBlock(group=_('Fields')) - checkbox = CheckboxFieldBlock(group=_('Fields')) - dropdown = DropdownFieldBlock(group=_('Fields')) + char = CharFieldBlock(group=_("Fields")) + text = TextFieldBlock(group=_("Fields")) + text_markup = RichTextBlock(group=_("Fields"), label=_("Paragraph")) + score = ScoreFieldBlock(group=_("Fields")) + score_without_text = ScoreFieldWithoutTextBlock(group=_("Fields")) + checkbox = CheckboxFieldBlock(group=_("Fields")) + dropdown = DropdownFieldBlock(group=_("Fields")) required_blocks = ReviewMustIncludeFieldBlock.__subclasses__() diff --git a/hypha/apply/review/fields.py b/hypha/apply/review/fields.py index 8bd3b636d1..079e01478d 100644 --- a/hypha/apply/review/fields.py +++ b/hypha/apply/review/fields.py @@ -26,12 +26,14 @@ def render(self, name, value, attrs=None, renderer=None): rendered = [] # We need to explicitly call the render method on the tinymce widget # MultiValueWidget just passes all the context into the template - for kwargs, widget in zip(context['widget']['subwidgets'], self.widgets, strict=False): - name = kwargs['name'] - value = kwargs['value'] - attrs = kwargs['attrs'] + for kwargs, widget in zip( + context["widget"]["subwidgets"], self.widgets, strict=False + ): + name = kwargs["name"] + value = kwargs["value"] + attrs = kwargs["attrs"] rendered.append(widget.render(name, value, attrs, renderer)) - return mark_safe(''.join(list(rendered))) + return mark_safe("".join(list(rendered))) class ScoredAnswerField(forms.MultiValueField): @@ -49,4 +51,4 @@ def compress(self, data_list): if data_list: return [data_list[0], int(data_list[1])] else: - return ['', NA] + return ["", NA] diff --git a/hypha/apply/review/forms.py b/hypha/apply/review/forms.py index 60bd1ec7a2..122be1db3c 100644 --- a/hypha/apply/review/forms.py +++ b/hypha/apply/review/forms.py @@ -18,22 +18,24 @@ class ReviewModelForm(StreamBaseForm, forms.ModelForm, metaclass=MixedMetaClass) class Meta: model = Review - fields = ['recommendation', 'visibility', 'score', 'submission'] + fields = ["recommendation", "visibility", "score", "submission"] widgets = { - 'recommendation': forms.HiddenInput(), - 'score': forms.HiddenInput(), - 'submission': forms.HiddenInput(), - 'visibility': forms.HiddenInput(), + "recommendation": forms.HiddenInput(), + "score": forms.HiddenInput(), + "submission": forms.HiddenInput(), + "visibility": forms.HiddenInput(), } error_messages = { NON_FIELD_ERRORS: { - 'unique_together': "You have already posted a review for this submission", + "unique_together": "You have already posted a review for this submission", } } - def __init__(self, *args, submission, user=None, initial=None, instance=None, **kwargs): + def __init__( + self, *args, submission, user=None, initial=None, instance=None, **kwargs + ): if initial is None: initial = {} @@ -54,7 +56,7 @@ def __init__(self, *args, submission, user=None, initial=None, instance=None, ** def clean(self): cleaned_data = super().clean() - cleaned_data['form_data'] = { + cleaned_data["form_data"] = { key: value for key, value in cleaned_data.items() if key not in self._meta.fields @@ -64,16 +66,20 @@ def clean(self): def save(self, commit=True): self.instance.score = self.calculate_score(self.cleaned_data) - self.instance.recommendation = int(self.cleaned_data[self.instance.recommendation_field.id]) + self.instance.recommendation = int( + self.cleaned_data[self.instance.recommendation_field.id] + ) self.instance.is_draft = self.draft_button_name in self.data # Old review forms do not have the requred visability field. # This will set visibility to PRIVATE by default. try: - self.instance.visibility = self.cleaned_data[self.instance.visibility_field.id] + self.instance.visibility = self.cleaned_data[ + self.instance.visibility_field.id + ] except AttributeError: self.instance.visibility = PRIVATE - self.instance.form_data = self.cleaned_data['form_data'] + self.instance.form_data = self.cleaned_data["form_data"] if not self.instance.is_draft: # Capture the revision against which the user was reviewing @@ -94,7 +100,7 @@ def calculate_score(self, data): for field in self.instance.score_fields_without_text: score = data.get(field.id) # Include '' answers as 0. - if score == '': + if score == "": score = 0 scores.append(int(score)) @@ -106,7 +112,7 @@ def calculate_score(self, data): class SubmitButtonWidget(forms.Widget): def render(self, name, value, attrs=None, renderer=None): - disabled = 'disabled' if attrs.get('disabled') else '' + disabled = "disabled" if attrs.get("disabled") else "" return ''.format( disabled=disabled, name=escape(name), @@ -118,7 +124,7 @@ class OpinionField(forms.IntegerField): def __init__(self, *args, opinion, **kwargs): kwargs["widget"] = SubmitButtonWidget self.opinion = opinion - kwargs['label'] = '' + kwargs["label"] = "" super().__init__(*args, **kwargs) def clean(self, value): @@ -131,7 +137,7 @@ class ReviewOpinionForm(forms.ModelForm): class Meta: model = ReviewOpinion - fields = ('opinion',) + fields = ("opinion",) def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -147,8 +153,8 @@ def clean(self): opinions = [cleaned_data.get(opinion.lower()) for _, opinion in OPINION_CHOICES] valid_opinions = [opinion for opinion in opinions if opinion is not None] if len(valid_opinions) > 1: - self.add_error(None, 'Cant submit both an agreement and disagreement') - cleaned_data = {'opinion': valid_opinions[0]} + self.add_error(None, "Cant submit both an agreement and disagreement") + cleaned_data = {"opinion": valid_opinions[0]} return cleaned_data def save(self, *args, **kwargs): diff --git a/hypha/apply/review/management/commands/export_reviews_csv.py b/hypha/apply/review/management/commands/export_reviews_csv.py index de5ab62763..2829674c9d 100644 --- a/hypha/apply/review/management/commands/export_reviews_csv.py +++ b/hypha/apply/review/management/commands/export_reviews_csv.py @@ -9,9 +9,18 @@ class Command(BaseCommand): help = "Export reviews stats to a csv file.." def handle(self, *args, **options): - with open('export_reviews.csv', 'w', newline='') as csvfile: + with open("export_reviews.csv", "w", newline="") as csvfile: writer = csv.writer(csvfile, quoting=csv.QUOTE_ALL) - writer.writerow(['Review author', 'Reviewer type', 'Review date', 'Submission', 'Submission date', 'Round/Lab/Fellowship']) + writer.writerow( + [ + "Review author", + "Reviewer type", + "Review date", + "Submission", + "Submission date", + "Round/Lab/Fellowship", + ] + ) for review in Review.objects.submitted(): if review.submission.round: submission_type = review.submission.round @@ -19,12 +28,21 @@ def handle(self, *args, **options): submission_type = review.submission.page if review.author.reviewer.is_apply_staff: - reviewer_type = 'Staff' + reviewer_type = "Staff" elif review.author.reviewer.is_reviewer: - reviewer_type = 'Reviewer' + reviewer_type = "Reviewer" elif review.author.reviewer.is_partner: - reviewer_type = 'Partner' + reviewer_type = "Partner" elif review.author.reviewer.is_community_reviewer: - reviewer_type = 'Community' + reviewer_type = "Community" - writer.writerow([review.author, reviewer_type, review.created_at.strftime('%Y-%m-%d'), review.submission.title, review.submission.submit_time.strftime('%Y-%m-%d'), submission_type]) + writer.writerow( + [ + review.author, + reviewer_type, + review.created_at.strftime("%Y-%m-%d"), + review.submission.title, + review.submission.submit_time.strftime("%Y-%m-%d"), + submission_type, + ] + ) diff --git a/hypha/apply/review/management/commands/fix_stream_field_ids.py b/hypha/apply/review/management/commands/fix_stream_field_ids.py index 14d35aca0d..c42dc6aab7 100644 --- a/hypha/apply/review/management/commands/fix_stream_field_ids.py +++ b/hypha/apply/review/management/commands/fix_stream_field_ids.py @@ -11,7 +11,7 @@ class Command(BaseCommand): @transaction.atomic def handle(self, *args, **options): with connection.cursor() as cursor: - cursor.execute('SELECT id, form_fields FROM review_reviewform') + cursor.execute("SELECT id, form_fields FROM review_reviewform") form_fields = cursor.fetchall() for row in form_fields: @@ -19,11 +19,14 @@ def handle(self, *args, **options): form = json.loads(review_form) updated = False for field in form: - if field['id'] == '976386e1-3a66-490f-9e82-bfbe1f134cf2': - field['id'] = str(uuid.uuid4()) + if field["id"] == "976386e1-3a66-490f-9e82-bfbe1f134cf2": + field["id"] = str(uuid.uuid4()) updated = True if updated: updated_form = json.dumps(form) with connection.cursor() as cursor: - cursor.execute('UPDATE review_reviewform SET form_fields = %s WHERE id = %s', [updated_form, review_id]) + cursor.execute( + "UPDATE review_reviewform SET form_fields = %s WHERE id = %s", + [updated_form, review_id], + ) diff --git a/hypha/apply/review/management/commands/migration_review_base.py b/hypha/apply/review/management/commands/migration_review_base.py index 7ef22d250d..712fdc9001 100644 --- a/hypha/apply/review/management/commands/migration_review_base.py +++ b/hypha/apply/review/management/commands/migration_review_base.py @@ -78,15 +78,39 @@ class MigrateCommand(BaseCommand): } def add_arguments(self, parser): - parser.add_argument('source', type=argparse.FileType('r'), help='Migration source JSON file') + parser.add_argument( + "source", type=argparse.FileType("r"), help="Migration source JSON file" + ) @transaction.atomic def handle(self, *args, **options): - with options['source'] as json_data: + with options["source"] as json_data: self.data = json.load(json_data) # A user can only submitt a single review in the new system so pick the latest one. - blacklist = {"7574", "7413", "7412", "5270", "6468", "6436", "5511", "3490", "2840", "2837", "2737", "9362", "9203", "8958", "13313", "4868", "4867", "5863", "5770", "3962", "3747"} + blacklist = { + "7574", + "7413", + "7412", + "5270", + "6468", + "6436", + "5511", + "3490", + "2840", + "2837", + "2737", + "9362", + "9203", + "8958", + "13313", + "4868", + "4867", + "5863", + "5770", + "3962", + "3747", + } counter = 0 for id in self.data: @@ -100,9 +124,9 @@ def process(self, id): node = self.data[id] try: - review = Review.objects.get(drupal_id=node['nid']) + review = Review.objects.get(drupal_id=node["nid"]) except Review.DoesNotExist: - review = Review(drupal_id=node['nid']) + review = Review(drupal_id=node["nid"]) # Disable auto_* on date fields so imported dates are used. for field in review._meta.local_fields: @@ -112,9 +136,9 @@ def process(self, id): field.auto_now = False # TODO timezone? - review.created_at = datetime.fromtimestamp(int(node['created']), timezone.utc) - review.updated_at = datetime.fromtimestamp(int(node['changed']), timezone.utc) - review.author = self.get_user(node['uid']) + review.created_at = datetime.fromtimestamp(int(node["created"]), timezone.utc) + review.updated_at = datetime.fromtimestamp(int(node["changed"]), timezone.utc) + review.author = self.get_user(node["uid"]) review.recommendation = self.get_recommendation(node) review.submission = self.get_submission(node) review.revision = review.submission.live_revision @@ -138,7 +162,7 @@ def process(self, id): for field in node: if field in self.STREAMFIELD_MAP: try: - id = self.STREAMFIELD_MAP[field]['id'] + id = self.STREAMFIELD_MAP[field]["id"] form_data[id] = self.get_field_value(field, node) except TypeError: pass @@ -150,7 +174,11 @@ def process(self, id): review.form_data = form_data - scores = [review.data(field.id)[1] for field in review.score_fields if review.data(field.id)[1] != NA] + scores = [ + review.data(field.id)[1] + for field in review.score_fields + if review.data(field.id)[1] != NA + ] try: review.score = sum(scores) / len(scores) except ZeroDivisionError: @@ -160,7 +188,9 @@ def process(self, id): review.save() self.stdout.write(f"Processed \"{node['title']}\" ({node['nid']})") except IntegrityError: - self.stdout.write(f"*** Skipped \"{node['title']}\" ({node['nid']}) due to IntegrityError") + self.stdout.write( + f"*** Skipped \"{node['title']}\" ({node['nid']}) due to IntegrityError" + ) def get_user(self, uid): try: @@ -179,65 +209,73 @@ def get_field_value(self, field, node): field: [{value|target_id|tid: VALUE},] """ mapping = self.STREAMFIELD_MAP[field] - mapping_type = mapping['type'] - key = mapping.get('key', 'value') + mapping_type = mapping["type"] + key = mapping.get("key", "value") source_value = node[field] value = None if mapping_type == "direct": value = source_value - elif mapping_type == 'value': + elif mapping_type == "value": if key in source_value: - value = self.nl2br(source_value[key]) if source_value else '' + value = self.nl2br(source_value[key]) if source_value else "" else: - value = self.nl2br(source_value['value']) if source_value else '' - elif mapping_type == 'merge_value': + value = self.nl2br(source_value["value"]) if source_value else "" + elif mapping_type == "merge_value": values = [] i = 0 for item in source_value: - question = self.REQUEST_QUESTION_MAP[node['request_nid']] + question = self.REQUEST_QUESTION_MAP[node["request_nid"]] if i in question: values.append(f"{question[i]}{item[key]}
\n") i += 1 - merged_values = ''.join(values) - value = self.nl2br(merged_values) if source_value else '' - elif mapping_type == 'score': + merged_values = "".join(values) + value = self.nl2br(merged_values) if source_value else "" + elif mapping_type == "score": value_rate = int(source_value[key]) if source_value else NA - value_text = '' + value_text = "" if "_rate" in field: - field = field.replace('field_field_', 'field_') + field = field.replace("field_field_", "field_") text_field = field[:-5] if text_field in self.STREAMFIELD_MAP: value_text_field = node[text_field] - if 'safe_value' in value_text_field: - value_text = self.nl2br(value_text_field['safe_value']) if value_text_field else '' + if "safe_value" in value_text_field: + value_text = ( + self.nl2br(value_text_field["safe_value"]) + if value_text_field + else "" + ) else: - value_text = self.nl2br(value_text_field['value']) if value_text_field else '' + value_text = ( + self.nl2br(value_text_field["value"]) + if value_text_field + else "" + ) value = [value_text, value_rate] - elif mapping_type == 'map' and 'map' in 'mapping': - value = mapping['map'].get(source_value[key]) - elif mapping_type == 'boolean': - value = source_value[key] == '1' if source_value else False + elif mapping_type == "map" and "map" in "mapping": + value = mapping["map"].get(source_value[key]) + elif mapping_type == "boolean": + value = source_value[key] == "1" if source_value else False return value def get_recommendation(self, node): - mapping = self.REVIEWFIELD_MAP[node['type']] - field_name = mapping['recommendation'] - rec_map = mapping.get('rec_map') + mapping = self.REVIEWFIELD_MAP[node["type"]] + field_name = mapping["recommendation"] + rec_map = mapping.get("rec_map") try: - return rec_map[node[field_name]['value']] + return rec_map[node[field_name]["value"]] except TypeError: return 0 def get_submission(self, node): - mapping = self.REVIEWFIELD_MAP[node['type']] - field_name = mapping['submission'] + mapping = self.REVIEWFIELD_MAP[node["type"]] + field_name = mapping["submission"] try: - nid = node[field_name]['target_id'] + nid = node[field_name]["target_id"] return ApplicationSubmission.objects.get(drupal_id=nid) except ApplicationSubmission.DoesNotExist: return None def nl2br(self, value): - return value.replace('\r\n', '
\n') + return value.replace("\r\n", "
\n") diff --git a/hypha/apply/review/migrations/0001_initial.py b/hypha/apply/review/migrations/0001_initial.py index 0f1ae8337a..89df7f4959 100644 --- a/hypha/apply/review/migrations/0001_initial.py +++ b/hypha/apply/review/migrations/0001_initial.py @@ -6,26 +6,46 @@ class Migration(migrations.Migration): - initial = True dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('funds', '0028_update_on_delete_django2'), + ("funds", "0028_update_on_delete_django2"), ] operations = [ migrations.CreateModel( - name='Review', + name="Review", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('review', models.TextField()), - ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), - ('submission', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='funds.ApplicationSubmission', related_name='reviews')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("review", models.TextField()), + ( + "author", + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + to=settings.AUTH_USER_MODEL, + ), + ), + ( + "submission", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to="funds.ApplicationSubmission", + related_name="reviews", + ), + ), ], ), migrations.AlterUniqueTogether( - name='review', - unique_together={('author', 'submission')}, + name="review", + unique_together={("author", "submission")}, ), ] diff --git a/hypha/apply/review/migrations/0002_add_common_fields.py b/hypha/apply/review/migrations/0002_add_common_fields.py index f1c3bc8b7e..b52769287f 100644 --- a/hypha/apply/review/migrations/0002_add_common_fields.py +++ b/hypha/apply/review/migrations/0002_add_common_fields.py @@ -5,34 +5,57 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0001_initial'), + ("review", "0001_initial"), ] operations = [ migrations.CreateModel( - name='ConceptReview', + name="ConceptReview", fields=[ - ('review_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='review.Review')), + ( + "review_ptr", + models.OneToOneField( + auto_created=True, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + serialize=False, + to="review.Review", + ), + ), ], - bases=('review.review',), + bases=("review.review",), ), migrations.CreateModel( - name='ProposalReview', + name="ProposalReview", fields=[ - ('review_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='review.Review')), + ( + "review_ptr", + models.OneToOneField( + auto_created=True, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + serialize=False, + to="review.Review", + ), + ), ], - bases=('review.review',), + bases=("review.review",), ), migrations.AddField( - model_name='review', - name='recommendation', - field=models.IntegerField(choices=[(0, 'No'), (1, 'Maybe'), (2, 'Yes')], default=0, verbose_name='Recommendation'), + model_name="review", + name="recommendation", + field=models.IntegerField( + choices=[(0, "No"), (1, "Maybe"), (2, "Yes")], + default=0, + verbose_name="Recommendation", + ), ), migrations.AddField( - model_name='review', - name='score', + model_name="review", + name="score", field=models.DecimalField(decimal_places=1, default=0, max_digits=10), ), ] diff --git a/hypha/apply/review/migrations/0003_review_json_field.py b/hypha/apply/review/migrations/0003_review_json_field.py index 6318c1850d..403eefdb5f 100644 --- a/hypha/apply/review/migrations/0003_review_json_field.py +++ b/hypha/apply/review/migrations/0003_review_json_field.py @@ -5,29 +5,28 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0002_add_common_fields'), + ("review", "0002_add_common_fields"), ] operations = [ migrations.RemoveField( - model_name='conceptreview', - name='review_ptr', + model_name="conceptreview", + name="review_ptr", ), migrations.RemoveField( - model_name='proposalreview', - name='review_ptr', + model_name="proposalreview", + name="review_ptr", ), migrations.AlterField( - model_name='review', - name='review', + model_name="review", + name="review", field=django.contrib.postgres.fields.jsonb.JSONField(), ), migrations.DeleteModel( - name='ConceptReview', + name="ConceptReview", ), migrations.DeleteModel( - name='ProposalReview', + name="ProposalReview", ), ] diff --git a/hypha/apply/review/migrations/0004_review_is_draft.py b/hypha/apply/review/migrations/0004_review_is_draft.py index 4e802ee1fa..516ca2eeea 100644 --- a/hypha/apply/review/migrations/0004_review_is_draft.py +++ b/hypha/apply/review/migrations/0004_review_is_draft.py @@ -4,15 +4,14 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0003_review_json_field'), + ("review", "0003_review_json_field"), ] operations = [ migrations.AddField( - model_name='review', - name='is_draft', - field=models.BooleanField(default=False, verbose_name='Draft'), + model_name="review", + name="is_draft", + field=models.BooleanField(default=False, verbose_name="Draft"), ), ] diff --git a/hypha/apply/review/migrations/0005_streamform.py b/hypha/apply/review/migrations/0005_streamform.py index d911e2a9fa..0609864087 100644 --- a/hypha/apply/review/migrations/0005_streamform.py +++ b/hypha/apply/review/migrations/0005_streamform.py @@ -9,29 +9,386 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0004_review_is_draft'), + ("review", "0004_review_is_draft"), ] operations = [ migrations.CreateModel( - name='ReviewForm', + name="ReviewForm", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255)), - ('form_fields', wagtail.fields.StreamField((('rich_text', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))), group='Fields')), ('char', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))), group='Fields')), ('text', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))), group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))), group='Fields')), ('Recommendation', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())), group='Required')), ('Comments', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())), group='Required'))))), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("name", models.CharField(max_length=255)), + ( + "form_fields", + wagtail.fields.StreamField( + ( + ( + "rich_text", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[ + ("email", "Email"), + ("url", "URL"), + ], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock( + group="Fields", label="Paragraph" + ), + ), + ( + "score", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "Recommendation", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "info", + wagtail.blocks.static_block.StaticBlock(), + ), + ), + group="Required", + ), + ), + ( + "Comments", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "info", + wagtail.blocks.static_block.StaticBlock(), + ), + ), + group="Required", + ), + ), + ) + ), + ), ], ), migrations.AddField( - model_name='review', - name='form_data', - field=django.contrib.postgres.fields.jsonb.JSONField(default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder), + model_name="review", + name="form_data", + field=django.contrib.postgres.fields.jsonb.JSONField( + default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder + ), ), migrations.AddField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField((('rich_text', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))), group='Fields')), ('char', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))), group='Fields')), ('text', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))), group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))), group='Fields')), ('Recommendation', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())), group='Required')), ('Comments', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())), group='Required')))), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + ( + ( + "rich_text", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "Recommendation", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ), + group="Required", + ), + ), + ( + "Comments", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ), + group="Required", + ), + ), + ) + ), preserve_default=False, ), ] diff --git a/hypha/apply/review/migrations/0006_remove_review_review.py b/hypha/apply/review/migrations/0006_remove_review_review.py index 5103383b2f..2ddf15bad0 100644 --- a/hypha/apply/review/migrations/0006_remove_review_review.py +++ b/hypha/apply/review/migrations/0006_remove_review_review.py @@ -4,14 +4,13 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0005_streamform'), + ("review", "0005_streamform"), ] operations = [ migrations.RemoveField( - model_name='review', - name='review', + model_name="review", + name="review", ), ] diff --git a/hypha/apply/review/migrations/0007_review_revision.py b/hypha/apply/review/migrations/0007_review_revision.py index 7c58d56bd3..bf9e4abe1e 100644 --- a/hypha/apply/review/migrations/0007_review_revision.py +++ b/hypha/apply/review/migrations/0007_review_revision.py @@ -5,16 +5,20 @@ class Migration(migrations.Migration): - dependencies = [ - ('funds', '0041_roundbasereviewform'), - ('review', '0006_remove_review_review'), + ("funds", "0041_roundbasereviewform"), + ("review", "0006_remove_review_review"), ] operations = [ migrations.AddField( - model_name='review', - name='revision', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='reviews', to='funds.ApplicationRevision'), + model_name="review", + name="revision", + field=models.ForeignKey( + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name="reviews", + to="funds.ApplicationRevision", + ), ), ] diff --git a/hypha/apply/review/migrations/0008_update_fields_for_tweaks.py b/hypha/apply/review/migrations/0008_update_fields_for_tweaks.py index 08add10934..1af821158a 100644 --- a/hypha/apply/review/migrations/0008_update_fields_for_tweaks.py +++ b/hypha/apply/review/migrations/0008_update_fields_for_tweaks.py @@ -7,20 +7,353 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0007_review_revision'), + ("review", "0007_review_revision"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField((('rich_text', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))), group='Fields')), ('char', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))), group='Fields')), ('text', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))), group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))), group='Fields')), ('recommendation', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())), group='Required')), ('comments', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())), group='Required')))), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + ( + ( + "rich_text", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ), + group="Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ), + group="Required", + ), + ), + ) + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField((('rich_text', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))), group='Fields')), ('char', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))), group='Fields')), ('text', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))), group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))), group='Fields')), ('recommendation', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())), group='Required')), ('comments', wagtail.blocks.StructBlock((('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())), group='Required')))), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + ( + ( + "rich_text", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ), + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ), + group="Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + ( + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ), + group="Required", + ), + ), + ) + ), ), ] diff --git a/hypha/apply/review/migrations/0009_auto_20180823_0918.py b/hypha/apply/review/migrations/0009_auto_20180823_0918.py index fb913379ec..3b5e66d3e9 100644 --- a/hypha/apply/review/migrations/0009_auto_20180823_0918.py +++ b/hypha/apply/review/migrations/0009_auto_20180823_0918.py @@ -7,20 +7,457 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0008_update_fields_for_tweaks'), + ("review", "0008_update_fields_for_tweaks"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group='Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group='Required'))]), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group="Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group="Required", + ), + ), + ] + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group='Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group='Required'))]), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group="Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group="Required", + ), + ), + ] + ), ), ] diff --git a/hypha/apply/review/migrations/0010_review_drupal_id.py b/hypha/apply/review/migrations/0010_review_drupal_id.py index 4917631402..a5b4461235 100644 --- a/hypha/apply/review/migrations/0010_review_drupal_id.py +++ b/hypha/apply/review/migrations/0010_review_drupal_id.py @@ -4,15 +4,14 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0009_auto_20180823_0918'), + ("review", "0009_auto_20180823_0918"), ] operations = [ migrations.AddField( - model_name='review', - name='drupal_id', + model_name="review", + name="drupal_id", field=models.IntegerField(blank=True, editable=False, null=True), ), ] diff --git a/hypha/apply/review/migrations/0011_add_date_fields.py b/hypha/apply/review/migrations/0011_add_date_fields.py index 7758db9f85..39b1279e97 100644 --- a/hypha/apply/review/migrations/0011_add_date_fields.py +++ b/hypha/apply/review/migrations/0011_add_date_fields.py @@ -5,21 +5,24 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0010_review_drupal_id'), + ("review", "0010_review_drupal_id"), ] operations = [ migrations.AddField( - model_name='review', - name='created_at', - field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now, verbose_name='Creation time'), + model_name="review", + name="created_at", + field=models.DateTimeField( + auto_now_add=True, + default=django.utils.timezone.now, + verbose_name="Creation time", + ), preserve_default=False, ), migrations.AddField( - model_name='review', - name='updated_at', - field=models.DateTimeField(auto_now=True, verbose_name='Update time'), + model_name="review", + name="updated_at", + field=models.DateTimeField(auto_now=True, verbose_name="Update time"), ), ] diff --git a/hypha/apply/review/migrations/0012_auto_20180926_0948.py b/hypha/apply/review/migrations/0012_auto_20180926_0948.py index a5da5235d7..3d172e7bd1 100644 --- a/hypha/apply/review/migrations/0012_auto_20180926_0948.py +++ b/hypha/apply/review/migrations/0012_auto_20180926_0948.py @@ -7,20 +7,469 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0011_add_date_fields'), + ("review", "0011_add_date_fields"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group='Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group='Required'))]), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group="Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group="Required", + ), + ), + ] + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group='Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group='Required'))]), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group="Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group="Required", + ), + ), + ] + ), ), ] diff --git a/hypha/apply/review/migrations/0013_rename_fields.py b/hypha/apply/review/migrations/0013_rename_fields.py index 9e18d0489a..e1eed3a2ee 100644 --- a/hypha/apply/review/migrations/0013_rename_fields.py +++ b/hypha/apply/review/migrations/0013_rename_fields.py @@ -7,20 +7,469 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0012_auto_20180926_0948'), + ("review", "0012_auto_20180926_0948"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), ] diff --git a/hypha/apply/review/migrations/0014_add_markdown.py b/hypha/apply/review/migrations/0014_add_markdown.py index 914d4e429a..311e5b1559 100644 --- a/hypha/apply/review/migrations/0014_add_markdown.py +++ b/hypha/apply/review/migrations/0014_add_markdown.py @@ -7,20 +7,529 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0013_rename_fields'), + ("review", "0013_rename_fields"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), ] diff --git a/hypha/apply/review/migrations/0015_review_opinion.py b/hypha/apply/review/migrations/0015_review_opinion.py index d96d7c5611..ea69c86a9e 100644 --- a/hypha/apply/review/migrations/0015_review_opinion.py +++ b/hypha/apply/review/migrations/0015_review_opinion.py @@ -6,24 +6,47 @@ class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('review', '0014_add_markdown'), + ("review", "0014_add_markdown"), ] operations = [ migrations.CreateModel( - name='ReviewOpinion', + name="ReviewOpinion", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('opinion', models.IntegerField(choices=[(1, 'Agree'), (0, 'Disagree')])), - ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), - ('review', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='opinions', to='review.Review')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "opinion", + models.IntegerField(choices=[(1, "Agree"), (0, "Disagree")]), + ), + ( + "author", + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + to=settings.AUTH_USER_MODEL, + ), + ), + ( + "review", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="opinions", + to="review.Review", + ), + ), ], ), migrations.AlterUniqueTogether( - name='reviewopinion', - unique_together={('author', 'review')}, + name="reviewopinion", + unique_together={("author", "review")}, ), ] diff --git a/hypha/apply/review/migrations/0016_review_visibility.py b/hypha/apply/review/migrations/0016_review_visibility.py index ab408d9418..26e4436a90 100644 --- a/hypha/apply/review/migrations/0016_review_visibility.py +++ b/hypha/apply/review/migrations/0016_review_visibility.py @@ -7,25 +7,577 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0015_review_opinion'), + ("review", "0015_review_opinion"), ] operations = [ migrations.AddField( - model_name='review', - name='visibility', - field=models.CharField(choices=[('private', 'Private'), ('reviewers', 'Reviewers and Staff')], default='private', max_length=10, verbose_name='Visibility'), + model_name="review", + name="visibility", + field=models.CharField( + choices=[("private", "Private"), ("reviewers", "Reviewers and Staff")], + default="private", + max_length=10, + verbose_name="Visibility", + ), ), migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), ] diff --git a/hypha/apply/review/migrations/0017_add_temp_author_field.py b/hypha/apply/review/migrations/0017_add_temp_author_field.py index 7a5e44a4a2..748ba78fd4 100644 --- a/hypha/apply/review/migrations/0017_add_temp_author_field.py +++ b/hypha/apply/review/migrations/0017_add_temp_author_field.py @@ -5,21 +5,29 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0016_review_visibility'), + ("review", "0016_review_visibility"), ] operations = [ migrations.AddField( - model_name='review', - name='author_temp', - field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='review', to='funds.AssignedReviewers', null=True), + model_name="review", + name="author_temp", + field=models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + related_name="review", + to="funds.AssignedReviewers", + null=True, + ), ), migrations.AddField( - model_name='reviewopinion', - name='author_temp', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='opinions', to='funds.AssignedReviewers', null=True), + model_name="reviewopinion", + name="author_temp", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="opinions", + to="funds.AssignedReviewers", + null=True, + ), ), - ] diff --git a/hypha/apply/review/migrations/0018_migrate_author_data.py b/hypha/apply/review/migrations/0018_migrate_author_data.py index 8d541dabf4..fa6a948933 100644 --- a/hypha/apply/review/migrations/0018_migrate_author_data.py +++ b/hypha/apply/review/migrations/0018_migrate_author_data.py @@ -7,25 +7,32 @@ # importing and creating a future dependency. Changes to Group names should # be handled in another migration -STAFF_GROUP_NAME = 'Staff' -REVIEWER_GROUP_NAME = 'Reviewer' -PARTNER_GROUP_NAME = 'Partner' -COMMUNITY_REVIEWER_GROUP_NAME = 'Community reviewer' +STAFF_GROUP_NAME = "Staff" +REVIEWER_GROUP_NAME = "Reviewer" +PARTNER_GROUP_NAME = "Partner" +COMMUNITY_REVIEWER_GROUP_NAME = "Community reviewer" -REVIEWER_GROUPS = {STAFF_GROUP_NAME, +REVIEWER_GROUPS = { + STAFF_GROUP_NAME, REVIEWER_GROUP_NAME, COMMUNITY_REVIEWER_GROUP_NAME, - PARTNER_GROUP_NAME,} + PARTNER_GROUP_NAME, +} def add_to_assigned_reviewers(apps, schema_editor): - Review = apps.get_model('review', 'Review') - AssignedReviewer = apps.get_model('funds', 'AssignedReviewers') - Group = apps.get_model('auth', 'Group') - for review in Review.objects.select_related('author'): - groups = set(review.author.groups.values_list('name', flat=True)) & REVIEWER_GROUPS + Review = apps.get_model("review", "Review") + AssignedReviewer = apps.get_model("funds", "AssignedReviewers") + Group = apps.get_model("auth", "Group") + for review in Review.objects.select_related("author"): + groups = ( + set(review.author.groups.values_list("name", flat=True)) & REVIEWER_GROUPS + ) if len(groups) > 1: - if PARTNER_GROUP_NAME in groups and review.author in review.submission.partners.all(): + if ( + PARTNER_GROUP_NAME in groups + and review.author in review.submission.partners.all() + ): groups = {PARTNER_GROUP_NAME} elif COMMUNITY_REVIEWER_GROUP_NAME in groups: groups = {COMMUNITY_REVIEWER_GROUP_NAME} @@ -44,22 +51,22 @@ def add_to_assigned_reviewers(apps, schema_editor): assignment, _ = AssignedReviewer.objects.update_or_create( submission=review.submission, reviewer=review.author, - defaults={'type': group}, + defaults={"type": group}, ) review.author_temp = assignment review.save() - for opinion in review.opinions.select_related('author'): + for opinion in review.opinions.select_related("author"): opinion_assignment, _ = AssignedReviewer.objects.update_or_create( submission=review.submission, reviewer=opinion.author, - defaults={'type': Group.objects.get(name=STAFF_GROUP_NAME)}, + defaults={"type": Group.objects.get(name=STAFF_GROUP_NAME)}, ) opinion.author_temp = opinion_assignment opinion.save() def add_to_review_and_opinion(apps, schema_editor): - AssignedReviewer = apps.get_model('funds', 'AssignedReviewers') + AssignedReviewer = apps.get_model("funds", "AssignedReviewers") for assigned in AssignedReviewer.objects.all(): try: assigned.review.author = assigned.reviewer @@ -73,11 +80,10 @@ def add_to_review_and_opinion(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ - ('review', '0017_add_temp_author_field'), - ('funds', '0063_make_reviewer_type_required'), - ('users', '0010_add_community_reviewer_group'), + ("review", "0017_add_temp_author_field"), + ("funds", "0063_make_reviewer_type_required"), + ("users", "0010_add_community_reviewer_group"), ] operations = [ diff --git a/hypha/apply/review/migrations/0019_replace_existing_author_field.py b/hypha/apply/review/migrations/0019_replace_existing_author_field.py index a5de51876c..a0a56ed2f6 100644 --- a/hypha/apply/review/migrations/0019_replace_existing_author_field.py +++ b/hypha/apply/review/migrations/0019_replace_existing_author_field.py @@ -5,38 +5,45 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0018_migrate_author_data'), + ("review", "0018_migrate_author_data"), ] operations = [ migrations.RemoveField( - model_name='review', - name='author', + model_name="review", + name="author", ), migrations.RenameField( - model_name='review', - old_name='author_temp', - new_name='author', + model_name="review", + old_name="author_temp", + new_name="author", ), migrations.AlterField( - model_name='review', - name='author', - field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='review', to='funds.AssignedReviewers'), + model_name="review", + name="author", + field=models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + related_name="review", + to="funds.AssignedReviewers", + ), ), migrations.RemoveField( - model_name='reviewopinion', - name='author', + model_name="reviewopinion", + name="author", ), migrations.RenameField( - model_name='reviewopinion', - old_name='author_temp', - new_name='author', + model_name="reviewopinion", + old_name="author_temp", + new_name="author", ), migrations.AlterField( - model_name='reviewopinion', - name='author', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='opinions', to='funds.AssignedReviewers'), + model_name="reviewopinion", + name="author", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="opinions", + to="funds.AssignedReviewers", + ), ), ] diff --git a/hypha/apply/review/migrations/0020_review_score_calc_update.py b/hypha/apply/review/migrations/0020_review_score_calc_update.py index f31dd48245..922026c41c 100644 --- a/hypha/apply/review/migrations/0020_review_score_calc_update.py +++ b/hypha/apply/review/migrations/0020_review_score_calc_update.py @@ -10,7 +10,7 @@ def review_score_update(apps, schema_editor): for review in Review.objects.all(): # Disable auto_now on "updated_at" field so date is not changed. for field in review._meta.local_fields: - if field.name == 'updated_at': + if field.name == "updated_at": field.auto_now = False # Update the score and save. scores = [] @@ -33,7 +33,7 @@ def review_score_revert(apps, schema_editor): for review in Review.objects.all(): # Disable auto_now on "updated_at" field so date is not changed. for field in review._meta.local_fields: - if field.name == 'updated_at': + if field.name == "updated_at": field.auto_now = False # Update the score and save. scores = [] @@ -52,9 +52,8 @@ def review_score_revert(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ - ('review', '0019_replace_existing_author_field'), + ("review", "0019_replace_existing_author_field"), ] operations = [ diff --git a/hypha/apply/review/migrations/0021_add_help_link_field.py b/hypha/apply/review/migrations/0021_add_help_link_field.py index 3e89675f43..e6ead2f083 100644 --- a/hypha/apply/review/migrations/0021_add_help_link_field.py +++ b/hypha/apply/review/migrations/0021_add_help_link_field.py @@ -7,20 +7,687 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0020_review_score_calc_update'), + ("review", "0020_review_score_calc_update"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), ] diff --git a/hypha/apply/review/migrations/0022_add_word_limit_to_text_blocks.py b/hypha/apply/review/migrations/0022_add_word_limit_to_text_blocks.py index 7c2e3d67f7..f8fade9c7b 100644 --- a/hypha/apply/review/migrations/0022_add_word_limit_to_text_blocks.py +++ b/hypha/apply/review/migrations/0022_add_word_limit_to_text_blocks.py @@ -7,20 +7,723 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0021_add_help_link_field'), + ("review", "0021_add_help_link_field"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), ] diff --git a/hypha/apply/review/migrations/0023_add_score_without_text_block.py b/hypha/apply/review/migrations/0023_add_score_without_text_block.py index 0a7873d5ab..645652641f 100644 --- a/hypha/apply/review/migrations/0023_add_score_without_text_block.py +++ b/hypha/apply/review/migrations/0023_add_score_without_text_block.py @@ -7,20 +7,783 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0022_add_word_limit_to_text_blocks'), + ("review", "0022_add_word_limit_to_text_blocks"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('score_without_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "score_without_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('score_without_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))]), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "score_without_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ] + ), ), ] diff --git a/hypha/apply/review/migrations/0024_auto_20220111_1314.py b/hypha/apply/review/migrations/0024_auto_20220111_1314.py index f42ea70e5e..4a8d64a065 100644 --- a/hypha/apply/review/migrations/0024_auto_20220111_1314.py +++ b/hypha/apply/review/migrations/0024_auto_20220111_1314.py @@ -5,15 +5,16 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0023_add_score_without_text_block'), + ("review", "0023_add_score_without_text_block"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_data', - field=models.JSONField(default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder), + model_name="review", + name="form_data", + field=models.JSONField( + default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder + ), ), ] diff --git a/hypha/apply/review/migrations/0025_auto_20220722_0844.py b/hypha/apply/review/migrations/0025_auto_20220722_0844.py index 0b1ddaf48c..d8ca94b73e 100644 --- a/hypha/apply/review/migrations/0025_auto_20220722_0844.py +++ b/hypha/apply/review/migrations/0025_auto_20220722_0844.py @@ -7,20 +7,785 @@ class Migration(migrations.Migration): - dependencies = [ - ('review', '0024_auto_20220111_1314'), + ("review", "0024_auto_20220111_1314"), ] operations = [ migrations.AlterField( - model_name='review', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('score_without_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], use_json_field=True), + model_name="review", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "score_without_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ], + use_json_field=True, + ), ), migrations.AlterField( - model_name='reviewform', - name='form_fields', - field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('markdown_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('char', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('format', wagtail.blocks.ChoiceBlock(choices=[('email', 'Email'), ('url', 'URL')], label='Format', required=False)), ('default_value', wagtail.blocks.CharBlock(label='Default value', required=False))], group='Fields')), ('text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.TextBlock(label='Default value', required=False)), ('word_limit', wagtail.blocks.IntegerBlock(default=1000, label='Word limit'))], group='Fields')), ('text_markup', wagtail.blocks.RichTextBlock(group='Fields', label='Paragraph')), ('score', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('score_without_text', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False))], group='Fields')), ('checkbox', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('default_value', wagtail.blocks.BooleanBlock(required=False))], group='Fields')), ('dropdown', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('required', wagtail.blocks.BooleanBlock(label='Required', required=False)), ('choices', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Choice')))], group='Fields')), ('recommendation', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('comments', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required')), ('visibility', wagtail.blocks.StructBlock([('field_label', wagtail.blocks.CharBlock(label='Label')), ('help_text', wagtail.blocks.TextBlock(label='Help text', required=False)), ('help_link', wagtail.blocks.URLBlock(label='Help link', required=False)), ('info', wagtail.blocks.static_block.StaticBlock())], group=' Required'))], use_json_field=True), + model_name="reviewform", + name="form_fields", + field=wagtail.fields.StreamField( + [ + ( + "rich_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "markdown_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "char", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "format", + wagtail.blocks.ChoiceBlock( + choices=[("email", "Email"), ("url", "URL")], + label="Format", + required=False, + ), + ), + ( + "default_value", + wagtail.blocks.CharBlock( + label="Default value", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.TextBlock( + label="Default value", required=False + ), + ), + ( + "word_limit", + wagtail.blocks.IntegerBlock( + default=1000, label="Word limit" + ), + ), + ], + group="Fields", + ), + ), + ( + "text_markup", + wagtail.blocks.RichTextBlock(group="Fields", label="Paragraph"), + ), + ( + "score", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "score_without_text", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ], + group="Fields", + ), + ), + ( + "checkbox", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "default_value", + wagtail.blocks.BooleanBlock(required=False), + ), + ], + group="Fields", + ), + ), + ( + "dropdown", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ( + "required", + wagtail.blocks.BooleanBlock( + label="Required", required=False + ), + ), + ( + "choices", + wagtail.blocks.ListBlock( + wagtail.blocks.CharBlock(label="Choice") + ), + ), + ], + group="Fields", + ), + ), + ( + "recommendation", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "comments", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ( + "visibility", + wagtail.blocks.StructBlock( + [ + ( + "field_label", + wagtail.blocks.CharBlock(label="Label"), + ), + ( + "help_text", + wagtail.blocks.TextBlock( + label="Help text", required=False + ), + ), + ( + "help_link", + wagtail.blocks.URLBlock( + label="Help link", required=False + ), + ), + ("info", wagtail.blocks.static_block.StaticBlock()), + ], + group=" Required", + ), + ), + ], + use_json_field=True, + ), ), ] diff --git a/hypha/apply/review/models.py b/hypha/apply/review/models.py index 1afbdaa2f6..a78f2b1494 100644 --- a/hypha/apply/review/models.py +++ b/hypha/apply/review/models.py @@ -37,7 +37,6 @@ class ReviewFormFieldsMixin(models.Model): - wagtail_reference_index_ignore = True class Meta: @@ -84,8 +83,8 @@ class ReviewForm(ReviewFormFieldsMixin, models.Model): name = models.CharField(max_length=255) panels = [ - FieldPanel('name'), - FieldPanel('form_fields'), + FieldPanel("name"), + FieldPanel("form_fields"), ] def __str__(self): @@ -97,7 +96,7 @@ def submitted(self): return self.filter(is_draft=False) def _by_group(self, group): - return self.select_related('author__type').filter(author__type__name=group) + return self.select_related("author__type").filter(author__type__name=group) def by_staff(self): return self.submitted()._by_group(STAFF_GROUP_NAME) @@ -109,7 +108,7 @@ def by_partners(self): return self.submitted()._by_group(PARTNER_GROUP_NAME) def by_user(self, user): - return self.submitted().filter(author__reviewer=user).order_by('-created_at') + return self.submitted().filter(author__reviewer=user).order_by("-created_at") def staff_score(self): return self.by_staff().score() @@ -124,15 +123,15 @@ def reviewers_recommendation(self): return self.by_reviewers().recommendation() def score(self): - return self.exclude(score=NA).aggregate(models.Avg('score'))['score__avg'] + return self.exclude(score=NA).aggregate(models.Avg("score"))["score__avg"] def recommendation(self): - opinions = self.values_list('opinions__opinion', flat=True) + opinions = self.values_list("opinions__opinion", flat=True) if any(opinion == DISAGREE for opinion in opinions): return MAYBE - recommendations = self.values_list('recommendation', flat=True) + recommendations = self.values_list("recommendation", flat=True) try: recommendation = sum(recommendations) / len(recommendations) except ZeroDivisionError: @@ -145,26 +144,42 @@ def recommendation(self): return MAYBE def opinions(self): - return ReviewOpinion.objects.filter(review__id__in=self.values_list('id')) + return ReviewOpinion.objects.filter(review__id__in=self.values_list("id")) class Review(ReviewFormFieldsMixin, BaseStreamForm, AccessFormData, models.Model): - submission = models.ForeignKey('funds.ApplicationSubmission', on_delete=models.CASCADE, related_name='reviews') - revision = models.ForeignKey('funds.ApplicationRevision', on_delete=models.SET_NULL, related_name='reviews', null=True) + submission = models.ForeignKey( + "funds.ApplicationSubmission", on_delete=models.CASCADE, related_name="reviews" + ) + revision = models.ForeignKey( + "funds.ApplicationRevision", + on_delete=models.SET_NULL, + related_name="reviews", + null=True, + ) author = models.OneToOneField( - 'funds.AssignedReviewers', - related_name='review', + "funds.AssignedReviewers", + related_name="review", on_delete=models.CASCADE, ) form_data = models.JSONField(default=dict, encoder=DjangoJSONEncoder) - recommendation = models.IntegerField(verbose_name=_("Recommendation"), choices=RECOMMENDATION_CHOICES, default=0) + recommendation = models.IntegerField( + verbose_name=_("Recommendation"), choices=RECOMMENDATION_CHOICES, default=0 + ) score = models.DecimalField(max_digits=10, decimal_places=1, default=0) is_draft = models.BooleanField(default=False, verbose_name=_("Draft")) - created_at = models.DateTimeField(verbose_name=_("Creation time"), auto_now_add=True) + created_at = models.DateTimeField( + verbose_name=_("Creation time"), auto_now_add=True + ) updated_at = models.DateTimeField(verbose_name=_("Update time"), auto_now=True) - visibility = models.CharField(verbose_name=_("Visibility"), choices=VISIBILITY.items(), default=PRIVATE, max_length=10) + visibility = models.CharField( + verbose_name=_("Visibility"), + choices=VISIBILITY.items(), + default=PRIVATE, + max_length=10, + ) # Meta: used for migration purposes only drupal_id = models.IntegerField(null=True, blank=True, editable=False) @@ -172,27 +187,35 @@ class Review(ReviewFormFieldsMixin, BaseStreamForm, AccessFormData, models.Model objects = ReviewQuerySet.as_manager() class Meta: - unique_together = ('author', 'submission') + unique_together = ("author", "submission") @property def outcome(self): return self.get_recommendation_display() def get_comments_display(self, include_question=True): - return self.render_answer(self.comment_field.id, include_question=include_question) + return self.render_answer( + self.comment_field.id, include_question=include_question + ) @property def get_score_display(self): - return '{:.1f}'.format(self.score) if self.score != NA else 'NA' + return "{:.1f}".format(self.score) if self.score != NA else "NA" def get_absolute_url(self): - return reverse('apply:submissions:reviews:review', args=(self.submission.pk, self.id,)) + return reverse( + "apply:submissions:reviews:review", + args=( + self.submission.pk, + self.id, + ), + ) def __str__(self): - return f'Review for {self.submission.title} by {self.author!s}' + return f"Review for {self.submission.title} by {self.author!s}" def __repr__(self): - return f'<{self.__class__.__name__}: {str(self.form_data)}>' + return f"<{self.__class__.__name__}: {str(self.form_data)}>" @property def for_latest(self): @@ -212,16 +235,18 @@ def is_updated(self): class ReviewOpinion(models.Model): - review = models.ForeignKey(Review, on_delete=models.CASCADE, related_name='opinions') + review = models.ForeignKey( + Review, on_delete=models.CASCADE, related_name="opinions" + ) author = models.ForeignKey( - 'funds.AssignedReviewers', - related_name='opinions', + "funds.AssignedReviewers", + related_name="opinions", on_delete=models.CASCADE, ) opinion = models.IntegerField(choices=OPINION_CHOICES) class Meta: - unique_together = ('author', 'review') + unique_together = ("author", "review") @property def opinion_display(self): diff --git a/hypha/apply/review/options.py b/hypha/apply/review/options.py index ebf99ae28e..aad50ced30 100644 --- a/hypha/apply/review/options.py +++ b/hypha/apply/review/options.py @@ -3,13 +3,13 @@ NA = 99 RATE_CHOICES = ( - (0, _('0. Need more info')), - (1, _('1. Poor')), - (2, _('2. Not so good')), - (3, _('3. Is o.k.')), - (4, _('4. Good')), - (5, _('5. Excellent')), - (NA, _('n/a - choose not to answer')), + (0, _("0. Need more info")), + (1, _("1. Poor")), + (2, _("2. Not so good")), + (3, _("3. Is o.k.")), + (4, _("4. Good")), + (5, _("5. Excellent")), + (NA, _("n/a - choose not to answer")), ) RATE_CHOICES_DICT = dict(RATE_CHOICES) @@ -20,28 +20,28 @@ YES = 2 RECOMMENDATION_CHOICES = ( - (NO, _('No')), - (MAYBE, _('Maybe')), - (YES, _('Yes')), + (NO, _("No")), + (MAYBE, _("Maybe")), + (YES, _("Yes")), ) DISAGREE = 0 AGREE = 1 OPINION_CHOICES = ( - (AGREE, _('Agree')), - (DISAGREE, _('Disagree')), + (AGREE, _("Agree")), + (DISAGREE, _("Disagree")), ) -PRIVATE = 'private' -REVIEWER = 'reviewers' +PRIVATE = "private" +REVIEWER = "reviewers" VISIBILILTY_HELP_TEXT = { - PRIVATE: _('Visible only to staff.'), - REVIEWER: _('Visible to other reviewers and staff.'), + PRIVATE: _("Visible only to staff."), + REVIEWER: _("Visible to other reviewers and staff."), } VISIBILITY = { - PRIVATE: _('Private'), - REVIEWER: _('Reviewers and Staff'), + PRIVATE: _("Private"), + REVIEWER: _("Reviewers and Staff"), } diff --git a/hypha/apply/review/templates/review/includes/review_opinions_list.html b/hypha/apply/review/templates/review/includes/review_opinions_list.html index 0cc942d17b..e186ced5b3 100644 --- a/hypha/apply/review/templates/review/includes/review_opinions_list.html +++ b/hypha/apply/review/templates/review/includes/review_opinions_list.html @@ -1,13 +1,13 @@ {% load wagtailimages_tags %} {% if opinions %} -
-
- {% for opinion in opinions %}
-
- - {{ opinion.author }} - {% if opinion.get_author_assignment %}{% image opinion.get_author_assignment.icon max-12x12 %}{% endif %} - {{ opinion.get_opinion_display }}s - - {% endfor %} -
-
+ {% for opinion in opinions %}
+
- + {{ opinion.author }} + {% if opinion.get_author_assignment %}{% image opinion.get_author_assignment.icon max-12x12 %}{% endif %} + {{ opinion.get_opinion_display }}s + + {% endfor %} +
-
+ {{ value.field_label }}
-{{ score }}
- {{ comment|bleach }}
-
+
{% endblock %}
diff --git a/hypha/apply/review/templates/review/review_confirm_delete.html b/hypha/apply/review/templates/review/review_confirm_delete.html
index b1f803d5d4..21238b4280 100644
--- a/hypha/apply/review/templates/review/review_confirm_delete.html
+++ b/hypha/apply/review/templates/review/review_confirm_delete.html
@@ -4,19 +4,19 @@
{% block title %}{% trans "Deleting" %}: {{ object }}{% endblock %}
{% block content %}
-{{ value.field_label }}
+{{ score }}
+ {{ comment|bleach }}
+
-
-
-
{% endblock %}
diff --git a/hypha/apply/review/templates/review/review_detail.html b/hypha/apply/review/templates/review/review_detail.html
index 9ea9627c21..0378a70584 100644
--- a/hypha/apply/review/templates/review/review_detail.html
+++ b/hypha/apply/review/templates/review/review_detail.html
@@ -2,71 +2,71 @@
{% load i18n bleach_tags submission_tags %}
{% block title %}{% trans "Review for" %} {{ review.submission.title }}{% endblock %}
{% block content %}
-
-
-//',
- PasswordResetConfirmView.as_view(),
- name='password_reset_confirm'
- ),
- path(
- 'reset/complete/',
- auth_views.PasswordResetCompleteView.as_view(template_name='users/password_reset/complete.html'),
- name='password_reset_complete'
- ),
-
- ])),
- path('confirmation/done/', EmailChangeDoneView.as_view(), name="confirm_link_sent"),
- path('confirmation///', EmailChangeConfirmationView.as_view(), name="confirm_email"),
- path('activate///', ActivationView.as_view(), name='activate'),
- path('activate/', create_password, name="activate_password"),
- path('oauth', oauth, name='oauth'),
- # Two factor redirect
- path('two_factor/required/', TWOFARequiredMessageView.as_view(), name='two_factor_required'),
- path('two_factor/setup/', TWOFASetupView.as_view(), name='setup'),
- path('two_factor/backup_tokens/password/', TWOFABackupTokensPasswordView.as_view(), name='backup_tokens_password'),
- path('two_factor/disable/', TWOFADisableView.as_view(), name='disable'),
- path('two_factor/admin/disable//', TWOFAAdminDisableView.as_view(), name='admin_disable'),
- ])),
+ path(
+ "account/",
+ include(
+ [
+ path(
+ "",
+ ratelimit(key="ip", rate=settings.DEFAULT_RATE_LIMIT, method="GET")(
+ AccountView.as_view()
+ ),
+ name="account",
+ ),
+ path(
+ "password/",
+ include(
+ [
+ path(
+ "",
+ EmailChangePasswordView.as_view(),
+ name="email_change_confirm_password",
+ ),
+ path(
+ "change/",
+ ratelimit(
+ key="user",
+ rate=settings.DEFAULT_RATE_LIMIT,
+ method="POST",
+ )(
+ auth_views.PasswordChangeView.as_view(
+ template_name="users/change_password.html",
+ success_url=reverse_lazy("users:account"),
+ )
+ ),
+ name="password_change",
+ ),
+ path(
+ "reset/",
+ PasswordResetView.as_view(),
+ name="password_reset",
+ ),
+ path(
+ "reset/done/",
+ auth_views.PasswordResetDoneView.as_view(
+ template_name="users/password_reset/done.html"
+ ),
+ name="password_reset_done",
+ ),
+ path(
+ "reset/confirm///",
+ PasswordResetConfirmView.as_view(),
+ name="password_reset_confirm",
+ ),
+ path(
+ "reset/complete/",
+ auth_views.PasswordResetCompleteView.as_view(
+ template_name="users/password_reset/complete.html"
+ ),
+ name="password_reset_complete",
+ ),
+ ]
+ ),
+ ),
+ path(
+ "confirmation/done/",
+ EmailChangeDoneView.as_view(),
+ name="confirm_link_sent",
+ ),
+ path(
+ "confirmation///",
+ EmailChangeConfirmationView.as_view(),
+ name="confirm_email",
+ ),
+ path(
+ "activate///",
+ ActivationView.as_view(),
+ name="activate",
+ ),
+ path("activate/", create_password, name="activate_password"),
+ path("oauth", oauth, name="oauth"),
+ # Two factor redirect
+ path(
+ "two_factor/required/",
+ TWOFARequiredMessageView.as_view(),
+ name="two_factor_required",
+ ),
+ path("two_factor/setup/", TWOFASetupView.as_view(), name="setup"),
+ path(
+ "two_factor/backup_tokens/password/",
+ TWOFABackupTokensPasswordView.as_view(),
+ name="backup_tokens_password",
+ ),
+ path("two_factor/disable/", TWOFADisableView.as_view(), name="disable"),
+ path(
+ "two_factor/admin/disable//",
+ TWOFAAdminDisableView.as_view(),
+ name="admin_disable",
+ ),
+ ]
+ ),
+ ),
]
if settings.HIJACK_ENABLE:
urlpatterns += [
- path('account/become/', become, name='become'),
+ path("account/become/", become, name="become"),
]
diff --git a/hypha/apply/users/utils.py b/hypha/apply/users/utils.py
index dbe6ddc2d1..e46c33ead6 100644
--- a/hypha/apply/users/utils.py
+++ b/hypha/apply/users/utils.py
@@ -35,7 +35,7 @@ def is_user_already_registered(email: str) -> (bool, str):
if user_model.objects.filter(email__iexact=email):
return (True, _("Email is already in use."))
- return (False, '')
+ return (False, "")
def can_use_oauth_check(user):
@@ -45,7 +45,7 @@ def can_use_oauth_check(user):
or associate OAuth accounts
"""
try:
- domain = user.email.split('@')[-1]
+ domain = user.email.split("@")[-1]
return domain in settings.SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS
except AttributeError:
# Anonymous user or setting not defined
@@ -53,7 +53,7 @@ def can_use_oauth_check(user):
return False
-def send_activation_email(user, site=None, redirect_url=''):
+def send_activation_email(user, site=None, redirect_url=""):
"""
Send the activation email. The activation key is the username,
signed using TimestampSigner.
@@ -63,29 +63,29 @@ def send_activation_email(user, site=None, redirect_url=''):
uid = urlsafe_base64_encode(force_bytes(user.pk))
- activation_path = reverse('users:activate', kwargs={'uidb64': uid, 'token': token})
+ activation_path = reverse("users:activate", kwargs={"uidb64": uid, "token": token})
if redirect_url:
- activation_path = f'{activation_path}?next={redirect_url}'
+ activation_path = f"{activation_path}?next={redirect_url}"
timeout_days = settings.PASSWORD_RESET_TIMEOUT // (24 * 3600)
context = {
- 'user': user,
- 'name': user.get_full_name(),
- 'username': user.get_username(),
- 'activation_path': activation_path,
- 'timeout_days': timeout_days,
- 'org_long_name': settings.ORG_LONG_NAME,
- 'org_short_name': settings.ORG_SHORT_NAME,
+ "user": user,
+ "name": user.get_full_name(),
+ "username": user.get_username(),
+ "activation_path": activation_path,
+ "timeout_days": timeout_days,
+ "org_long_name": settings.ORG_LONG_NAME,
+ "org_short_name": settings.ORG_SHORT_NAME,
}
if site:
context.update(site=site)
- subject = 'Account details for {username} at {org_long_name}'.format(**context)
+ subject = "Account details for {username} at {org_long_name}".format(**context)
# Force subject to a single line to avoid header-injection issues.
- subject = ''.join(subject.splitlines())
- message = render_to_string('users/activation/email.txt', context)
+ subject = "".join(subject.splitlines())
+ message = render_to_string("users/activation/email.txt", context)
user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
@@ -97,35 +97,41 @@ def send_confirmation_email(user, token, updated_email=None, site=None):
uid = urlsafe_base64_encode(force_bytes(user.pk))
- activation_path = reverse('users:confirm_email', kwargs={'uidb64': uid, 'token': token})
+ activation_path = reverse(
+ "users:confirm_email", kwargs={"uidb64": uid, "token": token}
+ )
timeout_days = settings.PASSWORD_RESET_TIMEOUT // (24 * 3600)
context = {
- 'user': user,
- 'name': user.get_full_name(),
- 'username': user.get_username(),
- 'unverified_email': updated_email,
- 'activation_path': activation_path,
- 'timeout_days': timeout_days,
- 'org_long_name': settings.ORG_LONG_NAME,
- 'org_short_name': settings.ORG_SHORT_NAME,
+ "user": user,
+ "name": user.get_full_name(),
+ "username": user.get_username(),
+ "unverified_email": updated_email,
+ "activation_path": activation_path,
+ "timeout_days": timeout_days,
+ "org_long_name": settings.ORG_LONG_NAME,
+ "org_short_name": settings.ORG_SHORT_NAME,
}
if site:
context.update(site=site)
- subject = 'Confirmation email for {unverified_email} at {org_long_name}'.format(**context)
+ subject = "Confirmation email for {unverified_email} at {org_long_name}".format(
+ **context
+ )
# Force subject to a single line to avoid header-injection issues.
- subject = ''.join(subject.splitlines())
- message = render_to_string('users/email_change/confirm_email.txt', context)
+ subject = "".join(subject.splitlines())
+ message = render_to_string("users/email_change/confirm_email.txt", context)
if updated_email:
send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [updated_email])
else:
user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
-def get_redirect_url(request, redirect_field: str, success_url_allowed_hosts=None) -> str:
+def get_redirect_url(
+ request, redirect_field: str, success_url_allowed_hosts=None
+) -> str:
"""
Return the user-originating redirect URL if it's safe.
@@ -141,10 +147,7 @@ def get_redirect_url(request, redirect_field: str, success_url_allowed_hosts=Non
# Try to get the redirect URL from the request's POST data, and if it's not
# there, try to get it from the request's GET data. If it's not in either,
# default to an empty string.
- redirect_to = request.POST.get(
- redirect_field,
- request.GET.get(redirect_field, '')
- )
+ redirect_to = request.POST.get(redirect_field, request.GET.get(redirect_field, ""))
# Check if the redirect URL is safe. If it is, return it. Otherwise, return
# an empty string.
@@ -153,5 +156,4 @@ def get_redirect_url(request, redirect_field: str, success_url_allowed_hosts=Non
allowed_hosts={request.get_host(), *success_url_allowed_hosts},
require_https=request.is_secure(),
)
- return redirect_to if url_is_safe else ''
-
+ return redirect_to if url_is_safe else ""
diff --git a/hypha/apply/users/views.py b/hypha/apply/users/views.py
index df1ad76188..f6e2146abe 100644
--- a/hypha/apply/users/views.py
+++ b/hypha/apply/users/views.py
@@ -61,9 +61,12 @@
User = get_user_model()
-@method_decorator(ratelimit(key='ip', rate=settings.DEFAULT_RATE_LIMIT, method='POST'), name='dispatch')
+@method_decorator(
+ ratelimit(key="ip", rate=settings.DEFAULT_RATE_LIMIT, method="POST"),
+ name="dispatch",
+)
class RegisterView(SuccessURLAllowedHostsMixin, View):
- redirect_field_name = 'next'
+ redirect_field_name = "next"
form = CustomUserCreationForm
def get(self, request):
@@ -74,15 +77,15 @@ def get(self, request):
raise Http404
if request.user.is_authenticated:
- return redirect('dashboard:dashboard')
+ return redirect("dashboard:dashboard")
ctx = {
- 'form': self.form(),
- 'redirect_url': get_redirect_url(request, self.redirect_field_name),
+ "form": self.form(),
+ "redirect_url": get_redirect_url(request, self.redirect_field_name),
}
- return render(request, 'users/register.html', ctx)
+ return render(request, "users/register.html", ctx)
- def post(self,request):
+ def post(self, request):
# See comment in get() above about doing this here rather than in urls
if not settings.ENABLE_REGISTRATION_WITHOUT_APPLICATION:
raise Http404
@@ -91,83 +94,94 @@ def post(self,request):
context = {}
if form.is_valid():
# If using wagtail password management
- if 'password1' in form.cleaned_data:
- context['password']=form.cleaned_data['password1']
+ if "password1" in form.cleaned_data:
+ context["password"] = form.cleaned_data["password1"]
site = Site.find_for_request(self.request)
user, created = User.objects.get_or_create_and_notify(
- email=form.cleaned_data['email'],
+ email=form.cleaned_data["email"],
site=site,
redirect_url=get_redirect_url(request, self.redirect_field_name),
defaults={
- 'full_name': form.cleaned_data['full_name'],
+ "full_name": form.cleaned_data["full_name"],
},
- **context
+ **context,
)
if created:
params = {"name": user.full_name, "email": user.email}
# redirect to success page with params as query params
return HttpResponseRedirect(
- resolve_url('users_public:register-success')
- + '?'
+ resolve_url("users_public:register-success")
+ + "?"
+ urlencode(params)
)
- return render(request, 'users/register.html', {'form': form})
+ return render(request, "users/register.html", {"form": form})
class RegistrationSuccessView(TemplateView):
- template_name = 'users/register-success.html'
+ template_name = "users/register-success.html"
-@method_decorator(ratelimit(key='ip', rate=settings.DEFAULT_RATE_LIMIT, method='POST'), name='dispatch')
-@method_decorator(ratelimit(key='post:email', rate=settings.DEFAULT_RATE_LIMIT, method='POST'), name='dispatch')
+@method_decorator(
+ ratelimit(key="ip", rate=settings.DEFAULT_RATE_LIMIT, method="POST"),
+ name="dispatch",
+)
+@method_decorator(
+ ratelimit(key="post:email", rate=settings.DEFAULT_RATE_LIMIT, method="POST"),
+ name="dispatch",
+)
class LoginView(TwoFactorLoginView):
form_list = (
- ('auth', CustomAuthenticationForm),
- ('token', AuthenticationTokenForm),
- ('backup', BackupTokenForm),
+ ("auth", CustomAuthenticationForm),
+ ("token", AuthenticationTokenForm),
+ ("backup", BackupTokenForm),
)
def get_context_data(self, form, **kwargs):
context_data = super(LoginView, self).get_context_data(form, **kwargs)
context_data["is_public_site"] = True
- context_data["redirect_url"] = get_redirect_url(self.request, self.redirect_field_name)
- if Site.find_for_request(self.request) == ApplyHomePage.objects.first().get_site():
+ context_data["redirect_url"] = get_redirect_url(
+ self.request, self.redirect_field_name
+ )
+ if (
+ Site.find_for_request(self.request)
+ == ApplyHomePage.objects.first().get_site()
+ ):
context_data["is_public_site"] = False
return context_data
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
class AccountView(UpdateView):
form_class = ProfileForm
- template_name = 'users/account.html'
+ template_name = "users/account.html"
def get_object(self):
return self.request.user
def form_valid(self, form):
- updated_email = form.cleaned_data['email']
- name = form.cleaned_data['full_name']
- slack = form.cleaned_data.get('slack', '')
+ updated_email = form.cleaned_data["email"]
+ name = form.cleaned_data["full_name"]
+ slack = form.cleaned_data.get("slack", "")
user = get_object_or_404(User, id=self.request.user.id)
if updated_email and updated_email != user.email:
- base_url = reverse('users:email_change_confirm_password')
- query_dict = {
- 'updated_email': updated_email,
- 'name': name,
- 'slack': slack
- }
+ base_url = reverse("users:email_change_confirm_password")
+ query_dict = {"updated_email": updated_email, "name": name, "slack": slack}
signer = TimestampSigner()
signed_value = signer.sign(dumps(query_dict))
# Using session variables for redirect validation
token_signer = Signer()
- self.request.session['signed_token'] = token_signer.sign(user.email)
- return redirect('{}?{}'.format(base_url, urlencode({'value': signed_value})))
+ self.request.session["signed_token"] = token_signer.sign(user.email)
+ return redirect(
+ "{}?{}".format(base_url, urlencode({"value": signed_value}))
+ )
return super(AccountView, self).form_valid(form)
- def get_success_url(self,):
- return reverse_lazy('users:account')
+ def get_success_url(
+ self,
+ ):
+ return reverse_lazy("users:account")
def get_context_data(self, **kwargs):
if self.request.user.is_superuser and settings.HIJACK_ENABLE:
@@ -175,7 +189,9 @@ def get_context_data(self, **kwargs):
else:
swappable_form = None
- show_change_password = password_management_enabled() and self.request.user.has_usable_password(),
+ show_change_password = (
+ password_management_enabled() and self.request.user.has_usable_password(),
+ )
return super().get_context_data(
swappable_form=swappable_form,
@@ -185,76 +201,79 @@ def get_context_data(self, **kwargs):
)
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
class EmailChangePasswordView(FormView):
form_class = EmailChangePasswordForm
- template_name = 'users/email_change/confirm_password.html'
- success_url = reverse_lazy('users:confirm_link_sent')
- title = _('Enter Password')
+ template_name = "users/email_change/confirm_password.html"
+ success_url = reverse_lazy("users:confirm_link_sent")
+ title = _("Enter Password")
def get_initial(self):
"""
Validating the redirection from account via session variable
"""
- if 'signed_token' not in self.request.session:
+ if "signed_token" not in self.request.session:
raise Http404
signer = Signer()
try:
- signer.unsign(self.request.session['signed_token'])
+ signer.unsign(self.request.session["signed_token"])
except BadSignature as e:
raise Http404 from e
return super(EmailChangePasswordView, self).get_initial()
def get_form_kwargs(self):
kwargs = super().get_form_kwargs()
- kwargs['user'] = self.request.user
+ kwargs["user"] = self.request.user
return kwargs
def form_valid(self, form):
# Make sure redirection url is inaccessible after email is sent
- if 'signed_token' in self.request.session:
- del self.request.session['signed_token']
+ if "signed_token" in self.request.session:
+ del self.request.session["signed_token"]
signer = TimestampSigner()
try:
unsigned_value = signer.unsign(
- self.request.GET.get('value'),
- max_age=settings.PASSWORD_PAGE_TIMEOUT
+ self.request.GET.get("value"), max_age=settings.PASSWORD_PAGE_TIMEOUT
)
except Exception:
- messages.error(self.request, _("Password Page timed out. Try changing the email again."))
- return redirect('users:account')
+ messages.error(
+ self.request,
+ _("Password Page timed out. Try changing the email again."),
+ )
+ return redirect("users:account")
value = loads(unsigned_value)
form.save(**value)
send_confirmation_email(
self.request.user,
- signer.sign(dumps(value['updated_email'])),
- updated_email=value['updated_email'],
- site=Site.find_for_request(self.request))
+ signer.sign(dumps(value["updated_email"])),
+ updated_email=value["updated_email"],
+ site=Site.find_for_request(self.request),
+ )
return super(EmailChangePasswordView, self).form_valid(form)
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
class EmailChangeDoneView(TemplateView):
- template_name = 'users/email_change/done.html'
- title = _('Verify Email')
+ template_name = "users/email_change/done.html"
+ title = _("Verify Email")
@login_required()
def become(request):
if not settings.HIJACK_ENABLE:
- raise Http404(_('Hijack feature is not enabled.'))
+ raise Http404(_("Hijack feature is not enabled."))
if not request.user.is_superuser:
raise PermissionDenied()
- id = request.POST.get('user_pk')
+ id = request.POST.get("user_pk")
if request.POST and id:
target_user = User.objects.get(pk=id)
if target_user.is_superuser:
raise PermissionDenied()
return AcquireUserView.as_view()(request)
- return redirect('users:account')
+ return redirect("users:account")
@login_required()
@@ -262,29 +281,31 @@ def become(request):
def oauth(request):
"""Generic, empty view for the OAuth associations."""
- return TemplateResponse(request, 'users/oauth.html', {})
+ return TemplateResponse(request, "users/oauth.html", {})
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
class EmailChangeConfirmationView(TemplateView):
def get(self, request, *args, **kwargs):
- user = self.get_user(kwargs.get('uidb64'))
- email = self.unsigned(kwargs.get('token'))
+ user = self.get_user(kwargs.get("uidb64"))
+ email = self.unsigned(kwargs.get("token"))
if user and email:
if user.email != email:
user.email = email
user.save()
- messages.success(request, _(f"Your email has been successfully updated to {email}!"))
- return redirect('users:account')
+ messages.success(
+ request, _(f"Your email has been successfully updated to {email}!")
+ )
+ return redirect("users:account")
- return render(request, 'users/email_change/invalid_link.html')
+ return render(request, "users/email_change/invalid_link.html")
def unsigned(self, token):
signer = TimestampSigner()
try:
unsigned_value = signer.unsign(
token,
- max_age=datetime.timedelta(seconds=settings.PASSWORD_RESET_TIMEOUT)
+ max_age=datetime.timedelta(seconds=settings.PASSWORD_RESET_TIMEOUT),
)
except Exception:
return False
@@ -297,37 +318,35 @@ def get_user(self, uidb64):
doesn't.
"""
try:
- user = User.objects.get(**{
- 'pk': force_str(urlsafe_base64_decode(uidb64))
- })
+ user = User.objects.get(**{"pk": force_str(urlsafe_base64_decode(uidb64))})
return user
except (TypeError, ValueError, OverflowError, User.DoesNotExist):
return None
class ActivationView(SuccessURLAllowedHostsMixin, TemplateView):
- redirect_field_name = 'next'
+ redirect_field_name = "next"
def get(self, request, *args, **kwargs):
- user = self.get_user(kwargs.get('uidb64'))
+ user = self.get_user(kwargs.get("uidb64"))
- if self.valid(user, kwargs.get('token')):
+ if self.valid(user, kwargs.get("token")):
user.backend = settings.CUSTOM_AUTH_BACKEND
login(request, user)
if (
- settings.WAGTAILUSERS_PASSWORD_ENABLED and
- settings.ENABLE_REGISTRATION_WITHOUT_APPLICATION
+ settings.WAGTAILUSERS_PASSWORD_ENABLED
+ and settings.ENABLE_REGISTRATION_WITHOUT_APPLICATION
):
# In this case, the user entered a password while registering,
# and so they shouldn't need to activate a password
- return redirect('users:account')
+ return redirect("users:account")
else:
- url = reverse('users:activate_password')
+ url = reverse("users:activate_password")
if redirect_url := get_redirect_url(request, self.redirect_field_name):
- url = f'{url}?next={redirect_url}'
+ url = f"{url}?next={redirect_url}"
return redirect(url)
- return render(request, 'users/activation/invalid.html')
+ return render(request, "users/activation/invalid.html")
def valid(self, user, token):
"""
@@ -345,9 +364,7 @@ def get_user(self, uidb64):
doesn't.
"""
try:
- user = User.objects.get(**{
- 'pk': force_str(urlsafe_base64_decode(uidb64))
- })
+ user = User.objects.get(**{"pk": force_str(urlsafe_base64_decode(uidb64))})
return user
except (TypeError, ValueError, OverflowError, User.DoesNotExist):
return None
@@ -357,48 +374,58 @@ def create_password(request):
"""
A custom view for the admin password change form used for account activation.
"""
- redirect_url = get_redirect_url(request, redirect_field='next')
+ redirect_url = get_redirect_url(request, redirect_field="next")
- if request.method == 'POST':
+ if request.method == "POST":
form = AdminPasswordChangeForm(request.user, request.POST)
if form.is_valid():
user = form.save()
update_session_auth_hash(request, user) # Important!
- messages.success(request, 'Your password was successfully updated!')
+ messages.success(request, "Your password was successfully updated!")
if redirect_url:
return redirect(redirect_url)
- return redirect('users:account')
+ return redirect("users:account")
else:
- messages.error(request, 'Please correct the errors below.')
+ messages.error(request, "Please correct the errors below.")
else:
form = AdminPasswordChangeForm(request.user)
- return render(request, 'users/change_password.html', {
- 'form': form,
- 'redirect_url': redirect_url,
- })
+ return render(
+ request,
+ "users/change_password.html",
+ {
+ "form": form,
+ "redirect_url": redirect_url,
+ },
+ )
-@method_decorator(ratelimit(key='post:email', rate=settings.DEFAULT_RATE_LIMIT, method='POST'), name='dispatch')
-@method_decorator(ratelimit(key='ip', rate=settings.DEFAULT_RATE_LIMIT, method='POST'), name='dispatch')
+@method_decorator(
+ ratelimit(key="post:email", rate=settings.DEFAULT_RATE_LIMIT, method="POST"),
+ name="dispatch",
+)
+@method_decorator(
+ ratelimit(key="ip", rate=settings.DEFAULT_RATE_LIMIT, method="POST"),
+ name="dispatch",
+)
class PasswordResetView(DjPasswordResetView):
- redirect_field_name = 'next'
- email_template_name = 'users/password_reset/email.txt'
- template_name = 'users/password_reset/form.html'
- success_url = reverse_lazy('users:password_reset_done')
+ redirect_field_name = "next"
+ email_template_name = "users/password_reset/email.txt"
+ template_name = "users/password_reset/form.html"
+ success_url = reverse_lazy("users:password_reset_done")
def get_context_data(self, **kwargs):
ctx = super().get_context_data(**kwargs)
- ctx['redirect_url'] = get_redirect_url(self.request, self.redirect_field_name)
+ ctx["redirect_url"] = get_redirect_url(self.request, self.redirect_field_name)
return ctx
def get_extra_email_context(self):
return {
- 'redirect_url': get_redirect_url(self.request, self.redirect_field_name),
- 'site': Site.find_for_request(self.request),
- 'org_short_name': settings.ORG_SHORT_NAME,
- 'org_long_name': settings.ORG_LONG_NAME,
+ "redirect_url": get_redirect_url(self.request, self.redirect_field_name),
+ "site": Site.find_for_request(self.request),
+ "org_short_name": settings.ORG_SHORT_NAME,
+ "org_long_name": settings.ORG_LONG_NAME,
}
def form_valid(self, form):
@@ -406,96 +433,111 @@ def form_valid(self, form):
Overrides default django form_valid to pass extra context to send_email method
"""
opts = {
- 'use_https': self.request.is_secure(),
- 'token_generator': self.token_generator,
- 'from_email': self.from_email,
- 'email_template_name': self.email_template_name,
- 'subject_template_name': self.subject_template_name,
- 'request': self.request,
- 'html_email_template_name': self.html_email_template_name,
- 'extra_email_context': self.get_extra_email_context(),
+ "use_https": self.request.is_secure(),
+ "token_generator": self.token_generator,
+ "from_email": self.from_email,
+ "email_template_name": self.email_template_name,
+ "subject_template_name": self.subject_template_name,
+ "request": self.request,
+ "html_email_template_name": self.html_email_template_name,
+ "extra_email_context": self.get_extra_email_context(),
}
form.save(**opts)
return HttpResponseRedirect(self.get_success_url())
-@method_decorator(never_cache, name='dispatch')
-@method_decorator(login_required, name='dispatch')
+@method_decorator(never_cache, name="dispatch")
+@method_decorator(login_required, name="dispatch")
class TWOFASetupView(TwoFactorSetupView):
def get_issuer(self):
return get_current_site(self.request).name
def get_context_data(self, form, **kwargs):
context = super().get_context_data(form, **kwargs)
- if self.steps.current == 'generator':
+ if self.steps.current == "generator":
try:
username = self.request.user.get_username()
except AttributeError:
username = self.request.user.username
- otpauth_url = get_otpauth_url(accountname=username,
- issuer=self.get_issuer(),
- secret=context['secret_key'],
- digits=totp_digits())
- context.update({
- 'otpauth_url': otpauth_url,
- })
+ otpauth_url = get_otpauth_url(
+ accountname=username,
+ issuer=self.get_issuer(),
+ secret=context["secret_key"],
+ digits=totp_digits(),
+ )
+ context.update(
+ {
+ "otpauth_url": otpauth_url,
+ }
+ )
return context
-@method_decorator(login_required, name='dispatch')
-@method_decorator(ratelimit(key='user', rate=settings.DEFAULT_RATE_LIMIT, method='POST'), name='dispatch')
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+ ratelimit(key="user", rate=settings.DEFAULT_RATE_LIMIT, method="POST"),
+ name="dispatch",
+)
class TWOFABackupTokensPasswordView(TwoFactorBackupTokensView):
"""
Require password to see backup codes
"""
+
form_class = TWOFAPasswordForm
- success_url = reverse_lazy('two_factor:backup_tokens')
- template_name = 'two_factor/core/backup_tokens_password.html'
+ success_url = reverse_lazy("two_factor:backup_tokens")
+ template_name = "two_factor/core/backup_tokens_password.html"
def get_form_kwargs(self):
kwargs = super().get_form_kwargs()
- kwargs['user'] = self.request.user
+ kwargs["user"] = self.request.user
return kwargs
-@method_decorator(ratelimit(key='user', rate=settings.DEFAULT_RATE_LIMIT, method='POST'), name='dispatch')
-@method_decorator(login_required, name='dispatch')
+@method_decorator(
+ ratelimit(key="user", rate=settings.DEFAULT_RATE_LIMIT, method="POST"),
+ name="dispatch",
+)
+@method_decorator(login_required, name="dispatch")
class TWOFADisableView(TwoFactorDisableView):
"""
View for disabling two-factor for a user's account.
"""
- template_name = 'two_factor/profile/disable.html'
- success_url = reverse_lazy('users:account')
+
+ template_name = "two_factor/profile/disable.html"
+ success_url = reverse_lazy("users:account")
form_class = TWOFAPasswordForm
def get_form_kwargs(self):
kwargs = super().get_form_kwargs()
- kwargs['user'] = self.request.user
+ kwargs["user"] = self.request.user
return kwargs
-@method_decorator(permission_required(change_user_perm, raise_exception=True), name='dispatch')
+@method_decorator(
+ permission_required(change_user_perm, raise_exception=True), name="dispatch"
+)
class TWOFAAdminDisableView(FormView):
"""
View for PasswordForm to confirm the Disable 2FA process on wagtail admin.
"""
+
form_class = TWOFAPasswordForm
- template_name = 'two_factor/admin/disable.html'
+ template_name = "two_factor/admin/disable.html"
user = None
def get_form_kwargs(self):
kwargs = super().get_form_kwargs()
# pass request's user to form to validate the password
- kwargs['user'] = self.request.user
+ kwargs["user"] = self.request.user
# store the user from url for redirecting to the same user's account edit page
- self.user = get_object_or_404(User, pk=self.kwargs.get('user_id'))
+ self.user = get_object_or_404(User, pk=self.kwargs.get("user_id"))
return kwargs
def get_form(self, form_class=None):
form = super(TWOFAAdminDisableView, self).get_form(form_class=form_class)
- form.fields['password'].label = "Password"
+ form.fields["password"].label = "Password"
return form
def form_valid(self, form):
@@ -504,24 +546,24 @@ def form_valid(self, form):
return redirect(self.get_success_url())
def get_success_url(self):
- return reverse('wagtailusers_users:edit', args=[self.user.id])
+ return reverse("wagtailusers_users:edit", args=[self.user.id])
def get_context_data(self, **kwargs):
ctx = super(TWOFAAdminDisableView, self).get_context_data(**kwargs)
- ctx['user'] = self.user
+ ctx["user"] = self.user
return ctx
class TWOFARequiredMessageView(TemplateView):
- template_name = 'two_factor/core/two_factor_required.html'
+ template_name = "two_factor/core/two_factor_required.html"
class PasswordResetConfirmView(DjPasswordResetConfirmView):
- redirect_field_name = 'next'
- template_name = 'users/password_reset/confirm.html'
+ redirect_field_name = "next"
+ template_name = "users/password_reset/confirm.html"
post_reset_login = True
post_reset_login_backend = settings.CUSTOM_AUTH_BACKEND
- success_url = reverse_lazy('users:account')
+ success_url = reverse_lazy("users:account")
def get_success_url(self) -> str:
if next_path := get_redirect_url(self.request, self.redirect_field_name):
@@ -530,19 +572,21 @@ def get_success_url(self) -> str:
def get_context_data(self, **kwargs: Any) -> Any:
context = super().get_context_data(**kwargs)
- context['redirect_url'] = get_redirect_url(self.request, self.redirect_field_name)
+ context["redirect_url"] = get_redirect_url(
+ self.request, self.redirect_field_name
+ )
return context
@method_decorator(sensitive_post_parameters())
@method_decorator(never_cache)
def dispatch(self, *args, **kwargs):
- assert 'uidb64' in kwargs and 'token' in kwargs
+ assert "uidb64" in kwargs and "token" in kwargs
self.validlink = False
- self.user = self.get_user(kwargs['uidb64'])
+ self.user = self.get_user(kwargs["uidb64"])
if self.user is not None:
- token = kwargs['token']
+ token = kwargs["token"]
if token == self.reset_url_token:
session_token = self.request.session.get(INTERNAL_RESET_SESSION_TOKEN)
if self.token_generator.check_token(self.user, session_token):
@@ -556,11 +600,14 @@ def dispatch(self, *args, **kwargs):
# avoids the possibility of leaking the token in the
# HTTP Referer header.
self.request.session[INTERNAL_RESET_SESSION_TOKEN] = token
- redirect_url = self.request.path.replace(token, self.reset_url_token)
+ redirect_url = self.request.path.replace(
+ token, self.reset_url_token
+ )
# Add handler for '?next' redirect parameter.
- if next_path := get_redirect_url(self.request, self.redirect_field_name):
- redirect_url = f'{redirect_url}?next={next_path}'
+ if next_path := get_redirect_url(
+ self.request, self.redirect_field_name
+ ):
+ redirect_url = f"{redirect_url}?next={next_path}"
return HttpResponseRedirect(redirect_url)
-
diff --git a/hypha/apply/users/wagtail_hooks.py b/hypha/apply/users/wagtail_hooks.py
index eb3e6fe2cd..9c7c1c70d5 100644
--- a/hypha/apply/users/wagtail_hooks.py
+++ b/hypha/apply/users/wagtail_hooks.py
@@ -8,10 +8,10 @@
from .utils import send_activation_email
-@hooks.register('register_admin_urls')
+@hooks.register("register_admin_urls")
def register_admin_urls():
return [
- re_path(r'^users/$', index, name='index'),
+ re_path(r"^users/$", index, name="index"),
]
@@ -20,7 +20,7 @@ def register_viewset():
return CustomGroupViewSet("groups", url_prefix="groups")
-@hooks.register('after_create_user')
+@hooks.register("after_create_user")
def notify_after_create_user(request, user):
messenger(
MESSAGES.STAFF_ACCOUNT_CREATED,
@@ -32,13 +32,14 @@ def notify_after_create_user(request, user):
site = Site.find_for_request(request)
send_activation_email(user, site)
-@hooks.register('after_edit_user')
+
+@hooks.register("after_edit_user")
def notify_after_edit_user(request, user):
- roles = list(user.groups.values_list('name', flat=True))
+ roles = list(user.groups.values_list("name", flat=True))
if user.is_superuser:
- roles.append('Administrator')
+ roles.append("Administrator")
if roles:
- roles = ', '.join(roles)
+ roles = ", ".join(roles)
messenger(
MESSAGES.STAFF_ACCOUNT_EDITED,
request=request,
diff --git a/hypha/apply/utils/admin.py b/hypha/apply/utils/admin.py
index 416f2fb2f4..4bd8fc2c8e 100644
--- a/hypha/apply/utils/admin.py
+++ b/hypha/apply/utils/admin.py
@@ -15,11 +15,13 @@ class ListRelatedMixin:
def get_queryset(self, request):
qs = super().get_queryset(request)
- related = [f'{form}_set__{field}' for form, field in self.related_models]
+ related = [f"{form}_set__{field}" for form, field in self.related_models]
return qs.prefetch_related(*related)
def _list_related(self, obj, form, field):
- return ', '.join(getattr(obj, f'{form}_set').values_list(f'{field}__title', flat=True))
+ return ", ".join(
+ getattr(obj, f"{form}_set").values_list(f"{field}__title", flat=True)
+ )
def used_by(self, obj):
rows = []
@@ -27,7 +29,7 @@ def used_by(self, obj):
related = self._list_related(obj, form, field)
if related:
rows.append(related)
- return ', '.join(rows)
+ return ", ".join(rows)
class RelatedFormsMixin:
@@ -38,10 +40,12 @@ class RelatedFormsMixin:
"""
def application_forms(self, obj):
-
def build_urls(application_forms):
for application_form in application_forms:
- url = reverse('funds_applicationform_modeladmin_edit', args=[application_form.form.id])
+ url = reverse(
+ "funds_applicationform_modeladmin_edit",
+ args=[application_form.form.id],
+ )
yield f'{application_form}'
urls = list(build_urls(obj.forms.all()))
@@ -49,12 +53,14 @@ def build_urls(application_forms):
if not urls:
return
- return mark_safe('
'.join(urls)) + return mark_safe("
".join(urls)) def review_forms(self, obj): def build_urls(review_forms): for review_form in review_forms: - url = reverse('review_reviewform_modeladmin_edit', args=[review_form.form.id]) + url = reverse( + "review_reviewform_modeladmin_edit", args=[review_form.form.id] + ) yield f'{review_form}' urls = list(build_urls(obj.review_forms.all())) @@ -62,12 +68,15 @@ def build_urls(review_forms): if not urls: return - return mark_safe('
'.join(urls)) + return mark_safe("
".join(urls)) def determination_forms(self, obj): def build_urls(determination_forms): for determination_form in determination_forms: - url = reverse('determinations_determinationform_modeladmin_edit', args=[determination_form.form.id]) + url = reverse( + "determinations_determinationform_modeladmin_edit", + args=[determination_form.form.id], + ) yield f'{determination_form}' urls = list(build_urls(obj.determination_forms.all())) @@ -75,4 +84,4 @@ def build_urls(determination_forms): if not urls: return - return mark_safe('
'.join(urls)) + return mark_safe("
".join(urls)) diff --git a/hypha/apply/utils/apps.py b/hypha/apply/utils/apps.py index 7a7dbfb38f..1f9a3760c5 100644 --- a/hypha/apply/utils/apps.py +++ b/hypha/apply/utils/apps.py @@ -2,5 +2,5 @@ class UtilsConfig(AppConfig): - name = 'hypha.apply.utils' - label = 'apply_utils' + name = "hypha.apply.utils" + label = "apply_utils" diff --git a/hypha/apply/utils/blocks.py b/hypha/apply/utils/blocks.py index 843ef8ae32..0f1cd2af0e 100644 --- a/hypha/apply/utils/blocks.py +++ b/hypha/apply/utils/blocks.py @@ -19,9 +19,7 @@ def find_duplicates(items): counted = Counter(items) - duplicates = [ - name for name, count in counted.items() if count > 1 - ] + duplicates = [name for name, count in counted.items() if count > 1] return duplicates @@ -30,7 +28,7 @@ def prettify_names(sequence): def nice_field_name(name): - return name.title().replace('_', ' ') + return name.title().replace("_", " ") def show_admin_form_error_messages(request, form): @@ -46,44 +44,50 @@ class RichTextFieldBlock(TextFieldBlock): widget = RICH_TEXT_WIDGET class Meta: - label = _('Rich text field') - icon = 'form' + label = _("Rich text field") + icon = "form" def get_searchable_content(self, value, data): - return bleach.clean(data or '', tags=[], strip=True) + return bleach.clean(data or "", tags=[], strip=True) def no_response(self): - return '
'.join([self.description, form]) + error_message + form = "
".join([self.description, form]) + error_message return mark_safe(form) def deconstruct(self): - return ('wagtail.blocks.static_block.StaticBlock', (), {}) + return ("wagtail.blocks.static_block.StaticBlock", (), {}) class SingleIncludeMixin: def __init__(self, *args, **kwargs): - info_name = f'{self._meta_class.label} Field' if self._meta_class.label else f'{self.name.title()} Field' - child_blocks = [('info', SingleIncludeStatic(label=info_name, description=self.description))] + info_name = ( + f"{self._meta_class.label} Field" + if self._meta_class.label + else f"{self.name.title()} Field" + ) + child_blocks = [ + ("info", SingleIncludeStatic(label=info_name, description=self.description)) + ] super().__init__(child_blocks, *args, **kwargs) @@ -205,5 +231,5 @@ class MustIncludeFieldBlock(SingleIncludeMixin, FormFieldBlock): def get_field_kwargs(self, struct_value): kwargs = super().get_field_kwargs(struct_value) - kwargs['required'] = True + kwargs["required"] = True return kwargs diff --git a/hypha/apply/utils/image.py b/hypha/apply/utils/image.py index e255d0426d..8ee570333f 100644 --- a/hypha/apply/utils/image.py +++ b/hypha/apply/utils/image.py @@ -4,7 +4,7 @@ def image_url_cache_key(image_id, spec): - return f'image_url_cache_{image_id}_{spec}' + return f"image_url_cache_{image_id}_{spec}" def generate_image_url(image, filter_spec): @@ -13,13 +13,14 @@ def generate_image_url(image, filter_spec): if url: return url from wagtail.images.views.serve import generate_signature + signature = generate_signature(image.id, filter_spec) - url = reverse('wagtailimages_serve', args=(signature, image.id, filter_spec)) - url += image.file.name[len('original_images/'):] + url = reverse("wagtailimages_serve", args=(signature, image.id, filter_spec)) + url += image.file.name[len("original_images/") :] cache.set(cache_key, url) return url -def generate_image_tag(image, filter_spec, html_class=''): +def generate_image_tag(image, filter_spec, html_class=""): url = generate_image_url(image, filter_spec) return format_html(f'
')
diff --git a/hypha/apply/utils/migrations/0001_add_pdf_page_size_setting.py b/hypha/apply/utils/migrations/0001_add_pdf_page_size_setting.py
index 37620a7d10..6f1ceea60f 100644
--- a/hypha/apply/utils/migrations/0001_add_pdf_page_size_setting.py
+++ b/hypha/apply/utils/migrations/0001_add_pdf_page_size_setting.py
@@ -5,23 +5,49 @@
class Migration(migrations.Migration):
-
initial = True
dependencies = [
- ('wagtailcore', '0045_assign_unlock_grouppagepermission'),
+ ("wagtailcore", "0045_assign_unlock_grouppagepermission"),
]
operations = [
migrations.CreateModel(
- name='PDFPageSettings',
+ name="PDFPageSettings",
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('download_page_size', models.CharField(choices=[('A4', 'A4'), ('legal', 'Legal'), ('letter', 'Letter')], default='legal', help_text='Page size of downloadable Project and Submission PDFs', max_length=6)),
- ('site', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, to='wagtailcore.Site')),
+ (
+ "id",
+ models.AutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ (
+ "download_page_size",
+ models.CharField(
+ choices=[
+ ("A4", "A4"),
+ ("legal", "Legal"),
+ ("letter", "Letter"),
+ ],
+ default="legal",
+ help_text="Page size of downloadable Project and Submission PDFs",
+ max_length=6,
+ ),
+ ),
+ (
+ "site",
+ models.OneToOneField(
+ editable=False,
+ on_delete=django.db.models.deletion.CASCADE,
+ to="wagtailcore.Site",
+ ),
+ ),
],
options={
- 'verbose_name': 'pdf settings',
+ "verbose_name": "pdf settings",
},
),
]
diff --git a/hypha/apply/utils/models.py b/hypha/apply/utils/models.py
index cdd22890ee..3e4273840d 100644
--- a/hypha/apply/utils/models.py
+++ b/hypha/apply/utils/models.py
@@ -6,25 +6,25 @@
@register_setting
class PDFPageSettings(BaseSiteSetting):
- A4 = 'A4'
- LEGAL = 'legal'
- LETTER = 'letter'
+ A4 = "A4"
+ LEGAL = "legal"
+ LETTER = "letter"
PAGE_SIZES = [
- (A4, 'A4'),
- (LEGAL, 'Legal'),
- (LETTER, 'Letter'),
+ (A4, "A4"),
+ (LEGAL, "Legal"),
+ (LETTER, "Letter"),
]
class Meta:
- verbose_name = 'pdf settings'
+ verbose_name = "pdf settings"
download_page_size = models.CharField(
choices=PAGE_SIZES,
default=LEGAL,
max_length=6,
- help_text=_('Page size of downloadable Project and Submission PDFs')
+ help_text=_("Page size of downloadable Project and Submission PDFs"),
)
panels = [
- FieldPanel('download_page_size'),
+ FieldPanel("download_page_size"),
]
diff --git a/hypha/apply/utils/options.py b/hypha/apply/utils/options.py
index 8c7c6c8d65..c89b72ea3b 100644
--- a/hypha/apply/utils/options.py
+++ b/hypha/apply/utils/options.py
@@ -1,30 +1,36 @@
from tinymce.widgets import TinyMCE
MCE_ATTRIBUTES = {
- 'elementpath': False,
- 'branding': False,
- 'contextmenu': False,
- 'entity_encoding': 'raw',
- 'plugins': 'link table lists wordcount',
- 'toolbar1': 'undo redo | styleselect | bold italic | bullist numlist | table | link',
- 'style_formats': [
- {'title': 'Headers', 'items': [
- {'title': 'Header 1', 'format': 'h1'},
- {'title': 'Header 2', 'format': 'h2'},
- {'title': 'Header 3', 'format': 'h3'},
- ]},
- {'title': 'Inline', 'items': [
- {'title': 'Bold', 'icon': 'bold', 'format': 'bold'},
- {'title': 'Italic', 'icon': 'italic', 'format': 'italic'},
- {'title': 'Underline', 'icon': 'underline', 'format': 'underline'},
- ]},
+ "elementpath": False,
+ "branding": False,
+ "contextmenu": False,
+ "entity_encoding": "raw",
+ "plugins": "link table lists wordcount",
+ "toolbar1": "undo redo | styleselect | bold italic | bullist numlist | table | link",
+ "style_formats": [
+ {
+ "title": "Headers",
+ "items": [
+ {"title": "Header 1", "format": "h1"},
+ {"title": "Header 2", "format": "h2"},
+ {"title": "Header 3", "format": "h3"},
+ ],
+ },
+ {
+ "title": "Inline",
+ "items": [
+ {"title": "Bold", "icon": "bold", "format": "bold"},
+ {"title": "Italic", "icon": "italic", "format": "italic"},
+ {"title": "Underline", "icon": "underline", "format": "underline"},
+ ],
+ },
],
- 'relative_urls': False,
- 'browser_spellcheck': True,
- 'default_link_target': '_blank',
- 'invalid_elements': 'iframe,object,embed'
+ "relative_urls": False,
+ "browser_spellcheck": True,
+ "default_link_target": "_blank",
+ "invalid_elements": "iframe,object,embed",
}
-MCE_ATTRIBUTES_SHORT = {**MCE_ATTRIBUTES, **{'height': 180}}
+MCE_ATTRIBUTES_SHORT = {**MCE_ATTRIBUTES, **{"height": 180}}
RICH_TEXT_WIDGET = TinyMCE(mce_attrs=MCE_ATTRIBUTES)
RICH_TEXT_WIDGET_SHORT = TinyMCE(mce_attrs=MCE_ATTRIBUTES_SHORT)
diff --git a/hypha/apply/utils/pdfs.py b/hypha/apply/utils/pdfs.py
index a2e62591fe..fd90474511 100644
--- a/hypha/apply/utils/pdfs.py
+++ b/hypha/apply/utils/pdfs.py
@@ -25,17 +25,68 @@
)
STYLES = {
- 'Question': PS(fontName='MontserratBold', fontSize=14, name='Question', spaceAfter=0, spaceBefore=18, leading=21),
- 'QuestionSmall': PS(fontName='MontserratBold', fontSize=12, name='QuestionSmall', spaceAfter=0, spaceBefore=16, leading=18),
- 'Normal': PS(fontName='NotoSans', name='Normal'),
- 'Heading1': PS(fontName='NotoSansBold', fontSize=12, name='Heading1', spaceAfter=4, spaceBefore=12, leading=18),
- 'Heading2': PS(fontName='NotoSansBold', fontSize=10, name='Heading2', spaceAfter=4, spaceBefore=10, leading=15),
- 'Heading3': PS(fontName='NotoSansBold', fontSize=10, name='Heading3', spaceAfter=4, spaceBefore=10, leading=15),
- 'Heading4': PS(fontName='NotoSansBold', fontSize=10, name='Heading4', spaceAfter=4, spaceBefore=10, leading=15),
- 'Heading5': PS(fontName='NotoSansBold', fontSize=10, name='Heading5', spaceAfter=4, spaceBefore=10, leading=15),
+ "Question": PS(
+ fontName="MontserratBold",
+ fontSize=14,
+ name="Question",
+ spaceAfter=0,
+ spaceBefore=18,
+ leading=21,
+ ),
+ "QuestionSmall": PS(
+ fontName="MontserratBold",
+ fontSize=12,
+ name="QuestionSmall",
+ spaceAfter=0,
+ spaceBefore=16,
+ leading=18,
+ ),
+ "Normal": PS(fontName="NotoSans", name="Normal"),
+ "Heading1": PS(
+ fontName="NotoSansBold",
+ fontSize=12,
+ name="Heading1",
+ spaceAfter=4,
+ spaceBefore=12,
+ leading=18,
+ ),
+ "Heading2": PS(
+ fontName="NotoSansBold",
+ fontSize=10,
+ name="Heading2",
+ spaceAfter=4,
+ spaceBefore=10,
+ leading=15,
+ ),
+ "Heading3": PS(
+ fontName="NotoSansBold",
+ fontSize=10,
+ name="Heading3",
+ spaceAfter=4,
+ spaceBefore=10,
+ leading=15,
+ ),
+ "Heading4": PS(
+ fontName="NotoSansBold",
+ fontSize=10,
+ name="Heading4",
+ spaceAfter=4,
+ spaceBefore=10,
+ leading=15,
+ ),
+ "Heading5": PS(
+ fontName="NotoSansBold",
+ fontSize=10,
+ name="Heading5",
+ spaceAfter=4,
+ spaceBefore=10,
+ leading=15,
+ ),
}
-font_location = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'media', 'fonts')
+font_location = os.path.join(
+ os.path.dirname(os.path.abspath(__file__)), "media", "fonts"
+)
def font(font_name):
@@ -49,28 +100,32 @@ def prepare_fonts():
global PREPARED_FONTS
if PREPARED_FONTS:
return
- pdfmetrics.registerFont(TTFont('Montserrat', font('Montserrat-Regular.ttf')))
- pdfmetrics.registerFont(TTFont('MontserratBold', font('Montserrat-Bold.ttf')))
- pdfmetrics.registerFont(TTFont('MontserratItalic', font('Montserrat-Italic.ttf')))
- pdfmetrics.registerFont(TTFont('MontserratBoldItalic', font('Montserrat-BoldItalic.ttf')))
+ pdfmetrics.registerFont(TTFont("Montserrat", font("Montserrat-Regular.ttf")))
+ pdfmetrics.registerFont(TTFont("MontserratBold", font("Montserrat-Bold.ttf")))
+ pdfmetrics.registerFont(TTFont("MontserratItalic", font("Montserrat-Italic.ttf")))
+ pdfmetrics.registerFont(
+ TTFont("MontserratBoldItalic", font("Montserrat-BoldItalic.ttf"))
+ )
pdfmetrics.registerFontFamily(
- 'Montserrat',
- normal='Montserrat',
- bold='MontserratBold',
- italic='MontserratItalic',
- boldItalic='MontserratBoldItalic'
+ "Montserrat",
+ normal="Montserrat",
+ bold="MontserratBold",
+ italic="MontserratItalic",
+ boldItalic="MontserratBoldItalic",
)
- pdfmetrics.registerFont(TTFont('NotoSans', font('NotoSans-Regular.ttf')))
- pdfmetrics.registerFont(TTFont('NotoSansBold', font('NotoSans-Bold.ttf')))
- pdfmetrics.registerFont(TTFont('NotoSansItalic', font('NotoSans-Italic.ttf')))
- pdfmetrics.registerFont(TTFont('NotoSansBoldItalic', font('NotoSans-BoldItalic.ttf')))
+ pdfmetrics.registerFont(TTFont("NotoSans", font("NotoSans-Regular.ttf")))
+ pdfmetrics.registerFont(TTFont("NotoSansBold", font("NotoSans-Bold.ttf")))
+ pdfmetrics.registerFont(TTFont("NotoSansItalic", font("NotoSans-Italic.ttf")))
+ pdfmetrics.registerFont(
+ TTFont("NotoSansBoldItalic", font("NotoSans-BoldItalic.ttf"))
+ )
pdfmetrics.registerFontFamily(
- 'NotoSans',
- normal='NotoSans',
- bold='NotoSansBold',
- italic='NotoSansItalic',
- boldItalic='NotoSansBoldItalic'
+ "NotoSans",
+ normal="NotoSans",
+ bold="NotoSansBold",
+ italic="NotoSansItalic",
+ boldItalic="NotoSansBoldItalic",
)
PREPARED_FONTS = True
@@ -87,11 +142,23 @@ def do_nothing(doc, canvas):
class ReportDocTemplate(BaseDocTemplate):
def build(self, flowables, onFirstPage=do_nothing, onLaterPages=do_nothing):
- frame = Frame(self.leftMargin, self.bottomMargin, self.width, self.height, id='normal')
- self.addPageTemplates([
- PageTemplate(id='Header', autoNextPageTemplate='Main', frames=frame, onPage=onFirstPage, pagesize=self.pagesize),
- PageTemplate(id='Main', frames=frame, onPage=onLaterPages, pagesize=self.pagesize),
- ])
+ frame = Frame(
+ self.leftMargin, self.bottomMargin, self.width, self.height, id="normal"
+ )
+ self.addPageTemplates(
+ [
+ PageTemplate(
+ id="Header",
+ autoNextPageTemplate="Main",
+ frames=frame,
+ onPage=onFirstPage,
+ pagesize=self.pagesize,
+ ),
+ PageTemplate(
+ id="Main", frames=frame, onPage=onLaterPages, pagesize=self.pagesize
+ ),
+ ]
+ )
super().build(flowables)
@@ -108,8 +175,8 @@ def make_pdf(title, sections, pagesize):
story = []
for section in sections:
- story.extend(section['content'])
- story.append(NextPageTemplate('Header'))
+ story.extend(section["content"])
+ story.append(NextPageTemplate("Header"))
story.append(PageBreak())
current_section = None
@@ -122,9 +189,9 @@ def header_page(canvas, doc):
title_spacer = draw_title_block(
canvas,
doc,
- current_section['title'],
+ current_section["title"],
title,
- current_section['meta'],
+ current_section["meta"],
page_width,
page_height,
)
@@ -137,7 +204,7 @@ def main_page(canvas, doc):
spacer = draw_header(
canvas,
doc,
- current_section['title'],
+ current_section["title"],
title,
page_width,
page_height,
@@ -166,9 +233,9 @@ def draw_header(canvas, doc, page_title, title, page_width, page_height):
# only count title - assume 1 line of title in header
total_height = (
- doc.topMargin +
- 1.5 * (len(split_title) - 1) * title_size +
- title_size / 2 # bottom padding
+ doc.topMargin
+ + 1.5 * (len(split_title) - 1) * title_size
+ + title_size / 2 # bottom padding
)
canvas.setFillColor(DARK_GREY)
@@ -182,9 +249,9 @@ def draw_header(canvas, doc, page_title, title, page_width, page_height):
)
pos = (
- (page_height - doc.topMargin) + # bottom of top margin
- title_size / 2 + # spacing below page title
- 1.5 * 1 * title_size # text
+ (page_height - doc.topMargin)
+ + title_size / 2 # bottom of top margin
+ + 1.5 * 1 * title_size # spacing below page title # text
)
canvas.setFillColor(white)
@@ -223,14 +290,16 @@ def draw_title_block(canvas, doc, page_title, title, meta, page_width, page_heig
canvas.setFont("MontserratBold", meta_size)
canvas.setFillColor(white)
- meta_text = ' | '.join(str(text) for text in meta)
+ meta_text = " | ".join(str(text) for text in meta)
split_meta = split_text(canvas, meta_text, text_width)
total_height = (
- doc.topMargin +
- page_title_size + page_title_size * 3 / 4 + # page title + spaceing
- len(split_title) * (title_size + title_size / 2) + # title + spacing
- (1.5 * len(split_meta) + 3) * meta_size # 1.5 per text line + 3 for spacing
+ doc.topMargin
+ + page_title_size
+ + page_title_size * 3 / 4
+ + len(split_title) * (title_size + title_size / 2) # page title + spaceing
+ + (1.5 * len(split_meta) + 3) # title + spacing
+ * meta_size # 1.5 per text line + 3 for spacing
)
canvas.setFillColor(DARK_GREY)
@@ -295,52 +364,54 @@ def handle_block(block, custom_style=None):
if isinstance(tag, NavigableString):
text = tag.strip()
if text:
- paragraphs.append(Paragraph(text, styles['Normal']))
- elif tag.name in {'ul', 'ol'}:
- style = styles['Normal']
- if tag.name == 'ul':
- bullet = 'bullet'
- elif tag.name == 'ol':
- bullet = '1'
+ paragraphs.append(Paragraph(text, styles["Normal"]))
+ elif tag.name in {"ul", "ol"}:
+ style = styles["Normal"]
+ if tag.name == "ul":
+ bullet = "bullet"
+ elif tag.name == "ol":
+ bullet = "1"
paragraphs.append(
ListFlowable(
[
ListItem(Paragraph(bullet_item.get_text(), style))
- for bullet_item in tag.find_all('li')
+ for bullet_item in tag.find_all("li")
],
bulletType=bullet,
)
)
- elif tag.name in {'table'}:
+ elif tag.name in {"table"}:
paragraphs.append(
Table(
[
[
- Paragraph(cell.get_text(), styles['Normal'])
- for cell in row.find_all({'td', 'th'})
+ Paragraph(cell.get_text(), styles["Normal"])
+ for cell in row.find_all({"td", "th"})
]
- for row in tag.find_all('tr')
+ for row in tag.find_all("tr")
],
- colWidths='*',
- style=TableStyle([
- ('VALIGN', (0, 0), (-1, -1), 'TOP'),
- ('LINEABOVE', (0, 0), (-1, -1), 1, DARK_GREY),
- ]),
+ colWidths="*",
+ style=TableStyle(
+ [
+ ("VALIGN", (0, 0), (-1, -1), "TOP"),
+ ("LINEABOVE", (0, 0), (-1, -1), 1, DARK_GREY),
+ ]
+ ),
)
)
else:
style = None
- if tag.name in {'p'}:
- style = styles['Normal']
- elif tag.name == 'h2':
- style = styles['Heading2']
- elif tag.name == 'h3':
- style = styles['Heading3']
- elif tag.name == 'h4':
- style = styles['Heading4']
- elif tag.name == 'h5':
- style = styles['Heading5']
+ if tag.name in {"p"}:
+ style = styles["Normal"]
+ elif tag.name == "h2":
+ style = styles["Heading2"]
+ elif tag.name == "h3":
+ style = styles["Heading3"]
+ elif tag.name == "h4":
+ style = styles["Heading4"]
+ elif tag.name == "h5":
+ style = styles["Heading5"]
if style:
text = tag.get_text()
@@ -355,29 +426,37 @@ def draw_submission_content(content):
prepare_fonts()
paragraphs = []
- for section in BeautifulSoup(content, "html5lib").find_all('section'):
- question_text = section.select_one('.question').get_text()
- question = Paragraph(question_text, STYLES['Question'])
+ for section in BeautifulSoup(content, "html5lib").find_all("section"):
+ question_text = section.select_one(".question").get_text()
+ question = Paragraph(question_text, STYLES["Question"])
# Keep the question and the first block of the answer together
# this keeps 1 line answers tidy and ensures that bigger responses break
# sooner instead of waiting to fill an entire page. There may still be issues
- first_answer, *rest = handle_block(section.select_one('.answer'))
- paragraphs.extend([
- KeepTogether([
- question,
- first_answer,
- ]),
- *rest
- ])
+ first_answer, *rest = handle_block(section.select_one(".answer"))
+ paragraphs.extend(
+ [
+ KeepTogether(
+ [
+ question,
+ first_answer,
+ ]
+ ),
+ *rest,
+ ]
+ )
return paragraphs
def draw_project_content(content):
prepare_fonts()
paragraphs = []
- for section in BeautifulSoup(content, "html5lib").find_all(class_='simplified__wrapper'):
- flowables = handle_block(section, custom_style={"Heading3": "Question", "Heading5": "QuestionSmall"})
+ for section in BeautifulSoup(content, "html5lib").find_all(
+ class_="simplified__wrapper"
+ ):
+ flowables = handle_block(
+ section, custom_style={"Heading3": "Question", "Heading5": "QuestionSmall"}
+ )
paragraphs.extend(flowables)
return paragraphs
diff --git a/hypha/apply/utils/storage.py b/hypha/apply/utils/storage.py
index a8476cdef1..30ec9f1110 100644
--- a/hypha/apply/utils/storage.py
+++ b/hypha/apply/utils/storage.py
@@ -4,7 +4,7 @@
from django.http import FileResponse
from django.views.generic import View
-private_file_storage = getattr(settings, 'PRIVATE_FILE_STORAGE', None)
+private_file_storage = getattr(settings, "PRIVATE_FILE_STORAGE", None)
PrivateStorage = get_storage_class(private_file_storage)
@@ -17,6 +17,7 @@ class PrivateMediaView(LoginRequiredMixin, View):
based on the file being served, this class will only ensure that the file
is not made public to unauthenticated users.
"""
+
storage = PrivateStorage()
def get_media(self, *args, **kwargs):
diff --git a/hypha/apply/utils/templates/apply/404.html b/hypha/apply/utils/templates/apply/404.html
index d460a095e1..233889d1a7 100644
--- a/hypha/apply/utils/templates/apply/404.html
+++ b/hypha/apply/utils/templates/apply/404.html
@@ -6,8 +6,8 @@
{% block body_class %}template-404{% endblock %}
{% block content %}
-
-
+ {% if perms.funds.delete_review or request.user == review.author.reviewer %}
+
+ {% endif %}
+ {% if perms.funds.change_review or request.user == review.author.reviewer %}
+
+ {% endif %}
+ {% if not review.for_latest %}
+
-
-
- {% trans "Recommendation" %}
-{{ review.get_recommendation_display }}
-
-
-
- {% trans "Score" %}
-{{ review.get_score_display }}
-
-
- {{ review.get_visibility_display }}
-
- {% if perms.funds.delete_review or request.user == review.author.reviewer %}
+
-
- {% trans "Delete" %}
-
-
+
- {% endif %}
- {% if perms.funds.change_review or request.user == review.author.reviewer %}
- {% endif %}
- {% if not review.for_latest %}
+
{% trans "Recommendation" %}
+{{ review.get_recommendation_display }}
-
- {% endif %}
-{% trans "Review was not against the latest version" %}:
- + + {{ review.get_visibility_display }}
+
+ {% endif %}
+ {% trans "Review was not against the latest version" %}:
+ +
- {{ object.get_comments_display|submission_links }}
+
-{% if form %}
-
+ {% if form %}
+
-
+ {{ object.get_comments_display|submission_links }}
- {{ object.output_answers|submission_links }}
-
+ {{ object.output_answers|submission_links }}
+ {% trans "An opinion is a replacement for a review. You will no longer be able to submit a review for this application." %}
-{% endif %} +{% trans "An opinion is a replacement for a review. You will no longer be able to submit a review for this application." %}
+ {% endif %} {% endblock %} diff --git a/hypha/apply/review/templates/review/review_edit_form.html b/hypha/apply/review/templates/review/review_edit_form.html index 7664e51b80..cf870aacb6 100644 --- a/hypha/apply/review/templates/review/review_edit_form.html +++ b/hypha/apply/review/templates/review/review_edit_form.html @@ -2,44 +2,44 @@ {% load i18n %} {% block title %}{{ title }}{% endblock %} {% block content %} -
-
-{% include "forms/includes/form_errors.html" with form=form %}
+ {% include "forms/includes/form_errors.html" with form=form %}
-
diff --git a/hypha/apply/users/templatetags/users_tags.py b/hypha/apply/users/templatetags/users_tags.py
index 94a8584b01..8c8622cb03 100644
--- a/hypha/apply/users/templatetags/users_tags.py
+++ b/hypha/apply/users/templatetags/users_tags.py
@@ -10,20 +10,20 @@
def backend_name(name):
"""Human readable mapping for the social auth backend"""
return {
- 'google-oauth': 'Google OAuth',
- 'google-oauth2': 'Google OAuth',
- 'google-openidconnect': 'Google OpenId',
+ "google-oauth": "Google OAuth",
+ "google-oauth2": "Google OAuth",
+ "google-openidconnect": "Google OpenId",
}.get(name, name)
@register.filter
def backend_class(backend):
- return backend.replace('-', ' ')
+ return backend.replace("-", " ")
@register.simple_tag(takes_context=True)
def can_use_oauth(context):
- user = context.get('user')
+ user = context.get("user")
return can_use_oauth_check(user)
diff --git a/hypha/apply/users/tests/factories.py b/hypha/apply/users/tests/factories.py
index 284d91896e..2068b91c25 100644
--- a/hypha/apply/users/tests/factories.py
+++ b/hypha/apply/users/tests/factories.py
@@ -20,18 +20,20 @@
class GroupFactory(factory.django.DjangoModelFactory):
class Meta:
model = Group
- django_get_or_create = ('name',)
+ django_get_or_create = ("name",)
- name = factory.Sequence('group name {}'.format)
+ name = factory.Sequence("group name {}".format)
class UserFactory(factory.django.DjangoModelFactory):
class Meta:
model = get_user_model()
- email = factory.LazyAttribute(lambda o: '{}+{}@email.com'.format(slugify(o.full_name), uuid.uuid4()))
- full_name = factory.Faker('name')
- password = factory.PostGenerationMethodCall('set_password', 'defaultpassword')
+ email = factory.LazyAttribute(
+ lambda o: "{}+{}@email.com".format(slugify(o.full_name), uuid.uuid4())
+ )
+ full_name = factory.Faker("name")
+ password = factory.PostGenerationMethodCall("set_password", "defaultpassword")
@factory.post_generation
def groups(self, create, extracted, **kwargs):
@@ -45,7 +47,7 @@ def groups(self, create, extracted, **kwargs):
class OAuthUserFactory(UserFactory):
- password = factory.PostGenerationMethodCall('set_unusable_password')
+ password = factory.PostGenerationMethodCall("set_unusable_password")
class AdminFactory(UserFactory):
@@ -54,13 +56,14 @@ class AdminFactory(UserFactory):
class StaffFactory(OAuthUserFactory):
class Meta:
- exclude = ('slack_temp', )
+ exclude = ("slack_temp",)
+
is_staff = True
# Required to generate the fake data add pass to LazyAttribute
- slack_temp = factory.Faker('word')
+ slack_temp = factory.Faker("word")
- slack = factory.LazyAttribute(lambda p: '@{}'.format(p.slack_temp))
+ slack = factory.LazyAttribute(lambda p: "@{}".format(p.slack_temp))
@factory.post_generation
def groups(self, create, extracted, **kwargs):
@@ -70,8 +73,7 @@ def groups(self, create, extracted, **kwargs):
def get_wagtail_admin_access_permission():
return Permission.objects.get(
- content_type__app_label='wagtailadmin',
- codename='access_admin'
+ content_type__app_label="wagtailadmin", codename="access_admin"
)
@@ -97,13 +99,14 @@ def groups(self, create, extracted, **kwargs):
class FinanceFactory(OAuthUserFactory):
class Meta:
- exclude = ('slack_temp', )
+ exclude = ("slack_temp",)
+
is_staff = True
# Required to generate the fake data add pass to LazyAttribute
- slack_temp = factory.Faker('word')
+ slack_temp = factory.Faker("word")
- slack = factory.LazyAttribute(lambda p: '@{}'.format(p.slack_temp))
+ slack = factory.LazyAttribute(lambda p: "@{}".format(p.slack_temp))
@factory.post_generation
def groups(self, create, extracted, **kwargs):
@@ -127,7 +130,7 @@ def groups(self, create, extracted, **kwargs):
if create:
self.groups.add(
GroupFactory(name=FINANCE_GROUP_NAME),
- GroupFactory(name=APPROVER_GROUP_NAME)
+ GroupFactory(name=APPROVER_GROUP_NAME),
)
@@ -146,7 +149,7 @@ def groups(self, create, extracted, **kwargs):
if create:
self.groups.add(
GroupFactory(name=CONTRACTING_GROUP_NAME),
- GroupFactory(name=APPROVER_GROUP_NAME)
+ GroupFactory(name=APPROVER_GROUP_NAME),
)
diff --git a/hypha/apply/users/tests/test_forms.py b/hypha/apply/users/tests/test_forms.py
index f7062fe4bf..9dc5009c88 100644
--- a/hypha/apply/users/tests/test_forms.py
+++ b/hypha/apply/users/tests/test_forms.py
@@ -13,7 +13,9 @@ def form_data(self, user, **values):
return data
def submit_form(self, instance, **extra_data):
- form = ProfileForm(instance=instance, data=self.form_data(instance, **extra_data))
+ form = ProfileForm(
+ instance=instance, data=self.form_data(instance, **extra_data)
+ )
if form.is_valid():
form.save()
@@ -32,13 +34,13 @@ def test_email_unique(self):
self.assertNotEqual(self.user.email, other_user.email)
def test_can_change_email(self):
- new_email = 'me@another.com'
+ new_email = "me@another.com"
self.submit_form(self.user, email=new_email)
self.user.refresh_from_db()
self.assertEqual(self.user.email, new_email)
def test_cant_set_slack_name(self):
- slack_name = '@foobar'
+ slack_name = "@foobar"
self.submit_form(self.user, slack=slack_name)
self.user.refresh_from_db()
self.assertNotEqual(self.user.slack, slack_name)
@@ -49,27 +51,27 @@ def setUp(self):
self.staff = StaffFactory()
def test_cant_change_email(self):
- new_email = 'me@this.com'
+ new_email = "me@this.com"
self.submit_form(self.staff, email=new_email)
self.staff.refresh_from_db()
self.assertNotEqual(new_email, self.staff.email)
def test_can_set_slack_name(self):
- slack_name = '@foobar'
+ slack_name = "@foobar"
self.submit_form(self.staff, slack=slack_name)
self.staff.refresh_from_db()
self.assertEqual(self.staff.slack, slack_name)
def test_can_set_slack_name_with_trailing_space(self):
- slack_name = '@foobar'
+ slack_name = "@foobar"
self.submit_form(self.staff, slack=slack_name)
self.staff.refresh_from_db()
self.assertEqual(self.staff.slack, slack_name)
def test_cant_set_slack_name_with_space(self):
- slack_name = '@ foobar'
+ slack_name = "@ foobar"
form = self.submit_form(self.staff, slack=slack_name)
self.assertFalse(form.is_valid())
@@ -77,14 +79,14 @@ def test_cant_set_slack_name_with_space(self):
self.assertNotEqual(self.staff.slack, slack_name)
def test_auto_prepend_at(self):
- slack_name = 'foobar'
+ slack_name = "foobar"
self.submit_form(self.staff, slack=slack_name)
self.staff.refresh_from_db()
- self.assertEqual(self.staff.slack, '@' + slack_name)
+ self.assertEqual(self.staff.slack, "@" + slack_name)
def test_can_clear_slack_name(self):
- slack_name = ''
+ slack_name = ""
self.submit_form(self.staff, slack=slack_name)
self.staff.refresh_from_db()
@@ -97,10 +99,10 @@ def setUp(self):
def test_doesnt_error_on_null_slack_field(self):
form = EmailChangePasswordForm(self.user)
- form.save('', '', None)
+ form.save("", "", None)
def test_can_update_slack(self):
- slack_name = 'foobar'
+ slack_name = "foobar"
form = EmailChangePasswordForm(self.user)
- form.save('', '', slack_name)
+ form.save("", "", slack_name)
self.assertEqual(self.user.slack, slack_name)
diff --git a/hypha/apply/users/tests/test_middleware.py b/hypha/apply/users/tests/test_middleware.py
index 6800bb67ba..a5de674bb4 100644
--- a/hypha/apply/users/tests/test_middleware.py
+++ b/hypha/apply/users/tests/test_middleware.py
@@ -7,20 +7,24 @@
from ..middleware import ALLOWED_SUBPATH_FOR_UNVERIFIED_USERS
-@override_settings(ROOT_URLCONF='hypha.apply.urls', ENFORCE_TWO_FACTOR=True)
+@override_settings(ROOT_URLCONF="hypha.apply.urls", ENFORCE_TWO_FACTOR=True)
class TestTwoFactorAuthenticationMiddleware(TestCase):
def enable_otp(self, user):
- return user.totpdevice_set.create(name='default')
+ return user.totpdevice_set.create(name="default")
def test_unverified_user_redirect(self):
user = UserFactory()
self.client.force_login(user)
response = self.client.get(settings.LOGIN_REDIRECT_URL, follow=True)
- self.assertRedirects(response, reverse('users:two_factor_required'), status_code=301)
+ self.assertRedirects(
+ response, reverse("users:two_factor_required"), status_code=301
+ )
- response = self.client.get(reverse('funds:submissions:list'), follow=True)
- self.assertRedirects(response, reverse('users:two_factor_required'), status_code=301)
+ response = self.client.get(reverse("funds:submissions:list"), follow=True)
+ self.assertRedirects(
+ response, reverse("users:two_factor_required"), status_code=301
+ )
def test_verified_user_redirect(self):
user = UserFactory()
@@ -29,7 +33,7 @@ def test_verified_user_redirect(self):
response = self.client.get(settings.LOGIN_REDIRECT_URL, follow=True)
self.assertEqual(response.status_code, 200)
- response = self.client.get(reverse('funds:submissions:list'), follow=True)
+ response = self.client.get(reverse("funds:submissions:list"), follow=True)
self.assertEqual(response.status_code, 200)
def test_unverified_user_can_access_allowed_urls(self):
diff --git a/hypha/apply/users/tests/test_oauth_access.py b/hypha/apply/users/tests/test_oauth_access.py
index 8de97b56be..124d211b32 100644
--- a/hypha/apply/users/tests/test_oauth_access.py
+++ b/hypha/apply/users/tests/test_oauth_access.py
@@ -4,11 +4,11 @@
from django.urls import reverse
-@override_settings(ROOT_URLCONF='hypha.apply.urls')
+@override_settings(ROOT_URLCONF="hypha.apply.urls")
class TestOAuthAccess(TestCase):
def login(self):
- email = 'test@email.com'
- password = 'password'
+ email = "test@email.com"
+ password = "password"
user = get_user_model().objects.create_user(email=email, password=password)
logged_in = self.client.login(email=email, password=password)
self.assertTrue(logged_in)
@@ -18,11 +18,11 @@ def test_oauth_page_requires_login(self):
"""
This checks that /account/oauth requires the user to be logged in
"""
- oauth_page = reverse('users:oauth')
+ oauth_page = reverse("users:oauth")
response = self.client.get(oauth_page, follow=True)
self.assertRedirects(
response,
- reverse('users_public:login') + '?next=' + reverse('users:oauth'),
+ reverse("users_public:login") + "?next=" + reverse("users:oauth"),
status_code=301,
target_status_code=200,
)
@@ -32,31 +32,31 @@ def test_oauth_not_set_up(self):
del settings.SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS
self.login()
- response = self.client.get(reverse('users:oauth'), follow=True)
+ response = self.client.get(reverse("users:oauth"), follow=True)
self.assertEqual(response.status_code, 403)
def test_oauth_user_email_not_whitelisted(self):
self.login()
- response = self.client.get(reverse('users:oauth'), follow=True)
+ response = self.client.get(reverse("users:oauth"), follow=True)
self.assertEqual(response.status_code, 403)
- @override_settings(SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS=['email.com'])
+ @override_settings(SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS=["email.com"])
def test_oauth_whitelisted_user_can_see_link_to_oauth_settings_page(self):
self.login()
- response = self.client.get(reverse('users:account'), follow=True)
- self.assertNotContains(response, 'Manage OAuth')
+ response = self.client.get(reverse("users:account"), follow=True)
+ self.assertNotContains(response, "Manage OAuth")
- @override_settings(SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS=['email.com'])
+ @override_settings(SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS=["email.com"])
def test_oauth_whitelisted_user_can_access_oauth_settings_page(self):
"""
Checks that the test user can access the OAuth page as their email is whitelisted
"""
self.login()
- response = self.client.get(reverse('users:oauth'), follow=True)
+ response = self.client.get(reverse("users:oauth"), follow=True)
self.assertEqual(response.status_code, 200)
- self.assertContains(response, 'Google OAuth')
- self.assertNotContains(response, 'Disconnect Google OAuth')
+ self.assertContains(response, "Google OAuth")
+ self.assertNotContains(response, "Disconnect Google OAuth")
- self.assertTemplateUsed(response, 'users/oauth.html')
+ self.assertTemplateUsed(response, "users/oauth.html")
diff --git a/hypha/apply/users/tests/test_registration.py b/hypha/apply/users/tests/test_registration.py
index f6f3a98e89..ea0019c6b6 100644
--- a/hypha/apply/users/tests/test_registration.py
+++ b/hypha/apply/users/tests/test_registration.py
@@ -6,18 +6,17 @@
from hypha.apply.utils.testing import make_request
-@override_settings(ROOT_URLCONF='hypha.apply.urls')
+@override_settings(ROOT_URLCONF="hypha.apply.urls")
class TestRegistration(TestCase):
-
@override_settings(ENABLE_REGISTRATION_WITHOUT_APPLICATION=False)
def test_registration_enabled_has_no_link(self):
response = self.client.get("/", follow=True)
- self.assertNotContains(response, reverse('users_public:register'))
+ self.assertNotContains(response, reverse("users_public:register"))
@override_settings(ENABLE_REGISTRATION_WITHOUT_APPLICATION=True)
def test_registration_enabled_has_link(self):
response = self.client.get("/", follow=True)
- self.assertContains(response, reverse('users_public:register'))
+ self.assertContains(response, reverse("users_public:register"))
@override_settings(ENABLE_REGISTRATION_WITHOUT_APPLICATION=True)
def test_registration(self):
@@ -28,12 +27,13 @@ def test_registration(self):
"first_name": "Not used - see full_name",
"last_name": "Not used - see full_name",
},
- secure=True)
+ secure=True,
+ )
assert len(mail.outbox) == 1
- assert 'Activate your account on the' in mail.outbox[0].body
+ assert "Activate your account on the" in mail.outbox[0].body
assert response.status_code == 302
- assert reverse('users_public:register-success') in response.url
+ assert reverse("users_public:register-success") in response.url
@override_settings(ENABLE_REGISTRATION_WITHOUT_APPLICATION=True)
def test_duplicate_registration_fails(self):
@@ -44,7 +44,8 @@ def test_duplicate_registration_fails(self):
"first_name": "Not used - see full_name",
"last_name": "Not used - see full_name",
},
- secure=True)
+ secure=True,
+ )
mail.outbox.clear()
response = self.client.post(
@@ -54,14 +55,19 @@ def test_duplicate_registration_fails(self):
"first_name": "Not used - see full_name",
"last_name": "Not used - see full_name",
},
- secure=True)
+ secure=True,
+ )
assert len(mail.outbox) == 0
self.assertContains(response, "A user with that email already exists")
- @override_settings(FORCE_LOGIN_FOR_APPLICATION=True, ENABLE_REGISTRATION_WITHOUT_APPLICATION=False)
+ @override_settings(
+ FORCE_LOGIN_FOR_APPLICATION=True, ENABLE_REGISTRATION_WITHOUT_APPLICATION=False
+ )
def test_force_login(self):
fund = FundTypeFactory()
- response = fund.serve(make_request(None, {}, method='get', site=fund.get_site()))
+ response = fund.serve(
+ make_request(None, {}, method="get", site=fund.get_site())
+ )
assert response.status_code == 302
- assert response.url == reverse('users_public:login') + '?next=/'
+ assert response.url == reverse("users_public:login") + "?next=/"
diff --git a/hypha/apply/users/tests/test_utils.py b/hypha/apply/users/tests/test_utils.py
index bc86a7e347..a569864972 100644
--- a/hypha/apply/users/tests/test_utils.py
+++ b/hypha/apply/users/tests/test_utils.py
@@ -6,9 +6,8 @@
from ..utils import get_user_by_email, is_user_already_registered, send_activation_email
-@override_settings(ROOT_URLCONF='hypha.apply.urls')
+@override_settings(ROOT_URLCONF="hypha.apply.urls")
class TestActivationEmail(TestCase):
-
def test_activation_email_includes_link(self):
send_activation_email(UserFactory())
assert len(mail.outbox) == 1
@@ -16,35 +15,39 @@ def test_activation_email_includes_link(self):
assert "password reset form at: https://primary-test-host.org" in email_body
-@override_settings(ROOT_URLCONF='hypha.apply.urls')
+@override_settings(ROOT_URLCONF="hypha.apply.urls")
class TestGetUserByEmail(TestCase):
-
def test_no_account(self):
- assert get_user_by_email(email='abc@gmail.com') is None
+ assert get_user_by_email(email="abc@gmail.com") is None
def test_single_same_email(self):
- user1 = UserFactory(email='abc@gmail.com')
+ user1 = UserFactory(email="abc@gmail.com")
- assert get_user_by_email(email='abc@gmail.com').id == user1.id
- assert get_user_by_email(email='ABC@gmail.com').id == user1.id
- assert get_user_by_email(email='ABC@GMAIL.COM').id == user1.id
+ assert get_user_by_email(email="abc@gmail.com").id == user1.id
+ assert get_user_by_email(email="ABC@gmail.com").id == user1.id
+ assert get_user_by_email(email="ABC@GMAIL.COM").id == user1.id
def test_multiple_accounts_same_email(self):
- user1 = UserFactory(email='abc@gmail.com')
- user2 = UserFactory(email='Abc@gmail.com')
+ user1 = UserFactory(email="abc@gmail.com")
+ user2 = UserFactory(email="Abc@gmail.com")
- assert get_user_by_email(email='abc@gmail.com').id == user1.id
- assert get_user_by_email(email='Abc@gmail.com').id == user2.id
+ assert get_user_by_email(email="abc@gmail.com").id == user1.id
+ assert get_user_by_email(email="Abc@gmail.com").id == user2.id
-@override_settings(ROOT_URLCONF='hypha.apply.urls')
+@override_settings(ROOT_URLCONF="hypha.apply.urls")
class TestUserAlreadyRegistered(TestCase):
-
def test_no_account(self):
- assert is_user_already_registered(email='abc@gmail.com') == (False, '')
+ assert is_user_already_registered(email="abc@gmail.com") == (False, "")
def test_case_sensitive_email(self):
- UserFactory(email='abc@gmail.com')
-
- assert is_user_already_registered(email='abc@gmail.com') == (True, "Email is already in use.")
- assert is_user_already_registered(email='ABc@gmail.com') == (True, "Email is already in use.")
+ UserFactory(email="abc@gmail.com")
+
+ assert is_user_already_registered(email="abc@gmail.com") == (
+ True,
+ "Email is already in use.",
+ )
+ assert is_user_already_registered(email="ABc@gmail.com") == (
+ True,
+ "Email is already in use.",
+ )
diff --git a/hypha/apply/users/tests/test_views.py b/hypha/apply/users/tests/test_views.py
index 52f70dbc6a..45351e8e8f 100644
--- a/hypha/apply/users/tests/test_views.py
+++ b/hypha/apply/users/tests/test_views.py
@@ -7,11 +7,11 @@
from .factories import OAuthUserFactory, StaffFactory, SuperUserFactory, UserFactory
-@override_settings(ROOT_URLCONF='hypha.apply.urls')
+@override_settings(ROOT_URLCONF="hypha.apply.urls")
class BaseTestProfielView(TestCase):
@classmethod
def setUpTestData(cls):
- cls.url = reverse('users:account')
+ cls.url = reverse("users:account")
class TestProfileView(BaseTestProfielView):
@@ -23,20 +23,24 @@ def test_cant_acces_if_not_logged_in(self):
self.client.logout()
response = self.client.get(self.url, follow=True)
# Initial redirect will be via to https through a 301
- self.assertRedirects(response, reverse('users_public:login') + '?next=' + self.url, status_code=301)
+ self.assertRedirects(
+ response,
+ reverse("users_public:login") + "?next=" + self.url,
+ status_code=301,
+ )
def test_includes_change_password(self):
response = self.client.get(self.url, follow=True)
- self.assertContains(response, reverse('users:password_change'))
+ self.assertContains(response, reverse("users:password_change"))
def test_doesnt_includes_change_password_for_oauth(self):
self.client.force_login(OAuthUserFactory())
response = self.client.get(self.url, follow=True)
- self.assertNotContains(response, reverse('users:password_change'))
+ self.assertNotContains(response, reverse("users:password_change"))
def test_cant_set_slack_name(self):
response = self.client.get(self.url, follow=True)
- self.assertNotContains(response, 'Slack name')
+ self.assertNotContains(response, "Slack name")
class TestStaffProfileView(BaseTestProfielView):
@@ -46,22 +50,24 @@ def setUp(self):
def test_can_set_slack_name(self):
response = self.client.get(self.url, follow=True)
- self.assertContains(response, 'Slack name')
+ self.assertContains(response, "Slack name")
class TestPasswordReset(BaseViewTestCase):
user_factory = UserFactory
- url_name = 'users:{}'
- base_view_name = 'password_reset'
+ url_name = "users:{}"
+ base_view_name = "password_reset"
def test_recieves_email(self):
- response = self.post_page(None, data={'email': self.user.email})
- self.assertRedirects(response, self.url(None, view_name='password_reset_done'))
+ response = self.post_page(None, data={"email": self.user.email})
+ self.assertRedirects(response, self.url(None, view_name="password_reset_done"))
self.assertEqual(len(mail.outbox), 1)
- self.assertIn('https://testserver/account/password/reset/confirm', mail.outbox[0].body)
+ self.assertIn(
+ "https://testserver/account/password/reset/confirm", mail.outbox[0].body
+ )
-@override_settings(ROOT_URLCONF='hypha.apply.urls')
+@override_settings(ROOT_URLCONF="hypha.apply.urls")
class TestBecome(TestCase):
def setUp(self):
self.staff = StaffFactory()
@@ -70,8 +76,10 @@ def setUp(self):
def become_request(self, user, target):
self.client.force_login(user)
- url = reverse('users:become')
- response = self.client.post(url, {'user_pk': target.pk}, follow=True, secure=True)
+ url = reverse("users:become")
+ response = self.client.post(
+ url, {"user_pk": target.pk}, follow=True, secure=True
+ )
return response
def test_staff_cannot_become_user(self):
diff --git a/hypha/apply/users/urls.py b/hypha/apply/users/urls.py
index 159eddaad5..708d8f3154 100644
--- a/hypha/apply/users/urls.py
+++ b/hypha/apply/users/urls.py
@@ -24,71 +24,128 @@
oauth,
)
-app_name = 'users'
+app_name = "users"
public_urlpatterns = [
path(
- 'login/', LoginView.as_view(
- template_name='users/login.html',
- redirect_authenticated_user=True
+ "login/",
+ LoginView.as_view(
+ template_name="users/login.html", redirect_authenticated_user=True
),
- name='login'
+ name="login",
),
-
# Log out
- path('logout/', auth_views.LogoutView.as_view(next_page='/'), name='logout'),
- path('register/', RegisterView.as_view() , name='register'),
- path('register-success/', RegistrationSuccessView.as_view() , name='register-success')
+ path("logout/", auth_views.LogoutView.as_view(next_page="/"), name="logout"),
+ path("register/", RegisterView.as_view(), name="register"),
+ path(
+ "register-success/", RegistrationSuccessView.as_view(), name="register-success"
+ ),
]
urlpatterns = [
- path('account/', include([
- path('', ratelimit(key='ip', rate=settings.DEFAULT_RATE_LIMIT, method='GET')(AccountView.as_view()), name='account'),
- path('password/', include([
- path('', EmailChangePasswordView.as_view(), name='email_change_confirm_password'),
- path(
- 'change/',
- ratelimit(key='user', rate=settings.DEFAULT_RATE_LIMIT, method='POST')
- (auth_views.PasswordChangeView.as_view(
- template_name="users/change_password.html",
- success_url=reverse_lazy('users:account')
- )),
- name='password_change',
- ),
- path('reset/', PasswordResetView.as_view(), name='password_reset'),
- path(
- 'reset/done/',
- auth_views.PasswordResetDoneView.as_view(template_name='users/password_reset/done.html'),
- name='password_reset_done'
- ),
- path(
- 'reset/confirm/
-
+
{% endblock %}
diff --git a/hypha/apply/review/templates/review/review_form.html b/hypha/apply/review/templates/review/review_form.html
index 5f34abea3b..30ef672ca3 100644
--- a/hypha/apply/review/templates/review/review_form.html
+++ b/hypha/apply/review/templates/review/review_form.html
@@ -2,48 +2,48 @@
{% load i18n %}
{% block title %}{{ title }}{% endblock %}
{% block content %}
-
-
-{% include "forms/includes/form_errors.html" with form=form %}
+ {% include "forms/includes/form_errors.html" with form=form %}
-/', ReviewDetailView.as_view(), name="review"),
- path('reviews//delete/', ReviewDeleteView.as_view(), name="delete"),
- path('reviews//edit/', ReviewEditView.as_view(), name="edit"),
- path('review/', ReviewCreateOrUpdateView.as_view(), name='form'),
+ path("reviews/", ReviewListView.as_view(), name="list"),
+ path("reviews//", ReviewDetailView.as_view(), name="review"),
+ path("reviews//delete/", ReviewDeleteView.as_view(), name="delete"),
+ path("reviews//edit/", ReviewEditView.as_view(), name="edit"),
+ path("review/", ReviewCreateOrUpdateView.as_view(), name="form"),
]
diff --git a/hypha/apply/review/views.py b/hypha/apply/review/views.py
index 6f777b38ba..fe10489a99 100644
--- a/hypha/apply/review/views.py
+++ b/hypha/apply/review/views.py
@@ -32,8 +32,8 @@
def get_fields_for_stage(submission, user=None):
- forms = submission.get_from_parent('review_forms').all()
- external_review_forms = submission.get_from_parent('external_review_forms').all()
+ forms = submission.get_from_parent("review_forms").all()
+ external_review_forms = submission.get_from_parent("external_review_forms").all()
# Use ExternalReviewForm if submission's stage has external review and external review form is attached to fund.
# ExternalReviewForm is only for non-staff reviewers(external reviewers)
@@ -48,23 +48,24 @@ def get_fields_for_stage(submission, user=None):
return forms[0].form.form_fields
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
class ReviewEditView(UserPassesTestMixin, BaseStreamForm, UpdateView):
submission_form_class = ReviewModelForm
model = Review
- template_name = 'review/review_edit_form.html'
+ template_name = "review/review_edit_form.html"
raise_exception = True
def test_func(self):
review = self.get_object()
- return self.request.user.has_perm('review.change_review') or self.request.user == review.author.reviewer
+ return (
+ self.request.user.has_perm("review.change_review")
+ or self.request.user == review.author.reviewer
+ )
def get_context_data(self, **kwargs):
review = self.get_object()
return super().get_context_data(
- submission=review.submission,
- title=_('Edit Review'),
- **kwargs
+ submission=review.submission, title=_("Edit Review"), **kwargs
)
def get_defined_fields(self):
@@ -74,16 +75,18 @@ def get_defined_fields(self):
This ensures editing of submitted review is not affected by the changes to the original review forms.
"""
review = self.get_object()
- return review.form_fields or get_fields_for_stage(review.submission, user=self.request.user)
+ return review.form_fields or get_fields_for_stage(
+ review.submission, user=self.request.user
+ )
def get_form_kwargs(self):
review = self.get_object()
kwargs = super().get_form_kwargs()
- kwargs['user'] = self.request.user
- kwargs['submission'] = review.submission
+ kwargs["user"] = self.request.user
+ kwargs["submission"] = review.submission
if self.object:
- kwargs['initial'] = self.object.form_data
+ kwargs["initial"] = self.object.form_data
return kwargs
@@ -105,22 +108,28 @@ def form_valid(self, form):
def get_success_url(self):
review = self.get_object()
- return reverse_lazy('funds:submissions:detail', args=(review.submission.id,))
+ return reverse_lazy("funds:submissions:detail", args=(review.submission.id,))
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
class ReviewCreateOrUpdateView(BaseStreamForm, CreateOrUpdateView):
submission_form_class = ReviewModelForm
model = Review
- template_name = 'review/review_form.html'
+ template_name = "review/review_form.html"
def get_object(self, queryset=None):
- return self.model.objects.get(submission=self.submission, author__reviewer=self.request.user)
+ return self.model.objects.get(
+ submission=self.submission, author__reviewer=self.request.user
+ )
def dispatch(self, request, *args, **kwargs):
- self.submission = get_object_or_404(ApplicationSubmission, id=self.kwargs['submission_pk'])
+ self.submission = get_object_or_404(
+ ApplicationSubmission, id=self.kwargs["submission_pk"]
+ )
- if not self.submission.phase.permissions.can_review(request.user) or not self.submission.has_permission_to_review(request.user):
+ if not self.submission.phase.permissions.can_review(
+ request.user
+ ) or not self.submission.has_permission_to_review(request.user):
raise PermissionDenied()
if self.request.POST and self.submission.reviewed_by(request.user):
@@ -133,8 +142,8 @@ def get_context_data(self, **kwargs):
return super().get_context_data(
submission=self.submission,
has_submitted_review=has_submitted_review,
- title=_('Update Review draft') if self.object else _('Create Review'),
- **kwargs
+ title=_("Update Review draft") if self.object else _("Create Review"),
+ **kwargs,
)
def get_defined_fields(self):
@@ -142,11 +151,11 @@ def get_defined_fields(self):
def get_form_kwargs(self):
kwargs = super().get_form_kwargs()
- kwargs['user'] = self.request.user
- kwargs['submission'] = self.submission
+ kwargs["user"] = self.request.user
+ kwargs["submission"] = self.submission
if self.object:
- kwargs['initial'] = self.object.form_data
+ kwargs["initial"] = self.object.form_data
return kwargs
@@ -184,21 +193,37 @@ def review_workflow_actions(request, submission):
if transition_after and submission.status == INITIAL_STATE:
# Automatically transition the application to "Internal review".
action = submission_stepped_phases[2][0].name
- elif transition_after and submission.status == 'proposal_discussion':
+ elif transition_after and submission.status == "proposal_discussion":
# Automatically transition the proposal to "Internal review".
- action = 'proposal_internal_review'
- elif transition_after and submission.status == submission_stepped_phases[2][0].name and submission.reviews.count() >= transition_after:
+ action = "proposal_internal_review"
+ elif (
+ transition_after
+ and submission.status == submission_stepped_phases[2][0].name
+ and submission.reviews.count() >= transition_after
+ ):
# Automatically transition the application to "Ready for discussion".
action = submission_stepped_phases[3][0].name
- elif transition_after and submission.status == 'ext_external_review' and submission.reviews.by_reviewers().count() >= transition_after:
+ elif (
+ transition_after
+ and submission.status == "ext_external_review"
+ and submission.reviews.by_reviewers().count() >= transition_after
+ ):
# Automatically transition the application to "Ready for discussion".
- action = 'ext_post_external_review_discussion'
- elif transition_after and submission.status == 'com_external_review' and submission.reviews.by_reviewers().count() >= transition_after:
+ action = "ext_post_external_review_discussion"
+ elif (
+ transition_after
+ and submission.status == "com_external_review"
+ and submission.reviews.by_reviewers().count() >= transition_after
+ ):
# Automatically transition the application to "Ready for discussion".
- action = 'com_post_external_review_discussion'
- elif transition_after and submission.status == 'external_review' and submission.reviews.by_reviewers().count() >= transition_after:
+ action = "com_post_external_review_discussion"
+ elif (
+ transition_after
+ and submission.status == "external_review"
+ and submission.reviews.by_reviewers().count() >= transition_after
+ ):
# Automatically transition the proposal to "Ready for discussion".
- action = 'post_external_review_discussion'
+ action = "post_external_review_discussion"
# If action is set run perform_transition().
if action:
@@ -221,7 +246,9 @@ def get_context_data(self, **kwargs):
review = self.get_object()
if review.author.reviewer != self.request.user:
consensus_form = ReviewOpinionForm(
- instance=review.opinions.filter(author__reviewer=self.request.user).first(),
+ instance=review.opinions.filter(
+ author__reviewer=self.request.user
+ ).first(),
)
else:
consensus_form = None
@@ -245,7 +272,12 @@ def test_func(self):
if user.is_reviewer and review.reviewer_visibility:
return True
- if user.is_community_reviewer and submission.community_review and review.reviewer_visibility and submission.user != user:
+ if (
+ user.is_community_reviewer
+ and submission.community_review
+ and review.reviewer_visibility
+ and submission.user != user
+ ):
return True
return False
@@ -254,13 +286,17 @@ def dispatch(self, request, *args, **kwargs):
review = self.get_object()
if review.is_draft:
- return HttpResponseRedirect(reverse_lazy('apply:submissions:reviews:form', args=(review.submission.id,)))
+ return HttpResponseRedirect(
+ reverse_lazy(
+ "apply:submissions:reviews:form", args=(review.submission.id,)
+ )
+ )
return super().dispatch(request, *args, **kwargs)
class ReviewOpinionFormView(UserPassesTestMixin, CreateView):
- template_name = 'review/review_detail.html'
+ template_name = "review/review_detail.html"
form_class = ReviewOpinionForm
model = Review
raise_exception = True
@@ -268,8 +304,10 @@ class ReviewOpinionFormView(UserPassesTestMixin, CreateView):
def get_form_kwargs(self):
self.object = self.get_object()
kwargs = super().get_form_kwargs()
- instance = kwargs['instance']
- kwargs['instance'] = instance.opinions.filter(author__reviewer=self.request.user).first()
+ instance = kwargs["instance"]
+ kwargs["instance"] = instance.opinions.filter(
+ author__reviewer=self.request.user
+ ).first()
return kwargs
def test_func(self):
@@ -287,7 +325,12 @@ def test_func(self):
if user.is_reviewer and review.reviewer_visibility:
return True
- if user.is_community_reviewer and submission.community_review and review.reviewer_visibility and submission.user != user:
+ if (
+ user.is_community_reviewer
+ and submission.community_review
+ and review.reviewer_visibility
+ and submission.user != user
+ ):
return True
return False
@@ -312,7 +355,11 @@ def form_valid(self, form):
)
if opinion.opinion == DISAGREE:
- return HttpResponseRedirect(reverse_lazy('apply:submissions:reviews:form', args=(self.review.submission.pk,)))
+ return HttpResponseRedirect(
+ reverse_lazy(
+ "apply:submissions:reviews:form", args=(self.review.submission.pk,)
+ )
+ )
else:
return response
@@ -320,7 +367,7 @@ def get_success_url(self):
return self.review.get_absolute_url()
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
class ReviewDetailView(DetailView):
def get(self, request, *args, **kwargs):
view = ReviewDisplay.as_view()
@@ -331,76 +378,102 @@ def post(self, request, *args, **kwargs):
return view(request, *args, **kwargs)
-@method_decorator(staff_required, name='dispatch')
+@method_decorator(staff_required, name="dispatch")
class ReviewListView(ListView):
model = Review
def get_queryset(self):
- self.submission = get_object_or_404(ApplicationSubmission, id=self.kwargs['submission_pk'])
- self.queryset = self.model.objects.filter(submission=self.submission, is_draft=False)
+ self.submission = get_object_or_404(
+ ApplicationSubmission, id=self.kwargs["submission_pk"]
+ )
+ self.queryset = self.model.objects.filter(
+ submission=self.submission, is_draft=False
+ )
return super().get_queryset()
def should_display(self, field):
- return not isinstance(field.block, (RecommendationBlock, RecommendationCommentsBlock, RichTextBlock))
+ return not isinstance(
+ field.block,
+ (RecommendationBlock, RecommendationCommentsBlock, RichTextBlock),
+ )
def get_context_data(self, **kwargs):
review_data = {}
# Add the header rows
- review_data['title'] = {'question': '', 'answers': []}
- review_data['opinions'] = {'question': 'Opinions', 'answers': []}
- review_data['score'] = {'question': 'Overall Score', 'answers': []}
- review_data['recommendation'] = {'question': 'Recommendation', 'answers': []}
- review_data['revision'] = {'question': 'Revision', 'answers': []}
- review_data['comments'] = {'question': 'Comments', 'answers': []}
+ review_data["title"] = {"question": "", "answers": []}
+ review_data["opinions"] = {"question": "Opinions", "answers": []}
+ review_data["score"] = {"question": "Overall Score", "answers": []}
+ review_data["recommendation"] = {"question": "Recommendation", "answers": []}
+ review_data["revision"] = {"question": "Revision", "answers": []}
+ review_data["comments"] = {"question": "Comments", "answers": []}
responses = self.object_list.count()
- ordered_reviewers = AssignedReviewers.objects.filter(submission=self.submission).reviewed().review_order()
+ ordered_reviewers = (
+ AssignedReviewers.objects.filter(submission=self.submission)
+ .reviewed()
+ .review_order()
+ )
reviews = {review.author: review for review in self.object_list}
for i, reviewer in enumerate(ordered_reviewers):
review = reviews[reviewer]
- author = '{}'.format(review.get_absolute_url(), review.author)
+ author = '{}'.format(
+ review.get_absolute_url(), review.author
+ )
if review.author.role:
- author += generate_image_tag(review.author.role.icon, '12x12')
- author = f'
-
+
+
{% endif %}
diff --git a/hypha/apply/stream_forms/templates/stream_forms/render_multi_file_field.html b/hypha/apply/stream_forms/templates/stream_forms/render_multi_file_field.html
index b427ee9d07..f29dd76e06 100644
--- a/hypha/apply/stream_forms/templates/stream_forms/render_multi_file_field.html
+++ b/hypha/apply/stream_forms/templates/stream_forms/render_multi_file_field.html
@@ -1,12 +1,12 @@
{% extends "stream_forms/render_field.html" %}
{% block data_display %}
diff --git a/hypha/apply/users/templates/users/register-success.html b/hypha/apply/users/templates/users/register-success.html
index 6050f05af0..bb50fb5a54 100644
--- a/hypha/apply/users/templates/users/register-success.html
+++ b/hypha/apply/users/templates/users/register-success.html
@@ -17,13 +17,13 @@
{% endif %}
-{% if not has_submitted_review %}
-
{% endblock %}
diff --git a/hypha/apply/review/templates/review/review_list.html b/hypha/apply/review/templates/review/review_list.html
index 2a3d6fa542..3cfdd3298d 100644
--- a/hypha/apply/review/templates/review/review_list.html
+++ b/hypha/apply/review/templates/review/review_list.html
@@ -17,22 +17,22 @@
{% endif %}
{% endadminbar %}
-
-
- {% for answers in review_data.values %}
-
+
{% endblock %}
diff --git a/hypha/apply/review/templatetags/review_tags.py b/hypha/apply/review/templatetags/review_tags.py
index 7c0aac1b65..8feac2f3d9 100644
--- a/hypha/apply/review/templatetags/review_tags.py
+++ b/hypha/apply/review/templatetags/review_tags.py
@@ -9,17 +9,14 @@
TRAFFIC_LIGHT_COLORS = {
YES: {
- 'color': 'green',
- 'value': 'Y',
+ "color": "green",
+ "value": "Y",
},
MAYBE: {
- 'color': 'amber',
- 'value': 'M',
+ "color": "amber",
+ "value": "M",
},
- NO: {
- 'color': 'red',
- 'value': 'N'
- }
+ NO: {"color": "red", "value": "N"},
}
TRAFFIC_LIGHT_TEMPLATE = ''
@@ -30,7 +27,7 @@ def traffic_light(value):
try:
return mark_safe(TRAFFIC_LIGHT_TEMPLATE.format(**TRAFFIC_LIGHT_COLORS[value]))
except KeyError:
- return ''
+ return ""
@register.filter
@@ -40,7 +37,10 @@ def can_review(user, submission):
@register.filter
def has_draft(user, submission):
- return submission.can_review(user) and submission.assigned.draft_reviewed().filter(reviewer=user).exists()
+ return (
+ submission.can_review(user)
+ and submission.assigned.draft_reviewed().filter(reviewer=user).exists()
+ )
@register.filter
@@ -49,7 +49,9 @@ def average_review_score(reviewers):
scores = [
reviewer.review.score
for reviewer in reviewers
- if not reviewer.has_review and not reviewer.review.is_draft and not reviewer.review.score == NA
+ if not reviewer.has_review
+ and not reviewer.review.is_draft
+ and not reviewer.review.score == NA
]
if len(scores) > 0:
return sum(scores) / len(scores)
diff --git a/hypha/apply/review/tests/factories/blocks.py b/hypha/apply/review/tests/factories/blocks.py
index 4a462581de..de3557dc8c 100644
--- a/hypha/apply/review/tests/factories/blocks.py
+++ b/hypha/apply/review/tests/factories/blocks.py
@@ -12,7 +12,11 @@
)
from hypha.apply.utils.testing.factories import RichTextFieldBlockFactory
-__all__ = ['ReviewFormFieldsFactory', 'RecommendationBlockFactory', 'ScoreFieldBlockFactory']
+__all__ = [
+ "ReviewFormFieldsFactory",
+ "RecommendationBlockFactory",
+ "ScoreFieldBlockFactory",
+]
class RecommendationBlockFactory(FormFieldBlockFactory):
@@ -55,26 +59,37 @@ class Meta:
def make_answer(cls, params=None):
if params is None:
params = {}
- return json.dumps([factory.Faker('paragraph').evaluate(None, None, dict(params, locale=None)), random.randint(1, 5)])
+ return json.dumps(
+ [
+ factory.Faker("paragraph").evaluate(
+ None, None, dict(params, locale=None)
+ ),
+ random.randint(1, 5),
+ ]
+ )
@classmethod
def make_form_answer(cls, params=None):
if params is None:
params = {}
defaults = {
- 'description': factory.Faker('paragraph').evaluate(None, None, {'locale': None}),
- 'score': random.randint(1, 5),
+ "description": factory.Faker("paragraph").evaluate(
+ None, None, {"locale": None}
+ ),
+ "score": random.randint(1, 5),
}
defaults.update(params)
return defaults
-ReviewFormFieldsFactory = StreamFieldUUIDFactory({
- 'char': CharFieldBlockFactory,
- 'text': RichTextFieldBlockFactory,
- 'score': ScoreFieldBlockFactory,
- 'score_without_text': ScoreFieldWithoutTextBlockFactory,
- 'recommendation': RecommendationBlockFactory,
- 'comments': RecommendationCommentsBlockFactory,
- 'visibility': VisibilityBlockFactory,
-})
+ReviewFormFieldsFactory = StreamFieldUUIDFactory(
+ {
+ "char": CharFieldBlockFactory,
+ "text": RichTextFieldBlockFactory,
+ "score": ScoreFieldBlockFactory,
+ "score_without_text": ScoreFieldWithoutTextBlockFactory,
+ "recommendation": RecommendationBlockFactory,
+ "comments": RecommendationCommentsBlockFactory,
+ "visibility": VisibilityBlockFactory,
+ }
+)
diff --git a/hypha/apply/review/tests/factories/models.py b/hypha/apply/review/tests/factories/models.py
index 07bfc59bab..a56a999118 100644
--- a/hypha/apply/review/tests/factories/models.py
+++ b/hypha/apply/review/tests/factories/models.py
@@ -10,7 +10,7 @@
from ...options import AGREE, DISAGREE, MAYBE, NO, PRIVATE, REVIEWER, YES
from . import blocks
-__all__ = ['ReviewFactory', 'ReviewFormFactory', 'ReviewOpinionFactory']
+__all__ = ["ReviewFactory", "ReviewFormFactory", "ReviewOpinionFactory"]
class ReviewFormDataFactory(FormDataFactory):
@@ -29,12 +29,16 @@ class Params:
visibility_reviewer = factory.Trait(visibility=REVIEWER)
submission = factory.SubFactory(ApplicationSubmissionFactory)
- revision = factory.SelfAttribute('submission.live_revision')
- author = factory.SubFactory(AssignedReviewersFactory, submission=factory.SelfAttribute('..submission'))
- form_fields = factory.LazyAttribute(lambda o: o.submission.round.review_forms.first().fields)
+ revision = factory.SelfAttribute("submission.live_revision")
+ author = factory.SubFactory(
+ AssignedReviewersFactory, submission=factory.SelfAttribute("..submission")
+ )
+ form_fields = factory.LazyAttribute(
+ lambda o: o.submission.round.review_forms.first().fields
+ )
form_data = factory.SubFactory(
ReviewFormDataFactory,
- form_fields=factory.SelfAttribute('..form_fields'),
+ form_fields=factory.SelfAttribute("..form_fields"),
)
is_draft = False
recommendation = NO
@@ -50,7 +54,11 @@ class Params:
opinion_disagree = factory.Trait(opinion=DISAGREE)
review = factory.SubFactory(ReviewFactory)
- author = factory.SubFactory(AssignedReviewersFactory, staff=True, submission=factory.SelfAttribute('..review.submission'))
+ author = factory.SubFactory(
+ AssignedReviewersFactory,
+ staff=True,
+ submission=factory.SelfAttribute("..review.submission"),
+ )
opinion = DISAGREE
@@ -58,5 +66,5 @@ class ReviewFormFactory(factory.django.DjangoModelFactory):
class Meta:
model = ReviewForm
- name = factory.Faker('word')
+ name = factory.Faker("word")
form_fields = blocks.ReviewFormFieldsFactory
diff --git a/hypha/apply/review/tests/test_admin.py b/hypha/apply/review/tests/test_admin.py
index 247987d6a9..d786718711 100644
--- a/hypha/apply/review/tests/test_admin.py
+++ b/hypha/apply/review/tests/test_admin.py
@@ -6,7 +6,6 @@
class TestReviewFormAdminForm(TestCase):
-
def test_can_create_review_form(self):
review_form = ReviewFormFactory()
self.assertEqual(ReviewForm.objects.last(), review_form)
diff --git a/hypha/apply/review/tests/test_admin_views.py b/hypha/apply/review/tests/test_admin_views.py
index d61316fca9..03c8d28e11 100644
--- a/hypha/apply/review/tests/test_admin_views.py
+++ b/hypha/apply/review/tests/test_admin_views.py
@@ -14,112 +14,122 @@ def setUpTestData(cls):
ReviewForm.objects.all().delete()
cls.user = SuperUserFactory()
cls.label_help_text_data = {
- 'field_label': factory.Faker('sentence').evaluate(None, None, {'locale': None}),
- 'help_text': factory.Faker('sentence').evaluate(None, None, {'locale': None})
+ "field_label": factory.Faker("sentence").evaluate(
+ None, None, {"locale": None}
+ ),
+ "help_text": factory.Faker("sentence").evaluate(
+ None, None, {"locale": None}
+ ),
}
- cls.name = factory.Faker('name').evaluate(None, None, {'locale': None})
+ cls.name = factory.Faker("name").evaluate(None, None, {"locale": None})
def create_page(self, data):
self.client.force_login(self.user)
- url = reverse('review_reviewform_modeladmin_create')
+ url = reverse("review_reviewform_modeladmin_create")
response = self.client.post(url, data=data, secure=True, follow=True)
return response
def test_name_field_required(self):
- data = {'name': ['']}
+ data = {"name": [""]}
form_field_data = create_form_fields_data(
{
- 'recommendation': self.label_help_text_data,
- 'comments': self.label_help_text_data,
- 'visibility': self.label_help_text_data,
+ "recommendation": self.label_help_text_data,
+ "comments": self.label_help_text_data,
+ "visibility": self.label_help_text_data,
}
)
data.update(form_field_data)
response = self.create_page(data=data)
- expected_message = 'This field is required.'
- for message in get_messages(response.context['request']):
+ expected_message = "This field is required."
+ for message in get_messages(response.context["request"]):
self.assertEqual(expected_message, str(message.message).strip())
self.assertEqual(ReviewForm.objects.count(), 0)
def test_recommendation_block_required(self):
- data = {'name': [self.name]}
+ data = {"name": [self.name]}
form_field_data = create_form_fields_data(
{
- 'comments': self.label_help_text_data,
- 'visibility': self.label_help_text_data,
+ "comments": self.label_help_text_data,
+ "visibility": self.label_help_text_data,
}
)
data.update(form_field_data)
response = self.create_page(data=data)
- expected_message = 'You are missing the following required fields: Recommendation'
- messages = list(response.context['messages'])
+ expected_message = (
+ "You are missing the following required fields: Recommendation"
+ )
+ messages = list(response.context["messages"])
self.assertEqual(len(messages), 1)
self.assertEqual(expected_message, str(messages[0]).strip())
self.assertEqual(ReviewForm.objects.count(), 0)
def test_comments_block_required(self):
ReviewForm.objects.all().delete()
- data = {'name': [self.name]}
+ data = {"name": [self.name]}
form_field_data = create_form_fields_data(
{
- 'recommendation': self.label_help_text_data,
- 'visibility': self.label_help_text_data,
+ "recommendation": self.label_help_text_data,
+ "visibility": self.label_help_text_data,
}
)
data.update(form_field_data)
response = self.create_page(data=data)
- expected_message = 'You are missing the following required fields: Comments'
- messages = list(response.context['messages'])
+ expected_message = "You are missing the following required fields: Comments"
+ messages = list(response.context["messages"])
self.assertEqual(len(messages), 1)
self.assertEqual(expected_message, str(messages[0]).strip())
self.assertEqual(ReviewForm.objects.count(), 0)
def test_visibility_block_required(self):
- data = {'name': [self.name]}
+ data = {"name": [self.name]}
form_field_data = create_form_fields_data(
{
- 'recommendation': self.label_help_text_data,
- 'comments': self.label_help_text_data,
+ "recommendation": self.label_help_text_data,
+ "comments": self.label_help_text_data,
}
)
data.update(form_field_data)
response = self.create_page(data=data)
- expected_message = 'You are missing the following required fields: Visibility'
- messages = list(response.context['messages'])
+ expected_message = "You are missing the following required fields: Visibility"
+ messages = list(response.context["messages"])
self.assertEqual(len(messages), 1)
self.assertEqual(expected_message, str(messages[0]).strip())
self.assertEqual(ReviewForm.objects.count(), 0)
def test_field_label_required(self):
- data = {'name': [self.name]}
+ data = {"name": [self.name]}
form_field_data = create_form_fields_data(
{
- 'recommendation': {},
- 'comments': {},
- 'visibility': {},
+ "recommendation": {},
+ "comments": {},
+ "visibility": {},
}
)
data.update(form_field_data)
response = self.create_page(data=data)
- expected_messages_list = ['Label cannot be empty for Recommendation', 'Label cannot be empty for Comments', 'Label cannot be empty for Visibility']
- messages = list(response.context['messages'])
+ expected_messages_list = [
+ "Label cannot be empty for Recommendation",
+ "Label cannot be empty for Comments",
+ "Label cannot be empty for Visibility",
+ ]
+ messages = list(response.context["messages"])
self.assertEqual(len(messages), 3)
for message in messages:
self.assertIn(str(message).strip(), expected_messages_list)
self.assertEqual(ReviewForm.objects.count(), 0)
def test_form_creation(self):
- data = {'name': [self.name]}
+ data = {"name": [self.name]}
form_field_data = create_form_fields_data(
{
- 'recommendation': self.label_help_text_data,
- 'comments': self.label_help_text_data,
- 'visibility': self.label_help_text_data,
+ "recommendation": self.label_help_text_data,
+ "comments": self.label_help_text_data,
+ "visibility": self.label_help_text_data,
}
)
data.update(form_field_data)
diff --git a/hypha/apply/review/tests/test_views.py b/hypha/apply/review/tests/test_views.py
index a8c1fe40a8..da476e32ec 100644
--- a/hypha/apply/review/tests/test_views.py
+++ b/hypha/apply/review/tests/test_views.py
@@ -23,18 +23,21 @@
class StaffReviewsTestCase(BaseViewTestCase):
user_factory = StaffFactory
- url_name = 'funds:submissions:reviews:{}'
- base_view_name = 'review'
+ url_name = "funds:submissions:reviews:{}"
+ base_view_name = "review"
def get_kwargs(self, instance):
- return {'pk': instance.id, 'submission_pk': instance.submission.id}
+ return {"pk": instance.id, "submission_pk": instance.submission.id}
def test_can_access_review(self):
review = ReviewFactory(author__reviewer=self.user, author__staff=True)
response = self.get_page(review)
self.assertContains(response, review.submission.title)
self.assertContains(response, self.user.full_name)
- self.assertContains(response, reverse('funds:submissions:detail', kwargs={'pk': review.submission.id}))
+ self.assertContains(
+ response,
+ reverse("funds:submissions:detail", kwargs={"pk": review.submission.id}),
+ )
def test_can_access_other_review(self):
submission = ApplicationSubmissionFactory()
@@ -45,71 +48,85 @@ def test_can_access_other_review(self):
class StaffReviewListingTestCase(BaseViewTestCase):
user_factory = StaffFactory
- url_name = 'funds:submissions:reviews:{}'
- base_view_name = 'review'
+ url_name = "funds:submissions:reviews:{}"
+ base_view_name = "review"
def get_kwargs(self, instance):
- return {'submission_pk': instance.id}
+ return {"submission_pk": instance.id}
def test_can_access_review_listing(self):
submission = ApplicationSubmissionFactory()
reviews = ReviewFactory.create_batch(3, submission=submission)
- response = self.get_page(submission, 'list')
+ response = self.get_page(submission, "list")
self.assertContains(response, submission.title)
- self.assertContains(response, reverse('funds:submissions:detail', kwargs={'pk': submission.id}))
+ self.assertContains(
+ response, reverse("funds:submissions:detail", kwargs={"pk": submission.id})
+ )
for review in reviews:
self.assertContains(response, review.author.reviewer.full_name)
def test_draft_reviews_dont_appear(self):
submission = ApplicationSubmissionFactory()
review = ReviewFactory.create(submission=submission, is_draft=True)
- response = self.get_page(submission, 'list')
+ response = self.get_page(submission, "list")
self.assertContains(response, submission.title)
- self.assertContains(response, reverse('funds:submissions:detail', kwargs={'pk': submission.id}))
+ self.assertContains(
+ response, reverse("funds:submissions:detail", kwargs={"pk": submission.id})
+ )
self.assertNotContains(response, review.author.reviewer.full_name)
class StaffReviewFormTestCase(BaseViewTestCase):
user_factory = StaffFactory
- url_name = 'funds:submissions:reviews:{}'
- base_view_name = 'review'
+ url_name = "funds:submissions:reviews:{}"
+ base_view_name = "review"
submission = None
def setUp(self):
- self.submission = ApplicationSubmissionFactory(status='internal_review')
+ self.submission = ApplicationSubmissionFactory(status="internal_review")
super().setUp()
def get_kwargs(self, instance):
- return {'submission_pk': instance.id}
+ return {"submission_pk": instance.id}
def test_can_access_form(self):
- response = self.get_page(self.submission, 'form')
+ response = self.get_page(self.submission, "form")
self.assertContains(response, self.submission.title)
- self.assertContains(response, reverse('funds:submissions:detail', kwargs={'pk': self.submission.id}))
+ self.assertContains(
+ response,
+ reverse("funds:submissions:detail", kwargs={"pk": self.submission.id}),
+ )
def test_cant_access_wrong_status(self):
submission = ApplicationSubmissionFactory(rejected=True)
- response = self.get_page(submission, 'form')
+ response = self.get_page(submission, "form")
self.assertEqual(response.status_code, 403)
def test_cant_resubmit_review(self):
- ReviewFactory(submission=self.submission, author__reviewer=self.user, author__staff=True)
- response = self.post_page(self.submission, {'data': 'value'}, 'form')
- self.assertEqual(response.context['has_submitted_review'], True)
- self.assertEqual(response.context['title'], 'Update Review draft')
+ ReviewFactory(
+ submission=self.submission, author__reviewer=self.user, author__staff=True
+ )
+ response = self.post_page(self.submission, {"data": "value"}, "form")
+ self.assertEqual(response.context["has_submitted_review"], True)
+ self.assertEqual(response.context["title"], "Update Review draft")
def test_can_edit_draft_review(self):
- ReviewFactory(submission=self.submission, author__reviewer=self.user, author__staff=True, is_draft=True)
- response = self.get_page(self.submission, 'form')
- self.assertEqual(response.context['has_submitted_review'], False)
- self.assertEqual(response.context['title'], 'Update Review draft')
+ ReviewFactory(
+ submission=self.submission,
+ author__reviewer=self.user,
+ author__staff=True,
+ is_draft=True,
+ )
+ response = self.get_page(self.submission, "form")
+ self.assertEqual(response.context["has_submitted_review"], False)
+ self.assertEqual(response.context["title"], "Update Review draft")
def test_revision_captured_on_review(self):
form = self.submission.round.review_forms.first()
data = ReviewFormFieldsFactory.form_response(form.fields)
- self.post_page(self.submission, data, 'form')
+ self.post_page(self.submission, data, "form")
review = self.submission.reviews.first()
self.assertEqual(review.revision, self.submission.live_revision)
@@ -117,8 +134,8 @@ def test_can_submit_draft_review(self):
form = self.submission.round.review_forms.first()
data = ReviewFormFieldsFactory.form_response(form.fields)
- data['save_draft'] = True
- self.post_page(self.submission, data, 'form')
+ data["save_draft"] = True
+ self.post_page(self.submission, data, "form")
review = self.submission.reviews.first()
self.assertTrue(review.is_draft)
self.assertIsNone(review.revision)
@@ -126,53 +143,52 @@ def test_can_submit_draft_review(self):
class TestReviewScore(BaseViewTestCase):
user_factory = StaffFactory
- url_name = 'funds:submissions:reviews:{}'
- base_view_name = 'review'
+ url_name = "funds:submissions:reviews:{}"
+ base_view_name = "review"
submission = None
def setUp(self):
super().setUp()
- self.submission = ApplicationSubmissionFactory(status='internal_review')
+ self.submission = ApplicationSubmissionFactory(status="internal_review")
def get_kwargs(self, instance):
- return {'submission_pk': instance.id}
+ return {"submission_pk": instance.id}
def submit_review_scores(self, scores=(), scores_without_text=()):
if scores:
form = ReviewFormFactory(
form_fields__multiple__score=len(scores),
- form_fields__multiple__score_without_text=len(scores_without_text)
+ form_fields__multiple__score_without_text=len(scores_without_text),
)
else:
form = ReviewFormFactory(
form_fields__exclude__score=True,
- form_fields__exclude__score_without_text=True
+ form_fields__exclude__score_without_text=True,
)
review_form = self.submission.round.review_forms.first()
review_form.form = form
review_form.save()
score_fields = {
- field.id: {'score': score}
+ field.id: {"score": score}
for field, score in zip(form.score_fields, scores, strict=False)
}
score_fields_without_text = {
field.id: score
- for field, score in zip(form.score_fields_without_text, scores_without_text, strict=False)
+ for field, score in zip(
+ form.score_fields_without_text, scores_without_text, strict=False
+ )
}
score_fields.update(score_fields_without_text)
- data = ReviewFormFieldsFactory.form_response(
- form.form_fields,
- score_fields
- )
+ data = ReviewFormFieldsFactory.form_response(form.form_fields, score_fields)
# Make a new person for every review
self.client.force_login(self.user_factory())
- response = self.post_page(self.submission, data, 'form')
+ response = self.post_page(self.submission, data, "form")
# import ipdb; ipdb.set_trace()
self.assertIn(
- 'funds/applicationsubmission_admin_detail.html',
+ "funds/applicationsubmission_admin_detail.html",
response.template_name,
- msg='Failed to post the form correctly'
+ msg="Failed to post the form correctly",
)
self.client.force_login(self.user)
return self.submission.reviews.first()
@@ -207,72 +223,90 @@ def test_na_included_multiple_reviews_average(self):
class UserReviewFormTestCase(BaseViewTestCase):
user_factory = UserFactory
- url_name = 'funds:submissions:reviews:{}'
- base_view_name = 'review'
+ url_name = "funds:submissions:reviews:{}"
+ base_view_name = "review"
def get_kwargs(self, instance):
- return {'submission_pk': instance.id}
+ return {"submission_pk": instance.id}
def test_cant_access_form(self):
- submission = ApplicationSubmissionFactory(status='internal_review')
- response = self.get_page(submission, 'form')
+ submission = ApplicationSubmissionFactory(status="internal_review")
+ response = self.get_page(submission, "form")
self.assertEqual(response.status_code, 403)
class ReviewDetailTestCase(BaseViewTestCase):
user_factory = StaffFactory
- url_name = 'funds:submissions:reviews:{}'
- base_view_name = 'review'
+ url_name = "funds:submissions:reviews:{}"
+ base_view_name = "review"
def get_kwargs(self, instance):
- return {'pk': instance.id, 'submission_pk': instance.submission.id}
+ return {"pk": instance.id, "submission_pk": instance.submission.id}
def test_review_detail_recommendation(self):
- submission = ApplicationSubmissionFactory(status='draft_proposal', workflow_stages=2)
- review = ReviewFactory(submission=submission, author__reviewer=self.user, recommendation_yes=True)
+ submission = ApplicationSubmissionFactory(
+ status="draft_proposal", workflow_stages=2
+ )
+ review = ReviewFactory(
+ submission=submission, author__reviewer=self.user, recommendation_yes=True
+ )
response = self.get_page(review)
self.assertContains(response, submission.title)
self.assertContains(response, "| {{ answers.question }} | - {% for answer in answers.answers %} - {% if forloop.parentloop.first %} -{{ answer|safe }} | - {% elif answers.question == "Opinions"%} -{{ answer }} | - {% else %} -{{ answer|bleach }} | - {% endif %} +
|---|
| {{ answers.question }} | + {% for answer in answers.answers %} + {% if forloop.parentloop.first %} +{{ answer|safe }} | + {% elif answers.question == "Opinions"%} +{{ answer }} | + {% else %} +{{ answer|bleach }} | + {% endif %} + {% endfor %} +
|---|
Yes
") def test_review_detail_opinion(self): staff = StaffFactory() - submission = ApplicationSubmissionFactory(status='draft_proposal', workflow_stages=2) - review = ReviewFactory(submission=submission, author__reviewer=self.user, recommendation_yes=True) - ReviewOpinionFactory(review=review, author__reviewer=staff, opinion_disagree=True) + submission = ApplicationSubmissionFactory( + status="draft_proposal", workflow_stages=2 + ) + review = ReviewFactory( + submission=submission, author__reviewer=self.user, recommendation_yes=True + ) + ReviewOpinionFactory( + review=review, author__reviewer=staff, opinion_disagree=True + ) response = self.get_page(review) self.assertContains(response, "Disagrees") class ReviewListTestCase(BaseViewTestCase): user_factory = StaffFactory - url_name = 'funds:submissions:reviews:{}' - base_view_name = 'list' + url_name = "funds:submissions:reviews:{}" + base_view_name = "list" def get_kwargs(self, instance): - return {'submission_pk': instance.submission.id} + return {"submission_pk": instance.submission.id} def test_review_list_opinion(self): staff = StaffFactory() - submission = ApplicationSubmissionFactory(status='draft_proposal', workflow_stages=2) - review = ReviewFactory(submission=submission, author__reviewer=self.user, recommendation_yes=True) - ReviewOpinionFactory(review=review, author__reviewer=staff, opinion_disagree=True) + submission = ApplicationSubmissionFactory( + status="draft_proposal", workflow_stages=2 + ) + review = ReviewFactory( + submission=submission, author__reviewer=self.user, recommendation_yes=True + ) + ReviewOpinionFactory( + review=review, author__reviewer=staff, opinion_disagree=True + ) response = self.get_page(review) - response_opinion = response.context['review_data']['opinions']['answers'][0] + response_opinion = response.context["review_data"]["opinions"]["answers"][0] self.assertIn("Disagrees", response_opinion) self.assertIn(str(staff), response_opinion) class StaffReviewOpinionCase(BaseViewTestCase): user_factory = StaffFactory - url_name = 'funds:submissions:reviews:{}' - base_view_name = 'review' + url_name = "funds:submissions:reviews:{}" + base_view_name = "review" def setUp(self): super().setUp() - self.submission = ApplicationSubmissionFactory(status='draft_proposal', workflow_stages=2) + self.submission = ApplicationSubmissionFactory( + status="draft_proposal", workflow_stages=2 + ) def get_kwargs(self, instance): - return {'pk': instance.id, 'submission_pk': instance.submission.id} + return {"pk": instance.id, "submission_pk": instance.submission.id} def test_can_see_opinion_buttons_on_others_review(self): staff = StaffFactory() @@ -286,7 +320,11 @@ def test_can_see_opinion_buttons_on_others_review(self): self.assertContains(response, 'name="agree"') def test_cant_see_opinion_buttons_on_self_review(self): - review = ReviewFactory(submission=self.submission, author__reviewer=self.user, recommendation_yes=True) + review = ReviewFactory( + submission=self.submission, + author__reviewer=self.user, + recommendation_yes=True, + ) response = self.get_page(review) self.assertNotContains(response, 'name="agree"') @@ -298,11 +336,16 @@ def test_can_add_opinion_to_others_review(self): author__staff=True, recommendation_yes=True, ) - response = self.post_page(review, {'agree': AGREE}) - self.assertTrue(review.opinions.first().opinion_display in Activity.objects.first().message) + response = self.post_page(review, {"agree": AGREE}) + self.assertTrue( + review.opinions.first().opinion_display in Activity.objects.first().message + ) self.assertEqual(ReviewOpinion.objects.all().count(), 1) self.assertEqual(ReviewOpinion.objects.first().opinion, AGREE) - url = self.url_from_pattern('apply:submissions:reviews:review', kwargs={'submission_pk': self.submission.pk, 'pk': review.id}) + url = self.url_from_pattern( + "apply:submissions:reviews:review", + kwargs={"submission_pk": self.submission.pk, "pk": review.id}, + ) self.assertRedirects(response, url) def test_disagree_opinion_redirects_to_review_form(self): @@ -313,49 +356,67 @@ def test_disagree_opinion_redirects_to_review_form(self): author__staff=True, recommendation_yes=True, ) - response = self.post_page(review, {'disagree': DISAGREE}) - url = self.url_from_pattern('funds:submissions:reviews:form', kwargs={'submission_pk': self.submission.id}) + response = self.post_page(review, {"disagree": DISAGREE}) + url = self.url_from_pattern( + "funds:submissions:reviews:form", + kwargs={"submission_pk": self.submission.id}, + ) self.assertRedirects(response, url) class NonStaffReviewOpinionCase(BaseViewTestCase): user_factory = UserFactory - url_name = 'funds:submissions:reviews:{}' - base_view_name = 'review' + url_name = "funds:submissions:reviews:{}" + base_view_name = "review" submission = None def setUp(self): super().setUp() - self.submission = ApplicationSubmissionFactory(status='draft_proposal', workflow_stages=2) + self.submission = ApplicationSubmissionFactory( + status="draft_proposal", workflow_stages=2 + ) def get_kwargs(self, instance): - return {'pk': instance.id, 'submission_pk': instance.submission.id} + return {"pk": instance.id, "submission_pk": instance.submission.id} def test_nonstaff_cant_post_opinion_to_review(self): staff = StaffFactory() - review = ReviewFactory(submission=self.submission, author__reviewer=staff, author__staff=True, recommendation_yes=True) - response = self.post_page(review, {'agree': AGREE}) + review = ReviewFactory( + submission=self.submission, + author__reviewer=staff, + author__staff=True, + recommendation_yes=True, + ) + response = self.post_page(review, {"agree": AGREE}) self.assertEqual(response.status_code, 403) class ReviewDetailVisibilityTestCase(BaseViewTestCase): user_factory = ReviewerFactory - url_name = 'funds:submissions:reviews:{}' - base_view_name = 'review' + url_name = "funds:submissions:reviews:{}" + base_view_name = "review" def get_kwargs(self, instance): - return {'pk': instance.id, 'submission_pk': instance.submission.id} + return {"pk": instance.id, "submission_pk": instance.submission.id} def test_review_detail_visibility_private(self): - submission = ApplicationSubmissionFactory(status='external_review', workflow_stages=2) - review = ReviewFactory(submission=submission, author__reviewer=self.user, visibility_private=True) + submission = ApplicationSubmissionFactory( + status="external_review", workflow_stages=2 + ) + review = ReviewFactory( + submission=submission, author__reviewer=self.user, visibility_private=True + ) self.client.force_login(self.user_factory()) response = self.get_page(review) self.assertEqual(response.status_code, 403) def test_review_detail_visibility_reviewer(self): - submission = ApplicationSubmissionFactory(status='external_review', workflow_stages=2) - review = ReviewFactory(submission=submission, author__reviewer=self.user, visibility_reviewer=True) + submission = ApplicationSubmissionFactory( + status="external_review", workflow_stages=2 + ) + review = ReviewFactory( + submission=submission, author__reviewer=self.user, visibility_reviewer=True + ) self.client.force_login(self.user_factory()) response = self.get_page(review) self.assertEqual(response.status_code, 200) @@ -363,15 +424,15 @@ def test_review_detail_visibility_reviewer(self): class ReviewWorkFlowActionTestCase(BaseViewTestCase): user_factory = StaffFactory - url_name = 'funds:submissions:reviews:{}' - base_view_name = 'review' + url_name = "funds:submissions:reviews:{}" + base_view_name = "review" @classmethod def setUpTestData(cls): super().setUpTestData() def get_kwargs(self, instance): - return {'submission_pk': instance.id} + return {"submission_pk": instance.id} def test_initial_state_transition_to_internal_review(self): submission = ApplicationSubmissionFactory(status=INITIAL_STATE) @@ -380,104 +441,107 @@ def test_initial_state_transition_to_internal_review(self): data = ReviewFormFieldsFactory.form_response(form.fields) - self.post_page(submission, data, 'form') + self.post_page(submission, data, "form") submission = ApplicationSubmission.objects.get(id=submission.id) - self.assertEqual( - submission.status, - submission_stepped_phases[2][0].name - ) + self.assertEqual(submission.status, submission_stepped_phases[2][0].name) def test_proposal_discussion_to_proposal_internal_review(self): - submission = ApplicationSubmissionFactory(status='proposal_discussion', workflow_stages=2) + submission = ApplicationSubmissionFactory( + status="proposal_discussion", workflow_stages=2 + ) self.client.force_login(self.user_factory()) fields = get_fields_for_stage(submission) data = ReviewFormFieldsFactory.form_response(fields) - self.post_page(submission, data, 'form') + self.post_page(submission, data, "form") submission = ApplicationSubmission.objects.get(id=submission.id) - self.assertEqual( - submission.status, - 'proposal_internal_review' - ) + self.assertEqual(submission.status, "proposal_internal_review") def test_internal_review_to_ready_for_discussion(self): - submission = ApplicationSubmissionFactory(status='internal_review') + submission = ApplicationSubmissionFactory(status="internal_review") submission_stepped_phases = submission.workflow.stepped_phases - ReviewFactory(submission=submission, author__reviewer=self.user, visibility_private=True) + ReviewFactory( + submission=submission, author__reviewer=self.user, visibility_private=True + ) self.client.force_login(self.user_factory()) fields = get_fields_for_stage(submission) data = ReviewFormFieldsFactory.form_response(fields) - self.post_page(submission, data, 'form') + self.post_page(submission, data, "form") submission = ApplicationSubmission.objects.get(id=submission.id) - self.assertEqual( - submission.status, - submission_stepped_phases[3][0].name - ) + self.assertEqual(submission.status, submission_stepped_phases[3][0].name) def test_ext_external_review_to_ready_for_discussion(self): - submission = ApplicationSubmissionFactory(status='ext_external_review', with_external_review=True) + submission = ApplicationSubmissionFactory( + status="ext_external_review", with_external_review=True + ) reviewers = ReviewerFactory.create_batch(2) AssignedReviewersFactory(submission=submission, reviewer=reviewers[0]) AssignedReviewersFactory(submission=submission, reviewer=reviewers[1]) - ReviewFactory(submission=submission, author__reviewer=reviewers[0], visibility_private=True) + ReviewFactory( + submission=submission, + author__reviewer=reviewers[0], + visibility_private=True, + ) self.client.force_login(reviewers[1]) fields = get_fields_for_stage(submission) data = ReviewFormFieldsFactory.form_response(fields) - self.post_page(submission, data, 'form') + self.post_page(submission, data, "form") submission = ApplicationSubmission.objects.get(id=submission.id) - self.assertEqual( - submission.status, - 'ext_post_external_review_discussion' - ) + self.assertEqual(submission.status, "ext_post_external_review_discussion") def test_com_external_review_to_ready_for_discussion(self): - submission = ApplicationSubmissionFactory(status='com_external_review', workflow_name='single_com') + submission = ApplicationSubmissionFactory( + status="com_external_review", workflow_name="single_com" + ) reviewers = ReviewerFactory.create_batch(2) AssignedReviewersFactory(submission=submission, reviewer=reviewers[0]) AssignedReviewersFactory(submission=submission, reviewer=reviewers[1]) - ReviewFactory(submission=submission, author__reviewer=reviewers[0], visibility_private=True) + ReviewFactory( + submission=submission, + author__reviewer=reviewers[0], + visibility_private=True, + ) form = submission.round.review_forms.first() self.client.force_login(reviewers[1]) data = ReviewFormFieldsFactory.form_response(form.fields) - self.post_page(submission, data, 'form') + self.post_page(submission, data, "form") submission = ApplicationSubmission.objects.get(id=submission.id) - self.assertEqual( - submission.status, - 'com_post_external_review_discussion' - ) + self.assertEqual(submission.status, "com_post_external_review_discussion") def test_external_review_to_ready_for_discussion(self): - submission = ApplicationSubmissionFactory(status='external_review', workflow_stages=2) + submission = ApplicationSubmissionFactory( + status="external_review", workflow_stages=2 + ) reviewers = ReviewerFactory.create_batch(2) AssignedReviewersFactory(submission=submission, reviewer=reviewers[0]) AssignedReviewersFactory(submission=submission, reviewer=reviewers[1]) - ReviewFactory(submission=submission, author__reviewer=reviewers[0], visibility_private=True) + ReviewFactory( + submission=submission, + author__reviewer=reviewers[0], + visibility_private=True, + ) self.client.force_login(reviewers[1]) fields = get_fields_for_stage(submission) data = ReviewFormFieldsFactory.form_response(fields) - self.post_page(submission, data, 'form') + self.post_page(submission, data, "form") submission = ApplicationSubmission.objects.get(id=submission.id) - self.assertEqual( - submission.status, - 'post_external_review_discussion' - ) + self.assertEqual(submission.status, "post_external_review_discussion") def test_submission_did_not_transition(self): - submission = ApplicationSubmissionFactory(status='proposal_internal_review', workflow_stages=2) + submission = ApplicationSubmissionFactory( + status="proposal_internal_review", workflow_stages=2 + ) self.client.force_login(self.user_factory()) fields = get_fields_for_stage(submission) data = ReviewFormFieldsFactory.form_response(fields) - self.post_page(submission, data, 'form') + self.post_page(submission, data, "form") submission = ApplicationSubmission.objects.get(id=submission.id) - self.assertEqual( - submission.status, - 'proposal_internal_review' - ) + self.assertEqual(submission.status, "proposal_internal_review") diff --git a/hypha/apply/review/urls.py b/hypha/apply/review/urls.py index 0d389652ec..9c0dc1e41e 100644 --- a/hypha/apply/review/urls.py +++ b/hypha/apply/review/urls.py @@ -8,12 +8,12 @@ ReviewListView, ) -app_name = 'reviews' +app_name = "reviews" urlpatterns = [ - path('reviews/', ReviewListView.as_view(), name='list'), - path('reviews/{author}
'
-
- review_data['title']['answers'].append(author)
- opinions_template = get_template('review/includes/review_opinions_list.html')
- opinions_html = opinions_template.render({'opinions': review.opinions.select_related('author').all()})
- review_data['opinions']['answers'].append(opinions_html)
- review_data['score']['answers'].append(review.get_score_display)
- review_data['recommendation']['answers'].append(review.get_recommendation_display())
- review_data['comments']['answers'].append(review.get_comments_display(include_question=False))
+ author += generate_image_tag(review.author.role.icon, "12x12")
+ author = f"{author}
"
+
+ review_data["title"]["answers"].append(author)
+ opinions_template = get_template(
+ "review/includes/review_opinions_list.html"
+ )
+ opinions_html = opinions_template.render(
+ {"opinions": review.opinions.select_related("author").all()}
+ )
+ review_data["opinions"]["answers"].append(opinions_html)
+ review_data["score"]["answers"].append(review.get_score_display)
+ review_data["recommendation"]["answers"].append(
+ review.get_recommendation_display()
+ )
+ review_data["comments"]["answers"].append(
+ review.get_comments_display(include_question=False)
+ )
if review.for_latest:
- revision = 'Current'
+ revision = "Current"
else:
revision = 'Compare'.format(review.get_compare_url())
- review_data['revision']['answers'].append(revision)
+ review_data["revision"]["answers"].append(revision)
for field_id in review.fields:
field = review.field(field_id)
data = review.data(field_id)
if self.should_display(field):
- question = field.value['field_label']
- review_data.setdefault(field.id, {'question': question, 'answers': [''] * responses})
- review_data[field.id]['answers'][i] = field.block.render(None, {'data': data})
+ question = field.value["field_label"]
+ review_data.setdefault(
+ field.id, {"question": question, "answers": [""] * responses}
+ )
+ review_data[field.id]["answers"][i] = field.block.render(
+ None, {"data": data}
+ )
return super().get_context_data(
- submission=self.submission,
- review_data=review_data,
- **kwargs
+ submission=self.submission, review_data=review_data, **kwargs
)
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
class ReviewDeleteView(UserPassesTestMixin, DeleteView):
model = Review
raise_exception = True
def test_func(self):
review = self.get_object()
- return self.request.user.has_perm('review.delete_review') or self.request.user == review.author.reviewer
+ return (
+ self.request.user.has_perm("review.delete_review")
+ or self.request.user == review.author.reviewer
+ )
def delete(self, request, *args, **kwargs):
review = self.get_object()
@@ -416,4 +489,4 @@ def delete(self, request, *args, **kwargs):
def get_success_url(self):
review = self.get_object()
- return reverse_lazy('funds:submissions:detail', args=(review.submission.id,))
+ return reverse_lazy("funds:submissions:detail", args=(review.submission.id,))
diff --git a/hypha/apply/review/wagtail_hooks.py b/hypha/apply/review/wagtail_hooks.py
index c36567dc50..04ef831790 100644
--- a/hypha/apply/review/wagtail_hooks.py
+++ b/hypha/apply/review/wagtail_hooks.py
@@ -2,9 +2,9 @@
from wagtail import hooks
-@hooks.register('register_permissions')
+@hooks.register("register_permissions")
def register_permissions():
return Permission.objects.filter(
- content_type__app_label='review',
- codename__in=['add_review', 'change_review', 'delete_review']
+ content_type__app_label="review",
+ codename__in=["add_review", "change_review", "delete_review"],
)
diff --git a/hypha/apply/search/filters.py b/hypha/apply/search/filters.py
index cb451a413e..f345011762 100644
--- a/hypha/apply/search/filters.py
+++ b/hypha/apply/search/filters.py
@@ -18,7 +18,7 @@ def apply_date_filter(qs, field, values):
return qs.filter(q_obj)
-def date_filter_tokens_to_q_obj(tokens: list, field: str)-> Q:
+def date_filter_tokens_to_q_obj(tokens: list, field: str) -> Q:
"""Convert a date tokens parsed using `tokenize_date_filter_value` into a
Q object that can be used to filter a queryset.
diff --git a/hypha/apply/search/query_parser.py b/hypha/apply/search/query_parser.py
index 3f2d27ba72..edec8925e2 100644
--- a/hypha/apply/search/query_parser.py
+++ b/hypha/apply/search/query_parser.py
@@ -44,7 +44,7 @@ def ESCAPED_STRING(self, s):
# Define the grammar
parser = Lark(
- r'''
+ r"""
?start: expression
expression: (filter_expression | search_term)*
@@ -63,10 +63,10 @@ def ESCAPED_STRING(self, s):
%import common.NUMBER
%import common.ESCAPED_STRING
%ignore /\s+/
-''',
- start='start',
- parser='lalr',
- transformer=QueryTransformer()
+""",
+ start="start",
+ parser="lalr",
+ transformer=QueryTransformer(),
)
diff --git a/hypha/apply/search/tests/test_filters.py b/hypha/apply/search/tests/test_filters.py
index 10fb6c8664..299ebba446 100644
--- a/hypha/apply/search/tests/test_filters.py
+++ b/hypha/apply/search/tests/test_filters.py
@@ -6,19 +6,42 @@
from ..filters import date_filter_tokens_to_q_obj
-@pytest.mark.parametrize("tokens, field, expected", [
- (['>', 2023, 12, 2], 'date_field', Q(date_field__date__gt=dt.date(2023, 12, 2))),
- (['>=', 2023, 12, 2], 'date_field', Q(date_field__date__gte=dt.date(2023, 12, 2))),
- (['<=', 2023, 12, 2], 'date_field', Q(date_field__date__lte=dt.date(2023, 12, 2))),
- ([None, 2023, 12, 2], 'date_field', Q(date_field__date=dt.date(2023, 12, 2))),
- ([None, 2023, 12], 'date_field', Q(date_field__month=12) & Q(date_field__year=2023)),
- (['>', 2023, 12], 'date_field', Q(date_field__month__gt=12) & Q(date_field__year__gt=2023)),
- (['>', 2023], 'date_field', Q(date_field__year__gt=2023)),
- (['<', 2023], 'date_field', Q(date_field__year__lt=2023)),
- ([None, 2023], 'date_field', Q(date_field__year=2023)),
- ([None, 2023], 'date_field', Q(date_field__year=2023)),
- ([], 'date_field', Q(None)),
- ([], 'date_field', Q(None)),
-])
+@pytest.mark.parametrize(
+ "tokens, field, expected",
+ [
+ (
+ [">", 2023, 12, 2],
+ "date_field",
+ Q(date_field__date__gt=dt.date(2023, 12, 2)),
+ ),
+ (
+ [">=", 2023, 12, 2],
+ "date_field",
+ Q(date_field__date__gte=dt.date(2023, 12, 2)),
+ ),
+ (
+ ["<=", 2023, 12, 2],
+ "date_field",
+ Q(date_field__date__lte=dt.date(2023, 12, 2)),
+ ),
+ ([None, 2023, 12, 2], "date_field", Q(date_field__date=dt.date(2023, 12, 2))),
+ (
+ [None, 2023, 12],
+ "date_field",
+ Q(date_field__month=12) & Q(date_field__year=2023),
+ ),
+ (
+ [">", 2023, 12],
+ "date_field",
+ Q(date_field__month__gt=12) & Q(date_field__year__gt=2023),
+ ),
+ ([">", 2023], "date_field", Q(date_field__year__gt=2023)),
+ (["<", 2023], "date_field", Q(date_field__year__lt=2023)),
+ ([None, 2023], "date_field", Q(date_field__year=2023)),
+ ([None, 2023], "date_field", Q(date_field__year=2023)),
+ ([], "date_field", Q(None)),
+ ([], "date_field", Q(None)),
+ ],
+)
def test_date_filter_tokens_to_q_obj(tokens, field, expected):
assert date_filter_tokens_to_q_obj(tokens=tokens, field=field) == expected
diff --git a/hypha/apply/search/tests/test_query_parser.py b/hypha/apply/search/tests/test_query_parser.py
index 6dcb10e918..95969eef83 100644
--- a/hypha/apply/search/tests/test_query_parser.py
+++ b/hypha/apply/search/tests/test_query_parser.py
@@ -5,32 +5,47 @@
from ..query_parser import parse_search_query, tokenize_date_filter_value
-@pytest.mark.parametrize("query, expected", [
- ('', {"filters": {}, "text": ""}),
- ('#12 #13', {"filters": {"id": [12, 13]}, "text": ""}),
- ('text before #12', {"filters": {"id": [12]}, "text": "text before"}),
- ('#12 text after', {"filters": {"id": [12]}, "text": "text after"}),
- ('hello', {"filters": {}, "text": "hello"}),
- ('submitted:2023-12-02 hello', {"filters": {'submitted': ['2023-12-02']}, "text": "hello"}),
- ('submitted:>2023-12-02 submitted:<2023-12-01 hello', {"filters": {'submitted': ['>2023-12-02', '<2023-12-01']}, "text": "hello"}),
- ('submitted:"hello world"', {"filters": {'submitted': ['hello world']}, "text": ""}),
- ('"hello world"', {"filters": {}, "text": '"hello world"'}),
-])
+@pytest.mark.parametrize(
+ "query, expected",
+ [
+ ("", {"filters": {}, "text": ""}),
+ ("#12 #13", {"filters": {"id": [12, 13]}, "text": ""}),
+ ("text before #12", {"filters": {"id": [12]}, "text": "text before"}),
+ ("#12 text after", {"filters": {"id": [12]}, "text": "text after"}),
+ ("hello", {"filters": {}, "text": "hello"}),
+ (
+ "submitted:2023-12-02 hello",
+ {"filters": {"submitted": ["2023-12-02"]}, "text": "hello"},
+ ),
+ (
+ "submitted:>2023-12-02 submitted:<2023-12-01 hello",
+ {"filters": {"submitted": [">2023-12-02", "<2023-12-01"]}, "text": "hello"},
+ ),
+ (
+ 'submitted:"hello world"',
+ {"filters": {"submitted": ["hello world"]}, "text": ""},
+ ),
+ ('"hello world"', {"filters": {}, "text": '"hello world"'}),
+ ],
+)
def test_parse_search_query(query, expected):
assert parse_search_query(query) == expected
-@pytest.mark.parametrize("date_str, expected", [
- ('>2023-12-02', ['>', 2023, 12, 2]),
- ('<2023-12-01', ['<', 2023, 12, 1]),
- ('<=2023-12-01', ['<=', 2023, 12, 1]),
- ('>=2023-12-01', ['>=', 2023, 12, 1]),
- ('>=2023-12', ['>=', 2023, 12]),
- ('2023-12', [None, 2023, 12]),
- ('2023-24', []),
- ('1111-12-89', []),
- ('2023', [None, 2023]),
- ('>2023', ['>', 2023]),
-])
+@pytest.mark.parametrize(
+ "date_str, expected",
+ [
+ (">2023-12-02", [">", 2023, 12, 2]),
+ ("<2023-12-01", ["<", 2023, 12, 1]),
+ ("<=2023-12-01", ["<=", 2023, 12, 1]),
+ (">=2023-12-01", [">=", 2023, 12, 1]),
+ (">=2023-12", [">=", 2023, 12]),
+ ("2023-12", [None, 2023, 12]),
+ ("2023-24", []),
+ ("1111-12-89", []),
+ ("2023", [None, 2023]),
+ (">2023", [">", 2023]),
+ ],
+)
def test_tokenize_date_filter_value(date_str, expected):
assert tokenize_date_filter_value(date_str=date_str) == expected
diff --git a/hypha/apply/stream_forms/apps.py b/hypha/apply/stream_forms/apps.py
index 7521c6a312..8cdd109ffc 100644
--- a/hypha/apply/stream_forms/apps.py
+++ b/hypha/apply/stream_forms/apps.py
@@ -2,4 +2,4 @@
class StreamFormsConfig(AppConfig):
- name = 'hypha.apply.stream_forms'
+ name = "hypha.apply.stream_forms"
diff --git a/hypha/apply/stream_forms/blocks.py b/hypha/apply/stream_forms/blocks.py
index 90ed8754a3..6059e66eed 100644
--- a/hypha/apply/stream_forms/blocks.py
+++ b/hypha/apply/stream_forms/blocks.py
@@ -33,18 +33,18 @@
class FormFieldBlock(StructBlock):
- field_label = CharBlock(label=_('Label'))
- help_text = TextBlock(required=False, label=_('Help text'))
- help_link = URLBlock(required=False, label=_('Help link'))
+ field_label = CharBlock(label=_("Label"))
+ help_text = TextBlock(required=False, label=_("Help text"))
+ help_link = URLBlock(required=False, label=_("Help link"))
field_class = forms.CharField
widget = None
class Meta:
- template = 'stream_forms/render_field.html'
+ template = "stream_forms/render_field.html"
def get_slug(self, struct_value):
- return force_str(slugify(anyascii(struct_value['field_label'])))
+ return force_str(slugify(anyascii(struct_value["field_label"])))
def get_field_class(self, struct_value):
return self.field_class
@@ -54,15 +54,15 @@ def get_widget(self, struct_value):
def get_field_kwargs(self, struct_value):
kwargs = {
- 'label': struct_value['field_label'],
- 'help_text': conditional_escape(struct_value['help_text']),
- 'required': struct_value.get('required', False)
+ "label": struct_value["field_label"],
+ "help_text": conditional_escape(struct_value["help_text"]),
+ "required": struct_value.get("required", False),
}
- if 'default_value' in struct_value:
- kwargs['initial'] = struct_value['default_value']
+ if "default_value" in struct_value:
+ kwargs["initial"] = struct_value["default_value"]
form_widget = self.get_widget(struct_value)
if form_widget is not None:
- kwargs['widget'] = form_widget
+ kwargs["widget"] = form_widget
return kwargs
def get_field(self, struct_value):
@@ -76,28 +76,28 @@ def decode(self, value):
def serialize(self, value, context):
field_kwargs = self.get_field_kwargs(value)
return {
- 'question': field_kwargs['label'],
- 'answer': context.get('data'),
- 'type': self.name,
+ "question": field_kwargs["label"],
+ "answer": context.get("data"),
+ "type": self.name,
}
def serialize_no_response(self, value, context):
return {
- 'question': value['field_label'],
- 'answer': '-',
- 'type': 'no_response',
+ "question": value["field_label"],
+ "answer": "-",
+ "type": "no_response",
}
def prepare_data(self, value, data, serialize=False):
return bleach_value(str(data))
def render(self, value, context):
- data = context.get('data')
- data = self.prepare_data(value, data, context.get('serialize', False))
+ data = context.get("data")
+ data = self.prepare_data(value, data, context.get("serialize", False))
context.update(data=data or self.no_response())
- if context.get('serialize'):
+ if context.get("serialize"):
if not data:
return self.serialize_no_response(value, context)
return self.serialize(value, context)
@@ -112,66 +112,66 @@ def no_response(self):
class OptionalFormFieldBlock(FormFieldBlock):
- required = BooleanBlock(label=_('Required'), required=False)
+ required = BooleanBlock(label=_("Required"), required=False)
CHARFIELD_FORMATS = [
- ('email', _('Email')),
- ('url', _('URL')),
+ ("email", _("Email")),
+ ("url", _("URL")),
]
class CharFieldBlock(OptionalFormFieldBlock):
- format = ChoiceBlock(choices=CHARFIELD_FORMATS, required=False, label=_('Format'))
- default_value = CharBlock(required=False, label=_('Default value'))
+ format = ChoiceBlock(choices=CHARFIELD_FORMATS, required=False, label=_("Format"))
+ default_value = CharBlock(required=False, label=_("Default value"))
class Meta:
- label = _('Text field (single line)')
- template = 'stream_forms/render_unsafe_field.html'
+ label = _("Text field (single line)")
+ template = "stream_forms/render_unsafe_field.html"
def get_field_class(self, struct_value):
- text_format = struct_value['format']
- if text_format == 'url':
+ text_format = struct_value["format"]
+ if text_format == "url":
return forms.URLField
- if text_format == 'email':
+ if text_format == "email":
return forms.EmailField
return super().get_field_class(struct_value)
def get_searchable_content(self, value, data):
# CharField acts as a fallback. Force data to string
data = str(data)
- return bleach.clean(data or '', tags=[], strip=True)
+ return bleach.clean(data or "", tags=[], strip=True)
class MultiInputCharFieldBlock(CharFieldBlock):
- number_of_inputs = IntegerBlock(default=2, label=_('Max number of inputs'))
- add_button_text = CharBlock(required=False, default=_('Add new item'))
+ number_of_inputs = IntegerBlock(default=2, label=_("Max number of inputs"))
+ add_button_text = CharBlock(required=False, default=_("Add new item"))
class Meta:
- label = _('Text field (single line) (multiple inputs)')
+ label = _("Text field (single line) (multiple inputs)")
class TextFieldBlock(OptionalFormFieldBlock):
- default_value = TextBlock(required=False, label=_('Default value'))
- word_limit = IntegerBlock(default=1000, label=_('Word limit'))
+ default_value = TextBlock(required=False, label=_("Default value"))
+ word_limit = IntegerBlock(default=1000, label=_("Word limit"))
- widget = forms.Textarea(attrs={'rows': 5})
+ widget = forms.Textarea(attrs={"rows": 5})
class Meta:
- label = _('Text field (multi line)')
- template = 'stream_forms/render_unsafe_field.html'
+ label = _("Text field (multi line)")
+ template = "stream_forms/render_unsafe_field.html"
def get_searchable_content(self, value, data):
- return bleach.clean(data or '', tags=[], strip=True)
+ return bleach.clean(data or "", tags=[], strip=True)
class NumberFieldBlock(OptionalFormFieldBlock):
- default_value = CharBlock(required=False, label=_('Default value'))
+ default_value = CharBlock(required=False, label=_("Default value"))
widget = forms.NumberInput
class Meta:
- label = _('Number field')
+ label = _("Number field")
def get_searchable_content(self, value, data):
return None
@@ -183,8 +183,8 @@ class CheckboxFieldBlock(OptionalFormFieldBlock):
field_class = forms.BooleanField
class Meta:
- label = _('Checkbox field')
- icon = 'tick-inverse'
+ label = _("Checkbox field")
+ icon = "tick-inverse"
def get_searchable_content(self, value, data):
return None
@@ -194,99 +194,90 @@ def no_response(self):
class RadioButtonsFieldBlock(OptionalFormFieldBlock):
- choices = ListBlock(CharBlock(label=_('Choice')))
+ choices = ListBlock(CharBlock(label=_("Choice")))
field_class = forms.ChoiceField
widget = forms.RadioSelect
class Meta:
- label = _('Radio buttons')
- icon = 'radio-empty'
+ label = _("Radio buttons")
+ icon = "radio-empty"
def get_field_kwargs(self, struct_value):
kwargs = super().get_field_kwargs(struct_value)
- kwargs['choices'] = [
- (choice, choice)
- for choice in struct_value['choices']
- ]
+ kwargs["choices"] = [(choice, choice) for choice in struct_value["choices"]]
return kwargs
class GroupToggleBlock(FormFieldBlock):
- required = BooleanBlock(label=_('Required'), default=True, required=False)
+ required = BooleanBlock(label=_("Required"), default=True, required=False)
choices = ListBlock(
- CharBlock(label=_('Choice')),
+ CharBlock(label=_("Choice")),
help_text=(
- 'Please create only two choices for toggle. '
- 'First choice will revel the group and the second hide it. '
- 'Additional choices will be ignored.'
- )
+ "Please create only two choices for toggle. "
+ "First choice will revel the group and the second hide it. "
+ "Additional choices will be ignored."
+ ),
)
field_class = forms.ChoiceField
widget = forms.RadioSelect
class Meta:
- label = _('Group fields')
- icon = 'group'
- help_text = 'Remember to end group using Group fields end block.'
+ label = _("Group fields")
+ icon = "group"
+ help_text = "Remember to end group using Group fields end block."
def get_field_kwargs(self, struct_value):
kwargs = super().get_field_kwargs(struct_value)
- field_choices = [
- (choice, choice)
- for choice in struct_value['choices']
- ]
+ field_choices = [(choice, choice) for choice in struct_value["choices"]]
total_choices = len(field_choices)
if total_choices > 2:
# For toggle we need only two choices
field_choices = field_choices[:2]
elif total_choices < 2:
field_choices = [
- ('yes', 'Yes'),
- ('no', 'No'),
+ ("yes", "Yes"),
+ ("no", "No"),
]
- kwargs['choices'] = field_choices
+ kwargs["choices"] = field_choices
return kwargs
class GroupToggleEndBlock(StaticBlock):
class Meta:
- label = 'Group fields end'
- icon = 'group'
- admin_text = 'End of Group fields Block'
+ label = "Group fields end"
+ icon = "group"
+ admin_text = "End of Group fields Block"
class DropdownFieldBlock(RadioButtonsFieldBlock):
widget = forms.Select
class Meta:
- label = _('Dropdown field')
- icon = 'arrow-down-big'
+ label = _("Dropdown field")
+ icon = "arrow-down-big"
def get_field_kwargs(self, struct_value):
kwargs = super().get_field_kwargs(struct_value)
- kwargs['choices'].insert(0, BLANK_CHOICE_DASH[0])
+ kwargs["choices"].insert(0, BLANK_CHOICE_DASH[0])
return kwargs
class CheckboxesFieldBlock(OptionalFormFieldBlock):
- checkboxes = ListBlock(CharBlock(label=_('Checkbox')))
+ checkboxes = ListBlock(CharBlock(label=_("Checkbox")))
field_class = forms.MultipleChoiceField
widget = forms.CheckboxSelectMultiple
class Meta:
- label = _('Multiple checkboxes field')
- icon = 'list-ul'
- template = 'stream_forms/render_list_field.html'
+ label = _("Multiple checkboxes field")
+ icon = "list-ul"
+ template = "stream_forms/render_list_field.html"
def get_field_kwargs(self, struct_value):
kwargs = super().get_field_kwargs(struct_value)
- kwargs['choices'] = [
- (choice, choice)
- for choice in struct_value['checkboxes']
- ]
+ kwargs["choices"] = [(choice, choice) for choice in struct_value["checkboxes"]]
return kwargs
def prepare_data(self, value, data, serialize=False):
@@ -299,14 +290,16 @@ def get_searchable_content(self, value, data):
class DatePickerInput(forms.DateInput):
def __init__(self, *args, **kwargs):
- attrs = kwargs.get('attrs')
+ attrs = kwargs.get("attrs")
if attrs is None:
attrs = {}
- attrs.update({
- 'data-provide': 'datepicker',
- 'data-date-format': 'yyyy-mm-dd',
- })
- kwargs['attrs'] = attrs
+ attrs.update(
+ {
+ "data-provide": "datepicker",
+ "data-date-format": "yyyy-mm-dd",
+ }
+ )
+ kwargs["attrs"] = attrs
super().__init__(*args, **kwargs)
@@ -317,8 +310,8 @@ class DateFieldBlock(OptionalFormFieldBlock):
widget = DatePickerInput
class Meta:
- label = _('Date field')
- icon = 'date'
+ label = _("Date field")
+ icon = "date"
def get_searchable_content(self, value, data):
return None
@@ -329,7 +322,7 @@ def decode(self, value):
class HTML5TimeInput(forms.TimeInput):
- input_type = 'time'
+ input_type = "time"
class TimeFieldBlock(OptionalFormFieldBlock):
@@ -339,8 +332,8 @@ class TimeFieldBlock(OptionalFormFieldBlock):
widget = HTML5TimeInput
class Meta:
- label = _('Time field')
- icon = 'time'
+ label = _("Time field")
+ icon = "time"
def get_searchable_content(self, value, data):
return None
@@ -352,8 +345,7 @@ def decode(self, value):
class DateTimePickerInput(forms.SplitDateTimeWidget):
def __init__(self, attrs=None, date_format=None, time_format=None):
- super().__init__(attrs=attrs,
- date_format=date_format, time_format=time_format)
+ super().__init__(attrs=attrs, date_format=date_format, time_format=time_format)
self.widgets = (
DatePickerInput(attrs=attrs, format=date_format),
HTML5TimeInput(attrs=attrs, format=time_format),
@@ -372,8 +364,8 @@ class DateTimeFieldBlock(OptionalFormFieldBlock):
widget = DateTimePickerInput
class Meta:
- label = _('Date+time field')
- icon = 'date'
+ label = _("Date+time field")
+ icon = "date"
def get_searchable_content(self, value, data):
return None
@@ -385,7 +377,7 @@ def decode(self, value):
class UploadableMediaBlock(OptionalFormFieldBlock):
class Meta:
- template = 'stream_forms/render_file_field.html'
+ template = "stream_forms/render_file_field.html"
def get_searchable_content(self, value, data):
return None
@@ -404,8 +396,8 @@ class ImageFieldBlock(UploadableMediaBlock):
widget = ClearableFileInput
class Meta:
- label = _('Image field')
- icon = 'image'
+ label = _("Image field")
+ icon = "image"
class FileFieldBlock(UploadableMediaBlock):
@@ -413,15 +405,19 @@ class FileFieldBlock(UploadableMediaBlock):
You must implement this if you want to reuse it.
"""
+
field_class = SingleFileField
class Meta:
- label = _('Single File field')
- icon = 'download'
+ label = _("Single File field")
+ icon = "download"
def get_field_kwargs(self, struct_value):
kwargs = super().get_field_kwargs(struct_value)
- kwargs['help_text'] = kwargs['help_text'] + f" Accepted file types are {settings.FILE_ACCEPT_ATTR_VALUE}"
+ kwargs["help_text"] = (
+ kwargs["help_text"]
+ + f" Accepted file types are {settings.FILE_ACCEPT_ATTR_VALUE}"
+ )
return kwargs
@@ -429,13 +425,16 @@ class MultiFileFieldBlock(UploadableMediaBlock):
field_class = MultiFileField
class Meta:
- icon = 'download'
- label = _('Multiple File field')
- template = 'stream_forms/render_multi_file_field.html'
+ icon = "download"
+ label = _("Multiple File field")
+ template = "stream_forms/render_multi_file_field.html"
def get_field_kwargs(self, struct_value):
kwargs = super().get_field_kwargs(struct_value)
- kwargs['help_text'] = kwargs['help_text'] + f" Accepted file types are {settings.FILE_ACCEPT_ATTR_VALUE}"
+ kwargs["help_text"] = (
+ kwargs["help_text"]
+ + f" Accepted file types are {settings.FILE_ACCEPT_ATTR_VALUE}"
+ )
return kwargs
def prepare_data(self, value, data, serialize):
@@ -448,14 +447,10 @@ def no_response(self):
class HeadingBlock(StructBlock):
- HEADER_SIZE = [
- ('h2', 'H2'),
- ('h3', 'H3'),
- ('h4', 'H4')
- ]
+ HEADER_SIZE = [("h2", "H2"), ("h3", "H3"), ("h4", "H4")]
heading_text = CharBlock(classname="title", required=True)
- size = ChoiceBlock(choices=HEADER_SIZE, default='h2')
+ size = ChoiceBlock(choices=HEADER_SIZE, default="h2")
class Meta:
icon = "title"
@@ -463,24 +458,24 @@ class Meta:
class FormFieldsBlock(StreamBlock):
- text_markup = RichTextBlock(group=_('Custom'), label=_('Paragraph'))
- header_markup = HeadingBlock(group=_('Custom'), label=_('Section header'))
- char = CharFieldBlock(group=_('Fields'))
- multi_inputs_char = MultiInputCharFieldBlock(group=_('Fields'))
- text = TextFieldBlock(group=_('Fields'))
- number = NumberFieldBlock(group=_('Fields'))
- checkbox = CheckboxFieldBlock(group=_('Fields'))
- radios = RadioButtonsFieldBlock(group=_('Fields'))
- dropdown = DropdownFieldBlock(group=_('Fields'))
- checkboxes = CheckboxesFieldBlock(group=_('Fields'))
- date = DateFieldBlock(group=_('Fields'))
- time = TimeFieldBlock(group=_('Fields'))
- datetime = DateTimeFieldBlock(group=_('Fields'))
- image = ImageFieldBlock(group=_('Fields'))
- file = FileFieldBlock(group=_('Fields'))
- multi_file = MultiFileFieldBlock(group=_('Fields'))
+ text_markup = RichTextBlock(group=_("Custom"), label=_("Paragraph"))
+ header_markup = HeadingBlock(group=_("Custom"), label=_("Section header"))
+ char = CharFieldBlock(group=_("Fields"))
+ multi_inputs_char = MultiInputCharFieldBlock(group=_("Fields"))
+ text = TextFieldBlock(group=_("Fields"))
+ number = NumberFieldBlock(group=_("Fields"))
+ checkbox = CheckboxFieldBlock(group=_("Fields"))
+ radios = RadioButtonsFieldBlock(group=_("Fields"))
+ dropdown = DropdownFieldBlock(group=_("Fields"))
+ checkboxes = CheckboxesFieldBlock(group=_("Fields"))
+ date = DateFieldBlock(group=_("Fields"))
+ time = TimeFieldBlock(group=_("Fields"))
+ datetime = DateTimeFieldBlock(group=_("Fields"))
+ image = ImageFieldBlock(group=_("Fields"))
+ file = FileFieldBlock(group=_("Fields"))
+ multi_file = MultiFileFieldBlock(group=_("Fields"))
group_toggle = GroupToggleBlock(group=_("Custom"))
group_toggle_end = GroupToggleEndBlock(group=_("Custom"))
class Meta:
- label = _('Form fields')
+ label = _("Form fields")
diff --git a/hypha/apply/stream_forms/fields.py b/hypha/apply/stream_forms/fields.py
index ede6baefe3..cef673915c 100644
--- a/hypha/apply/stream_forms/fields.py
+++ b/hypha/apply/stream_forms/fields.py
@@ -8,19 +8,20 @@
class FileFieldWidgetMixin:
-
# This file seems to be imported even during collectstatic,
# at which point `static()` won't be able to find these files yet
# using production settings, so we delay calling `static()` until it's needed.
@cached_property
def media(self):
return Media(
- css={'all': [
- static('file_form/file_form.css'),
- ]},
+ css={
+ "all": [
+ static("file_form/file_form.css"),
+ ]
+ },
js=[
- static('file_form/file_form.js'),
- static('js/apply/file-uploads.js'),
+ static("file_form/file_form.js"),
+ static("js/apply/file-uploads.js"),
],
)
@@ -36,28 +37,35 @@ def clean(self, value, initial):
if not value:
return []
old_files = [
- file for file in value
- if hasattr(file, 'is_placeholder') and file.is_placeholder
+ file
+ for file in value
+ if hasattr(file, "is_placeholder") and file.is_placeholder
]
new_files = [
- file for file in value
- if hasattr(file, 'is_placeholder') and not file.is_placeholder
+ file
+ for file in value
+ if hasattr(file, "is_placeholder") and not file.is_placeholder
]
if not new_files and initial and len(old_files) == len(initial):
return initial
files = [
- FileField(validators=[
- FileExtensionValidator(allowed_extensions=settings.FILE_ALLOWED_EXTENSIONS)
- ]).clean(file, initial) for file in value
+ FileField(
+ validators=[
+ FileExtensionValidator(
+ allowed_extensions=settings.FILE_ALLOWED_EXTENSIONS
+ )
+ ]
+ ).clean(file, initial)
+ for file in value
]
return files
def widget_attrs(self, widget):
attrs = super().widget_attrs(widget)
- if isinstance(widget, MultiFileFieldWidget) and 'accept' not in widget.attrs:
- attrs.setdefault('accept', settings.FILE_ACCEPT_ATTR_VALUE)
+ if isinstance(widget, MultiFileFieldWidget) and "accept" not in widget.attrs:
+ attrs.setdefault("accept", settings.FILE_ACCEPT_ATTR_VALUE)
return attrs
@@ -71,14 +79,16 @@ class SingleFileField(UploadedFileField):
def clean(self, value, initial):
if not value:
return
- if hasattr(value, 'is_placeholder') and value.is_placeholder and initial:
+ if hasattr(value, "is_placeholder") and value.is_placeholder and initial:
return initial
- validator = FileExtensionValidator(allowed_extensions=settings.FILE_ALLOWED_EXTENSIONS)
+ validator = FileExtensionValidator(
+ allowed_extensions=settings.FILE_ALLOWED_EXTENSIONS
+ )
file = FileField(validators=[validator]).clean(value, initial)
return file
def widget_attrs(self, widget):
attrs = super().widget_attrs(widget)
- if isinstance(widget, SingleFileFieldWidget) and 'accept' not in widget.attrs:
- attrs.setdefault('accept', settings.FILE_ACCEPT_ATTR_VALUE)
+ if isinstance(widget, SingleFileFieldWidget) and "accept" not in widget.attrs:
+ attrs.setdefault("accept", settings.FILE_ACCEPT_ATTR_VALUE)
return attrs
diff --git a/hypha/apply/stream_forms/files.py b/hypha/apply/stream_forms/files.py
index 00442348b8..4cc42f4471 100644
--- a/hypha/apply/stream_forms/files.py
+++ b/hypha/apply/stream_forms/files.py
@@ -9,8 +9,8 @@ class StreamFieldDataEncoder(DjangoJSONEncoder):
def default(self, o):
if isinstance(o, StreamFieldFile):
return {
- 'name': o.name,
- 'filename': o.filename,
+ "name": o.name,
+ "filename": o.filename,
}
return super().default(o)
@@ -21,7 +21,10 @@ class StreamFieldFile(File):
see django.db.models.fields.files for the inspiration
"""
- def __init__(self, instance, field, *args, filename=None, storage=default_storage, **kwargs):
+
+ def __init__(
+ self, instance, field, *args, filename=None, storage=default_storage, **kwargs
+ ):
super().__init__(*args, **kwargs)
# Field is the wagtail field that the file was uploaded to
self.field = field
@@ -46,8 +49,8 @@ def __eq__(self, other):
return other.__eq__(self)
def _get_file(self):
- if getattr(self, '_file', None) is None:
- self._file = self.storage.open(self.name, 'rb')
+ if getattr(self, "_file", None) is None:
+ self._file = self.storage.open(self.name, "rb")
return self._file
def _set_file(self, file):
@@ -85,18 +88,18 @@ def modification_time(self):
try:
modified_time = self.storage.get_modified_time(self.name).date()
except FileNotFoundError:
- modified_time = '–'
+ modified_time = "–"
return modified_time
def serialize(self):
return {
- 'url': self.url,
- 'filename': self.filename,
+ "url": self.url,
+ "filename": self.filename,
}
- def open(self, mode='rb'):
- if getattr(self, '_file', None) is None:
+ def open(self, mode="rb"):
+ if getattr(self, "_file", None) is None:
self.file = self.storage.open(self.name, mode)
else:
self.file.open(mode)
@@ -117,7 +120,7 @@ def delete(self, save=True):
return
# Only close the file if it's already open, which we know by the
# presence of self._file
- if hasattr(self, '_file'):
+ if hasattr(self, "_file"):
self.close()
del self.file
@@ -128,11 +131,11 @@ def delete(self, save=True):
@property
def closed(self):
- file = getattr(self, '_file', None)
+ file = getattr(self, "_file", None)
return file is None or file.closed
def close(self):
- file = getattr(self, '_file', None)
+ file = getattr(self, "_file", None)
if file is not None:
file.close()
diff --git a/hypha/apply/stream_forms/forms.py b/hypha/apply/stream_forms/forms.py
index eded2dc26c..67f0b31f16 100644
--- a/hypha/apply/stream_forms/forms.py
+++ b/hypha/apply/stream_forms/forms.py
@@ -15,6 +15,7 @@ class MixedFieldMetaclass(DeclarativeFieldsMetaclass):
This allows the form to be rendered when Field-like blocks are passed
in as part of the definition
"""
+
def __new__(mcs, name, bases, attrs):
display = attrs.copy()
new_class = super(MixedFieldMetaclass, mcs).__new__(mcs, name, bases, attrs)
@@ -31,6 +32,7 @@ def wrapped(self, *args, **kwargs):
self.fields = self.display
yield from func(self, *args, **kwargs)
self.fields = fields
+
return wrapped
@swap_fields_for_display
@@ -86,7 +88,7 @@ def delete_temporary_files(self):
class PageStreamBaseForm(BaseForm, StreamBaseForm):
- """ Adds page and user reference to the form class"""
+ """Adds page and user reference to the form class"""
def clean(self):
cleaned_data = super().clean()
@@ -95,30 +97,41 @@ def clean(self):
if isinstance(value, EmailField):
email = self.data.get(field)
if email:
- is_registered, _ = is_user_already_registered(email=self.data.get(field))
+ is_registered, _ = is_user_already_registered(
+ email=self.data.get(field)
+ )
if is_registered:
user = get_user_by_email(email=email)
if not user:
- self.add_error(field, 'Found multiple account')
- raise ValidationError(mark_safe('Found multiple account for the same email. '
- 'Please login with the correct credentials or '
- ''
- 'contact to the support team'
- '.'.format(settings.ORG_EMAIL)))
+ self.add_error(field, "Found multiple account")
+ raise ValidationError(
+ mark_safe(
+ "Found multiple account for the same email. "
+ "Please login with the correct credentials or "
+ ''
+ "contact to the support team"
+ ".".format(settings.ORG_EMAIL)
+ )
+ )
elif not user.is_active:
- self.add_error(field, 'Found an inactive account')
- raise ValidationError(mark_safe('Found an inactive account for the same email. '
- 'Please use different email or '
- ''
- 'contact to the support team'
- '.'.format(settings.ORG_EMAIL)))
+ self.add_error(field, "Found an inactive account")
+ raise ValidationError(
+ mark_safe(
+ "Found an inactive account for the same email. "
+ "Please use different email or "
+ ''
+ "contact to the support team"
+ ".".format(settings.ORG_EMAIL)
+ )
+ )
return cleaned_data
class BlockFieldWrapper:
"""Wraps stream blocks so that they can be rendered as a field within a form"""
+
is_hidden = False
label = None
help_text = None
diff --git a/hypha/apply/stream_forms/models.py b/hypha/apply/stream_forms/models.py
index c8b85c5ed8..b20e5875dd 100644
--- a/hypha/apply/stream_forms/models.py
+++ b/hypha/apply/stream_forms/models.py
@@ -28,8 +28,10 @@ class BaseStreamForm:
@classmethod
def from_db(cls, db, field_names, values):
instance = super().from_db(db, field_names, values)
- if 'form_data' in field_names:
- instance.form_data = cls.deserialize_form_data(instance, instance.form_data, instance.form_fields)
+ if "form_data" in field_names:
+ instance.form_data = cls.deserialize_form_data(
+ instance, instance.form_data, instance.form_fields
+ )
return instance
@classmethod
@@ -39,8 +41,8 @@ def deserialize_form_data(cls, instance, form_data, form_fields):
# Do not attempt to iterate over form_fields - that will fully instantiate the form_fields
# including any sub queries that they do
for _i, field_data in enumerate(form_fields.raw_data):
- block = form_fields.stream_block.child_blocks[field_data['type']]
- field_id = field_data.get('id')
+ block = form_fields.stream_block.child_blocks[field_data["type"]]
+ field_id = field_data.get("id")
try:
value = data[field_id]
except KeyError:
@@ -68,7 +70,9 @@ def get_form_fields(self, draft=False, form_data=None, user=None):
struct_value = struct_child.value
if isinstance(block, FormFieldBlock):
field_from_block = block.get_field(struct_value)
- disabled_help_text = _('You are logged in so this information is fetched from your user account.')
+ disabled_help_text = _(
+ "You are logged in so this information is fetched from your user account."
+ )
if isinstance(block, FullNameBlock) and user and user.is_authenticated:
field_from_block.disabled = True
field_from_block.initial = user.full_name
@@ -77,25 +81,35 @@ def get_form_fields(self, draft=False, form_data=None, user=None):
field_from_block.disabled = True
field_from_block.initial = user.email
field_from_block.help_text = disabled_help_text
- if draft and not issubclass(block.__class__, ApplicationMustIncludeFieldBlock):
+ if draft and not issubclass(
+ block.__class__, ApplicationMustIncludeFieldBlock
+ ):
field_from_block.required = False
- field_from_block.help_link = struct_value.get('help_link')
+ field_from_block.help_link = struct_value.get("help_link")
field_from_block.group_number = group_counter if is_in_group else 1
if isinstance(block, GroupToggleBlock) and not is_in_group:
field_from_block.group_number = 1
field_from_block.grouper_for = group_counter + 1
group_counter += 1
is_in_group = True
- grouped_fields_visible = form_data.get(struct_child.id) == field_from_block.choices[0][0]
+ grouped_fields_visible = (
+ form_data.get(struct_child.id) == field_from_block.choices[0][0]
+ )
if isinstance(block, TextFieldBlock):
- field_from_block.word_limit = struct_value.get('word_limit')
+ field_from_block.word_limit = struct_value.get("word_limit")
if isinstance(block, MultiInputCharFieldBlock):
- number_of_inputs = struct_value.get('number_of_inputs')
+ number_of_inputs = struct_value.get("number_of_inputs")
for index in range(number_of_inputs):
- form_fields[struct_child.id + '_' + str(index)] = field_from_block
+ form_fields[
+ struct_child.id + "_" + str(index)
+ ] = field_from_block
field_from_block.multi_input_id = struct_child.id
- field_from_block.add_button_text = struct_value.get('add_button_text')
- if index == number_of_inputs - 1: # Add button after last input field
+ field_from_block.add_button_text = struct_value.get(
+ "add_button_text"
+ )
+ if (
+ index == number_of_inputs - 1
+ ): # Add button after last input field
field_from_block.multi_input_add_button = True
# Index for field until which fields will be visible to applicant.
# Initially only the first field with id UUID_0 will be visible.
@@ -108,8 +122,12 @@ def get_form_fields(self, draft=False, form_data=None, user=None):
field_from_block = copy.copy(field_from_block)
else:
if is_in_group and not isinstance(block, GroupToggleBlock):
- field_from_block.required_when_visible = field_from_block.required
- field_from_block.required = field_from_block.required & grouped_fields_visible
+ field_from_block.required_when_visible = (
+ field_from_block.required
+ )
+ field_from_block.required = (
+ field_from_block.required & grouped_fields_visible
+ )
field_from_block.visible = grouped_fields_visible
form_fields[struct_child.id] = field_from_block
elif isinstance(block, GroupToggleEndBlock):
@@ -124,7 +142,11 @@ def get_form_fields(self, draft=False, form_data=None, user=None):
return form_fields
def get_form_class(self, draft=False, form_data=None, user=None):
- return type('WagtailStreamForm', (self.submission_form_class,), self.get_form_fields(draft, form_data, user))
+ return type(
+ "WagtailStreamForm",
+ (self.submission_form_class,),
+ self.get_form_fields(draft, form_data, user),
+ )
class AbstractStreamForm(BaseStreamForm, AbstractForm):
diff --git a/hypha/apply/stream_forms/templates/stream_forms/render_field.html b/hypha/apply/stream_forms/templates/stream_forms/render_field.html
index 47387630e6..a6bb449491 100644
--- a/hypha/apply/stream_forms/templates/stream_forms/render_field.html
+++ b/hypha/apply/stream_forms/templates/stream_forms/render_field.html
@@ -1,12 +1,12 @@
{% if include_question %}
-{{ value.field_label }}
+{{ value.field_label }}
{% endif %}
-{% block data_display %}
{% if include_question %}
-{{ data }}
{% endblock %} + {% block data_display %}{{ data }}
{% endblock %}
- {% for file in data %}
- {% if file.name %}
- {% include "stream_forms/includes/file_field.html" with file=file %}
- {% else %}
- {{ file }}
- {% endif %}
- {% endfor %}
+ {% for file in data %}
+ {% if file.name %}
+ {% include "stream_forms/includes/file_field.html" with file=file %}
+ {% else %}
+ {{ file }}
+ {% endif %}
+ {% endfor %}
{% endblock %}
diff --git a/hypha/apply/stream_forms/testing/factories.py b/hypha/apply/stream_forms/testing/factories.py
index 7a16818da1..3c23d0bcc6 100644
--- a/hypha/apply/stream_forms/testing/factories.py
+++ b/hypha/apply/stream_forms/testing/factories.py
@@ -11,11 +11,17 @@
from hypha.apply.stream_forms import blocks as stream_blocks
-__all__ = ['BLOCK_FACTORY_DEFINITION', 'FormFieldBlockFactory',
- 'CharFieldBlockFactory', 'NumberFieldBlockFactory',
- 'RadioFieldBlockFactory', 'UploadableMediaFactory',
- 'ImageFieldBlockFactory', 'FileFieldBlockFactory',
- 'MultiFileFieldBlockFactory']
+__all__ = [
+ "BLOCK_FACTORY_DEFINITION",
+ "FormFieldBlockFactory",
+ "CharFieldBlockFactory",
+ "NumberFieldBlockFactory",
+ "RadioFieldBlockFactory",
+ "UploadableMediaFactory",
+ "ImageFieldBlockFactory",
+ "FileFieldBlockFactory",
+ "MultiFileFieldBlockFactory",
+]
class AnswerFactory(factory.Factory):
@@ -29,7 +35,7 @@ def _build(self, *args, sub_factory=None, **kwargs):
class AddFormFieldsMetaclass(factory.base.FactoryMetaClass):
def __new__(mcs, class_name, bases, attrs):
# Add the form field definitions to allow nested calls
- field_factory = attrs.pop('field_factory', None)
+ field_factory = attrs.pop("field_factory", None)
if field_factory:
wrapped_factories = {
k: factory.SubFactory(AnswerFactory, sub_factory=v)
@@ -42,20 +48,18 @@ def __new__(mcs, class_name, bases, attrs):
class FormDataFactory(factory.Factory, metaclass=AddFormFieldsMetaclass):
@classmethod
- def _create(self, *args, form_fields = None, for_factory=None, clean=False, **kwargs):
+ def _create(self, *args, form_fields=None, for_factory=None, clean=False, **kwargs):
if form_fields is None:
form_fields = {}
if form_fields and isinstance(form_fields, str):
form_fields = json.loads(form_fields)
- form_definition = {
- field['type']: field['id']
- for field in form_fields
- }
+ form_definition = {field["type"]: field["id"] for field in form_fields}
else:
form_definition = {
f.block_type: f.id
- for f in form_fields or for_factory.Meta.model.form_fields.field.to_python(form_fields)
+ for f in form_fields
+ or for_factory.Meta.model.form_fields.field.to_python(form_fields)
}
form_data = {}
@@ -95,8 +99,8 @@ def _create(cls, model_class, value):
class FormFieldBlockFactory(wagtail_factories.StructBlockFactory):
- default_value = factory.Faker('sentence')
- field_label = factory.Faker('sentence')
+ default_value = factory.Faker("sentence")
+ field_label = factory.Faker("sentence")
help_text = factory.LazyAttribute(
lambda o: f"Help text for {o._Resolver__step.builder.factory_meta.model.__name__}"
)
@@ -117,35 +121,35 @@ def make_form_answer(cls, params=None):
class CharFieldBlockFactory(FormFieldBlockFactory):
- default_value = factory.Faker('sentence')
+ default_value = factory.Faker("sentence")
class Meta:
model = stream_blocks.CharFieldBlock
class TextFieldBlockFactory(FormFieldBlockFactory):
- default_value = factory.Faker('sentence')
+ default_value = factory.Faker("sentence")
class Meta:
model = stream_blocks.TextFieldBlock
class DateFieldBlockFactory(FormFieldBlockFactory):
- default_value = factory.Faker('date_object')
+ default_value = factory.Faker("date_object")
class Meta:
model = stream_blocks.DateFieldBlock
class TimeFieldBlockFactory(FormFieldBlockFactory):
- default_value = factory.Faker('time_object')
+ default_value = factory.Faker("time_object")
class Meta:
model = stream_blocks.TimeFieldBlock
class DateTimeFieldBlockFactory(FormFieldBlockFactory):
- default_value = factory.Faker('date_time')
+ default_value = factory.Faker("date_time")
class Meta:
model = stream_blocks.DateTimeFieldBlock
@@ -157,8 +161,8 @@ def make_form_answer(cls, params=None):
else:
date_time = super().make_form_answer(params)
return {
- 'date': str(date_time.date()),
- 'time': str(date_time.time()),
+ "date": str(date_time.date()),
+ "time": str(date_time.time()),
}
@@ -174,7 +178,7 @@ def make_answer(cls, params=None):
class CheckboxFieldBlockFactory(FormFieldBlockFactory):
- choices = ['check_one', 'check_two']
+ choices = ["check_one", "check_two"]
class Meta:
model = stream_blocks.CheckboxFieldBlock
@@ -185,7 +189,7 @@ def make_answer(cls, params=None):
class CheckboxesFieldBlockFactory(FormFieldBlockFactory):
- checkboxes = ['check_multiple_one', 'check_multiple_two', 'check_multiple_three']
+ checkboxes = ["check_multiple_one", "check_multiple_two", "check_multiple_three"]
class Meta:
model = stream_blocks.CheckboxesFieldBlock
@@ -196,7 +200,7 @@ def make_answer(cls, params=None):
class RadioFieldBlockFactory(FormFieldBlockFactory):
- choices = ['first', 'second']
+ choices = ["first", "second"]
class Meta:
model = stream_blocks.RadioButtonsFieldBlock
@@ -207,7 +211,7 @@ def make_answer(cls, params=None):
class DropdownFieldBlockFactory(FormFieldBlockFactory):
- choices = ['first', 'second']
+ choices = ["first", "second"]
class Meta:
model = stream_blocks.DropdownFieldBlock
@@ -223,9 +227,9 @@ class UploadableMediaFactory(FormFieldBlockFactory):
@classmethod
def make_answer(cls, params=None):
params = params or {}
- params.setdefault('data', b'this is some content')
- if params.get('filename') is None:
- params['filename'] = 'example.pdf'
+ params.setdefault("data", b"this is some content")
+ if params.get("filename") is None:
+ params["filename"] = "example.pdf"
file_name, file = cls.default_value._make_content(params)
return SimpleUploadedFile(file_name, file.read())
@@ -260,7 +264,9 @@ def generate(self, step, params):
for block_name, value in blocks:
block = self.factories[block_name]._meta.model()
value = block.get_prep_value(value)
- ret_val.append({'type': block_name, 'value': value, 'id': str(uuid.uuid4())})
+ ret_val.append(
+ {"type": block_name, "value": value, "id": str(uuid.uuid4())}
+ )
return json.dumps(ret_val, cls=DjangoJSONEncoder)
def build_form(self, data):
@@ -269,10 +275,10 @@ def build_form(self, data):
multiples = {}
for field, value in data.items():
# we dont care about position
- name, attr = field.split('__')
- if name == 'exclude':
+ name, attr = field.split("__")
+ if name == "exclude":
exclusions.append(attr)
- elif name == 'multiple':
+ elif name == "multiple":
multiples[attr] = value
else:
extras[name] = {attr: value}
@@ -280,20 +286,22 @@ def build_form(self, data):
defined_both = set(exclusions) & set(multiples)
if defined_both:
raise ValueError(
- 'Cant exclude and provide multiple at the same time: {}'.format(', '.join(defined_both))
+ "Cant exclude and provide multiple at the same time: {}".format(
+ ", ".join(defined_both)
+ )
)
form_fields = {}
field_count = 0
for field in self.factories:
- if field == 'text_markup' or field in exclusions:
+ if field == "text_markup" or field in exclusions:
pass
else:
for _ in range(multiples.get(field, 1)):
- form_fields[f'{field_count}__{field}__'] = ''
+ form_fields[f"{field_count}__{field}__"] = ""
field_count += 1
for attr, value in extras[field].items():
- form_fields[f'{field_count}__{field}__{attr}'] = value
+ form_fields[f"{field_count}__{field}__{attr}"] = value
return form_fields
@@ -301,38 +309,40 @@ def form_response(self, fields, field_values=None):
if not field_values:
field_values = {}
data = {
- field.id: self.factories[field.block.name].make_form_answer(field_values.get(field.id, {}))
+ field.id: self.factories[field.block.name].make_form_answer(
+ field_values.get(field.id, {})
+ )
for field in fields
- if hasattr(self.factories[field.block.name], 'make_form_answer')
+ if hasattr(self.factories[field.block.name], "make_form_answer")
}
return flatten_for_form(data)
BLOCK_FACTORY_DEFINITION = {
- 'text_markup': ParagraphBlockFactory,
- 'char': CharFieldBlockFactory,
- 'text': TextFieldBlockFactory,
- 'number': NumberFieldBlockFactory,
- 'checkbox': CheckboxFieldBlockFactory,
- 'radios': RadioFieldBlockFactory,
- 'dropdown': DropdownFieldBlockFactory,
- 'checkboxes': CheckboxesFieldBlockFactory,
- 'date': DateFieldBlockFactory,
- 'time': TimeFieldBlockFactory,
- 'datetime': DateTimeFieldBlockFactory,
- 'image': ImageFieldBlockFactory,
- 'file': FileFieldBlockFactory,
- 'multi_file': MultiFileFieldBlockFactory,
+ "text_markup": ParagraphBlockFactory,
+ "char": CharFieldBlockFactory,
+ "text": TextFieldBlockFactory,
+ "number": NumberFieldBlockFactory,
+ "checkbox": CheckboxFieldBlockFactory,
+ "radios": RadioFieldBlockFactory,
+ "dropdown": DropdownFieldBlockFactory,
+ "checkboxes": CheckboxesFieldBlockFactory,
+ "date": DateFieldBlockFactory,
+ "time": TimeFieldBlockFactory,
+ "datetime": DateTimeFieldBlockFactory,
+ "image": ImageFieldBlockFactory,
+ "file": FileFieldBlockFactory,
+ "multi_file": MultiFileFieldBlockFactory,
}
FormFieldsBlockFactory = StreamFieldUUIDFactory(BLOCK_FACTORY_DEFINITION)
-def flatten_for_form(data, field_name='', number=False):
+def flatten_for_form(data, field_name="", number=False):
result = {}
for i, (field, value) in enumerate(data.items()):
if number:
- field = f'{field_name}_{i}'
+ field = f"{field_name}_{i}"
if isinstance(value, dict):
result.update(**flatten_for_form(value, field_name=field, number=True))
else:
diff --git a/hypha/apply/templates/forms/includes/field.html b/hypha/apply/templates/forms/includes/field.html
index 7373b6c885..acd6033620 100644
--- a/hypha/apply/templates/forms/includes/field.html
+++ b/hypha/apply/templates/forms/includes/field.html
@@ -2,72 +2,72 @@
{% load bleach_tags markdown_tags %}
{% with widget_type=field|widget_type field_type=field|field_type %}
-
{% endwith %}
diff --git a/hypha/apply/templates/forms/includes/form_errors.html b/hypha/apply/templates/forms/includes/form_errors.html
index 136ed205d7..51721670f9 100644
--- a/hypha/apply/templates/forms/includes/form_errors.html
+++ b/hypha/apply/templates/forms/includes/form_errors.html
@@ -1,14 +1,14 @@
{% load i18n %}
{% if form.errors or form.non_field_errors %}
-
-
-
+ {% trans "There were some errors with your form. Please amend the fields highlighted below." %}
- {% if form.non_field_errors %} --
- {% for error in form.non_field_errors %}
-
- {{ error }} - {% endfor %} -
+
+
{% endif %}
diff --git a/hypha/apply/urls.py b/hypha/apply/urls.py
index 9164fab8e4..82ec859749 100644
--- a/hypha/apply/urls.py
+++ b/hypha/apply/urls.py
@@ -11,31 +11,31 @@
from .utils import views
urlpatterns = [
- path('apply/', include('hypha.apply.funds.urls', 'apply')),
- path('activity/', include('hypha.apply.activity.urls', 'activity')),
- path('', include(users_urls)),
- path('api/', include(api_urls)),
- path('dashboard/', include(dashboard_urls)),
- path('hijack/', include('hijack.urls', 'hijack')),
+ path("apply/", include("hypha.apply.funds.urls", "apply")),
+ path("activity/", include("hypha.apply.activity.urls", "activity")),
+ path("", include(users_urls)),
+ path("api/", include(api_urls)),
+ path("dashboard/", include(dashboard_urls)),
+ path("hijack/", include("hijack.urls", "hijack")),
# this must be above two factor include, this skip displaying the success
# page and advances user to download backup code page.
path(
- 'account/two_factor/setup/complete/',
+ "account/two_factor/setup/complete/",
RedirectView.as_view(
- url=reverse_lazy('users:backup_tokens_password'), permanent=False
+ url=reverse_lazy("users:backup_tokens_password"), permanent=False
),
- name='two_factor:setup_complete',
+ name="two_factor:setup_complete",
),
- path('', include(tf_urls, 'two_factor')),
+ path("", include(tf_urls, "two_factor")),
]
if settings.DEBUG:
urlpatterns += [
# Add views for testing 404 and 500 templates
- path('test404/', views.page_not_found),
+ path("test404/", views.page_not_found),
]
urlpatterns += base_urlpatterns
-handler404 = 'hypha.apply.utils.views.page_not_found'
+handler404 = "hypha.apply.utils.views.page_not_found"
diff --git a/hypha/apply/users/admin_views.py b/hypha/apply/users/admin_views.py
index 1de29022ba..2f49edb44a 100644
--- a/hypha/apply/users/admin_views.py
+++ b/hypha/apply/users/admin_views.py
@@ -24,68 +24,78 @@
# 'auth.delete_user') for user management actions, but this may vary according to
# the AUTH_USER_MODEL setting
add_user_perm = "{0}.add_{1}".format(AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME.lower())
-change_user_perm = "{0}.change_{1}".format(AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME.lower())
-delete_user_perm = "{0}.delete_{1}".format(AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME.lower())
+change_user_perm = "{0}.change_{1}".format(
+ AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME.lower()
+)
+delete_user_perm = "{0}.delete_{1}".format(
+ AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME.lower()
+)
+
def create_csv(users_list):
- base_path=os.path.join(settings.PROJECT_DIR,'../media')
- filename = 'users.csv'
- with open(os.path.join(base_path+'/'+filename),'w+') as file:
- fieldnames=['full_name','email','status','role']
+ base_path = os.path.join(settings.PROJECT_DIR, "../media")
+ filename = "users.csv"
+ with open(os.path.join(base_path + "/" + filename), "w+") as file:
+ fieldnames = ["full_name", "email", "status", "role"]
writer = csv.DictWriter(file, fieldnames=fieldnames)
writer.writeheader()
for user in users_list:
writer.writerow(user)
- return base_path + '/' + filename
+ return base_path + "/" + filename
+
def export(users):
users_list = []
for user in users:
if user.is_superuser:
- user.roles.insert(0,'Admin')
- roles=','.join(user.roles)
- user_data={
- 'full_name': user.full_name,
- 'email':user.email,
- 'status': 'Active' if user.is_active else 'Inactive',
- 'role': roles
+ user.roles.insert(0, "Admin")
+ roles = ",".join(user.roles)
+ user_data = {
+ "full_name": user.full_name,
+ "email": user.email,
+ "status": "Active" if user.is_active else "Inactive",
+ "role": roles,
}
users_list.append(user_data)
- filepath=create_csv(users_list)
- with open(filepath, 'rb') as file:
- response = HttpResponse(file.read(), content_type="text/csv")
- response['Content-Disposition'] = 'inline; filename=' + os.path.basename(filepath)
- return response
+ filepath = create_csv(users_list)
+ with open(filepath, "rb") as file:
+ response = HttpResponse(file.read(), content_type="text/csv")
+ response["Content-Disposition"] = "inline; filename=" + os.path.basename(
+ filepath
+ )
+ return response
+
class UserFilterSet(WagtailFilterSet):
STATUS_CHOICES = (
- ('inactive', 'INACTIVE'),
- ('active', 'ACTIVE'),
+ ("inactive", "INACTIVE"),
+ ("active", "ACTIVE"),
+ )
+ roles = django_filters.ModelChoiceFilter(
+ queryset=Group.objects.all(), label="Roles", method="filter_by_roles"
+ )
+ status = django_filters.ChoiceFilter(
+ choices=STATUS_CHOICES, label="Status", method="filter_by_status"
)
- roles = django_filters.ModelChoiceFilter(queryset=Group.objects.all(), label='Roles', method='filter_by_roles')
- status = django_filters.ChoiceFilter(choices=STATUS_CHOICES, label='Status', method='filter_by_status')
class Meta:
model = User
- fields = [
- 'roles',
- 'status'
- ]
+ fields = ["roles", "status"]
def filter_by_roles(self, queryset, name, value):
queryset = queryset.filter(groups__name=value)
return queryset
def filter_by_status(self, queryset, name, value):
- if value == 'active':
+ if value == "active":
return queryset.filter(is_active=True)
- elif value == 'inactive':
+ elif value == "inactive":
return queryset.filter(is_active=False)
return queryset
@any_permission_required(add_user_perm, change_user_perm, delete_user_perm)
-@vary_on_headers('X-Requested-With')
+@vary_on_headers("X-Requested-With")
def index(request, *args):
"""
Override wagtail's users index view to filter by full_name
@@ -102,28 +112,28 @@ def index(request, *args):
model_fields = [f.name for f in User._meta.get_fields()]
- if 'q' in request.GET:
+ if "q" in request.GET:
form = SearchForm(request.GET, placeholder=_("Search users"))
if form.is_valid():
- q = form.cleaned_data['q']
+ q = form.cleaned_data["q"]
is_searching = True
conditions = Q()
for term in q.split():
- if 'username' in model_fields:
+ if "username" in model_fields:
conditions |= Q(username__icontains=term)
- if 'first_name' in model_fields:
+ if "first_name" in model_fields:
conditions |= Q(first_name__icontains=term)
- if 'last_name' in model_fields:
+ if "last_name" in model_fields:
conditions |= Q(last_name__icontains=term)
- if 'email' in model_fields:
+ if "email" in model_fields:
conditions |= Q(email__icontains=term)
# filter by full_name
- if 'full_name' in model_fields:
+ if "full_name" in model_fields:
conditions |= Q(full_name__icontains=term)
users = User.objects.filter(group_filter & conditions)
@@ -131,55 +141,63 @@ def index(request, *args):
form = SearchForm(placeholder=_("Search users"))
if not is_searching:
- users = User.objects.filter(group_filter).order_by('-is_active', 'full_name')
+ users = User.objects.filter(group_filter).order_by("-is_active", "full_name")
filters = None
if not group:
filters = UserFilterSet(request.GET, queryset=users, request=request)
users = filters.qs
- if 'export' in request.GET:
+ if "export" in request.GET:
file = export(users)
return file
- if 'ordering' in request.GET:
- ordering = request.GET['ordering']
+ if "ordering" in request.GET:
+ ordering = request.GET["ordering"]
- if ordering == 'username':
+ if ordering == "username":
users = users.order_by(User.USERNAME_FIELD)
- elif ordering == 'status':
- users = users.order_by('is_active')
+ elif ordering == "status":
+ users = users.order_by("is_active")
else:
- ordering = 'name'
+ ordering = "name"
user_count = users.count()
- paginator = Paginator(users.select_related('wagtail_userprofile'), per_page=20)
- users = paginator.get_page(request.GET.get('p'))
-
- if request.headers.get('x-requested-with') == 'XMLHttpRequest':
- return TemplateResponse(request, "wagtailusers/users/results.html", {
- 'users': users,
- 'user_count': user_count,
- 'is_searching': is_searching,
- 'query_string': q,
- 'filters': filters,
- 'ordering': ordering,
- 'app_label': User._meta.app_label,
- 'model_name': User._meta.model_name,
- })
+ paginator = Paginator(users.select_related("wagtail_userprofile"), per_page=20)
+ users = paginator.get_page(request.GET.get("p"))
+
+ if request.headers.get("x-requested-with") == "XMLHttpRequest":
+ return TemplateResponse(
+ request,
+ "wagtailusers/users/results.html",
+ {
+ "users": users,
+ "user_count": user_count,
+ "is_searching": is_searching,
+ "query_string": q,
+ "filters": filters,
+ "ordering": ordering,
+ "app_label": User._meta.app_label,
+ "model_name": User._meta.model_name,
+ },
+ )
else:
- return TemplateResponse(request, "wagtailusers/users/index.html", {
- 'group': group,
- 'search_form': form,
- 'users': users,
- 'user_count': user_count,
- 'is_searching': is_searching,
- 'ordering': ordering,
- 'query_string': q,
- 'filters': filters,
- 'app_label': User._meta.app_label,
- 'model_name': User._meta.model_name,
- })
+ return TemplateResponse(
+ request,
+ "wagtailusers/users/index.html",
+ {
+ "group": group,
+ "search_form": form,
+ "users": users,
+ "user_count": user_count,
+ "is_searching": is_searching,
+ "ordering": ordering,
+ "query_string": q,
+ "filters": filters,
+ "app_label": User._meta.app_label,
+ "model_name": User._meta.model_name,
+ },
+ )
class CustomGroupViewSet(GroupViewSet):
@@ -187,6 +205,7 @@ class CustomGroupViewSet(GroupViewSet):
Overriding the wagtail.users.views.groups.GroupViewSet just to use custom users view(index)
when getting all users for a group.
"""
+
@property
def users_view(self):
return index
diff --git a/hypha/apply/users/decorators.py b/hypha/apply/users/decorators.py
index 0e72a29711..5f867287af 100644
--- a/hypha/apply/users/decorators.py
+++ b/hypha/apply/users/decorators.py
@@ -6,10 +6,12 @@
def require_oauth_whitelist(view_func):
"""Simple decorator that limits the use of OAuth to the configure whitelisted domains"""
+
def decorated_view(request, *args, **kwargs):
if can_use_oauth_check(request.user):
return view_func(request, *args, **kwargs)
raise PermissionDenied
+
return decorated_view
@@ -61,13 +63,22 @@ def is_contracting_approver(user):
finance_required = [login_required, user_passes_test(is_finance)]
-staff_or_finance_required = [login_required, user_passes_test(is_apply_staff_or_finance)]
+staff_or_finance_required = [
+ login_required,
+ user_passes_test(is_apply_staff_or_finance),
+]
approver_required = [login_required, user_passes_test(is_approver)]
-staff_or_finance_or_contracting_required = [login_required, user_passes_test(is_apply_staff_or_finance_or_contracting)]
+staff_or_finance_or_contracting_required = [
+ login_required,
+ user_passes_test(is_apply_staff_or_finance_or_contracting),
+]
-contracting_approver_required = [login_required, user_passes_test(is_contracting_approver)]
+contracting_approver_required = [
+ login_required,
+ user_passes_test(is_contracting_approver),
+]
def superuser_decorator(fn):
diff --git a/hypha/apply/users/forms.py b/hypha/apply/users/forms.py
index fcddaa0df7..3be84f4dc0 100644
--- a/hypha/apply/users/forms.py
+++ b/hypha/apply/users/forms.py
@@ -16,20 +16,24 @@ def __init__(self, *args, **kwargs):
self.user_settings = AuthSettings.load(request_or_site=self.request)
self.extra_text = self.user_settings.extra_text
if self.user_settings.consent_show:
- self.fields['consent'] = forms.BooleanField(
+ self.fields["consent"] = forms.BooleanField(
label=self.user_settings.consent_text,
help_text=self.user_settings.consent_help,
required=True,
)
-class CustomUserAdminFormBase():
+class CustomUserAdminFormBase:
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
# HACK: Wagtail admin doesn't work with custom User models that do not have first/last name.
- self.fields['first_name'].widget = forms.HiddenInput(attrs={'value': 'Not used - see full_name'})
- self.fields['last_name'].widget = forms.HiddenInput(attrs={'value': 'Not used - see full_name'})
+ self.fields["first_name"].widget = forms.HiddenInput(
+ attrs={"value": "Not used - see full_name"}
+ )
+ self.fields["last_name"].widget = forms.HiddenInput(
+ attrs={"value": "Not used - see full_name"}
+ )
class CustomUserEditForm(CustomUserAdminFormBase, UserEditForm):
@@ -38,8 +42,8 @@ class CustomUserEditForm(CustomUserAdminFormBase, UserEditForm):
class CustomUserCreationForm(CustomUserAdminFormBase, UserCreationForm):
error_messages = {
- 'duplicate_username': _("A user with that email already exists."),
- 'password_mismatch': _("The two password fields didn't match."),
+ "duplicate_username": _("A user with that email already exists."),
+ "password_mismatch": _("The two password fields didn't match."),
}
def __init__(self, request=None, *args, **kwargs):
@@ -48,7 +52,7 @@ def __init__(self, request=None, *args, **kwargs):
self.user_settings = AuthSettings.load(request_or_site=self.request)
if self.user_settings.consent_show:
- self.fields['consent'] = forms.BooleanField(
+ self.fields["consent"] = forms.BooleanField(
label=self.user_settings.consent_text,
help_text=self.user_settings.consent_help,
required=True,
@@ -58,29 +62,31 @@ def __init__(self, request=None, *args, **kwargs):
class ProfileForm(forms.ModelForm):
class Meta:
model = User
- fields = ['full_name', 'email', 'slack']
+ fields = ["full_name", "email", "slack"]
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
if not self.instance.is_apply_staff_or_finance:
- del self.fields['slack']
+ del self.fields["slack"]
if not self.instance.has_usable_password():
# User is registered with oauth - no password change allowed
- email_field = self.fields['email']
+ email_field = self.fields["email"]
email_field.disabled = True
email_field.required = False
- email_field.help_text = _('You are registered using OAuth, please contact an admin if you need to change your email address.')
+ email_field.help_text = _(
+ "You are registered using OAuth, please contact an admin if you need to change your email address."
+ )
def clean_slack(self):
- slack = self.cleaned_data['slack']
+ slack = self.cleaned_data["slack"]
if slack:
slack = slack.strip()
- if ' ' in slack:
- raise forms.ValidationError('Slack names must not include spaces')
+ if " " in slack:
+ raise forms.ValidationError("Slack names must not include spaces")
- if not slack.startswith('@'):
- slack = '@' + slack
+ if not slack.startswith("@"):
+ slack = "@" + slack
return slack
@@ -88,9 +94,9 @@ def clean_slack(self):
class BecomeUserForm(forms.Form):
user_pk = forms.ModelChoiceField(
widget=Select2Widget,
- help_text=_('Only includes active, non-superusers'),
+ help_text=_("Only includes active, non-superusers"),
queryset=User.objects.filter(is_active=True, is_superuser=False),
- label='',
+ label="",
required=False,
)
@@ -100,7 +106,7 @@ class EmailChangePasswordForm(forms.Form):
label=_("Password"),
help_text=_("Email change requires you to put password."),
strip=False,
- widget=forms.PasswordInput(attrs={'autofocus': True}),
+ widget=forms.PasswordInput(attrs={"autofocus": True}),
)
def __init__(self, user, *args, **kwargs):
@@ -112,7 +118,7 @@ def clean_password(self):
if not self.user.check_password(password):
raise forms.ValidationError(
_("Incorrect password. Please try again."),
- code='password_incorrect',
+ code="password_incorrect",
)
return password
@@ -129,7 +135,7 @@ class TWOFAPasswordForm(forms.Form):
password = forms.CharField(
label=_("Please type your password to confirm"),
strip=False,
- widget=forms.PasswordInput(attrs={'autofocus': True}),
+ widget=forms.PasswordInput(attrs={"autofocus": True}),
)
def __init__(self, user, *args, **kwargs):
@@ -141,6 +147,6 @@ def clean_password(self):
if not self.user.check_password(password):
raise forms.ValidationError(
_("Incorrect password. Please try again."),
- code='password_incorrect',
+ code="password_incorrect",
)
return password
diff --git a/hypha/apply/users/groups.py b/hypha/apply/users/groups.py
index 8fe1100619..41bcc0abf7 100644
--- a/hypha/apply/users/groups.py
+++ b/hypha/apply/users/groups.py
@@ -1,48 +1,48 @@
-APPLICANT_GROUP_NAME = 'Applicant'
-STAFF_GROUP_NAME = 'Staff'
-REVIEWER_GROUP_NAME = 'Reviewer'
-TEAMADMIN_GROUP_NAME = 'Staff Admin'
-PARTNER_GROUP_NAME = 'Partner'
-COMMUNITY_REVIEWER_GROUP_NAME = 'Community reviewer'
-APPROVER_GROUP_NAME = 'Approver'
-FINANCE_GROUP_NAME = 'Finance'
-CONTRACTING_GROUP_NAME = 'Contracting'
+APPLICANT_GROUP_NAME = "Applicant"
+STAFF_GROUP_NAME = "Staff"
+REVIEWER_GROUP_NAME = "Reviewer"
+TEAMADMIN_GROUP_NAME = "Staff Admin"
+PARTNER_GROUP_NAME = "Partner"
+COMMUNITY_REVIEWER_GROUP_NAME = "Community reviewer"
+APPROVER_GROUP_NAME = "Approver"
+FINANCE_GROUP_NAME = "Finance"
+CONTRACTING_GROUP_NAME = "Contracting"
GROUPS = [
{
- 'name': APPLICANT_GROUP_NAME,
- 'permissions': [],
+ "name": APPLICANT_GROUP_NAME,
+ "permissions": [],
},
{
- 'name': STAFF_GROUP_NAME,
- 'permissions': [],
+ "name": STAFF_GROUP_NAME,
+ "permissions": [],
},
{
- 'name': REVIEWER_GROUP_NAME,
- 'permissions': [],
+ "name": REVIEWER_GROUP_NAME,
+ "permissions": [],
},
{
- 'name': TEAMADMIN_GROUP_NAME,
- 'permissions': [],
+ "name": TEAMADMIN_GROUP_NAME,
+ "permissions": [],
},
{
- 'name': PARTNER_GROUP_NAME,
- 'permissions': [],
+ "name": PARTNER_GROUP_NAME,
+ "permissions": [],
},
{
- 'name': COMMUNITY_REVIEWER_GROUP_NAME,
- 'permissions': [],
+ "name": COMMUNITY_REVIEWER_GROUP_NAME,
+ "permissions": [],
},
{
- 'name': APPROVER_GROUP_NAME,
- 'permissions': [],
+ "name": APPROVER_GROUP_NAME,
+ "permissions": [],
},
{
- 'name': FINANCE_GROUP_NAME,
- 'permissions': [],
+ "name": FINANCE_GROUP_NAME,
+ "permissions": [],
},
{
- 'name': CONTRACTING_GROUP_NAME,
- 'permissions': [],
- }
+ "name": CONTRACTING_GROUP_NAME,
+ "permissions": [],
+ },
]
diff --git a/hypha/apply/users/management/commands/accounts_cleanup.py b/hypha/apply/users/management/commands/accounts_cleanup.py
index ebc9f7e468..e18b444e1a 100644
--- a/hypha/apply/users/management/commands/accounts_cleanup.py
+++ b/hypha/apply/users/management/commands/accounts_cleanup.py
@@ -13,7 +13,12 @@ class Command(BaseCommand):
def handle(self, *args, **options):
onehundredfifty_days_ago = timezone.now() - timedelta(days=150)
User = get_user_model()
- users_inactivate = User.objects.filter(date_joined__date__lte=onehundredfifty_days_ago, is_active=True, is_staff=False, last_login__isnull=True)
+ users_inactivate = User.objects.filter(
+ date_joined__date__lte=onehundredfifty_days_ago,
+ is_active=True,
+ is_staff=False,
+ last_login__isnull=True,
+ )
for user in users_inactivate:
user.is_active = False
diff --git a/hypha/apply/users/management/commands/migrate_users.py b/hypha/apply/users/management/commands/migrate_users.py
index 21549554b1..2e65c20b0a 100644
--- a/hypha/apply/users/management/commands/migrate_users.py
+++ b/hypha/apply/users/management/commands/migrate_users.py
@@ -15,12 +15,16 @@ class Command(BaseCommand):
groups = Group.objects.all()
def add_arguments(self, parser):
- parser.add_argument('source', type=argparse.FileType('r'), help="Migration source JSON file")
- parser.add_argument('--anonymize', action='store_true', help="Anonymizes non-OTF emails")
+ parser.add_argument(
+ "source", type=argparse.FileType("r"), help="Migration source JSON file"
+ )
+ parser.add_argument(
+ "--anonymize", action="store_true", help="Anonymizes non-OTF emails"
+ )
@transaction.atomic
def handle(self, *args, **options):
- with options['source'] as json_data:
+ with options["source"] as json_data:
User = get_user_model()
users = json.load(json_data)
@@ -30,12 +34,12 @@ def handle(self, *args, **options):
full_name = self.get_full_name(user)
slack_name = self.get_slack_name(user)
user_object, created = User.objects.get_or_create(
- email=self.get_email(user, options['anonymize']),
+ email=self.get_email(user, options["anonymize"]),
defaults={
- 'full_name': full_name,
- 'slack': slack_name,
- 'drupal_id': uid,
- }
+ "full_name": full_name,
+ "slack": slack_name,
+ "drupal_id": uid,
+ },
)
operation = "Imported" if created else "Processed"
@@ -54,33 +58,35 @@ def handle(self, *args, **options):
self.stdout.write(f"{operation} user {uid} ({full_name})")
def get_full_name(self, user):
- full_name = user.get('field_otf_real_name', None)
+ full_name = user.get("field_otf_real_name", None)
try:
- full_name = full_name['safe_value']
+ full_name = full_name["safe_value"]
except (KeyError, TypeError):
- full_name = user['name']
+ full_name = user["name"]
return full_name
def get_slack_name(self, user):
- slack_name = user.get('field_otf_slack_name', None)
+ slack_name = user.get("field_otf_slack_name", None)
try:
slack_name = f"@{slack_name['safe_value']}"
except (KeyError, TypeError):
- slack_name = ''
+ slack_name = ""
return slack_name
def get_user_groups(self, user):
groups = []
role_map = {
- 'council': 'Reviewer',
+ "council": "Reviewer",
}
- if self.is_staff(user['mail']):
+ if self.is_staff(user["mail"]):
groups.append(self.groups.filter(name=STAFF_GROUP_NAME).first())
- roles = [role for role in user.get('roles').values() if role != "authenticated user"]
+ roles = [
+ role for role in user.get("roles").values() if role != "authenticated user"
+ ]
for role in roles:
group_name = role_map.get(role)
@@ -90,12 +96,12 @@ def get_user_groups(self, user):
return groups
def get_email(self, user, anonymize=False):
- email = user['mail']
+ email = user["mail"]
if not anonymize or self.is_staff(email):
return email
return f"aeon+{user['uid']}@torchbox.com"
def is_staff(self, email):
- _, email_domain = email.split('@')
+ _, email_domain = email.split("@")
return email_domain in settings.STAFF_EMAIL_DOMAINS
diff --git a/hypha/apply/users/middleware.py b/hypha/apply/users/middleware.py
index 53ae4fc4f3..fd11afec37 100644
--- a/hypha/apply/users/middleware.py
+++ b/hypha/apply/users/middleware.py
@@ -6,9 +6,9 @@
)
ALLOWED_SUBPATH_FOR_UNVERIFIED_USERS = [
- 'login/',
- 'logout/',
- 'account/',
+ "login/",
+ "logout/",
+ "account/",
]
@@ -16,9 +16,10 @@ class SocialAuthExceptionMiddleware(_SocialAuthExceptionMiddleware):
"""
Wrapper around SocialAuthExceptionMiddleware to customise messages
"""
+
def get_message(self, request, exception):
if isinstance(exception, AuthForbidden):
- return 'Your credentials are not recognised.'
+ return "Your credentials are not recognised."
super().get_message(request, exception)
@@ -32,11 +33,11 @@ class TwoFactorAuthenticationMiddleware:
This will redirect all request from unverified users to enable 2FA first.
Except the request made on the url paths listed in ALLOWED_SUBPATH_FOR_UNVERIFIED_USERS.
"""
+
def __init__(self, get_response):
self.get_response = get_response
def is_path_allowed(self, path):
-
for sub_path in ALLOWED_SUBPATH_FOR_UNVERIFIED_USERS:
if sub_path in path:
return True
@@ -46,9 +47,13 @@ def __call__(self, request):
# code to execute before the view
user = request.user
if settings.ENFORCE_TWO_FACTOR:
- if user.is_authenticated and not user.is_verified() and not user.social_auth.exists():
+ if (
+ user.is_authenticated
+ and not user.is_verified()
+ and not user.social_auth.exists()
+ ):
if not self.is_path_allowed(request.path):
- return redirect('/account/two_factor/required/')
+ return redirect("/account/two_factor/required/")
response = self.get_response(request)
diff --git a/hypha/apply/users/migrations/0001_initial.py b/hypha/apply/users/migrations/0001_initial.py
index eba71cbb70..dda94d9a16 100644
--- a/hypha/apply/users/migrations/0001_initial.py
+++ b/hypha/apply/users/migrations/0001_initial.py
@@ -9,38 +9,125 @@
class Migration(migrations.Migration):
-
initial = True
dependencies = [
- ('auth', '0008_alter_user_username_max_length'),
+ ("auth", "0008_alter_user_username_max_length"),
]
operations = [
migrations.CreateModel(
- name='User',
+ name="User",
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('password', models.CharField(max_length=128, verbose_name='password')),
- ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
- ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
- ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
- ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')),
- ('last_name', models.CharField(blank=True, max_length=30, verbose_name='last name')),
- ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
- ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
- ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
- ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
- ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')),
- ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')),
+ (
+ "id",
+ models.AutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ ("password", models.CharField(max_length=128, verbose_name="password")),
+ (
+ "last_login",
+ models.DateTimeField(
+ blank=True, null=True, verbose_name="last login"
+ ),
+ ),
+ (
+ "is_superuser",
+ models.BooleanField(
+ default=False,
+ help_text="Designates that this user has all permissions without explicitly assigning them.",
+ verbose_name="superuser status",
+ ),
+ ),
+ (
+ "username",
+ models.CharField(
+ error_messages={
+ "unique": "A user with that username already exists."
+ },
+ help_text="Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.",
+ max_length=150,
+ unique=True,
+ validators=[
+ django.contrib.auth.validators.UnicodeUsernameValidator()
+ ],
+ verbose_name="username",
+ ),
+ ),
+ (
+ "first_name",
+ models.CharField(
+ blank=True, max_length=30, verbose_name="first name"
+ ),
+ ),
+ (
+ "last_name",
+ models.CharField(
+ blank=True, max_length=30, verbose_name="last name"
+ ),
+ ),
+ (
+ "email",
+ models.EmailField(
+ blank=True, max_length=254, verbose_name="email address"
+ ),
+ ),
+ (
+ "is_staff",
+ models.BooleanField(
+ default=False,
+ help_text="Designates whether the user can log into this admin site.",
+ verbose_name="staff status",
+ ),
+ ),
+ (
+ "is_active",
+ models.BooleanField(
+ default=True,
+ help_text="Designates whether this user should be treated as active. Unselect this instead of deleting accounts.",
+ verbose_name="active",
+ ),
+ ),
+ (
+ "date_joined",
+ models.DateTimeField(
+ default=django.utils.timezone.now, verbose_name="date joined"
+ ),
+ ),
+ (
+ "groups",
+ models.ManyToManyField(
+ blank=True,
+ help_text="The groups this user belongs to. A user will get all permissions granted to each of their groups.",
+ related_name="user_set",
+ related_query_name="user",
+ to="auth.Group",
+ verbose_name="groups",
+ ),
+ ),
+ (
+ "user_permissions",
+ models.ManyToManyField(
+ blank=True,
+ help_text="Specific permissions for this user.",
+ related_name="user_set",
+ related_query_name="user",
+ to="auth.Permission",
+ verbose_name="user permissions",
+ ),
+ ),
],
options={
- 'verbose_name': 'user',
- 'verbose_name_plural': 'users',
- 'abstract': False,
+ "verbose_name": "user",
+ "verbose_name_plural": "users",
+ "abstract": False,
},
managers=[
- ('objects', django.contrib.auth.models.UserManager()),
+ ("objects", django.contrib.auth.models.UserManager()),
],
),
]
diff --git a/hypha/apply/users/migrations/0002_initial_data.py b/hypha/apply/users/migrations/0002_initial_data.py
index 9e3b1b18f3..1621f68c92 100644
--- a/hypha/apply/users/migrations/0002_initial_data.py
+++ b/hypha/apply/users/migrations/0002_initial_data.py
@@ -14,35 +14,32 @@ def add_groups(apps, schema_editor):
db_alias = schema_editor.connection.alias
emit_post_migrate_signal(2, False, db_alias)
- Group = apps.get_model('auth.Group')
- Permission = apps.get_model('auth.Permission')
+ Group = apps.get_model("auth.Group")
+ Permission = apps.get_model("auth.Permission")
for group_data in GROUPS:
- group, created = Group.objects.get_or_create(name=group_data['name'])
- for permission in group_data['permissions']:
+ group, created = Group.objects.get_or_create(name=group_data["name"])
+ for permission in group_data["permissions"]:
try:
group.permissions.add(Permission.objects.get(codename=permission))
except ObjectDoesNotExist:
- print ("Could not find the '%s' permission" % permission)
+ print("Could not find the '%s' permission" % permission)
def remove_groups(apps, schema_editor):
- Group = apps.get_model('auth.Group')
+ Group = apps.get_model("auth.Group")
- groups = [group_data['name'] for group_data in GROUPS]
+ groups = [group_data["name"] for group_data in GROUPS]
Group.objects.filter(name__in=groups).delete()
class Migration(migrations.Migration):
-
dependencies = [
- ('users', '0001_initial'),
- ('wagtailadmin', '0001_create_admin_access_permissions'),
- ('wagtailimages', '0002_initial_data'),
- ('wagtaildocs', '0002_initial_data'),
- ('contenttypes', '__latest__'),
+ ("users", "0001_initial"),
+ ("wagtailadmin", "0001_create_admin_access_permissions"),
+ ("wagtailimages", "0002_initial_data"),
+ ("wagtaildocs", "0002_initial_data"),
+ ("contenttypes", "__latest__"),
]
- operations = [
- migrations.RunPython(add_groups, remove_groups)
- ]
+ operations = [migrations.RunPython(add_groups, remove_groups)]
diff --git a/hypha/apply/users/migrations/0003_make_email_username.py b/hypha/apply/users/migrations/0003_make_email_username.py
index fa56715e8f..9179bf0b57 100644
--- a/hypha/apply/users/migrations/0003_make_email_username.py
+++ b/hypha/apply/users/migrations/0003_make_email_username.py
@@ -8,25 +8,26 @@
class Migration(migrations.Migration):
-
dependencies = [
- ('users', '0002_initial_data'),
+ ("users", "0002_initial_data"),
]
operations = [
migrations.AlterModelManagers(
- name='user',
+ name="user",
managers=[
- ('objects', hypha.apply.users.models.UserManager()),
+ ("objects", hypha.apply.users.models.UserManager()),
],
),
migrations.AlterField(
- model_name='user',
- name='email',
- field=models.EmailField(max_length=254, unique=True, verbose_name='email address'),
+ model_name="user",
+ name="email",
+ field=models.EmailField(
+ max_length=254, unique=True, verbose_name="email address"
+ ),
),
migrations.RemoveField(
- model_name='user',
- name='username',
+ model_name="user",
+ name="username",
),
]
diff --git a/hypha/apply/users/migrations/0004_drop_first_last_names.py b/hypha/apply/users/migrations/0004_drop_first_last_names.py
index 19a541f53a..e1b03dab3d 100644
--- a/hypha/apply/users/migrations/0004_drop_first_last_names.py
+++ b/hypha/apply/users/migrations/0004_drop_first_last_names.py
@@ -6,23 +6,24 @@
class Migration(migrations.Migration):
-
dependencies = [
- ('users', '0003_make_email_username'),
+ ("users", "0003_make_email_username"),
]
operations = [
migrations.RemoveField(
- model_name='user',
- name='first_name',
+ model_name="user",
+ name="first_name",
),
migrations.RemoveField(
- model_name='user',
- name='last_name',
+ model_name="user",
+ name="last_name",
),
migrations.AddField(
- model_name='user',
- name='full_name',
- field=models.CharField(blank=True, max_length=255, verbose_name='Full name'),
+ model_name="user",
+ name="full_name",
+ field=models.CharField(
+ blank=True, max_length=255, verbose_name="Full name"
+ ),
),
]
diff --git a/hypha/apply/users/migrations/0005_user_drupal_id.py b/hypha/apply/users/migrations/0005_user_drupal_id.py
index 662c55217d..3d2899a0de 100644
--- a/hypha/apply/users/migrations/0005_user_drupal_id.py
+++ b/hypha/apply/users/migrations/0005_user_drupal_id.py
@@ -6,15 +6,14 @@
class Migration(migrations.Migration):
-
dependencies = [
- ('users', '0004_drop_first_last_names'),
+ ("users", "0004_drop_first_last_names"),
]
operations = [
migrations.AddField(
- model_name='user',
- name='drupal_id',
+ model_name="user",
+ name="drupal_id",
field=models.IntegerField(blank=True, editable=False, null=True),
),
]
diff --git a/hypha/apply/users/migrations/0006_update_the_ordering_of_users.py b/hypha/apply/users/migrations/0006_update_the_ordering_of_users.py
index 3c54ec9619..44e6f6fc54 100644
--- a/hypha/apply/users/migrations/0006_update_the_ordering_of_users.py
+++ b/hypha/apply/users/migrations/0006_update_the_ordering_of_users.py
@@ -4,14 +4,13 @@
class Migration(migrations.Migration):
-
dependencies = [
- ('users', '0005_user_drupal_id'),
+ ("users", "0005_user_drupal_id"),
]
operations = [
migrations.AlterModelOptions(
- name='user',
- options={'ordering': ('full_name', 'email')},
+ name="user",
+ options={"ordering": ("full_name", "email")},
),
]
diff --git a/hypha/apply/users/migrations/0007_user_slack.py b/hypha/apply/users/migrations/0007_user_slack.py
index 177e18168a..783843b47e 100644
--- a/hypha/apply/users/migrations/0007_user_slack.py
+++ b/hypha/apply/users/migrations/0007_user_slack.py
@@ -4,15 +4,19 @@
class Migration(migrations.Migration):
-
dependencies = [
- ('users', '0006_update_the_ordering_of_users'),
+ ("users", "0006_update_the_ordering_of_users"),
]
operations = [
migrations.AddField(
- model_name='user',
- name='slack',
- field=models.CharField(blank=True, help_text='This is the name we should "@mention" when sending notifications', max_length=50, verbose_name='Slack name'),
+ model_name="user",
+ name="slack",
+ field=models.CharField(
+ blank=True,
+ help_text='This is the name we should "@mention" when sending notifications',
+ max_length=50,
+ verbose_name="Slack name",
+ ),
),
]
diff --git a/hypha/apply/users/migrations/0008_add_staff_permissions.py b/hypha/apply/users/migrations/0008_add_staff_permissions.py
index 792a89873d..d6be98faac 100644
--- a/hypha/apply/users/migrations/0008_add_staff_permissions.py
+++ b/hypha/apply/users/migrations/0008_add_staff_permissions.py
@@ -7,16 +7,13 @@
class Migration(migrations.Migration):
-
def add_permissions(apps, schema_editor):
staff_group = Group.objects.get(name=STAFF_GROUP_NAME)
- staff_add_perm = Permission.objects.get(name='Can change event')
+ staff_add_perm = Permission.objects.get(name="Can change event")
staff_group.permissions.add(staff_add_perm)
dependencies = [
- ('users', '0007_user_slack'),
+ ("users", "0007_user_slack"),
]
- operations = [
- migrations.RunPython(add_permissions)
- ]
+ operations = [migrations.RunPython(add_permissions)]
diff --git a/hypha/apply/users/migrations/0009_add_partner_group.py b/hypha/apply/users/migrations/0009_add_partner_group.py
index b84e961f83..a471d8d8f8 100644
--- a/hypha/apply/users/migrations/0009_add_partner_group.py
+++ b/hypha/apply/users/migrations/0009_add_partner_group.py
@@ -1,4 +1,3 @@
-
# Generated by Django 2.0.9 on 2018-12-19 13:21
from __future__ import unicode_literals
@@ -14,12 +13,12 @@ def add_groups(apps, schema_editor):
db_alias = schema_editor.connection.alias
emit_post_migrate_signal(2, False, db_alias)
- Group = apps.get_model('auth.Group')
- Permission = apps.get_model('auth.Permission')
+ Group = apps.get_model("auth.Group")
+ Permission = apps.get_model("auth.Permission")
for group_data in GROUPS:
- group, created = Group.objects.get_or_create(name=group_data['name'])
- for permission in group_data['permissions']:
+ group, created = Group.objects.get_or_create(name=group_data["name"])
+ for permission in group_data["permissions"]:
try:
group.permissions.add(Permission.objects.get(codename=permission))
except ObjectDoesNotExist:
@@ -27,16 +26,13 @@ def add_groups(apps, schema_editor):
def remove_groups(apps, schema_editor):
- Group = apps.get_model('auth.Group')
+ Group = apps.get_model("auth.Group")
Group.objects.filter(name__in=[TEAMADMIN_GROUP_NAME, PARTNER_GROUP_NAME]).delete()
class Migration(migrations.Migration):
-
dependencies = [
- ('users', '0008_add_staff_permissions'),
+ ("users", "0008_add_staff_permissions"),
]
- operations = [
- migrations.RunPython(add_groups, remove_groups)
- ]
+ operations = [migrations.RunPython(add_groups, remove_groups)]
diff --git a/hypha/apply/users/migrations/0010_add_community_reviewer_group.py b/hypha/apply/users/migrations/0010_add_community_reviewer_group.py
index 8c304f8f51..4829cbaf5c 100644
--- a/hypha/apply/users/migrations/0010_add_community_reviewer_group.py
+++ b/hypha/apply/users/migrations/0010_add_community_reviewer_group.py
@@ -1,4 +1,3 @@
-
# Generated by Django 2.0.9 on 2018-12-19 13:21
from __future__ import unicode_literals
@@ -14,12 +13,12 @@ def add_groups(apps, schema_editor):
db_alias = schema_editor.connection.alias
emit_post_migrate_signal(2, False, db_alias)
- Group = apps.get_model('auth.Group')
- Permission = apps.get_model('auth.Permission')
+ Group = apps.get_model("auth.Group")
+ Permission = apps.get_model("auth.Permission")
for group_data in GROUPS:
- group, created = Group.objects.get_or_create(name=group_data['name'])
- for permission in group_data['permissions']:
+ group, created = Group.objects.get_or_create(name=group_data["name"])
+ for permission in group_data["permissions"]:
try:
group.permissions.add(Permission.objects.get(codename=permission))
except ObjectDoesNotExist:
@@ -27,16 +26,13 @@ def add_groups(apps, schema_editor):
def remove_groups(apps, schema_editor):
- Group = apps.get_model('auth.Group')
+ Group = apps.get_model("auth.Group")
Group.objects.filter(name__in=[COMMUNITY_REVIEWER_GROUP_NAME]).delete()
class Migration(migrations.Migration):
-
dependencies = [
- ('users', '0009_add_partner_group'),
+ ("users", "0009_add_partner_group"),
]
- operations = [
- migrations.RunPython(add_groups, remove_groups)
- ]
+ operations = [migrations.RunPython(add_groups, remove_groups)]
diff --git a/hypha/apply/users/migrations/0011_add_applicant_group.py b/hypha/apply/users/migrations/0011_add_applicant_group.py
index 3b0b7f0470..e55ee34e7d 100644
--- a/hypha/apply/users/migrations/0011_add_applicant_group.py
+++ b/hypha/apply/users/migrations/0011_add_applicant_group.py
@@ -1,4 +1,3 @@
-
# Generated by Django 2.0.9 on 2018-12-19 13:21
from __future__ import unicode_literals
@@ -14,12 +13,12 @@ def add_groups(apps, schema_editor):
db_alias = schema_editor.connection.alias
emit_post_migrate_signal(2, False, db_alias)
- Group = apps.get_model('auth.Group')
- Permission = apps.get_model('auth.Permission')
+ Group = apps.get_model("auth.Group")
+ Permission = apps.get_model("auth.Permission")
for group_data in GROUPS:
- group, created = Group.objects.get_or_create(name=group_data['name'])
- for permission in group_data['permissions']:
+ group, created = Group.objects.get_or_create(name=group_data["name"])
+ for permission in group_data["permissions"]:
try:
group.permissions.add(Permission.objects.get(codename=permission))
except ObjectDoesNotExist:
@@ -27,16 +26,13 @@ def add_groups(apps, schema_editor):
def remove_groups(apps, schema_editor):
- Group = apps.get_model('auth.Group')
+ Group = apps.get_model("auth.Group")
Group.objects.filter(name__in=[APPLICANT_GROUP_NAME]).delete()
class Migration(migrations.Migration):
-
dependencies = [
- ('users', '0010_add_community_reviewer_group'),
+ ("users", "0010_add_community_reviewer_group"),
]
- operations = [
- migrations.RunPython(add_groups, remove_groups)
- ]
+ operations = [migrations.RunPython(add_groups, remove_groups)]
diff --git a/hypha/apply/users/migrations/0012_set_applicant_group.py b/hypha/apply/users/migrations/0012_set_applicant_group.py
index acb650e865..0358424960 100644
--- a/hypha/apply/users/migrations/0012_set_applicant_group.py
+++ b/hypha/apply/users/migrations/0012_set_applicant_group.py
@@ -1,4 +1,3 @@
-
# Generated by Django 2.0.9 on 2018-12-19 13:21
from __future__ import unicode_literals
@@ -29,11 +28,8 @@ def unset_group(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
- ('users', '0011_add_applicant_group'),
+ ("users", "0011_add_applicant_group"),
]
- operations = [
- migrations.RunPython(set_group, unset_group)
- ]
+ operations = [migrations.RunPython(set_group, unset_group)]
diff --git a/hypha/apply/users/migrations/0013_add_approver_group.py b/hypha/apply/users/migrations/0013_add_approver_group.py
index 9ec436fd03..3638944b2c 100644
--- a/hypha/apply/users/migrations/0013_add_approver_group.py
+++ b/hypha/apply/users/migrations/0013_add_approver_group.py
@@ -12,12 +12,12 @@ def add_groups(apps, schema_editor):
db_alias = schema_editor.connection.alias
emit_post_migrate_signal(2, False, db_alias)
- Group = apps.get_model('auth.Group')
- Permission = apps.get_model('auth.Permission')
+ Group = apps.get_model("auth.Group")
+ Permission = apps.get_model("auth.Permission")
for group_data in GROUPS:
- group, created = Group.objects.get_or_create(name=group_data['name'])
- for codename in group_data['permissions']:
+ group, created = Group.objects.get_or_create(name=group_data["name"])
+ for codename in group_data["permissions"]:
try:
permission = Permission.objects.get(codename=codename)
except ObjectDoesNotExist:
@@ -28,16 +28,13 @@ def add_groups(apps, schema_editor):
def remove_groups(apps, schema_editor):
- Group = apps.get_model('auth.Group')
+ Group = apps.get_model("auth.Group")
Group.objects.filter(name=APPROVER_GROUP_NAME).delete()
class Migration(migrations.Migration):
-
dependencies = [
- ('users', '0012_set_applicant_group'),
+ ("users", "0012_set_applicant_group"),
]
- operations = [
- migrations.RunPython(add_groups, remove_groups)
- ]
+ operations = [migrations.RunPython(add_groups, remove_groups)]
diff --git a/hypha/apply/users/migrations/0014_usersettings.py b/hypha/apply/users/migrations/0014_usersettings.py
index da26c4d66a..1afa4e5785 100644
--- a/hypha/apply/users/migrations/0014_usersettings.py
+++ b/hypha/apply/users/migrations/0014_usersettings.py
@@ -6,24 +6,44 @@
class Migration(migrations.Migration):
-
dependencies = [
- ('wagtailcore', '0045_assign_unlock_grouppagepermission'),
- ('users', '0013_add_approver_group'),
+ ("wagtailcore", "0045_assign_unlock_grouppagepermission"),
+ ("users", "0013_add_approver_group"),
]
operations = [
migrations.CreateModel(
- name='UserSettings',
+ name="UserSettings",
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('consent_show', models.BooleanField(default=False, verbose_name='Show consent checkbox in login form')),
- ('consent_text', models.CharField(max_length=255)),
- ('consent_help', wagtail.fields.RichTextField()),
- ('site', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, to='wagtailcore.Site')),
+ (
+ "id",
+ models.AutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ (
+ "consent_show",
+ models.BooleanField(
+ default=False,
+ verbose_name="Show consent checkbox in login form",
+ ),
+ ),
+ ("consent_text", models.CharField(max_length=255)),
+ ("consent_help", wagtail.fields.RichTextField()),
+ (
+ "site",
+ models.OneToOneField(
+ editable=False,
+ on_delete=django.db.models.deletion.CASCADE,
+ to="wagtailcore.Site",
+ ),
+ ),
],
options={
- 'verbose_name': 'user settings',
+ "verbose_name": "user settings",
},
),
]
diff --git a/hypha/apply/users/migrations/0015_login_extra_text.py b/hypha/apply/users/migrations/0015_login_extra_text.py
index 8af7ff537f..cea17b6691 100644
--- a/hypha/apply/users/migrations/0015_login_extra_text.py
+++ b/hypha/apply/users/migrations/0015_login_extra_text.py
@@ -5,30 +5,31 @@
class Migration(migrations.Migration):
-
dependencies = [
- ('users', '0014_usersettings'),
+ ("users", "0014_usersettings"),
]
operations = [
migrations.AddField(
- model_name='usersettings',
- name='extra_text',
+ model_name="usersettings",
+ name="extra_text",
field=wagtail.fields.RichTextField(blank=True),
),
migrations.AlterField(
- model_name='usersettings',
- name='consent_help',
+ model_name="usersettings",
+ name="consent_help",
field=wagtail.fields.RichTextField(blank=True),
),
migrations.AlterField(
- model_name='usersettings',
- name='consent_show',
- field=models.BooleanField(default=False, verbose_name='Show consent checkbox'),
+ model_name="usersettings",
+ name="consent_show",
+ field=models.BooleanField(
+ default=False, verbose_name="Show consent checkbox"
+ ),
),
migrations.AlterField(
- model_name='usersettings',
- name='consent_text',
+ model_name="usersettings",
+ name="consent_text",
field=models.CharField(blank=True, max_length=255),
),
]
diff --git a/hypha/apply/users/migrations/0016_add_finance_group.py b/hypha/apply/users/migrations/0016_add_finance_group.py
index d26f3aaa5d..88525ad545 100644
--- a/hypha/apply/users/migrations/0016_add_finance_group.py
+++ b/hypha/apply/users/migrations/0016_add_finance_group.py
@@ -12,12 +12,12 @@ def add_groups(apps, schema_editor):
db_alias = schema_editor.connection.alias
emit_post_migrate_signal(2, False, db_alias)
- Group = apps.get_model('auth.Group')
- Permission = apps.get_model('auth.Permission')
+ Group = apps.get_model("auth.Group")
+ Permission = apps.get_model("auth.Permission")
for group_data in GROUPS:
- group, created = Group.objects.get_or_create(name=group_data['name'])
- for codename in group_data['permissions']:
+ group, created = Group.objects.get_or_create(name=group_data["name"])
+ for codename in group_data["permissions"]:
try:
permission = Permission.objects.get(codename=codename)
except ObjectDoesNotExist:
@@ -28,16 +28,13 @@ def add_groups(apps, schema_editor):
def remove_groups(apps, schema_editor):
- Group = apps.get_model('auth.Group')
+ Group = apps.get_model("auth.Group")
Group.objects.filter(name=FINANCE_GROUP_NAME).delete()
class Migration(migrations.Migration):
-
dependencies = [
- ('users', '0015_login_extra_text'),
+ ("users", "0015_login_extra_text"),
]
- operations = [
- migrations.RunPython(add_groups, remove_groups)
- ]
+ operations = [migrations.RunPython(add_groups, remove_groups)]
diff --git a/hypha/apply/users/migrations/0017_rename_staff_admin.py b/hypha/apply/users/migrations/0017_rename_staff_admin.py
index 00066286b2..11ae3ad0a0 100644
--- a/hypha/apply/users/migrations/0017_rename_staff_admin.py
+++ b/hypha/apply/users/migrations/0017_rename_staff_admin.py
@@ -1,4 +1,3 @@
-
# Generated by Django 2.0.9 on 2018-12-19 13:21
from __future__ import unicode_literals
@@ -10,7 +9,7 @@
def rename_group(apps, schema_editor):
try:
- team_admin_group = Group.objects.get(name='Team Admin')
+ team_admin_group = Group.objects.get(name="Team Admin")
except Group.DoesNotExist:
pass
else:
@@ -24,16 +23,13 @@ def unrename_group(apps, schema_editor):
except Group.DoesNotExist:
pass
else:
- team_admin_group.name = 'Team Admin'
+ team_admin_group.name = "Team Admin"
team_admin_group.save()
class Migration(migrations.Migration):
-
dependencies = [
- ('users', '0016_add_finance_group'),
+ ("users", "0016_add_finance_group"),
]
- operations = [
- migrations.RunPython(rename_group, unrename_group)
- ]
+ operations = [migrations.RunPython(rename_group, unrename_group)]
diff --git a/hypha/apply/users/migrations/0018_add_contracting_group.py b/hypha/apply/users/migrations/0018_add_contracting_group.py
index 99935b918a..ac220bd2c4 100644
--- a/hypha/apply/users/migrations/0018_add_contracting_group.py
+++ b/hypha/apply/users/migrations/0018_add_contracting_group.py
@@ -12,12 +12,12 @@ def add_groups(apps, schema_editor):
db_alias = schema_editor.connection.alias
emit_post_migrate_signal(2, False, db_alias)
- Group = apps.get_model('auth.Group')
- Permission = apps.get_model('auth.Permission')
+ Group = apps.get_model("auth.Group")
+ Permission = apps.get_model("auth.Permission")
for group_data in GROUPS:
- group, created = Group.objects.get_or_create(name=group_data['name'])
- for codename in group_data['permissions']:
+ group, created = Group.objects.get_or_create(name=group_data["name"])
+ for codename in group_data["permissions"]:
try:
permission = Permission.objects.get(codename=codename)
except ObjectDoesNotExist:
@@ -28,16 +28,13 @@ def add_groups(apps, schema_editor):
def remove_groups(apps, schema_editor):
- Group = apps.get_model('auth.Group')
+ Group = apps.get_model("auth.Group")
Group.objects.filter(name=CONTRACTING_GROUP_NAME).delete()
class Migration(migrations.Migration):
-
dependencies = [
- ('users', '0017_rename_staff_admin'),
+ ("users", "0017_rename_staff_admin"),
]
- operations = [
- migrations.RunPython(add_groups, remove_groups)
- ]
+ operations = [migrations.RunPython(add_groups, remove_groups)]
diff --git a/hypha/apply/users/migrations/0019_rename_usersettings_authsettings.py b/hypha/apply/users/migrations/0019_rename_usersettings_authsettings.py
index e8cacc3a97..9e56b3b891 100644
--- a/hypha/apply/users/migrations/0019_rename_usersettings_authsettings.py
+++ b/hypha/apply/users/migrations/0019_rename_usersettings_authsettings.py
@@ -4,15 +4,14 @@
class Migration(migrations.Migration):
-
dependencies = [
- ('wagtailcore', '0083_workflowcontenttype'),
- ('users', '0018_add_contracting_group'),
+ ("wagtailcore", "0083_workflowcontenttype"),
+ ("users", "0018_add_contracting_group"),
]
operations = [
migrations.RenameModel(
- old_name='UserSettings',
- new_name='AuthSettings',
+ old_name="UserSettings",
+ new_name="AuthSettings",
),
]
diff --git a/hypha/apply/users/migrations/0020_auto_20230625_1825.py b/hypha/apply/users/migrations/0020_auto_20230625_1825.py
index d235036964..cbc0aeb721 100644
--- a/hypha/apply/users/migrations/0020_auto_20230625_1825.py
+++ b/hypha/apply/users/migrations/0020_auto_20230625_1825.py
@@ -5,33 +5,40 @@
class Migration(migrations.Migration):
-
dependencies = [
- ('users', '0019_rename_usersettings_authsettings'),
+ ("users", "0019_rename_usersettings_authsettings"),
]
operations = [
migrations.AlterModelOptions(
- name='authsettings',
- options={'verbose_name': 'Auth Settings'},
+ name="authsettings",
+ options={"verbose_name": "Auth Settings"},
),
migrations.RemoveField(
- model_name='authsettings',
- name='site',
+ model_name="authsettings",
+ name="site",
),
migrations.AddField(
- model_name='authsettings',
- name='register_extra_text',
- field=wagtail.fields.RichTextField(blank=True, help_text='Extra text to be displayed on register form'),
+ model_name="authsettings",
+ name="register_extra_text",
+ field=wagtail.fields.RichTextField(
+ blank=True, help_text="Extra text to be displayed on register form"
+ ),
),
migrations.AlterField(
- model_name='authsettings',
- name='consent_show',
- field=models.BooleanField(default=False, verbose_name='Show consent checkbox?'),
+ model_name="authsettings",
+ name="consent_show",
+ field=models.BooleanField(
+ default=False, verbose_name="Show consent checkbox?"
+ ),
),
migrations.AlterField(
- model_name='authsettings',
- name='extra_text',
- field=wagtail.fields.RichTextField(blank=True, help_text='Displayed along side login form', verbose_name='Login extra text'),
+ model_name="authsettings",
+ name="extra_text",
+ field=wagtail.fields.RichTextField(
+ blank=True,
+ help_text="Displayed along side login form",
+ verbose_name="Login extra text",
+ ),
),
]
diff --git a/hypha/apply/users/models.py b/hypha/apply/users/models.py
index 95611cdb14..44ee07b515 100644
--- a/hypha/apply/users/models.py
+++ b/hypha/apply/users/models.py
@@ -55,10 +55,14 @@ def finances(self):
return self.filter(groups__name=FINANCE_GROUP_NAME, is_active=True)
def finances_level_1(self):
- return self.filter(groups__name=FINANCE_GROUP_NAME, is_active=True).exclude(groups__name=APPROVER_GROUP_NAME)
+ return self.filter(groups__name=FINANCE_GROUP_NAME, is_active=True).exclude(
+ groups__name=APPROVER_GROUP_NAME
+ )
def finances_level_2(self):
- return self.filter(groups__name=FINANCE_GROUP_NAME, is_active=True).filter(groups__name=APPROVER_GROUP_NAME)
+ return self.filter(groups__name=FINANCE_GROUP_NAME, is_active=True).filter(
+ groups__name=APPROVER_GROUP_NAME
+ )
def contracting(self):
return self.filter(groups__name=CONTRACTING_GROUP_NAME, is_active=True)
@@ -72,7 +76,7 @@ def _create_user(self, email, password, **extra_fields):
Creates and saves a User with the given username, email and password.
"""
if not email:
- raise ValueError('The given email must be set')
+ raise ValueError("The given email must be set")
email = self.normalize_email(email)
is_registered, reason = is_user_already_registered(email)
if is_registered:
@@ -83,18 +87,18 @@ def _create_user(self, email, password, **extra_fields):
return user
def create_user(self, email, password=None, **extra_fields):
- extra_fields.setdefault('is_staff', False)
- extra_fields.setdefault('is_superuser', False)
+ extra_fields.setdefault("is_staff", False)
+ extra_fields.setdefault("is_superuser", False)
return self._create_user(email, password, **extra_fields)
def create_superuser(self, email, password, **extra_fields):
- extra_fields.setdefault('is_staff', True)
- extra_fields.setdefault('is_superuser', True)
+ extra_fields.setdefault("is_staff", True)
+ extra_fields.setdefault("is_superuser", True)
- if extra_fields.get('is_staff') is not True:
- raise ValueError('Superuser must have is_staff=True.')
- if extra_fields.get('is_superuser') is not True:
- raise ValueError('Superuser must have is_superuser=True.')
+ if extra_fields.get("is_staff") is not True:
+ raise ValueError("Superuser must have is_staff=True.")
+ if extra_fields.get("is_superuser") is not True:
+ raise ValueError("Superuser must have is_superuser=True.")
return self._create_user(email, password, **extra_fields)
@@ -117,13 +121,17 @@ def _extract_model_params(self, defaults, **kwargs):
invalid_params.append(param)
if invalid_params:
raise exceptions.FieldError(
- "Invalid field name(s) for model %s: '%s'." % (
+ "Invalid field name(s) for model %s: '%s'."
+ % (
self.model._meta.object_name,
"', '".join(sorted(invalid_params)),
- ))
+ )
+ )
return params
- def get_or_create_and_notify(self, defaults: dict | None =None, site=None, **kwargs):
+ def get_or_create_and_notify(
+ self, defaults: dict | None = None, site=None, **kwargs
+ ):
"""Create or get an account for applicant and send activation email to applicant.
Args:
@@ -142,10 +150,10 @@ def get_or_create_and_notify(self, defaults: dict | None =None, site=None, **kwa
if defaults is None:
defaults = {}
- email = kwargs.get('email')
- redirect_url = ''
- if 'redirect_url' in kwargs:
- redirect_url = kwargs.pop('redirect_url')
+ email = kwargs.get("email")
+ redirect_url = ""
+ if "redirect_url" in kwargs:
+ redirect_url = kwargs.pop("redirect_url")
is_registered, _ = is_user_already_registered(email=email)
@@ -157,9 +165,9 @@ def get_or_create_and_notify(self, defaults: dict | None =None, site=None, **kwa
elif not user.is_active:
raise IntegrityError("Found an inactive account")
else:
- if 'password' in kwargs:
+ if "password" in kwargs:
# Coming from registration without application
- temp_pass = kwargs.pop('password')
+ temp_pass = kwargs.pop("password")
else:
temp_pass = BaseUserManager().make_random_password(length=32)
@@ -167,7 +175,9 @@ def get_or_create_and_notify(self, defaults: dict | None =None, site=None, **kwa
defaults.update(password=temp_pass_hash)
try:
- params = dict(resolve_callables(self._extract_model_params(defaults, **kwargs)))
+ params = dict(
+ resolve_callables(self._extract_model_params(defaults, **kwargs))
+ )
user = self.create(**params)
except IntegrityError:
raise
@@ -183,10 +193,12 @@ def get_or_create_and_notify(self, defaults: dict | None =None, site=None, **kwa
class User(AbstractUser):
- email = models.EmailField(_('email address'), unique=True)
- full_name = models.CharField(verbose_name=_('Full name'), max_length=255, blank=True)
+ email = models.EmailField(_("email address"), unique=True)
+ full_name = models.CharField(
+ verbose_name=_("Full name"), max_length=255, blank=True
+ )
slack = models.CharField(
- verbose_name=_('Slack name'),
+ verbose_name=_("Slack name"),
blank=True,
help_text=_('This is the name we should "@mention" when sending notifications'),
max_length=50,
@@ -195,7 +207,7 @@ class User(AbstractUser):
# Meta: used for migration purposes only
drupal_id = models.IntegerField(null=True, blank=True, editable=False)
- USERNAME_FIELD = 'email'
+ USERNAME_FIELD = "email"
REQUIRED_FIELDS = []
# Remove the username/first/last name field which is no longer used.
@@ -217,16 +229,16 @@ def get_short_name(self):
return self.email
def get_full_name_with_group(self):
- is_apply_staff = f' ({STAFF_GROUP_NAME})' if self.is_apply_staff else ''
- is_reviewer = f' ({REVIEWER_GROUP_NAME})' if self.is_reviewer else ''
- is_applicant = f' ({APPLICANT_GROUP_NAME})' if self.is_applicant else ''
- is_finance = f' ({FINANCE_GROUP_NAME})' if self.is_finance else ''
- is_contracting = f' ({CONTRACTING_GROUP_NAME})' if self.is_contracting else ''
- return f'{self.full_name.strip()}{is_apply_staff}{is_reviewer}{is_applicant}{is_finance}{is_contracting}'
+ is_apply_staff = f" ({STAFF_GROUP_NAME})" if self.is_apply_staff else ""
+ is_reviewer = f" ({REVIEWER_GROUP_NAME})" if self.is_reviewer else ""
+ is_applicant = f" ({APPLICANT_GROUP_NAME})" if self.is_applicant else ""
+ is_finance = f" ({FINANCE_GROUP_NAME})" if self.is_finance else ""
+ is_contracting = f" ({CONTRACTING_GROUP_NAME})" if self.is_contracting else ""
+ return f"{self.full_name.strip()}{is_apply_staff}{is_reviewer}{is_applicant}{is_finance}{is_contracting}"
@cached_property
def roles(self):
- return list(self.groups.values_list('name', flat=True))
+ return list(self.groups.values_list("name", flat=True))
@cached_property
def is_apply_staff(self):
@@ -238,7 +250,9 @@ def is_apply_staff_or_finance(self):
@cached_property
def is_apply_staff_admin(self):
- return self.groups.filter(name=TEAMADMIN_GROUP_NAME).exists() or self.is_superuser
+ return (
+ self.groups.filter(name=TEAMADMIN_GROUP_NAME).exists() or self.is_superuser
+ )
@cached_property
def is_reviewer(self):
@@ -266,14 +280,20 @@ def is_finance(self):
@cached_property
def is_finance_level_1(self):
- return self.groups.filter(name=FINANCE_GROUP_NAME).exists() and not self.groups.filter(name=APPROVER_GROUP_NAME).exists()
+ return (
+ self.groups.filter(name=FINANCE_GROUP_NAME).exists()
+ and not self.groups.filter(name=APPROVER_GROUP_NAME).exists()
+ )
@cached_property
def is_finance_level_2(self):
# disable finance2 user if invoice flow in not extended
if not settings.INVOICE_EXTENDED_WORKFLOW:
return False
- return self.groups.filter(name=FINANCE_GROUP_NAME).exists() & self.groups.filter(name=APPROVER_GROUP_NAME).exists()
+ return (
+ self.groups.filter(name=FINANCE_GROUP_NAME).exists()
+ & self.groups.filter(name=APPROVER_GROUP_NAME).exists()
+ )
@cached_property
def is_contracting(self):
@@ -281,7 +301,10 @@ def is_contracting(self):
@cached_property
def is_contracting_approver(self):
- return self.groups.filter(name=CONTRACTING_GROUP_NAME).exists() and self.groups.filter(name=APPROVER_GROUP_NAME).exists()
+ return (
+ self.groups.filter(name=CONTRACTING_GROUP_NAME).exists()
+ and self.groups.filter(name=APPROVER_GROUP_NAME).exists()
+ )
def get_absolute_url(self):
"""Used in the activities messages to generate URL for user instances.
@@ -289,13 +312,13 @@ def get_absolute_url(self):
Returns:
url pointing to the wagtail admin, as there are no public urls for user.
"""
- return reverse('wagtailusers_users:edit', args=[self.id])
+ return reverse("wagtailusers_users:edit", args=[self.id])
class Meta:
- ordering = ('full_name', 'email')
+ ordering = ("full_name", "email")
def __repr__(self):
- return f'<{self.__class__.__name__}: {self.full_name} ({self.email})>'
+ return f"<{self.__class__.__name__}: {self.full_name} ({self.email})>"
@register_setting
@@ -303,14 +326,15 @@ class AuthSettings(BaseGenericSetting):
wagtail_reference_index_ignore = True
class Meta:
- verbose_name = 'Auth Settings'
+ verbose_name = "Auth Settings"
- consent_show = models.BooleanField(_('Show consent checkbox?'), default=False)
+ consent_show = models.BooleanField(_("Show consent checkbox?"), default=False)
consent_text = models.CharField(max_length=255, blank=True)
consent_help = RichTextField(blank=True)
extra_text = RichTextField(
_("Login extra text"),
- blank=True, help_text=_("Displayed along side login form")
+ blank=True,
+ help_text=_("Displayed along side login form"),
)
register_extra_text = RichTextField(
blank=True, help_text=_("Extra text to be displayed on register form")
@@ -319,22 +343,22 @@ class Meta:
panels = [
MultiFieldPanel(
[
- FieldPanel('consent_show'),
- FieldPanel('consent_text'),
- FieldPanel('consent_help'),
+ FieldPanel("consent_show"),
+ FieldPanel("consent_text"),
+ FieldPanel("consent_help"),
],
- _("User consent on login & register forms")
+ _("User consent on login & register forms"),
),
MultiFieldPanel(
[
- FieldPanel('extra_text'),
+ FieldPanel("extra_text"),
],
- _('Login form customizations'),
+ _("Login form customizations"),
),
MultiFieldPanel(
[
- FieldPanel('register_extra_text'),
+ FieldPanel("register_extra_text"),
],
- _('Register form customizations'),
+ _("Register form customizations"),
),
]
diff --git a/hypha/apply/users/pipeline.py b/hypha/apply/users/pipeline.py
index 45b986748a..7a0d230a1d 100644
--- a/hypha/apply/users/pipeline.py
+++ b/hypha/apply/users/pipeline.py
@@ -5,7 +5,7 @@
def make_otf_staff(backend, user, response, *args, **kwargs):
- _, email_domain = user.email.split('@')
+ _, email_domain = user.email.split("@")
if email_domain in settings.STAFF_EMAIL_DOMAINS:
staff_group = Group.objects.get(name=STAFF_GROUP_NAME)
user.groups.add(staff_group)
diff --git a/hypha/apply/users/templates/two_factor/_wizard_actions.html b/hypha/apply/users/templates/two_factor/_wizard_actions.html
index e0e0a910cf..eaff592606 100644
--- a/hypha/apply/users/templates/two_factor/_wizard_actions.html
+++ b/hypha/apply/users/templates/two_factor/_wizard_actions.html
@@ -13,9 +13,9 @@
diff --git a/hypha/apply/users/templates/two_factor/core/setup.html b/hypha/apply/users/templates/two_factor/core/setup.html
index 838b3d5e36..8d9066ab87 100644
--- a/hypha/apply/users/templates/two_factor/core/setup.html
+++ b/hypha/apply/users/templates/two_factor/core/setup.html
@@ -3,26 +3,26 @@
{% block content %}
{% if wizard.steps.current == 'welcome' %}
- {% trans "There were some errors with your form. Please amend the fields highlighted below." %}
+ {% if form.non_field_errors %} +-
+ {% for error in form.non_field_errors %}
+
- {{ error }} + {% endfor %} +
{% blocktrans trimmed %}2FA is an extra layer of security used to make sure that people trying to gain access to an - online account are who they say they are. We recommend using Authy or another - authenticator app.{% endblocktrans %}
+{% blocktrans trimmed %}2FA is an extra layer of security used to make sure that people trying to gain access to an + online account are who they say they are. We recommend using Authy or another + authenticator app.{% endblocktrans %}
{% blocktrans trimmed %}Please contact {{ ORG_EMAIL }} if you have technical difficulty - enabling 2FA.{% endblocktrans %}
+ enabling 2FA.{% endblocktrans %} {% elif wizard.steps.current == 'method' %}{% blocktrans trimmed %}Please select which authentication method you would - like to use.{% endblocktrans %}
+ like to use.{% endblocktrans %} {% elif wizard.steps.current == 'generator' %}{% blocktrans trimmed %}2FA requires a verification code to pair your smartphone with your account. - {% endblocktrans %}
-{% blocktrans trimmed %}Step 1: Open the Authencator app on your phone and scan the QR code displayed below. - {% endblocktrans %}
+ {% endblocktrans %} +{% blocktrans trimmed %}Step 1: Open the Authencator app on your phone and scan the QR code displayed below. + {% endblocktrans %}
{% trans "Unable to scan the QR code? Try this link:" %} {{ otpauth_url }}
{% blocktrans trimmed %}Step 2: Enter the 6-digit verification code generated by the app below.{% endblocktrans %}
{% elif wizard.steps.current == 'sms' %}{% blocktrans trimmed %}Please enter the phone number you wish to receive the text messages on. This number will be validated in the next step. - {% endblocktrans %}
+ {% endblocktrans %} {% elif wizard.steps.current == 'call' %}{% blocktrans trimmed %}Please enter the phone number you wish to be called on. This number will be validated in the next step. {% endblocktrans %}
diff --git a/hypha/apply/users/templates/two_factor/core/setup_complete.html b/hypha/apply/users/templates/two_factor/core/setup_complete.html index 7f8cd13953..973817d57f 100644 --- a/hypha/apply/users/templates/two_factor/core/setup_complete.html +++ b/hypha/apply/users/templates/two_factor/core/setup_complete.html @@ -8,12 +8,12 @@{% block title %}{% trans "Two-Factor Authentication(2FA)" %}{% endblock %}
{% blocktrans trimmed %}Congratulations, you've successfully enabled two-factor - authentication.{% endblocktrans %}
-{% blocktrans trimmed %}We strongly recommend you to save the backup codes. - To get the backup codes you can continue to Show Codes.{% endblocktrans %}
+ authentication.{% endblocktrans %} +{% blocktrans trimmed %}We strongly recommend you to save the backup codes. + To get the backup codes you can continue to Show Codes.{% endblocktrans %}
{% if not phone_methods %} - {% trans "Show Codes" %} + {% trans "Show Codes" %} {% else %}{% blocktrans trimmed %}However, it might happen that you don't have access to your primary token device. To enable account recovery, add a phone @@ -21,7 +21,7 @@
{% block title %}{% trans "Two-Factor Authentication(2FA)" %}{% endblock %}<
{% trans "Add Phone Number" %}
+ class="btn btn-success">{% trans "Add Phone Number" %} {% endif %} {% endblock %} diff --git a/hypha/apply/users/templates/two_factor/core/two_factor_required.html b/hypha/apply/users/templates/two_factor/core/two_factor_required.html index 6bc7600733..ad0f7254cf 100644 --- a/hypha/apply/users/templates/two_factor/core/two_factor_required.html +++ b/hypha/apply/users/templates/two_factor/core/two_factor_required.html @@ -9,7 +9,7 @@{% block title %}{% trans "Permission Denied" %}{% endblock %}
{% blocktrans trimmed %}The page you requested, enforces users to verify using two-factor authentication for security reasons. You need to set up these security features in order to access this page. Without setting up these security features, - You can only access the account(Profile section) or can logout from the system.{% endblocktrans %}
+ You can only access the account(Profile section) or can logout from the system.{% endblocktrans %}{% blocktrans trimmed %}Two-factor authentication is not already set up for your account. Set up two-factor authentication for enhanced account @@ -17,6 +17,6 @@
{% block title %}{% trans "Permission Denied" %}{% endblock %}
- {% trans "Set up Two-Factor Authentication (2FA)" %} + {% trans "Set up Two-Factor Authentication (2FA)" %}
{% endblock %} diff --git a/hypha/apply/users/templates/two_factor/profile/disable.html b/hypha/apply/users/templates/two_factor/profile/disable.html index 44ca21a1e9..683c8c3038 100644 --- a/hypha/apply/users/templates/two_factor/profile/disable.html +++ b/hypha/apply/users/templates/two_factor/profile/disable.html @@ -2,38 +2,38 @@ {% load i18n %} {% block content %} - -{% block title %}{% trans "Disable Two-factor Authentication" %}{% endblock %}
-{% blocktrans trimmed %}Disabling Two-factor authentication weakens your account security. - We recommend reenabling it when you can.{% endblocktrans %}
-
-
+
{% endblock %}
diff --git a/hypha/apply/users/templates/two_factor/profile/profile.html b/hypha/apply/users/templates/two_factor/profile/profile.html
index fc7177d1cb..b5e73b3254 100644
--- a/hypha/apply/users/templates/two_factor/profile/profile.html
+++ b/hypha/apply/users/templates/two_factor/profile/profile.html
@@ -35,7 +35,7 @@ {% trans "Backup Phone Numbers" %}
{% endfor %}{% trans "Add Phone Number" %}
+ class="btn btn-info">{% trans "Add Phone Number" %} {% endif %}{% trans "Backup Tokens" %}
diff --git a/hypha/apply/users/templates/users/account.html b/hypha/apply/users/templates/users/account.html index 5bd5c6cae8..12346f36c0 100644 --- a/hypha/apply/users/templates/users/account.html +++ b/hypha/apply/users/templates/users/account.html @@ -14,55 +14,55 @@ {% endadminbar %} -
-
- {% endif %}
-
{% endblock %}
diff --git a/hypha/apply/users/templates/users/activation/invalid.html b/hypha/apply/users/templates/users/activation/invalid.html
index 0cea4902be..b6dc037fd6 100644
--- a/hypha/apply/users/templates/users/activation/invalid.html
+++ b/hypha/apply/users/templates/users/activation/invalid.html
@@ -5,14 +5,14 @@
{% block page_title %}{% trans "Invalid activation URL" %}{% endblock %}
{% block content %}
-{% url 'users:password_reset' as password_reset %}
-
-
-
- {% if show_change_password and user.has_usable_password and not backends.associated %}
+ {% trans "Profile" %}
- -
-
- {% endif %}
-
-
- {% if swappable_form %}
- {% trans "Account Security" %}
-{% trans "Password" %}
- - -{% trans "Two-Factor Authentication (2FA)" %}
- {% if default_device %} - - {% else %} - - {% endif %} -
- {% if swappable_form %}
-
+
+ {% if show_change_password and user.has_usable_password and not backends.associated %}
+ {% trans "Become" %}:
- +
+
{% endif %}
+
+ {% if swappable_form %}
+ {% trans "Account Security" %}
+{% trans "Password" %}
+ + +{% trans "Two-Factor Authentication (2FA)" %}
+ {% if default_device %} + + {% else %} + + {% endif %} +
+ {% if swappable_form %}
+
+ {% endif %}
{% trans "Become" %}:
+ + {% endif %} + {# Remove the comment block tags below when such need arises. e.g. adding new providers #} {% comment %} {% can_use_oauth as show_oauth_link %} @@ -70,7 +70,7 @@{% trans "Become" %}:
{% trans "Manage OAuth" %} {% endif %} {% endcomment %} +
-
{% endblock %}
diff --git a/hypha/apply/users/templates/users/change_password.html b/hypha/apply/users/templates/users/change_password.html
index b98d1cc71f..aefff426f7 100644
--- a/hypha/apply/users/templates/users/change_password.html
+++ b/hypha/apply/users/templates/users/change_password.html
@@ -13,38 +13,38 @@
{% endslot %}
{% endadminbar %}
-{% trans "Two possible reasons:" %}
--
-
- {% trans "The activation link has expired." %} -
- {% trans "The account has already been activated." %} -
+
+ {% trans "Two possible reasons:" %}
+-
+
- {% trans "The activation link has expired." %} +
- {% trans "The account has already been activated." %} +
{% blocktrans %}First try to reset your password. If that fails please contact {{ ORG_SHORT_NAME }} at{% endblocktrans %} {{ ORG_EMAIL }}
-{% blocktrans %}First try to reset your password. If that fails please contact {{ ORG_SHORT_NAME }} at{% endblocktrans %} {{ ORG_EMAIL }}
+
-
+
{% endblock %}
diff --git a/hypha/apply/users/templates/users/email_change/confirm_password.html b/hypha/apply/users/templates/users/email_change/confirm_password.html
index d967b5eed2..5b5b638acb 100644
--- a/hypha/apply/users/templates/users/email_change/confirm_password.html
+++ b/hypha/apply/users/templates/users/email_change/confirm_password.html
@@ -6,35 +6,35 @@
{% block content %}
-
-
+
{% endblock %}
diff --git a/hypha/apply/users/templates/users/email_change/done.html b/hypha/apply/users/templates/users/email_change/done.html
index 2fa6815e94..448999f44a 100644
--- a/hypha/apply/users/templates/users/email_change/done.html
+++ b/hypha/apply/users/templates/users/email_change/done.html
@@ -5,7 +5,7 @@
{% block title %}{% trans "Verify Email" %}{% endblock %}
{% block content %}
-
-
+ {% trans "To start using the new email, please click on the confirmation link that has been sent to you on your new email." %}
-
+
{% endblock %}
diff --git a/hypha/apply/users/templates/users/email_change/invalid_link.html b/hypha/apply/users/templates/users/email_change/invalid_link.html
index a0a8683dae..fa11dccc65 100644
--- a/hypha/apply/users/templates/users/email_change/invalid_link.html
+++ b/hypha/apply/users/templates/users/email_change/invalid_link.html
@@ -5,12 +5,12 @@
{% block page_title %}{% trans "Invalid Confirmation URL" %}{% endblock %}
{% block content %}
-{% trans "To start using the new email, please click on the confirmation link that has been sent to you on your new email." %}
+
-
{% endblock %}
diff --git a/hypha/apply/users/templates/users/oauth.html b/hypha/apply/users/templates/users/oauth.html
index c3fcd7865f..1ba0af818e 100644
--- a/hypha/apply/users/templates/users/oauth.html
+++ b/hypha/apply/users/templates/users/oauth.html
@@ -4,38 +4,38 @@
{% block title %}OAuth{% endblock %}
{% block content %}
-
+
{% endblock %}
diff --git a/hypha/apply/users/templates/users/password_reset/confirm.html b/hypha/apply/users/templates/users/password_reset/confirm.html
index 80af3bb973..cfe71e554f 100644
--- a/hypha/apply/users/templates/users/password_reset/confirm.html
+++ b/hypha/apply/users/templates/users/password_reset/confirm.html
@@ -6,45 +6,45 @@
{% block content %}
{% trans "Possible reason:" %}
--
-
- {% trans "The confirmation link has expired." %} -
+
+ {% trans "Possible reason:" %}
+-
+
- {% trans "The confirmation link has expired." %} +
{% blocktrans %}Try again to change email from accounts page. If that fails please contact {{ ORG_SHORT_NAME }} at{% endblocktrans %} {{ ORG_EMAIL }}
-{% blocktrans %}Try again to change email from accounts page. If that fails please contact {{ ORG_SHORT_NAME }} at{% endblocktrans %} {{ ORG_EMAIL }}
+
- {% if validlink %}
-
-
{% endblock %}
diff --git a/hypha/apply/users/templates/users/password_reset/form.html b/hypha/apply/users/templates/users/password_reset/form.html
index 9a8ae244af..d9298f8e4e 100644
--- a/hypha/apply/users/templates/users/password_reset/form.html
+++ b/hypha/apply/users/templates/users/password_reset/form.html
@@ -12,7 +12,7 @@
Reset Password
-{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}
- - - {% else %} -{% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}
- {% endif %} + {% if validlink %} + +Reset Password
+{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}
+ + + {% else %} +{% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}
+ {% endif %}-
{% for error in form.non_field_errors %}
-
- {{ error }} +
- {{ error }} {% endfor %}
{% if request.GET.name %} {% trans "Hi " %}{{ request.GET.name }}, {% endif %} - {% trans "your account" %} + {% trans "your account" %} - {% if request.GET.email %} + {% if request.GET.email %} {% trans "with the email" %} {{ request.GET.email }} - {% endif %} + {% endif %} - {% trans "has been successfully created! We have sent you an account activatation email." %} + {% trans "has been successfully created! We have sent you an account activatation email." %}
diff --git a/hypha/apply/users/templates/wagtailusers/users/results.html b/hypha/apply/users/templates/wagtailusers/users/results.html index 067e8481cf..3b350343fb 100644 --- a/hypha/apply/users/templates/wagtailusers/users/results.html +++ b/hypha/apply/users/templates/wagtailusers/users/results.html @@ -46,11 +46,11 @@
{% trans 'Filter' %}
{% endfor %} - {%with request.get_full_path as path%} -
-
-
- {%endwith%}
+ {%with request.get_full_path as path%}
+
+
+
+ {%endwith%}
'.join(urls)) + return mark_safe("
".join(urls)) def review_forms(self, obj): def build_urls(review_forms): for review_form in review_forms: - url = reverse('review_reviewform_modeladmin_edit', args=[review_form.form.id]) + url = reverse( + "review_reviewform_modeladmin_edit", args=[review_form.form.id] + ) yield f'{review_form}' urls = list(build_urls(obj.review_forms.all())) @@ -62,12 +68,15 @@ def build_urls(review_forms): if not urls: return - return mark_safe('
'.join(urls)) + return mark_safe("
".join(urls)) def determination_forms(self, obj): def build_urls(determination_forms): for determination_form in determination_forms: - url = reverse('determinations_determinationform_modeladmin_edit', args=[determination_form.form.id]) + url = reverse( + "determinations_determinationform_modeladmin_edit", + args=[determination_form.form.id], + ) yield f'{determination_form}' urls = list(build_urls(obj.determination_forms.all())) @@ -75,4 +84,4 @@ def build_urls(determination_forms): if not urls: return - return mark_safe('
'.join(urls)) + return mark_safe("
".join(urls)) diff --git a/hypha/apply/utils/apps.py b/hypha/apply/utils/apps.py index 7a7dbfb38f..1f9a3760c5 100644 --- a/hypha/apply/utils/apps.py +++ b/hypha/apply/utils/apps.py @@ -2,5 +2,5 @@ class UtilsConfig(AppConfig): - name = 'hypha.apply.utils' - label = 'apply_utils' + name = "hypha.apply.utils" + label = "apply_utils" diff --git a/hypha/apply/utils/blocks.py b/hypha/apply/utils/blocks.py index 843ef8ae32..0f1cd2af0e 100644 --- a/hypha/apply/utils/blocks.py +++ b/hypha/apply/utils/blocks.py @@ -19,9 +19,7 @@ def find_duplicates(items): counted = Counter(items) - duplicates = [ - name for name, count in counted.items() if count > 1 - ] + duplicates = [name for name, count in counted.items() if count > 1] return duplicates @@ -30,7 +28,7 @@ def prettify_names(sequence): def nice_field_name(name): - return name.title().replace('_', ' ') + return name.title().replace("_", " ") def show_admin_form_error_messages(request, form): @@ -46,44 +44,50 @@ class RichTextFieldBlock(TextFieldBlock): widget = RICH_TEXT_WIDGET class Meta: - label = _('Rich text field') - icon = 'form' + label = _("Rich text field") + icon = "form" def get_searchable_content(self, value, data): - return bleach.clean(data or '', tags=[], strip=True) + return bleach.clean(data or "", tags=[], strip=True) def no_response(self): - return '
-
' + return "-
" class MarkdownTextFieldBlock(TextFieldBlock): widget = PagedownWidget() - template = '' + template = "" class Meta: - label = _('Markdown text field') - icon = 'form' - template = 'stream_forms/render_markdown_field.html' + label = _("Markdown text field") + icon = "form" + template = "stream_forms/render_markdown_field.html" def get_searchable_content(self, value, data): - return bleach.clean(data or '', tags=[], strip=True) + return bleach.clean(data or "", tags=[], strip=True) def no_response(self): - return '-
' + return "-
" class CustomFormFieldsBlock(StreamBlock): - rich_text = RichTextFieldBlock(group=_('Fields')) - markdown_text = MarkdownTextFieldBlock(group=_('Fields')) + rich_text = RichTextFieldBlock(group=_("Fields")) + markdown_text = MarkdownTextFieldBlock(group=_("Fields")) required_blocks = [] single_blocks = [] def __init__(self, *args, **kwargs): # The space before " Required" is to make the group sort first. Ugly but easy, and it works. - child_blocks = [(block.name, block(group=_(' Required'))) for block in self.required_blocks] - child_blocks += [(block.name, block(group=_('Custom'))) for block in self.single_blocks] + child_blocks = [ + (block.name, block(group=_(" Required"))) for block in self.required_blocks + ] + child_blocks += [ + (block.name, block(group=_("Custom"))) for block in self.single_blocks + ] self.required_block_names = [block.name for block in self.required_blocks] - self.single_block_names = [block.name for block in self.single_blocks] + self.required_block_names + self.single_block_names = [ + block.name for block in self.single_blocks + ] + self.required_block_names super().__init__(child_blocks, *args, **kwargs) @@ -99,40 +103,52 @@ def clean(self, value): missing = set(self.required_block_names) - set(block_types) duplicates = [ - name for name in find_duplicates(block_types) + name + for name in find_duplicates(block_types) if name in self.single_block_names ] all_errors = [] if missing: all_errors.append( - 'You are missing the following required fields: {}'.format(', '.join(prettify_names(missing))) + "You are missing the following required fields: {}".format( + ", ".join(prettify_names(missing)) + ) ) if duplicates: all_errors.append( - 'The following fields must be included only once: {}'.format(', '.join(prettify_names(duplicates))) + "The following fields must be included only once: {}".format( + ", ".join(prettify_names(duplicates)) + ) ) for i, block_name in enumerate(block_types): if block_name in duplicates: - self.add_error_to_child(error_dict, i, 'info', 'Duplicate field') + self.add_error_to_child(error_dict, i, "info", "Duplicate field") for block in value: - if hasattr(block.block, 'child_blocks'): + if hasattr(block.block, "child_blocks"): for child_block_name, child_block in block.block.child_blocks.items(): if child_block.required and not block.value[child_block_name]: all_errors.append( - '{} cannot be empty for {}'.format(child_block.label, block.block.label) + "{} cannot be empty for {}".format( + child_block.label, block.block.label + ) ) - if isinstance(child_block, ListBlock) and child_block.child_block.required: + if ( + isinstance(child_block, ListBlock) + and child_block.child_block.required + ): for child_value in block.value[child_block_name]: if not child_value: all_errors.append( - '{} cannot be empty for {}'.format(child_block.label, block.block.label) + "{} cannot be empty for {}".format( + child_block.label, block.block.label + ) ) if all_errors or error_dict: - error_dict['__all__'] = all_errors + error_dict["__all__"] = all_errors raise ValidationError(all_errors, params=error_dict) return value @@ -143,7 +159,7 @@ def add_error_to_child(self, errors, child_number, field, message): errors[child_number].data[0].params[field] = new_error except KeyError: errors[child_number] = ErrorList( - [ValidationError('Error', params={field: new_error})] + [ValidationError("Error", params={field: new_error})] ) def to_python(self, value): @@ -153,8 +169,8 @@ def to_python(self, value): """ # If the data type is missing, fallback to a CharField for child_data in value: - if child_data['type'] not in self.child_blocks: - child_data['type'] = 'char' + if child_data["type"] not in self.child_blocks: + child_data["type"] = "char" return StreamValue(self, value, is_lazy=True) @@ -164,33 +180,43 @@ class SingleIncludeStatic(StaticBlock): helps display the error in a noticeable way. """ - def __init__(self, *args, description='', **kwargs): + def __init__(self, *args, description="", **kwargs): self.description = description super().__init__(*args, **kwargs) class Meta: - admin_text = 'Must be included in the form only once.' + admin_text = "Must be included in the form only once." def render_form(self, *args, **kwargs): - errors = kwargs.pop('errors') + errors = kwargs.pop("errors") if errors: # Pretend the error is a readonly input so that we get nice formatting # Issue discussed here: https://github.com/wagtail/wagtail/issues/4122 - error_message = ''.format(errors[0]) + error_message = ( + ''.format( + errors[0] + ) + ) else: - error_message = '' + error_message = "" form = super().render_form(*args, **kwargs) - form = ''.join([self.description, form]) + error_message + form = "
".join([self.description, form]) + error_message return mark_safe(form) def deconstruct(self): - return ('wagtail.blocks.static_block.StaticBlock', (), {}) + return ("wagtail.blocks.static_block.StaticBlock", (), {}) class SingleIncludeMixin: def __init__(self, *args, **kwargs): - info_name = f'{self._meta_class.label} Field' if self._meta_class.label else f'{self.name.title()} Field' - child_blocks = [('info', SingleIncludeStatic(label=info_name, description=self.description))] + info_name = ( + f"{self._meta_class.label} Field" + if self._meta_class.label + else f"{self.name.title()} Field" + ) + child_blocks = [ + ("info", SingleIncludeStatic(label=info_name, description=self.description)) + ] super().__init__(child_blocks, *args, **kwargs) @@ -205,5 +231,5 @@ class MustIncludeFieldBlock(SingleIncludeMixin, FormFieldBlock): def get_field_kwargs(self, struct_value): kwargs = super().get_field_kwargs(struct_value) - kwargs['required'] = True + kwargs["required"] = True return kwargs diff --git a/hypha/apply/utils/image.py b/hypha/apply/utils/image.py index e255d0426d..8ee570333f 100644 --- a/hypha/apply/utils/image.py +++ b/hypha/apply/utils/image.py @@ -4,7 +4,7 @@ def image_url_cache_key(image_id, spec): - return f'image_url_cache_{image_id}_{spec}' + return f"image_url_cache_{image_id}_{spec}" def generate_image_url(image, filter_spec): @@ -13,13 +13,14 @@ def generate_image_url(image, filter_spec): if url: return url from wagtail.images.views.serve import generate_signature + signature = generate_signature(image.id, filter_spec) - url = reverse('wagtailimages_serve', args=(signature, image.id, filter_spec)) - url += image.file.name[len('original_images/'):] + url = reverse("wagtailimages_serve", args=(signature, image.id, filter_spec)) + url += image.file.name[len("original_images/") :] cache.set(cache_key, url) return url -def generate_image_tag(image, filter_spec, html_class=''): +def generate_image_tag(image, filter_spec, html_class=""): url = generate_image_url(image, filter_spec) return format_html(f'
-
+ {{ settings.utils.SystemMessagesSettings.title_404 }}
-{{ settings.utils.SystemMessagesSettings.body_404|richtext }}
-
+
{% endblock %}
diff --git a/hypha/apply/utils/templatetags/apply_tags.py b/hypha/apply/utils/templatetags/apply_tags.py
index 71b4dbdca2..fd1028c89e 100644
--- a/hypha/apply/utils/templatetags/apply_tags.py
+++ b/hypha/apply/utils/templatetags/apply_tags.py
@@ -14,7 +14,13 @@ def model_verbose_name(instance):
@register.filter
def format_number_as_currency(amount):
try:
- float(str(amount).replace(',', ''))
- return babel.numbers.format_currency(str(amount).replace(',', ''), settings.CURRENCY_CODE, locale=settings.CURRENCY_LOCALE)
+ float(str(amount).replace(",", ""))
+ return babel.numbers.format_currency(
+ str(amount).replace(",", ""),
+ settings.CURRENCY_CODE,
+ locale=settings.CURRENCY_LOCALE,
+ )
except ValueError:
- return babel.numbers.get_currency_symbol(settings.CURRENCY_CODE, locale=settings.CURRENCY_LOCALE)
+ return babel.numbers.get_currency_symbol(
+ settings.CURRENCY_CODE, locale=settings.CURRENCY_LOCALE
+ )
diff --git a/hypha/apply/utils/testing/tests.py b/hypha/apply/utils/testing/tests.py
index 256066ac81..796fda6b34 100644
--- a/hypha/apply/utils/testing/tests.py
+++ b/hypha/apply/utils/testing/tests.py
@@ -6,11 +6,11 @@
request_factory = RequestFactory()
-def make_request(user=None, data=None, method='get', site=None):
+def make_request(user=None, data=None, method="get", site=None):
user = user or AnonymousUser()
data = data or {}
method = getattr(request_factory, method)
- request = method('', data)
+ request = method("", data)
request.user = user
request.site = site
request.session = {}
@@ -18,7 +18,7 @@ def make_request(user=None, data=None, method='get', site=None):
return request
-@override_settings(ROOT_URLCONF='hypha.apply.urls')
+@override_settings(ROOT_URLCONF="hypha.apply.urls")
class BaseViewTestCase(TestCase):
"""
Provides a basic framework for working with views. It works on the
@@ -35,8 +35,9 @@ class BaseViewTestCase(TestCase):
user_factory:() => User = Callable which will return a User object. If no
user_factory is defined an anonymous user will be user
"""
- url_name = ''
- base_view_name = ''
+
+ url_name = ""
+ base_view_name = ""
user_factory = None
user = None
@@ -56,14 +57,16 @@ def get_kwargs(self, instance):
def url(self, instance, view_name=None, absolute=True, url_kwargs=None):
view = view_name or self.base_view_name
full_url_name = self.url_name.format(view)
- kwargs_method = f'get_{view}_kwargs'
+ kwargs_method = f"get_{view}_kwargs"
if hasattr(self, kwargs_method):
kwargs = getattr(self, kwargs_method)(instance)
else:
kwargs = self.get_kwargs(instance)
if url_kwargs:
kwargs.update(url_kwargs)
- return self.url_from_pattern(full_url_name, kwargs, secure=True, absolute=absolute)
+ return self.url_from_pattern(
+ full_url_name, kwargs, secure=True, absolute=absolute
+ )
def absolute_url(self, location, secure=True):
request = self.factory.get(location, secure=secure)
@@ -77,11 +80,20 @@ def url_from_pattern(self, pattern, kwargs=None, secure=True, absolute=True):
return request.path
def get_page(self, instance=None, view_name=None, url_kwargs=None):
- return self.client.get(self.url(instance, view_name, url_kwargs=url_kwargs), secure=True, follow=True)
+ return self.client.get(
+ self.url(instance, view_name, url_kwargs=url_kwargs),
+ secure=True,
+ follow=True,
+ )
def post_page(self, instance=None, data=None, view_name=None, url_kwargs=None):
data = data or {}
- return self.client.post(self.url(instance, view_name, url_kwargs=url_kwargs), data, secure=True, follow=True)
+ return self.client.post(
+ self.url(instance, view_name, url_kwargs=url_kwargs),
+ data,
+ secure=True,
+ follow=True,
+ )
def refresh(self, instance):
return instance.__class__.objects.get(id=instance.id)
diff --git a/hypha/apply/utils/tests/test_views.py b/hypha/apply/utils/tests/test_views.py
index d4c750c3d0..866bfce2ad 100644
--- a/hypha/apply/utils/tests/test_views.py
+++ b/hypha/apply/utils/tests/test_views.py
@@ -13,7 +13,7 @@ class DelegatedView(DelegatedViewMixin, PatchedUpdateView):
model = int # pretend int is a model for the isinstance check
def get_parent_kwargs(self):
- return {'instance': 3}
+ return {"instance": 3}
class TestDelegatedViewMixin(TestCase):
diff --git a/hypha/apply/utils/views.py b/hypha/apply/utils/views.py
index 9f76f0fb12..2262ba1c57 100644
--- a/hypha/apply/utils/views.py
+++ b/hypha/apply/utils/views.py
@@ -16,13 +16,13 @@
from wagtail.models import Page
-def page_not_found(request, exception=None, template_name='apply/404.html'):
+def page_not_found(request, exception=None, template_name="apply/404.html"):
if not request.user.is_authenticated:
- template_name = '404.html'
+ template_name = "404.html"
return defaults.page_not_found(request, exception, template_name)
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
class ViewDispatcher(View):
admin_view: View = None
reviewer_view: View = None
@@ -82,7 +82,8 @@ class DelegatableBase(ContextMixin):
`DelegateableViews` objects should contain form views that inherit from `DelegatedViewMixin`
and `FormView`
"""
- form_prefix = 'form-submitted-'
+
+ form_prefix = "form-submitted-"
def __init__(self, *args, **kwargs):
self._form_views = {
@@ -109,8 +110,8 @@ def get_context_data(self, **kwargs):
def post(self, request, *args, **kwargs):
# Information to pretend we originate from this view
- kwargs['context'] = self.get_context_data()
- kwargs['template_names'] = self.get_template_names()
+ kwargs["context"] = self.get_context_data()
+ kwargs["template_names"] = self.get_template_names()
for form_key, form_view in self._form_views.items():
if form_key in request.POST:
@@ -123,14 +124,14 @@ def post(self, request, *args, **kwargs):
class DelegateableView(DelegatableBase):
def get_form_kwargs(self):
return {
- 'user': self.request.user,
- 'instance': self.object,
+ "user": self.request.user,
+ "instance": self.object,
}
def post(self, request, *args, **kwargs):
self.object = self.get_object()
- kwargs['object'] = self.object
+ kwargs["object"] = self.object
return super().post(request, *args, **kwargs)
@@ -138,7 +139,7 @@ def post(self, request, *args, **kwargs):
class DelegateableListView(DelegatableBase):
def get_form_kwargs(self):
return {
- 'user': self.request.user,
+ "user": self.request.user,
}
def post(self, request, *args, **kwargs):
@@ -161,7 +162,7 @@ def get_object(self):
# value we work with on the class.
# If we don't have self.object, bind the parent instance to it. This value will then
# be used by the form. Any further calls to get_object will get a new instance of the object
- if not hasattr(self, 'object'):
+ if not hasattr(self, "object"):
parent_object = self.get_parent_object()
if isinstance(parent_object, self.model):
return parent_object
@@ -169,14 +170,14 @@ def get_object(self):
return super().get_object()
def get_template_names(self):
- return self.kwargs['template_names']
+ return self.kwargs["template_names"]
def get_form_name(self):
return self.context_name
def get_form_kwargs(self):
form_kwargs = super().get_form_kwargs()
- form_kwargs['user'] = self.request.user
+ form_kwargs["user"] = self.request.user
form_kwargs.update(**self.get_parent_kwargs())
return form_kwargs
@@ -184,10 +185,10 @@ def get_parent_kwargs(self):
try:
return self.parent.get_form_kwargs()
except AttributeError:
- return self.kwargs['parent'].get_form_kwargs()
+ return self.kwargs["parent"].get_form_kwargs()
def get_parent_object(self):
- return self.get_parent_kwargs()['instance']
+ return self.get_parent_kwargs()["instance"]
def get_form(self, *args, **kwargs):
form = super().get_form(*args, **kwargs)
@@ -196,8 +197,8 @@ def get_form(self, *args, **kwargs):
def get_context_data(self, **kwargs):
# Use the previous context but override the validated form
- form = kwargs.pop('form')
- kwargs.update(self.kwargs['context'])
+ form = kwargs.pop("form")
+ kwargs.update(self.kwargs["context"])
kwargs.update(**{self.context_name: form})
return super().get_context_data(**kwargs)
@@ -211,9 +212,9 @@ def contribute_form(self, parent):
# We do not want to bind any forms generated this way
# pretend we are doing a get request to avoid passing data to forms
old_method = None
- if self.request.method in ('POST', 'PUT'):
+ if self.request.method in ("POST", "PUT"):
old_method = self.request.method
- self.request.method = 'GET'
+ self.request.method = "GET"
form = self.get_form()
@@ -224,12 +225,13 @@ def contribute_form(self, parent):
def get_success_url(self):
query = self.request.GET.urlencode()
if query:
- query = '?' + query
+ query = "?" + query
return self.request.path + query
-class CreateOrUpdateView(SingleObjectTemplateResponseMixin, ModelFormMixin, ProcessFormView):
-
+class CreateOrUpdateView(
+ SingleObjectTemplateResponseMixin, ModelFormMixin, ProcessFormView
+):
def get(self, request, *args, **kwargs):
try:
self.object = self.get_object()
@@ -262,7 +264,10 @@ def custom_wagtail_page_delete(request, page_id):
protected_details = ", ".join([str(obj) for obj in e.protected_objects])
page = get_object_or_404(Page, id=page_id).specific
parent_id = page.get_parent().id
- messages.warning(request, _("Page '{0}' can't be deleted because is in use in '{1}'.").format(
- page.get_admin_display_title(), protected_details
- ))
- return redirect('wagtailadmin_explore', parent_id)
+ messages.warning(
+ request,
+ _("Page '{0}' can't be deleted because is in use in '{1}'.").format(
+ page.get_admin_display_title(), protected_details
+ ),
+ )
+ return redirect("wagtailadmin_explore", parent_id)
diff --git a/hypha/cookieconsent/apps.py b/hypha/cookieconsent/apps.py
index 52e1ffa5e0..c23e09aefb 100644
--- a/hypha/cookieconsent/apps.py
+++ b/hypha/cookieconsent/apps.py
@@ -2,4 +2,4 @@
class CookieconsentConfig(AppConfig):
- name = 'hypha.cookieconsent'
+ name = "hypha.cookieconsent"
diff --git a/hypha/cookieconsent/context_processors.py b/hypha/cookieconsent/context_processors.py
index c945eb6a66..3f0fe2ecb6 100644
--- a/hypha/cookieconsent/context_processors.py
+++ b/hypha/cookieconsent/context_processors.py
@@ -1,8 +1,6 @@
-
-
def cookies_accepted(request):
cookieconsent = False
- if request.COOKIES.get('cookieconsent', 'decline') == 'accept':
+ if request.COOKIES.get("cookieconsent", "decline") == "accept":
cookieconsent = True
- return {'COOKIES_ACCEPTED': cookieconsent}
+ return {"COOKIES_ACCEPTED": cookieconsent}
diff --git a/hypha/cookieconsent/migrations/0001_initial.py b/hypha/cookieconsent/migrations/0001_initial.py
index 66364089fc..93ea2db74d 100644
--- a/hypha/cookieconsent/migrations/0001_initial.py
+++ b/hypha/cookieconsent/migrations/0001_initial.py
@@ -6,25 +6,57 @@
class Migration(migrations.Migration):
-
initial = True
dependencies = [
- ('wagtailcore', '0045_assign_unlock_grouppagepermission'),
+ ("wagtailcore", "0045_assign_unlock_grouppagepermission"),
]
operations = [
migrations.CreateModel(
- name='CookieConsentSettings',
+ name="CookieConsentSettings",
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('cookieconsent_active', models.BooleanField(default=False, verbose_name='Activate cookie concent feature')),
- ('cookieconsent_title', models.CharField(default='Your cookie settings', max_length=255, verbose_name='cookie concent title')),
- ('cookieconsent_message', wagtail.fields.RichTextField(default='{{ settings.utils.SystemMessagesSettings.title_404 }}
+{{ settings.utils.SystemMessagesSettings.body_404|richtext }}
+ This website deploys cookies for basic functionality and to keep it secure. These cookies are strictly necessary. Optional analysis cookies which provide us with statistical information about the use of the website may also be deployed, but only with your consent. Please review our Privacy & Data Policy for more information.
', verbose_name='cookie concent message')), - ('site', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, to='wagtailcore.Site')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "cookieconsent_active", + models.BooleanField( + default=False, verbose_name="Activate cookie concent feature" + ), + ), + ( + "cookieconsent_title", + models.CharField( + default="Your cookie settings", + max_length=255, + verbose_name="cookie concent title", + ), + ), + ( + "cookieconsent_message", + wagtail.fields.RichTextField( + default='This website deploys cookies for basic functionality and to keep it secure. These cookies are strictly necessary. Optional analysis cookies which provide us with statistical information about the use of the website may also be deployed, but only with your consent. Please review our Privacy & Data Policy for more information.
', + verbose_name="cookie concent message", + ), + ), + ( + "site", + models.OneToOneField( + editable=False, + on_delete=django.db.models.deletion.CASCADE, + to="wagtailcore.Site", + ), + ), ], options={ - 'verbose_name': 'Cookie consent settings', + "verbose_name": "Cookie consent settings", }, ), ] diff --git a/hypha/cookieconsent/models.py b/hypha/cookieconsent/models.py index 789d70c679..60708c6742 100644 --- a/hypha/cookieconsent/models.py +++ b/hypha/cookieconsent/models.py @@ -9,7 +9,7 @@ @register_public_site_setting class CookieConsentSettings(BaseSiteSetting): class Meta: - verbose_name = 'Cookie consent settings' + verbose_name = "Cookie consent settings" cookieconsent_active = models.BooleanField( "Activate cookie concent feature", @@ -17,20 +17,23 @@ class Meta: ) cookieconsent_title = models.CharField( - 'cookie concent title', + "cookie concent title", max_length=255, - default='Your cookie settings', + default="Your cookie settings", ) cookieconsent_message = RichTextField( - 'cookie concent message', + "cookie concent message", default='This website deploys cookies for basic functionality and to keep it secure. These cookies are strictly necessary. Optional analysis cookies which provide us with statistical information about the use of the website may also be deployed, but only with your consent. Please review our Privacy & Data Policy for more information.
', ) panels = [ - MultiFieldPanel([ - FieldPanel('cookieconsent_active'), - FieldPanel('cookieconsent_title'), - FieldPanel('cookieconsent_message'), - ], 'cookie banner'), + MultiFieldPanel( + [ + FieldPanel("cookieconsent_active"), + FieldPanel("cookieconsent_title"), + FieldPanel("cookieconsent_message"), + ], + "cookie banner", + ), ] diff --git a/hypha/cookieconsent/static/js/cookieconsent.js b/hypha/cookieconsent/static/js/cookieconsent.js index 29395bc30c..943fe3a371 100644 --- a/hypha/cookieconsent/static/js/cookieconsent.js +++ b/hypha/cookieconsent/static/js/cookieconsent.js @@ -1,38 +1,38 @@ (function () { + "use strict"; - 'use strict'; + if (typeof Cookies !== "undefined") { + const cookieconsent = document.querySelector(".cookieconsent"); - if (typeof Cookies !== 'undefined') { - const cookieconsent = document.querySelector('.cookieconsent'); - - if (typeof Cookies.get('cookieconsent') === 'undefined' && cookieconsent) { - cookieconsent.classList.add('js-cookieconsent-open'); + if ( + typeof Cookies.get("cookieconsent") === "undefined" && + cookieconsent + ) { + cookieconsent.classList.add("js-cookieconsent-open"); } const cookie_buttons = Array.prototype.slice.call( - document.querySelectorAll('button[data-consent]') + document.querySelectorAll("button[data-consent]") ); - const sitedomain = window.location.hostname.split('.').slice(-2); - const cookiedomain = sitedomain.join('.'); + const sitedomain = window.location.hostname.split(".").slice(-2); + const cookiedomain = sitedomain.join("."); let cookie_options = []; - cookie_options['domain'] = cookiedomain; - cookie_options['sameSite'] = 'strict'; - cookie_options['expires'] = 365; - if (window.location.protocol === 'https:') { - cookie_options['secure'] = true; + cookie_options["domain"] = cookiedomain; + cookie_options["sameSite"] = "strict"; + cookie_options["expires"] = 365; + if (window.location.protocol === "https:") { + cookie_options["secure"] = true; } cookie_buttons.forEach(function (button) { - button.addEventListener('click', function () { - if (button.getAttribute('data-consent') == 'true') { - Cookies.set('cookieconsent', 'accept', cookie_options); - } - else { - Cookies.set('cookieconsent', 'decline', cookie_options); + button.addEventListener("click", function () { + if (button.getAttribute("data-consent") == "true") { + Cookies.set("cookieconsent", "accept", cookie_options); + } else { + Cookies.set("cookieconsent", "decline", cookie_options); } - cookieconsent.classList.remove('js-cookieconsent-open'); - }) + cookieconsent.classList.remove("js-cookieconsent-open"); + }); }); } - })(); diff --git a/hypha/cookieconsent/templates/includes/banner.html b/hypha/cookieconsent/templates/includes/banner.html index bf48f1649c..0f490280f4 100644 --- a/hypha/cookieconsent/templates/includes/banner.html +++ b/hypha/cookieconsent/templates/includes/banner.html @@ -1,16 +1,16 @@ {% load i18n wagtailcore_tags %} {% if show_banner %} -