diff --git a/proposals/migrations/0050_replace_avg_understood.py b/proposals/migrations/0050_auto_20231116_1413.py similarity index 78% rename from proposals/migrations/0050_replace_avg_understood.py rename to proposals/migrations/0050_auto_20231116_1413.py index a9a9c9958..2de122f4d 100644 --- a/proposals/migrations/0050_replace_avg_understood.py +++ b/proposals/migrations/0050_auto_20231116_1413.py @@ -1,12 +1,10 @@ -# Generated by Django 3.2.20 on 2023-11-16 09:41 +# Generated by Django 3.2.20 on 2023-11-16 13:13 from django.db import migrations, models class Migration(migrations.Migration): - replaces = [('proposals', '0050_alter_proposal_avg_understood'), ('proposals', '0051_auto_20231116_1030')] - dependencies = [ ('proposals', '0049_alter_proposal_supervisor'), ] diff --git a/proposals/templates/proposals/proposal_pdf.html b/proposals/templates/proposals/proposal_pdf.html index 2548b9eb4..9d1d10631 100644 --- a/proposals/templates/proposals/proposal_pdf.html +++ b/proposals/templates/proposals/proposal_pdf.html @@ -85,7 +85,7 @@ {% block page_header %}
{% blocktrans with title=proposal.title reference_number=proposal.reference_number submitter=proposal.created_by.get_full_name reviewing_committee=proposal.reviewing_committee.name trimmed %} - FETC-GW - {{ title }} (referentienummer {{ reference_number }}-{{reviewing_committee}}, ingediend door {{ submitter }}) + FETC-GW - {{ title }} (referentienummer {{reviewing_committee}}-{{ reference_number }}, ingediend door {{ submitter }}) {% endblocktrans %} {% if proposal.is_revision %}
diff --git a/reviews/migrations/0013_is_commission_review_field.py b/reviews/migrations/0013_add_is_committee_review.py similarity index 54% rename from reviews/migrations/0013_is_commission_review_field.py rename to reviews/migrations/0013_add_is_committee_review.py index 88dc103e0..0ff5fedc6 100644 --- a/reviews/migrations/0013_is_commission_review_field.py +++ b/reviews/migrations/0013_add_is_committee_review.py @@ -1,17 +1,19 @@ -# Generated by Django 3.2.20 on 2023-11-14 09:46 +# Generated by Django 3.2.20 on 2023-11-16 13:01 from django.db import migrations, models -def update_is_commssion_review(apps, schema_editor): +def update_is_committee_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 + #Hardcoded these to account for possible future changes to stages SUPERVISOR_STAGE = 0 + CLOSED_STAGE = 4 if review.stage == SUPERVISOR_STAGE: - review.is_commission_review = False - review.update_go() + review.is_committee_review = False + if review.go: + review.stage = CLOSED_STAGE review.save() class Migration(migrations.Migration): @@ -23,8 +25,8 @@ class Migration(migrations.Migration): operations = [ migrations.AddField( model_name='review', - name='is_commission_review', + name='is_committee_review', field=models.BooleanField(default=True), ), - migrations.RunPython(update_is_commssion_review), + migrations.RunPython(update_is_committee_review), ] diff --git a/reviews/models.py b/reviews/models.py index 15c70f4f6..20825474a 100644 --- a/reviews/models.py +++ b/reviews/models.py @@ -63,7 +63,7 @@ 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( + is_committee_review = models.BooleanField( default=True ) @@ -93,7 +93,7 @@ def update_go(self, last_decision=None): self.save() # For a supervisor review: - if self.is_commission_review == False: + if self.is_committee_review == False: # Update the status of the Proposal with the end date self.proposal.date_reviewed_supervisor = self.date_end self.proposal.save() diff --git a/reviews/templates/reviews/review_detail_sidebar.html b/reviews/templates/reviews/review_detail_sidebar.html index 5d7b24791..da68c5636 100644 --- a/reviews/templates/reviews/review_detail_sidebar.html +++ b/reviews/templates/reviews/review_detail_sidebar.html @@ -90,7 +90,7 @@

{% endif %} - {% if review.is_commission_review == False %} + {% if not review.is_committee_review %}
  • {% blocktrans trimmed %} diff --git a/reviews/tests.py b/reviews/tests.py index 069d99910..60a4de5dc 100644 --- a/reviews/tests.py +++ b/reviews/tests.py @@ -154,7 +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(review.is_committee_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) @@ -171,7 +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(review.is_committee_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) @@ -198,7 +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(review.is_committee_review, False) self.assertEqual(len(mail.outbox), 2) self.check_subject_lines(mail.outbox) diff --git a/reviews/utils/review_utils.py b/reviews/utils/review_utils.py index dae480cdd..d0a568fd0 100644 --- a/reviews/utils/review_utils.py +++ b/reviews/utils/review_utils.py @@ -42,7 +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.is_committee_review = False review.save() proposal.date_submitted_supervisor = timezone.now() diff --git a/reviews/views.py b/reviews/views.py index 81c6bfba7..260438ca5 100644 --- a/reviews/views.py +++ b/reviews/views.py @@ -556,7 +556,7 @@ def form_valid(self, form): # Don't notify the secretary if this is a supervisor decision. # If it was a GO they the secretary will be notified anyway - if review.is_commission_review == True: + if review.is_committee_review: notify_secretary(form.instance) return super(DecisionUpdateView, self).form_valid(form)