#10359 Record considered when reviewers are notify along with the acknoledged

Author: jardakotesovec

classes/controllers/grid/users/reviewer/PKPReviewerGridHandler.php

@@ -752,8 +752,9 @@ public function reviewRead($args, $request)
             $newReviewData['quality'] = $newReviewData['dateRated'] = null;
         }
 
-        // if the review assignment had been unconsidered, update the flag.
-        $newReviewData['considered'] = $reviewAssignment->getConsidered() === ReviewAssignment::REVIEW_ASSIGNMENT_NEW
+        // if the review assignment had been unconsidered or only viewed but not considered, update the flag.
+        $newReviewData['considered'] = ($reviewAssignment->getConsidered() === ReviewAssignment::REVIEW_ASSIGNMENT_NEW || 
+                                       $reviewAssignment->getConsidered() === ReviewAssignment::REVIEW_ASSIGNMENT_VIEWED)
             ? ReviewAssignment::REVIEW_ASSIGNMENT_CONSIDERED
             : ReviewAssignment::REVIEW_ASSIGNMENT_RECONSIDERED;
 

classes/decision/types/traits/NotifyReviewers.php

@@ -27,6 +27,7 @@
 use PKP\mail\mailables\ReviewerUnassign;
 use PKP\security\Validation;
 use PKP\user\User;
+use PKP\submission\reviewAssignment\ReviewAssignment;
 
 trait NotifyReviewers
 {
@@ -56,10 +57,26 @@ protected function sendReviewersEmail(DecisionNotifyReviewer|ReviewerUnassign $m
                     ->getMany()
                     ->first();
                 if ($reviewAssignment) {
-                    Repo::reviewAssignment()->edit($reviewAssignment, [
-                        'dateAcknowledged' => Core::getCurrentDate(),
-                        'dateConsidered' => Core::getCurrentDate()
-                    ]);
+                    $updateData = [];
+                    if(!$reviewAssignment->getDateAcknowledged()) {
+                        $updateData['dateAcknowledged'] = Core::getCurrentDate();
+                    }
+                    if (!in_array($reviewAssignment->getConsidered(), [ReviewAssignment::REVIEW_ASSIGNMENT_CONSIDERED, ReviewAssignment::REVIEW_ASSIGNMENT_RECONSIDERED])) {
+                        $updateData['considered'] = ($reviewAssignment->getConsidered() === ReviewAssignment::REVIEW_ASSIGNMENT_NEW ||
+                                                $reviewAssignment->getConsidered() === ReviewAssignment::REVIEW_ASSIGNMENT_VIEWED)
+                            ? ReviewAssignment::REVIEW_ASSIGNMENT_CONSIDERED
+                            : ReviewAssignment::REVIEW_ASSIGNMENT_RECONSIDERED;
+                    }
+
+                    if(!$reviewAssignment->getDateConsidered()) {
+                        // set the date when the editor confirms the review
+                        $updateData['dateConsidered'] = Core::getCurrentDate();
+                    }
+
+                    if(!empty($updateData)) {
+                        Repo::reviewAssignment()->edit($reviewAssignment, $updateData);
+                    }
+
                 }
             }
 

controllers/grid/users/reviewer/form/ThankReviewerForm.php

@@ -149,13 +149,16 @@ public function execute(...$functionArgs)
         // update the ReviewAssignment with the acknowledged date
         $newData = ['dateAcknowledged' => Core::getCurrentDate()];
         if (!in_array($reviewAssignment->getConsidered(), [ReviewAssignment::REVIEW_ASSIGNMENT_CONSIDERED, ReviewAssignment::REVIEW_ASSIGNMENT_RECONSIDERED])) {
-            $newData['considered'] = $reviewAssignment->getConsidered() === ReviewAssignment::REVIEW_ASSIGNMENT_NEW
+            $newData['considered'] = ($reviewAssignment->getConsidered() === ReviewAssignment::REVIEW_ASSIGNMENT_NEW ||
+                                     $reviewAssignment->getConsidered() === ReviewAssignment::REVIEW_ASSIGNMENT_VIEWED)
                 ? ReviewAssignment::REVIEW_ASSIGNMENT_CONSIDERED
                 : ReviewAssignment::REVIEW_ASSIGNMENT_RECONSIDERED;
         }
 
-        // set the date when the editor confirms the review
-        $newData['dateConsidered'] = Core::getCurrentDate();
+        if(!$reviewAssignment->getDateConsidered()) {
+            // set the date when the editor confirms the review
+            $newData['dateConsidered'] = Core::getCurrentDate();
+        }
 
         Repo::reviewAssignment()->edit($reviewAssignment, $newData);