Merge pull request #9452 from nibou230/9400

#9400 Display competing interests once a reviewer accepts an invitation
pkp · Nov 13, 2023 · 0e30d1f · 0e30d1f
2 parents c35ac64 + ac3187f
commit 0e30d1f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/controllers/grid/users/reviewer/AuthorReviewerGridCellProvider.php b/controllers/grid/users/reviewer/AuthorReviewerGridCellProvider.php
@@ -75,7 +75,13 @@ public function getTemplateVarsFromRowColumn($row, $column)
                 return ['label' => __($element->getReviewMethodKey())];
 
             case 'considered':
-                return ['label' => $this->_getStatusText($this->getCellState($row, $column), $row)];
+                $statusText = $this->_getStatusText($this->getCellState($row, $column), $row);
+                $reviewAssignment = $row->getData();
+                $competingInterests = $reviewAssignment->getCompetingInterests();
+                if ($competingInterests) {
+                    $statusText .= '<span class="details">' . __('reviewer.competingInterests') . '</span>';
+                }
+                return ['label' => $statusText];
 
             case 'actions':
                 // Only attach actions to this column. See self::getCellActions()

diff --git a/controllers/grid/users/reviewer/ReviewerGridCellProvider.php b/controllers/grid/users/reviewer/ReviewerGridCellProvider.php
@@ -97,7 +97,13 @@ public function getTemplateVarsFromRowColumn($row, $column)
                 return ['label' => __($element->getReviewMethodKey())];
 
             case 'considered':
-                return ['label' => $this->_getStatusText($this->getCellState($row, $column), $row)];
+                $statusText = $this->_getStatusText($this->getCellState($row, $column), $row);
+                $reviewAssignment = $row->getData();
+                $competingInterests = $reviewAssignment->getCompetingInterests();
+                if ($competingInterests) {
+                    $statusText .= '<span class="details">' . __('reviewer.competingInterests') . '</span>';
+                }
+                return ['label' => $statusText];
 
             case 'actions':
                 // Only attach actions to this column. See self::getCellActions()

diff --git a/templates/controllers/grid/users/reviewer/readReview.tpl b/templates/controllers/grid/users/reviewer/readReview.tpl
@@ -25,6 +25,13 @@
 				{translate key="editor.review.readConfirmation"}
 			{/fbvFormSection}
 
+            {if $reviewAssignment->getCompetingInterests()}
+                <h3>{translate key="reviewer.submission.competingInterests"}</h3>
+                <div class="review_competing_interests">
+                    {$reviewAssignment->getCompetingInterests()|nl2br|strip_unsafe_html}
+                </div>
+            {/if}
+
 			{if $reviewAssignment->getDateCompleted()}
 				{fbvFormSection}
 					<div class="pkp_controllers_informationCenter_itemLastEvent">
@@ -53,12 +60,6 @@
 						{include file="controllers/revealMore.tpl" content=$comment->getComments()|strip_unsafe_html}
 					{/iterate}
 				{/if}
-				{if $reviewAssignment->getCompetingInterests()}
-					<h3>{translate key="reviewer.submission.competingInterests"}</h3>
-					<div class="review_competing_interests">
-						{$reviewAssignment->getCompetingInterests()|nl2br|strip_unsafe_html}
-					</div>
-				{/if}
 
 			{else}
 				{if $reviewAssignment->getDateCompleted()}