#147 -- Members Ad-hoc list enhancements

bireme · Jan 19, 2021 · eaea59e · eaea59e
1 parent e4876a8
commit eaea59e
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 4 deletions.
diff --git a/symphony/src/Proethos2/CoreBundle/Controller/ProtocolController.php b/symphony/src/Proethos2/CoreBundle/Controller/ProtocolController.php
@@ -1242,6 +1242,7 @@ public function initCommitteeReviewRevisorAction($protocol_id)
                     }
 
                     $protocol_revision->setIsFinalRevision(true);
+                    $protocol_revision->setRevisedIn(new \DateTime());
                 }
 
                 $protocol_revision->setAnswered(true);

diff --git a/symphony/src/Proethos2/CoreBundle/Resources/views/Protocol/initCommitteeReview.html.twig b/symphony/src/Proethos2/CoreBundle/Resources/views/Protocol/initCommitteeReview.html.twig
@@ -99,7 +99,8 @@
                                 <th>{% trans %}E-mail{% endtrans %}</th>
                                 <th>{% trans %}Country{% endtrans %}</th>
                                 <th>{% trans %}Recruitment Date{% endtrans %}</th>
-                                <th>{% trans %}Alert dispatch date{% endtrans %}</th>
+                                <th>{% trans %}Review submission date{% endtrans %}</th>
+                                <th>{% trans %}Alert delivery date{% endtrans %}</th>
                                 <th>{% trans %}Status{% endtrans %}</th>
                                 <th>{% trans %}Actions{% endtrans %}</th>
                             </tr>
@@ -114,6 +115,7 @@
                                     <td><a href='{{ revision.member.email }}'>{{ revision.member.email }}</a></td>
                                     <td>{{ revision.member.country }}</td>
                                     <td>{{ revision.created|date("d/m/Y") }}</td>
+                                    <td>{% if revision.revisedIn %}{{ revision.revisedIn|date("d/m/Y") }}{% endif %}</td>
                                     <td>{% if revision.sendAlertDate %}{{ revision.sendAlertDate|date("d/m/Y") }}{% endif %}</td>
                                     <td>
                                         {% if revision.rejected %}
@@ -159,11 +161,11 @@
                             <tr>
                                 <th></th>
                                 <th width="30%">{% trans %}Name{% endtrans %}</th>
-                                <th>{% trans %}Institution{% endtrans %}</th>
                                 <th>{% trans %}E-mail{% endtrans %}</th>
                                 <th>{% trans %}Country{% endtrans %}</th>
                                 <th>{% trans %}Recruitment Date{% endtrans %}</th>
-                                <th>{% trans %}Alert dispatch date{% endtrans %}</th>
+                                <th>{% trans %}Review submission date{% endtrans %}</th>
+                                <th>{% trans %}Alert delivery date{% endtrans %}</th>
                                 <th>{% trans %}Status{% endtrans %}</th>
                                 <th>{% trans %}Actions{% endtrans %}</th>
                             </tr>
@@ -174,10 +176,10 @@
                                 <tr>
                                     <td><input type="checkbox" name='revision-{{ revision.member.id }}' value="{{ revision.id }}" {% if revision.rejected or revision.isFinalRevision %}disabled{% endif %} /></td>
                                     <td>{{ revision.member.name }}</td>
-                                    <td><a href='{{ revision.member.lattes }}' target="_blank">CV</a></td>
                                     <td><a href='{{ revision.member.email }}'>{{ revision.member.email }}</a></td>
                                     <td>{{ revision.member.country }}</td>
                                     <td>{{ revision.created|date("d/m/Y") }}</td>
+                                    <td>{% if revision.revisedIn %}{{ revision.revisedIn|date("d/m/Y") }}{% endif %}</td>
                                     <td>{% if revision.sendAlertDate %}{{ revision.sendAlertDate|date("d/m/Y") }}{% endif %}</td>
                                     <td>
                                         {% if revision.rejected %}

diff --git a/symphony/src/Proethos2/ModelBundle/Entity/ProtocolAdhocRevision.php b/symphony/src/Proethos2/ModelBundle/Entity/ProtocolAdhocRevision.php
@@ -238,6 +238,11 @@ class ProtocolAdhocRevision extends Base
      */
     private $send_alert_date;
 
+    /**
+     * @ORM\Column(name="revised_in", type="datetime", nullable=true)
+     */
+    private $revised_in;
+
     /**
      * Get id
      *
@@ -991,4 +996,28 @@ public function getSendAlertDate()
     {
         return $this->send_alert_date;
     }
+
+    /**
+     * Set revisedIn
+     *
+     * @param \DateTime $revisedIn
+     *
+     * @return ProtocolAdhocRevision
+     */
+    public function setRevisedIn($revisedIn)
+    {
+        $this->revised_in = $revisedIn;
+
+        return $this;
+    }
+
+    /**
+     * Get revisedIn
+     *
+     * @return \DateTime
+     */
+    public function getRevisedIn()
+    {
+        return $this->revised_in;
+    }
 }
diff --git a/symphony/src/Proethos2/ModelBundle/Entity/ProtocolCommitteeRevision.php b/symphony/src/Proethos2/ModelBundle/Entity/ProtocolCommitteeRevision.php
@@ -112,6 +112,11 @@ class ProtocolCommitteeRevision extends Base
      */
     private $send_alert_date;
 
+    /**
+     * @ORM\Column(name="revised_in", type="datetime", nullable=true)
+     */
+    private $revised_in;
+
     /**
      * Get id
      *
@@ -433,4 +438,28 @@ public function getSendAlertDate()
     {
         return $this->send_alert_date;
     }
+
+    /**
+     * Set revisedIn
+     *
+     * @param \DateTime $revisedIn
+     *
+     * @return ProtocolCommitteeRevision
+     */
+    public function setRevisedIn($revisedIn)
+    {
+        $this->revised_in = $revisedIn;
+
+        return $this;
+    }
+
+    /**
+     * Get revisedIn
+     *
+     * @return \DateTime
+     */
+    public function getRevisedIn()
+    {
+        return $this->revised_in;
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                         }
                         $protocol_revision->setIsFinalRevision(true);
+                        $protocol_revision->setRevisedIn(new \DateTime());
                     }
                     $protocol_revision->setAnswered(true);
@@ Expand Down @@