|
@@ -137,7 +137,7 @@ class BackendController extends ActionController
|
|
|
|
|
|
|
|
public function showLast30Action()
|
|
public function showLast30Action()
|
|
|
{
|
|
{
|
|
|
- $activePagesExpiredInlast30days = $this->activePageRepository->findExpiredRecordsInTheLast30Days();
|
|
|
|
|
|
|
+ $activePagesExpiredInlast30days = $this->activePageRepository->findExpiredRecordsInTheLast30OR90Days(30);
|
|
|
$itemsperpage = $this->settings['itemsPerPage'] ?? 50;
|
|
$itemsperpage = $this->settings['itemsPerPage'] ?? 50;
|
|
|
|
|
|
|
|
$pageObjectArray = [];
|
|
$pageObjectArray = [];
|
|
@@ -165,7 +165,7 @@ class BackendController extends ActionController
|
|
|
|
|
|
|
|
public function showLast90Action()
|
|
public function showLast90Action()
|
|
|
{
|
|
{
|
|
|
- $activePagesExpiredInlast90days = $this->activePageRepository->findExpiredRecordsInTheLast90Days();
|
|
|
|
|
|
|
+ $activePagesExpiredInlast90days = $this->activePageRepository->findExpiredRecordsInTheLast30OR90Days(90);
|
|
|
$itemsperpage = $this->settings['itemsPerPage'] ?? 50;
|
|
$itemsperpage = $this->settings['itemsPerPage'] ?? 50;
|
|
|
|
|
|
|
|
$pageObjectArray = [];
|
|
$pageObjectArray = [];
|
|
@@ -204,6 +204,20 @@ class BackendController extends ActionController
|
|
|
$totalNumberOfRecords = count($activePages);
|
|
$totalNumberOfRecords = count($activePages);
|
|
|
|
|
|
|
|
$cPage = $arrayPaginator->getCurrentPageNumber();
|
|
$cPage = $arrayPaginator->getCurrentPageNumber();
|
|
|
|
|
+ $controlleractionName = $this->request->getControllerActionName();
|
|
|
|
|
+ $actioName = '';
|
|
|
|
|
+
|
|
|
|
|
+ switch($controlleractionName) {
|
|
|
|
|
+ case 'index':
|
|
|
|
|
+ $actionName = 'index';
|
|
|
|
|
+ break;
|
|
|
|
|
+ case 'showLast30':
|
|
|
|
|
+ $actionName = 'showLast30';
|
|
|
|
|
+ break;
|
|
|
|
|
+ case 'showLast90':
|
|
|
|
|
+ $actionName = 'showLast90';
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
$this->view->assignMultiple(
|
|
$this->view->assignMultiple(
|
|
|
[
|
|
[
|
|
@@ -213,6 +227,7 @@ class BackendController extends ActionController
|
|
|
'paginator' => $arrayPaginator,
|
|
'paginator' => $arrayPaginator,
|
|
|
'paging' => $paging,
|
|
'paging' => $paging,
|
|
|
'pages' => range(1, $paging->getLastPageNumber()),
|
|
'pages' => range(1, $paging->getLastPageNumber()),
|
|
|
|
|
+ 'actionName' => $actionName
|
|
|
]
|
|
]
|
|
|
);
|
|
);
|
|
|
}
|
|
}
|