pkp/pkp-lib#8887 Review assignments refactoring

Vitaliy-1 · Oct 20, 2023 · 05343ce · 05343ce
1 parent b1a84d3
commit 05343ce
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 4 deletions.
diff --git a/classes/facades/Repo.php b/classes/facades/Repo.php
@@ -25,6 +25,7 @@
 use APP\user\Repository as UserRepository;
 use PKP\facades\Repo as BaseRepo;
 use PKP\galley\Repository as GalleyRepository;
+use PKP\submission\reviewAssignment\Repository as ReviewAssignmentRepository;
 
 class Repo extends BaseRepo
 {
@@ -77,4 +78,9 @@ public static function mailable(): MailRepository
     {
         return app(MailRepository::class);
     }
+
+    public static function reviewAssignment(): ReviewAssignmentRepository
+    {
+        return app(ReviewAssignmentRepository::class);
+    }
 }
diff --git a/locale/en/submission.po b/locale/en/submission.po
@@ -420,3 +420,60 @@ msgstr ""
 
 msgid "submission.submit.form.contributorRoleRequired"
 msgstr "Please select the contributor's role."
+
+msgid "submission.dashboard.view.assigned"
+msgstr "Assigned to me"
+
+msgid "submission.dashboard.view.active"
+msgstr "Active submissions"
+
+msgid "submission.dashboard.view.needsEditor"
+msgstr "Needs editor"
+
+msgid "submission.dashboard.view.initialReview"
+msgstr "All in desk/initial review"
+
+msgid "submission.dashboard.view.reviewExternal"
+msgstr "All in peer review"
+
+msgid "submission.dashboard.view.needsReviewer"
+msgstr "Needs reviewers"
+
+msgid "submission.dashboard.view.awaitingReviews"
+msgstr "Awaiting reviews"
+
+msgid "submission.dashboard.view.reviewsSubmitted"
+msgstr "Reviews submitted"
+
+msgid "submission.dashboard.view.copyediting"
+msgstr "All in copyediting"
+
+msgid "submission.dashboard.view.production"
+msgstr "All in production"
+
+msgid "submission.dashboard.view.scheduled"
+msgstr "Scheduled for publication"
+
+msgid "submission.dashboard.view.published"
+msgstr "Published"
+
+msgid "submission.dashboard.view.declined"
+msgstr "Declined"
+
+msgid "submission.dashboard.view.revisionsRequested"
+msgstr "Revisions requested"
+
+msgid "submission.dashboard.view.revisionsSubmitted"
+msgstr "Revisions submitted"
+
+msgid "submission.dashboard.view.incompleteSubmissions"
+msgstr "Incomplete submissions"
+
+msgid "submission.dashboard.view.reviewerAssignmentsAll"
+msgstr "All assignments"
+
+msgid "submission.dashboard.view.reviewerAssignmentsPending"
+msgstr "Pending"
+
+msgid "submission.dashboard.view.reviewerAssignmentsFinished"
+msgstr "Completed / Declined"
diff --git a/pages/reviewer/ReviewerHandler.php b/pages/reviewer/ReviewerHandler.php
@@ -22,15 +22,13 @@
 use APP\submission\reviewer\form\ReviewerReviewStep3Form;
 use APP\submission\Submission;
 use PKP\core\PKPRequest;
-use PKP\db\DAORegistry;
 use PKP\pages\reviewer\PKPReviewerHandler;
 use PKP\security\AccessKeyManager;
 use PKP\security\authorization\SubmissionAccessPolicy;
 use PKP\security\Role;
 use PKP\security\Validation;
 use PKP\session\SessionManager;
 use PKP\submission\reviewAssignment\ReviewAssignment;
-use PKP\submission\reviewAssignment\ReviewAssignmentDAO;
 use PKP\submission\reviewer\form\ReviewerReviewForm;
 use PKP\user\User;
 
@@ -99,8 +97,7 @@ protected function _validateAccessKey($request)
             return;
         }
 
-        $reviewAssignmentDao = DAORegistry::getDAO('ReviewAssignmentDAO'); /** @var ReviewAssignmentDAO $reviewAssignmentDao */
-        $reviewAssignment = $reviewAssignmentDao->getById($reviewId);
+        $reviewAssignment = Repo::reviewAssignment()->get($reviewId);
         if (!$reviewAssignment) {
             return;
         } // e.g. deleted review assignment