Merge branch 'develop' into fix/bugfixes_and_textual_changes

locale/en/LC_MESSAGES/django.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-02 15:58+0200\n"
-"PO-Revision-Date: 2024-01-17 10:48+0100\n"
+"POT-Creation-Date: 2024-04-03 12:31+0200\n"
+"PO-Revision-Date: 2024-04-03 12:32+0200\n"
 "Last-Translator: Anna Asbury <[email protected]>\n"
 "Language-Team: \n"
 "Language: en\n"
@@ -270,7 +270,7 @@ msgid "Ingediende aanvragen"
 msgstr "My submitted applications;"
 
 #: main/templates/auth/user_detail.html:36 reviews/api/views.py:47
-#: reviews/api/views.py:276 reviews/api/views.py:337
+#: reviews/api/views.py:281 reviews/api/views.py:342
 #: reviews/templates/reviews/committee_members_workload.html:24
 msgid "Referentienummer"
 msgstr "Reference number"
@@ -295,7 +295,7 @@ msgstr "Phase"
 #: proposals/api/views.py:146
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:102
 #: proposals/templates/proposals/vue_templates/proposal_list.html:161
-#: reviews/api/views.py:51 reviews/api/views.py:280 reviews/api/views.py:341
+#: reviews/api/views.py:51 reviews/api/views.py:285 reviews/api/views.py:346
 #: reviews/templates/reviews/committee_members_workload.html:25
 #: reviews/templates/reviews/vue_templates/decision_list.html:153
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:95
@@ -316,7 +316,7 @@ msgstr "Desired end date"
 msgid "Mijn besluit"
 msgstr "My decision"
 
-#: main/templates/auth/user_detail.html:43 reviews/api/views.py:331
+#: main/templates/auth/user_detail.html:43 reviews/api/views.py:336
 #: reviews/models.py:34
 #: reviews/templates/reviews/vue_templates/decision_list.html:133
 #: reviews/templates/reviews/vue_templates/review_list.html:137
@@ -370,12 +370,12 @@ msgstr "Website export text"
 #: proposals/templates/proposals/proposal_confirmation.html:25
 #: reviews/templates/reviews/vue_templates/decision_list.html:95
 #: reviews/templates/reviews/vue_templates/review_list.html:88
-#: reviews/utils/review_actions.py:228
+#: reviews/utils/review_actions.py:230
 msgid "Bevestigingsbrief versturen"
 msgstr "Send confirmation letter"
 
 #: main/templates/auth/user_detail.html:97
-#: proposals/templates/proposals/proposal_confirmation.html:38
+#: proposals/templates/proposals/proposal_confirmation.html:39
 #: reviews/templates/reviews/vue_templates/decision_list.html:90
 #: reviews/templates/reviews/vue_templates/review_list.html:83
 msgid "Bevestigingsbrief verstuurd"
@@ -386,20 +386,21 @@ msgid "<< Opslaan en vorige stap"
 msgstr "<< Save and go back to previous step"
 
 #: main/templates/base/form_buttons.html:13
-#: main/templates/base/form_buttons.html:17
-#: main/templates/base/form_buttons.html:21
+#: main/templates/base/form_buttons.html:16
+#: main/templates/base/form_buttons.html:20
+#: main/templates/base/form_buttons.html:24
 msgid "Terug naar begin aanvraag"
 msgstr "Return to start of application"
 
-#: main/templates/base/form_buttons.html:26
+#: main/templates/base/form_buttons.html:29
 msgid "Terug naar begin traject"
 msgstr "Back to the beginning of the trajectory"
 
-#: main/templates/base/form_buttons.html:30
+#: main/templates/base/form_buttons.html:33
 msgid "Terug naar begin sessie"
 msgstr "Back to the beginning of the session"
 
-#: main/templates/base/form_buttons.html:34
+#: main/templates/base/form_buttons.html:37
 msgid "Opslaan en volgende stap >>"
 msgstr "Save and go to next step >>"
 
@@ -1051,12 +1052,12 @@ msgstr ""
 "%(title)s(reference number <em>%(ref_number)s</em>), trajectory %(order)s."
 
 #: observations/templates/observations/observation_update_attachments.html:43
-#: proposals/templates/proposals/proposal_confirmation.html:39
+#: proposals/templates/proposals/proposal_confirmation.html:36
 #: proposals/templates/proposals/proposal_diff.html:55
 #: proposals/templates/proposals/proposal_update_attachments.html:30
 #: proposals/templates/proposals/proposal_update_date_start.html:33
 #: reviews/templates/reviews/change_chamber_form.html:23
-#: reviews/templates/reviews/decision_form.html:92
+#: reviews/templates/reviews/decision_form.html:99
 #: reviews/templates/reviews/review_assign_form.html:46
 #: reviews/templates/reviews/review_close_form.html:40
 #: reviews/templates/reviews/review_discontinue_form.html:70
@@ -1744,7 +1745,7 @@ msgstr ""
 msgid "Amendement"
 msgstr "Amendment"
 
-#: proposals/models.py:677 reviews/api/views.py:41 reviews/api/views.py:327
+#: proposals/models.py:677 reviews/api/views.py:41 reviews/api/views.py:332
 #: reviews/templates/reviews/committee_members_workload.html:35
 #: reviews/templates/reviews/committee_members_workload.html:74
 #: reviews/templates/reviews/review_detail_sidebar.html:108
@@ -1908,8 +1909,8 @@ msgstr "Delete"
 
 #: proposals/templates/proposals/proposal_confirm_delete.html:21
 #: proposals/templates/proposals/proposal_copy.html:93
-#: tasks/templates/tasks/session_confirm_delete.html:22
-#: tasks/templates/tasks/task_confirm_delete.html:22
+#: tasks/templates/tasks/session_confirm_delete.html:21
+#: tasks/templates/tasks/task_confirm_delete.html:21
 msgid "Annuleren"
 msgstr "Cancel"
 
@@ -3024,7 +3025,7 @@ msgstr "To next step"
 
 #: proposals/templates/proposals/vue_templates/proposal_list.html:82
 msgid "Verberg"
-msgstr ""
+msgstr "Hide"
 
 #: proposals/templates/proposals/vue_templates/proposal_list.html:89
 msgid "Maak revisie"
@@ -3302,21 +3303,21 @@ msgstr "Contact <a href=\"{link}\">{secretary}</a> to make sure."
 msgid "Je onderzoek zal moeten worden beoordeeld door de METC."
 msgstr "Your application will require assessment by an METC."
 
-#: reviews/api/views.py:33 reviews/api/views.py:319
+#: reviews/api/views.py:33 reviews/api/views.py:324
 #: reviews/templates/reviews/vue_templates/decision_list.html:111
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:61
 #: reviews/templates/reviews/vue_templates/review_list.html:116
 msgid "Stadium"
 msgstr "Stage"
 
-#: reviews/api/views.py:37 reviews/api/views.py:323 reviews/models.py:31
+#: reviews/api/views.py:37 reviews/api/views.py:328 reviews/models.py:31
 #: reviews/templates/reviews/vue_templates/decision_list.html:178
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:121
 #: reviews/templates/reviews/vue_templates/review_list.html:183
 msgid "Route"
 msgstr "Route"
 
-#: reviews/api/views.py:55 reviews/api/views.py:284 reviews/api/views.py:345
+#: reviews/api/views.py:55 reviews/api/views.py:289 reviews/api/views.py:350
 msgid "Start datum"
 msgstr "Start date review"
 
@@ -3647,11 +3648,21 @@ msgstr ""
 "href=\"%(pdf_url)s\" target=\"_blank\">here</a> (downloads as PDF)."
 
 #: reviews/templates/reviews/decision_form.html:29
+msgid ""
+"<strong>Attentie:</strong> jij bent de laatste beoordelaar van deze "
+"aanvraag. Daarom kun je na het versturen je oordeel en commentaar niet meer "
+"bewerken. Controleer je antwoorden goed."
+msgstr ""
+"<strong>Warning</strong>: because you are the last remaining reviewer for "
+"this proposal, you won't be able to edit your response after submission. "
+"Double-check your answers."
+
+#: reviews/templates/reviews/decision_form.html:36
 #, python-format
 msgid "Je kunt nu de aanvraag <em>%(title)s</em> bekijken. <br />"
 msgstr "You can now (re)view this application here: <em>%(title)s</em>. <br />"
 
-#: reviews/templates/reviews/decision_form.html:35
+#: reviews/templates/reviews/decision_form.html:42
 msgid ""
 "Als de aanvraag (incl. geïnformeerde toestemmingsformulieren) in orde is, "
 "klik dan op ‘goedgekeurd’ en ‘Beslissing opslaan’ hieronder; dan wordt de "
@@ -3661,15 +3672,15 @@ msgstr ""
 "'endorsed' and 'Save decision' below; the application will then be submitted "
 "to the FEtC-H. "
 
-#: reviews/templates/reviews/decision_form.html:42
+#: reviews/templates/reviews/decision_form.html:49
 msgid ""
 "Als de aanvraag nog niet in orde is, dan zijn er twee mogelijkheden om de "
 "aanvraag aan te passen:"
 msgstr ""
 "If the application is not yet in order, there are two methods to amend the "
 "study: "
 
-#: reviews/templates/reviews/decision_form.html:49
+#: reviews/templates/reviews/decision_form.html:56
 #, python-format
 msgid ""
 "door de supervisor (jijzelf) <br /> Als supervisor kan je deze aanvraag <a "
@@ -3682,7 +3693,7 @@ msgstr ""
 "which, you will be redirected back to this page and you can approve the "
 "application; this means that the application is submitted to the FEtC-H. "
 
-#: reviews/templates/reviews/decision_form.html:58
+#: reviews/templates/reviews/decision_form.html:65
 msgid ""
 "door de indiener (je student of promovendus) <br /> Indien je wilt dat de "
 "indiener de aanvraag zelf aanpast voordat je de studie kunt goedkeuren en "
@@ -3697,15 +3708,15 @@ msgstr ""
 "any comments, and click 'Save decision'. Once you have done this, the "
 "submitter can make changes again. <br /> "
 
-#: reviews/templates/reviews/decision_form.html:70
+#: reviews/templates/reviews/decision_form.html:77
 msgid ""
 "Als de indiener de gevraagde wijzigingen heeft doorgevoerd en opnieuw heeft "
 "verstuurd, zal je de aangepaste aanvraag opnieuw moeten beoordelen."
 msgstr ""
 "Once the submitter has made the requested changes and resubmitted the "
 "application, you will have to re-evaluate the application. "
 
-#: reviews/templates/reviews/decision_form.html:80
+#: reviews/templates/reviews/decision_form.html:87
 #, python-format
 msgid ""
 "Dit is een revisie van of amendement op een vorige aanvraag. De verschillen "
@@ -3715,7 +3726,7 @@ msgstr ""
 "differences compared to the previous application <a "
 "href=\"%(diff_url)s\">here</a>."
 
-#: reviews/templates/reviews/decision_form.html:95
+#: reviews/templates/reviews/decision_form.html:102
 msgid "Beslissing opslaan"
 msgstr "Save decision"
 
@@ -3738,7 +3749,7 @@ msgstr "Appoint committee members"
 #, python-format
 msgid ""
 "<p> Kies hier de geschikte route en commissieleden voor de aanvraag "
-"<em>%(title)s</em>. klik <a href=\"%(workload_url)s\">hier</a> voor een "
+"<em>%(title)s</em>. Klik <a href=\"%(workload_url)s\">hier</a> voor een "
 "overzicht van de werkverdeling van deze commissie. </p>"
 msgstr ""
 "<p> Choose the appropriate route and committee members for the application "
@@ -3943,7 +3954,7 @@ msgid "Verplaats naar andere kamer"
 msgstr "Move study to different reviewing chamber"
 
 #: reviews/templates/reviews/vue_templates/review_list.html:95
-#: reviews/utils/review_actions.py:264
+#: reviews/utils/review_actions.py:266
 msgid "Verberg aanvraag uit het archief"
 msgstr "Remove this application from the archive"
 
@@ -4012,30 +4023,34 @@ msgid "Toestemmingsdocument observatie"
 msgstr "Consent document for observation"
 
 #: reviews/utils/review_actions.py:118
+msgid "Pas jouw beslissing en/of commentaar aan"
+msgstr "Edit your feedback on this proposal"
+
+#: reviews/utils/review_actions.py:120
 msgid "Geef jouw beslissing en/of commentaar door"
 msgstr "Provide feedback on this proposal"
 
-#: reviews/utils/review_actions.py:141
+#: reviews/utils/review_actions.py:143
 msgid "Deze versie afhandelen"
 msgstr "Conclude this version"
 
-#: reviews/utils/review_actions.py:169
+#: reviews/utils/review_actions.py:171
 msgid "Beëindig definitief de afhandeling van deze aanvraag"
 msgstr "Discontinue assessment of this application"
 
-#: reviews/utils/review_actions.py:197
+#: reviews/utils/review_actions.py:199
 msgid "Verander aangestelde commissieleden"
 msgstr "Change appointment of committee members"
 
-#: reviews/utils/review_actions.py:229
+#: reviews/utils/review_actions.py:231
 msgid "Datum van bevestigingsbrief aanpassen"
 msgstr "Change date of confirmation letter"
 
-#: reviews/utils/review_actions.py:266
+#: reviews/utils/review_actions.py:268
 msgid "Plaats aanvraag in het archief."
 msgstr "Add this application to the archive"
 
-#: reviews/utils/review_actions.py:283
+#: reviews/utils/review_actions.py:285
 msgid "Startdatum wijzigen"
 msgstr "Edit start date"
 

main/templates/base/form_buttons.html

@@ -11,6 +11,9 @@
                 {% if proposal.is_pre_assessment %}
                     <a class="button js-submit-redirect"
                        href="{% url 'proposals:update_pre' proposal.pk %}">{% trans "Terug naar begin aanvraag" %}</a>
+                {% elif proposal.is_pre_approved %}
+                    <a class="button js-submit-redirect"
+                       href="{% url 'proposals:update_pre_approved' proposal.pk %}">{% trans "Terug naar begin aanvraag" %}</a>
                 {% elif proposal.is_practice %}
                     <a class="button js-submit-redirect"
                        href="{% url 'proposals:update_practice' proposal.pk %}">

proposals/templates/proposals/proposal_confirmation.html

@@ -33,10 +33,10 @@ <h2>{% trans "Bevestigingsbrief versturen" %}</h2>
                 <table>
                     {{ form.as_table }}
                 </table>
+                <a class="button" href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
                 <input class="button"
                        type="submit"
                        value="{% trans 'Bevestigingsbrief verstuurd' %}" />
-                <a class="button" href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
             </form>
         </div>
     </div>

proposals/utils/pdf_diff_logic.py

@@ -1103,7 +1103,7 @@ def create_context_diff(context, old_proposal, new_proposal):
             DiffSection(WMOSection(old_proposal.wmo), WMOSection(new_proposal.wmo))
         )
 
-        if new_proposal.is_pre_assessment:
+        if not new_proposal.is_pre_assessment:
             if (
                 new_proposal.wmo.status != new_proposal.wmo.WMOStatuses.NO_WMO
                 or old_proposal.wmo.status != old_proposal.wmo.WMOStatuses.NO_WMO

requirements.in

@@ -26,4 +26,5 @@ python-magic
 pdftotext
 bpython
 black
-djlint
+djlint
+sentry-sdk[django]