Skip to content

Commit 3ca1fb6

Browse files
#10359 Record considered when reviewers are notify along with the acknoledged
1 parent 8069bd3 commit 3ca1fb6

File tree

3 files changed

+30
-9
lines changed

3 files changed

+30
-9
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -752,8 +752,9 @@ public function reviewRead($args, $request)
752752
$newReviewData['quality'] = $newReviewData['dateRated'] = null;
753753
}
754754

755-
// if the review assignment had been unconsidered, update the flag.
756-
$newReviewData['considered'] = $reviewAssignment->getConsidered() === ReviewAssignment::REVIEW_ASSIGNMENT_NEW
755+
// if the review assignment had been unconsidered or only viewed but not considered, update the flag.
756+
$newReviewData['considered'] = ($reviewAssignment->getConsidered() === ReviewAssignment::REVIEW_ASSIGNMENT_NEW ||
757+
$reviewAssignment->getConsidered() === ReviewAssignment::REVIEW_ASSIGNMENT_VIEWED)
757758
? ReviewAssignment::REVIEW_ASSIGNMENT_CONSIDERED
758759
: ReviewAssignment::REVIEW_ASSIGNMENT_RECONSIDERED;
759760

classes/decision/types/traits/NotifyReviewers.php

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
use PKP\mail\mailables\ReviewerUnassign;
2828
use PKP\security\Validation;
2929
use PKP\user\User;
30+
use PKP\submission\reviewAssignment\ReviewAssignment;
3031

3132
trait NotifyReviewers
3233
{
@@ -56,10 +57,26 @@ protected function sendReviewersEmail(DecisionNotifyReviewer|ReviewerUnassign $m
5657
->getMany()
5758
->first();
5859
if ($reviewAssignment) {
59-
Repo::reviewAssignment()->edit($reviewAssignment, [
60-
'dateAcknowledged' => Core::getCurrentDate(),
61-
'dateConsidered' => Core::getCurrentDate()
62-
]);
60+
$updateData = [];
61+
if(!$reviewAssignment->getDateAcknowledged()) {
62+
$updateData['dateAcknowledged'] = Core::getCurrentDate();
63+
}
64+
if (!in_array($reviewAssignment->getConsidered(), [ReviewAssignment::REVIEW_ASSIGNMENT_CONSIDERED, ReviewAssignment::REVIEW_ASSIGNMENT_RECONSIDERED])) {
65+
$updateData['considered'] = ($reviewAssignment->getConsidered() === ReviewAssignment::REVIEW_ASSIGNMENT_NEW ||
66+
$reviewAssignment->getConsidered() === ReviewAssignment::REVIEW_ASSIGNMENT_VIEWED)
67+
? ReviewAssignment::REVIEW_ASSIGNMENT_CONSIDERED
68+
: ReviewAssignment::REVIEW_ASSIGNMENT_RECONSIDERED;
69+
}
70+
71+
if(!$reviewAssignment->getDateConsidered()) {
72+
// set the date when the editor confirms the review
73+
$updateData['dateConsidered'] = Core::getCurrentDate();
74+
}
75+
76+
if(!empty($updateData)) {
77+
Repo::reviewAssignment()->edit($reviewAssignment, $updateData);
78+
}
79+
6380
}
6481
}
6582

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,16 @@ public function execute(...$functionArgs)
149149
// update the ReviewAssignment with the acknowledged date
150150
$newData = ['dateAcknowledged' => Core::getCurrentDate()];
151151
if (!in_array($reviewAssignment->getConsidered(), [ReviewAssignment::REVIEW_ASSIGNMENT_CONSIDERED, ReviewAssignment::REVIEW_ASSIGNMENT_RECONSIDERED])) {
152-
$newData['considered'] = $reviewAssignment->getConsidered() === ReviewAssignment::REVIEW_ASSIGNMENT_NEW
152+
$newData['considered'] = ($reviewAssignment->getConsidered() === ReviewAssignment::REVIEW_ASSIGNMENT_NEW ||
153+
$reviewAssignment->getConsidered() === ReviewAssignment::REVIEW_ASSIGNMENT_VIEWED)
153154
? ReviewAssignment::REVIEW_ASSIGNMENT_CONSIDERED
154155
: ReviewAssignment::REVIEW_ASSIGNMENT_RECONSIDERED;
155156
}
156157

157-
// set the date when the editor confirms the review
158-
$newData['dateConsidered'] = Core::getCurrentDate();
158+
if(!$reviewAssignment->getDateConsidered()) {
159+
// set the date when the editor confirms the review
160+
$newData['dateConsidered'] = Core::getCurrentDate();
161+
}
159162

160163
Repo::reviewAssignment()->edit($reviewAssignment, $newData);
161164

0 commit comments

Comments
 (0)