Skip to content
Snippets Groups Projects
Verified Commit abe51e18 authored by Damien's avatar Damien
Browse files

FEAT #8218 Home last 5 mails

parent c9c9914c
No related branches found
No related tags found
No related merge requests found
...@@ -28,10 +28,10 @@ abstract class HistoryModelAbstract ...@@ -28,10 +28,10 @@ abstract class HistoryModelAbstract
$aHistories = DatabaseModel::select([ $aHistories = DatabaseModel::select([
'select' => $aArgs['select'], 'select' => $aArgs['select'],
'table' => ['history'], 'table' => ['history'],
'where' => $aArgs['where'], 'where' => empty($aArgs['where']) ? [] : $aArgs['where'],
'data' => $aArgs['data'], 'data' => empty($aArgs['data']) ? [] : $aArgs['data'],
'order_by' => $aArgs['orderBy'], 'order_by' => empty($aArgs['orderBy']) ? [] : $aArgs['orderBy'],
'limit' => $aArgs['limit'] 'limit' => empty($aArgs['limit']) ? 0 : $aArgs['limit']
]); ]);
return $aHistories; return $aHistories;
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
namespace Home\controllers; namespace Home\controllers;
use Basket\models\BasketModel; use Basket\models\BasketModel;
use Resource\models\ResModel;
use Slim\Http\Request; use Slim\Http\Request;
use Slim\Http\Response; use Slim\Http\Response;
use User\models\UserModel; use User\models\UserModel;
...@@ -74,6 +75,11 @@ class HomeController ...@@ -74,6 +75,11 @@ class HomeController
$assignedBaskets[$key]['resourceNumber'] = BasketModel::getResourceNumberByClause(['userId' => $assignedBasket['user_abs'], 'clause' => $basket['basket_clause']]); $assignedBaskets[$key]['resourceNumber'] = BasketModel::getResourceNumberByClause(['userId' => $assignedBasket['user_abs'], 'clause' => $basket['basket_clause']]);
} }
return $response->withJson(['regroupedBaskets' => $regroupedBaskets, 'assignedBaskets' => $assignedBaskets]); $lastResources = ResModel::getLastResources([
'select' => ['res_letterbox.res_id', 'res_letterbox.subject', 'res_letterbox.creation_date'],
'number' => 5
]);
return $response->withJson(['regroupedBaskets' => $regroupedBaskets, 'assignedBaskets' => $assignedBaskets, 'lastResources' => $lastResources]);
} }
} }
...@@ -169,6 +169,31 @@ abstract class ResModelAbstract ...@@ -169,6 +169,31 @@ abstract class ResModelAbstract
return true; return true;
} }
public static function getLastResources(array $aArgs)
{
ValidatorModel::notEmpty($aArgs, ['number', 'select']);
ValidatorModel::intType($aArgs, ['number']);
ValidatorModel::arrayType($aArgs, ['select']);
$resources = DatabaseModel::select([
'select' => $aArgs['select'],
'table' => ['history, res_letterbox, mlb_coll_ext'],
'where' => [
'history.record_id IS NOT NULL', 'history.record_id != ?',
'CAST(history.record_id AS INT) = res_letterbox.res_id',
'mlb_coll_ext.res_id = res_letterbox.res_id',
'history.event_id != ?', 'history.event_id NOT LIKE ?',
'history.table_name IN (?)', 'res_letterbox.status != ?'
],
'data' => ['none', 'linkup', 'attach%', ['res_letterbox', 'res_view_letterbox'], 'DEL'],
'group_by' => ['res_letterbox.res_id'],
'order_by' => ['MAX(history.event_date) DESC'],
'limit' => $aArgs['number']
]);
return $resources;
}
public static function isLock(array $aArgs) public static function isLock(array $aArgs)
{ {
ValidatorModel::notEmpty($aArgs, ['resId', 'userId']); ValidatorModel::notEmpty($aArgs, ['resId', 'userId']);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment