Merge pull request #10998 from Vitaliy-1/i10970_all_assignments

#10970 show completed reviews in all assignments
pkp · Feb 27, 2025 · 67d3087 · 67d3087
2 parents ba8ef58 + 4950d01
commit 67d3087
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/classes/submission/reviewAssignment/Collector.php b/classes/submission/reviewAssignment/Collector.php
@@ -329,7 +329,6 @@ public function getQueryBuilder(): Builder
         $q->when(
             $this->actionRequiredByReviewer || $this->isActive,
             fn (Builder $q) => $q
-                ->whereNull('ra.date_completed')
                 ->where('ra.declined', '<>', 1)
                 ->where('ra.cancelled', '<>', 1)
                 ->whereIn(
@@ -342,6 +341,7 @@ public function getQueryBuilder(): Builder
                             $this->actionRequiredByReviewer,
                             fn (Builder $q) => $q
                                 ->whereColumn('s.stage_id', 'ra.stage_id')
+                                ->whereNull('ra.date_completed')
                         )
                         ->when(
                             $this->isActive,