Make display conditional and add note in target application

Author: anusharanganathan

doajtest/testbook/new_application_form/maned_form.yml

@@ -107,14 +107,22 @@ tests:
     - step: an admin account (admin1)
     - step: Login as `admin1`
     - step: Go to Application page at `/admin/application/1234`
+      results:
+        - if the status is not accepted, the "Mark as full review" checkbox is not visible
     - step: Select the status as `Accepted` in Change Status
-    - step: Click on the "Mark as full review" checkbox in the side panel
+      results:
+        - "Mark as full review" checkbox in the side panel is visible
+    - step: Click on the "Mark as full review" checkbox
       results:
         - "Mark as full review" checkbox is filled
     - step: Click "Save" button
       results:
         - The last full review date is saved in the associated journal
-        - a new note will be created
+        - a new note will be created in the application
+        - It will have the message "Last full review completed on {date} by `{username}`"
+        - your username and user id will be shown on that note
+        - the date and time you save the application will be shown
+        - a new note will be created in the journal (search for the journal and click on edit to see note)
         - It will have the message "Last full review completed on {date} by `{username}`"
         - your username and user id will be shown on that note
         - the date and time you save the application will be shown

portality/forms/application_processors.py

@@ -426,10 +426,15 @@ def finalise(self, account, save_target=True, email_alert=True):
             if (self.target.application_type == constants.APPLICATION_TYPE_UPDATE_REQUEST and
                     self.form.mark_as_full_review.data):
                 now = dates.now_str()
+                # Add last full review note to update request application
+                n = Messages.LAST_FULL_REVIEW_NOTE.format(date=now, username=account.id)
+                self.target.add_note(n, date=now, author_id=account.id)
+                self.target.save()
+                # Add last full review note to journal
                 j.last_full_review = now
                 n = Messages.LAST_FULL_REVIEW_NOTE.format(date=now, username=account.id)
                 j.add_note(n, date=now, author_id=account.id)
-
+                j.save()
             # record the url the journal is available at in the admin are and alert the user
             if has_request_context():       # fixme: if we handle alerts via a notification service we won't have to toggle on request context
                 jurl = url_for("doaj.toc", identifier=j.toc_id)
@@ -474,13 +479,6 @@ def finalise(self, account, save_target=True, email_alert=True):
 
         # the application was neither accepted or rejected, so just save it
         else:
-            if (self.source.current_journal is not None and j is not None and
-                    self.form.mark_as_full_review.data and
-                    self.target.application_type == constants.APPLICATION_TYPE_UPDATE_REQUEST):
-                now = dates.now_str()
-                j.last_full_review = now
-                n = Messages.LAST_FULL_REVIEW_NOTE.format(date=now, username=account.id)
-                j.add_note(n, date=now, author_id=account.id)
             self.target.set_last_manual_update()
             self.target.save()
 

portality/static/js/application_form.js

@@ -718,6 +718,15 @@ doaj.af.ManEdApplicationForm = class extends doaj.af.EditorialApplicationForm {
             $("#modal-quick_reject").show();
         });
 
+        $("#application_status").on("change", (e) => {
+            e.preventDefault();
+            if ($("#application_status").val() === "accepted") {
+                $("#mark_as_full_review_div").show();
+            } else {
+               $("#mark_as_full_review_div").hide();
+            }
+        });
+
         let that = this;
         $("#submit_quick_reject").on("click", function(event) {
             if ($("#quick_reject").val() === "" && $("#quick_reject_details").val() === "") {

portality/templates-v2/management/_application-form/includes/_editorial_side_panel.html

@@ -10,7 +10,14 @@ <h3 class="label"> Locked for editing until <span id="lock_expires"
         {% if obj.application_type==constants.APPLICATION_TYPE_UPDATE_REQUEST and fs %}
             {% for f in fs.fields() %}
                 {% set field_template = f.template %}
-                {% include field_template %}
+                {% if obj.application_status == constants.APPLICATION_STATUS_ACCEPTED %}
+                    {% set show=true %}
+                {% else %}
+                    {% set show=false %}
+                {% endif %}
+                <div id="mark_as_full_review_div" {% if not show %}style="display: none"{% endif %}>
+                    {% include field_template %}
+                </div>
             {% endfor %}
         {% endif %}
         <div class="editorial_panel--exit_buttons">