Feature/4 small issues

proposals/forms.py

@@ -574,8 +574,18 @@ class ProposalDataManagementForm(SoftValidationMixin, forms.ModelForm):
     class Meta:
         model = Proposal
         fields = ['avg_understood', 'dmp_file']
+        widgets = {
+            'avg_understood': forms.RadioSelect(choices=YES_NO),
+        }
+
+    def clean(self):
+        cleaned_data = super(ProposalDataManagementForm, self).clean()
 
-    _soft_validation_fields = ['avg_understood']
+        if cleaned_data['avg_understood'] is None:
+            self.add_error(
+                'avg_understood', 
+                _('Dit veld is verplicht om verder te gaan.')
+            )
 
 class ProposalUpdateDataManagementForm(forms.ModelForm):
     class Meta:

proposals/migrations/0050_alter_proposal_avg_understood.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.20 on 2023-11-15 10:56
+
+from django.db import migrations, models
+import proposals.validators
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0049_alter_proposal_supervisor'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='proposal',
+            name='avg_understood',
+            field=models.BooleanField(blank=True, default=None, null=True, validators=[proposals.validators.AVGUnderstoodValidator], verbose_name='Ik heb mijn aanvraag en de documenten voor deelnemers besproken met de privacy officer.'),
+        ),
+    ]

proposals/models.py

@@ -400,9 +400,10 @@ class Proposal(models.Model):
     )
 
     avg_understood = models.BooleanField(
-        _('Ik heb kennis genomen van het bovenstaande en begrijp mijn verantwoordelijkheden ten opzichte van de AVG.'),
-        default=False,
-        null=False,
+        _('Ik heb mijn aanvraag en de documenten voor deelnemers besproken met de privacy officer.'),
+        default=None,
+        null=True,
+        blank=True,
         validators=[AVGUnderstoodValidator],
     )
 

proposals/templates/proposals/proposal_pdf.html

@@ -87,6 +87,7 @@
     {% blocktrans with title=proposal.title reference_number=proposal.reference_number submitter=proposal.created_by.get_full_name trimmed %}
       FETC-GW - <em>{{ title }}</em> (referentienummer {{ reference_number }}, ingediend door {{ submitter }})
     {% endblocktrans %}
+    - {% trans proposal.reviewing_committee.name %}
     {% if proposal.is_revision %}
       <br>
       <strong>

proposals/utils/pdf_diff_logic.py

@@ -963,7 +963,7 @@ class DMPFileSection(PageBreakMixin, BaseSection):
 
     section_title = _("Data Management Plan")
 
-    row_fields = ["dmp_file"]
+    row_fields = ["dmp_file", "avg_understood"]
 
 
 class EmbargoSection(BaseSection):

proposals/validators.py

@@ -27,9 +27,11 @@ def __call__(self, value):
 
 
 def AVGUnderstoodValidator(value):
-
-    if value != True:
+# This does not seem to do anything, so I removed it from the model, however,
+# if I try to remove this validator entirely I get an error when making
+# migrations?
+    if value is None:
         raise forms.ValidationError(
-            _('Je dient kennis genomen te hebben van de AVG om jouw aanvraag in '
+            _('Je dient deze vraag in te vullen om jouw aanvraag in '
               'te dienen'), code='avg'
             )

reviews/migrations/0013_is_commission_review_field.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.2.20 on 2023-11-14 09:46
+
+from django.db import migrations, models
+
+def update_is_commssion_review(apps, schema_editor):
+
+    Review = apps.get_model('reviews', 'Review')
+
+    for review in Review.objects.all():
+        #Hardcoded this to account for possible future changes to stages
+        SUPERVISOR_STAGE = 0
+        if review.stage == SUPERVISOR_STAGE:
+            review.is_commission_review = False
+            review.save()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reviews', '0012_auto_20211213_1503'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='review',
+            name='is_commission_review',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.RunPython(update_is_commssion_review),
+    ]

reviews/models.py

@@ -63,6 +63,10 @@ class Review(models.Model):
     date_end = models.DateTimeField(blank=True, null=True)
     date_should_end = models.DateField(blank=True, null=True)
 
+    is_commission_review = models.BooleanField(
+        default=True
+    )
+
     proposal = models.ForeignKey(Proposal, on_delete=models.CASCADE)
 
     def update_go(self, last_decision=None):

reviews/templates/reviews/review_detail_sidebar.html

@@ -47,7 +47,7 @@ <h3>
         </li>
         {% if review.proposal.supervisor %}
             <li>
-                {% trans "Supervisor" %}: {{ review.proposal.supervisor }}
+                {% trans "Supervisor" %}: {{ review.proposal.supervisor.get_full_name }}
             </li>
         {% endif %}
         <li>

reviews/tests.py

@@ -154,6 +154,7 @@ def test_start_supervisor_review(self):
         # If the Relation on a Proposal requires a supervisor, a Review for the supervisor should be started.
         review = start_review(self.proposal)
         self.assertEqual(review.stage, Review.SUPERVISOR)
+        self.assertEqual(review.is_commission_review, False)
         self.assertEqual(Decision.objects.filter(reviewer=self.supervisor).count(), 1)
         self.assertEqual(Decision.objects.filter(review=review).count(), 1)
         self.assertEqual(review.decision_set.count(), 1)
@@ -170,6 +171,7 @@ def test_start_review(self):
 
         review = start_review(self.proposal)
         self.assertEqual(review.stage, Review.ASSIGNMENT)
+        self.assertEqual(review.is_commission_review, True)
         self.assertEqual(Decision.objects.filter(reviewer=self.secretary).count(), 1)
         self.assertEqual(Decision.objects.filter(review=review).count(), 1)
         self.assertEqual(review.decision_set.count(), 1)
@@ -196,6 +198,7 @@ def test_decision_supervisor(self):
         decision.save()
         review.refresh_from_db()
         self.assertEqual(review.go, True)
+        self.assertEqual(review.is_commission_review, False)
 
         self.assertEqual(len(mail.outbox), 2)
         self.check_subject_lines(mail.outbox)

reviews/utils/review_utils.py

@@ -42,6 +42,7 @@ def start_supervisor_phase(proposal):
     """
     review = Review.objects.create(proposal=proposal, date_start=timezone.now())
     review.stage = Review.SUPERVISOR
+    review.is_commission_review = False
     review.save()
 
     proposal.date_submitted_supervisor = timezone.now()