pkp#1660 fixed issue with review read recommendation view

touhidurabir · Jan 10, 2025 · 1964523 · 1964523
1 parent 85de3aa
commit 1964523
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 9 deletions.
diff --git a/classes/controllers/grid/users/reviewer/PKPReviewerGridHandler.php b/classes/controllers/grid/users/reviewer/PKPReviewerGridHandler.php
@@ -829,7 +829,10 @@ public function readReview($args, $request)
                 ReviewAssignment::SUBMISSION_REVIEWER_RATING_POOR => str_repeat($starHtml, ReviewAssignment::SUBMISSION_REVIEWER_RATING_POOR),
                 ReviewAssignment::SUBMISSION_REVIEWER_RATING_VERY_POOR => str_repeat($starHtml, ReviewAssignment::SUBMISSION_REVIEWER_RATING_VERY_POOR),
             ],
-            'reviewerRecommendationOptions' => ReviewAssignment::getReviewerRecommendationOptions($context),
+            'reviewerRecommendationOptions' => ReviewAssignment::getReviewerRecommendationOptions(
+                context: $context,
+                reviewAssignment: $reviewAssignment
+            ),
         ]);
 
         if ($reviewAssignment->getReviewFormId()) {

diff --git a/classes/submission/reviewAssignment/ReviewAssignment.php b/classes/submission/reviewAssignment/ReviewAssignment.php
@@ -799,9 +799,12 @@ public function getWeeksDue()
      *
      * @return array recommendation => localizedTitle
      */
-    public static function getReviewerRecommendationOptions(?Context $context = null, ?bool $active = true): array
+    public static function getReviewerRecommendationOptions(
+        Context $context = null,
+        ?bool $active = true,
+        ?self $reviewAssignment = null
+    ): array
     {
-        $context ??= Application::get()->getRequest()->getContext();
         static $reviewerRecommendationOptions = [];
 
         if (!empty($reviewerRecommendationOptions)) {
@@ -811,6 +814,14 @@ public static function getReviewerRecommendationOptions(?Context $context = null
         return $reviewerRecommendationOptions = ReviewerRecommendation::query()
             ->withContextId($context->getId())
             ->when(!is_null($active), fn ($query) => $query->withActive($active))
+            ->when(
+                $reviewAssignment, 
+                fn ($query) => $query->orWhere(
+                    fn ($query) => $query->withRecommendation(
+                        $reviewAssignment->getData("recommendation")
+                    )
+                )
+            )
             ->get()
             ->mapWithKeys(
                 fn (ReviewerRecommendation $recommendation): array => [
@@ -824,13 +835,13 @@ public static function getReviewerRecommendationOptions(?Context $context = null
     /**
      * Return a localized string representing the reviewer recommendation.
      */
-    public function getLocalizedRecommendation(): string
+    public function getLocalizedRecommendation(?Context $context = null): string
     {
-        $options = static::getReviewerRecommendationOptions();
-
-        return array_key_exists($this->getRecommendation(), $options)
-            ? $options[$this->getRecommendation()]
-            : '';
+        $options = static::getReviewerRecommendationOptions(
+            $context ?? Application::get()->getRequest()->getContext()
+        );
+
+        return $options[$this->getRecommendation()] ?? '';
     }
 
     /**

diff --git a/classes/submission/reviewer/recommendation/ReviewerRecommendation.php b/classes/submission/reviewer/recommendation/ReviewerRecommendation.php
@@ -183,4 +183,9 @@ public function scopeWithActive(Builder $query, bool $active = true): Builder
     {
         return $query->where('status', $active);
     }
+
+    public function scopeWithRecommendation(Builder $query, int $recommendation): Builder
+    {
+        return $query->where('value', $recommendation);
+    }
 }