Merge branch 'removeIncompleteSubmissions340-858' into 'main'

Retrieving of submissions only considers completed ones

See merge request softwares-pkp/plugins_ojs/relatorioscielo!38

Author: JhonathanLepidus

classes/ScieloSubmissionsDAO.php

@@ -24,16 +24,17 @@ class ScieloSubmissionsDAO extends DAO
 
     public function getSubmissions($locale, $contextId, $sectionsIds, $submissionDateInterval, $finalDecisionDateInterval)
     {
-        $query = DB::table('submissions')
-            ->join('publications', 'submissions.current_publication_id', '=', 'publications.publication_id')
-            ->where('submissions.context_id', $contextId)
-            ->whereNotNull('submissions.date_submitted')
-            ->whereIn('publications.section_id', $sectionsIds)
-            ->select('submissions.submission_id');
+        $query = DB::table('submissions AS s')
+            ->join('publications AS p', 's.current_publication_id', '=', 'p.publication_id')
+            ->where('s.context_id', $contextId)
+            ->where('s.submission_progress', '=', '')
+            ->whereNotNull('s.date_submitted')
+            ->whereIn('p.section_id', $sectionsIds)
+            ->select('s.submission_id');
 
         if (!is_null($submissionDateInterval)) {
-            $query = $query->where('submissions.date_submitted', '>=', $submissionDateInterval->getBeginningDate())
-                ->where('submissions.date_submitted', '<=', $submissionDateInterval->getEndDate());
+            $query = $query->where('s.date_submitted', '>=', $submissionDateInterval->getBeginningDate())
+                ->where('s.date_submitted', '<=', $submissionDateInterval->getEndDate());
         }
 
         $result = $query->get();

tests/ScieloSubmissionsReportFactoryTest.php

@@ -93,7 +93,11 @@ private function createSubmission($dateSubmitted = null, $finalDecisions = []):
 
         if (!is_null($dateSubmitted)) {
             $submission->setData('dateSubmitted', $dateSubmitted);
+            $submission->setData('submissionProgress', '');
+        } else {
+            $submission->setData('submissionProgress', 'start');
         }
+
         $submissionId = Repo::submission()->dao->insert($submission);
 
         if (!empty($finalDecisions)) {

version.xml

@@ -4,8 +4,8 @@
 <version>
 	<application>scieloSubmissionsReport</application>
 	<type>plugins.reports</type>
-	<release>3.0.5.1</release>
-	<date>2025-10-06</date>
+	<release>3.0.5.2</release>
+	<date>2025-11-24</date>
 	<lazy-load>1</lazy-load>
 	<class>ScieloSubmissionsReportPlugin</class>
 </version>