FEAT #13501 TIME 0:30 Fix last resources without priority

src/app/home/controllers/HomeController.php

@@ -17,6 +17,7 @@ namespace Home\controllers;
 use Basket\models\BasketModel;
 use Basket\models\RedirectBasketModel;
 use Group\models\GroupModel;
+use Priority\models\PriorityModel;
 use Resource\models\ResModel;
 use Slim\Http\Request;
 use Slim\Http\Response;
@@ -131,25 +132,35 @@ class HomeController
     {
         $lastResources = ResModel::getLastResources([
             'select'    => [
-                'r.alt_identifier',
-                'r.closing_date',
-                'r.creation_date',
-                'priorities.color as priority_color',
-                'r.process_limit_date',
-                'r.res_id',
-                'r.confidentiality',
+                'res_letterbox.alt_identifier',
+                'res_letterbox.closing_date',
+                'res_letterbox.creation_date',
+                'res_letterbox.priority',
+                'res_letterbox.process_limit_date',
+                'res_letterbox.res_id',
+                'res_letterbox.subject',
+                'res_letterbox.confidentiality',
                 'status.img_filename as status_icon',
                 'status.label_status as status_label',
-                'status.id as status_id',
-                'r.subject',
+                'status.id as status_id'
             ],
             'limit'     => 5,
             'userId'    => $GLOBALS['userId']
         ]);
+        $priorities = array_column($lastResources, 'priority');
+        $priorities = PriorityModel::get(['select' => ['id', 'color'], 'where' => ['id in (?)'], 'data' => [$priorities]]);
+
+        foreach ($lastResources as $key => $lastResource) {
+            if (!empty($lastResource['priority'])) {
+                foreach ($priorities as $priority) {
+                    if ($lastResource['priority'] == $priority['id']) {
+                        $lastResources[$key]['priority_color'] = $priority['color'];
+                    }
+                }
+            }
+        }
 
-        return $response->withJson([
-            'lastResources'     => $lastResources,
-        ]);
+        return $response->withJson(['lastResources' => $lastResources]);
     }
 
     public function getMaarchParapheurDocuments(Request $request, Response $response)

src/app/resource/models/ResModelAbstract.php

@@ -133,18 +133,17 @@ abstract class ResModelAbstract
 
         $resources = DatabaseModel::select([
             'select'    => $aArgs['select'],
-            'table'     => ['history, res_letterbox r, status, priorities'],
+            'table'     => ['history, res_letterbox, status'],
             'where'     => [
                 'history.user_id = ?', 'history.table_name IN (?)',
                 'history.record_id IS NOT NULL', 'history.record_id != ?',
                 'history.event_id != ?', 'history.event_id NOT LIKE ?',
-                'CAST(history.record_id AS INT) = r.res_id',
-                'r.res_id = r.res_id', 'r.status != ?',
-                'r.status = status.id',
-                'r.priority = priorities.id'
+                'CAST(history.record_id AS INT) = res_letterbox.res_id',
+                'res_letterbox.status != ?',
+                'res_letterbox.status = status.id'
             ],
             'data'      => [$aArgs['userId'], ['res_letterbox', 'res_view_letterbox'], 'none', 'linkup', 'attach%', 'DEL'],
-            'groupBy'   => ['r.subject', 'r.creation_date', 'r.res_id', 'r.alt_identifier', 'r.closing_date', 'r.process_limit_date', 'status.id', 'status.label_status', 'status.img_filename', 'priorities.color', 'priorities.label'],
+            'groupBy'   => ['res_letterbox.subject', 'res_letterbox.creation_date', 'res_letterbox.res_id', 'res_letterbox.alt_identifier', 'res_letterbox.closing_date', 'res_letterbox.process_limit_date', 'status.id', 'status.label_status', 'status.img_filename'],
             'order_by'  => ['MAX(history.event_date) DESC'],
             'limit'     => $aArgs['limit']
         ]);