Classes/Controller/BackendController.php

@@ -137,7 +137,7 @@ class BackendController extends ActionController
 
   public function showLast30Action()
   {
-    $activePagesExpiredInlast30days = $this->activePageRepository->findExpiredRecordsInTheLast30Days();
+    $activePagesExpiredInlast30days = $this->activePageRepository->findExpiredRecordsInTheLast30OR90Days(30);
     $itemsperpage = $this->settings['itemsPerPage'] ?? 50;
 
     $pageObjectArray = [];
@@ -165,7 +165,7 @@ class BackendController extends ActionController
 
   public function showLast90Action()
   {
-    $activePagesExpiredInlast90days = $this->activePageRepository->findExpiredRecordsInTheLast90Days();
+    $activePagesExpiredInlast90days = $this->activePageRepository->findExpiredRecordsInTheLast30OR90Days(90);
     $itemsperpage = $this->settings['itemsPerPage'] ?? 50;
 
     $pageObjectArray = [];
@@ -204,6 +204,20 @@ class BackendController extends ActionController
     $totalNumberOfRecords = count($activePages);
 
     $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(
       [
@@ -213,6 +227,7 @@ class BackendController extends ActionController
         'paginator' => $arrayPaginator,
         'paging' => $paging,
         'pages' => range(1, $paging->getLastPageNumber()),
+        'actionName' => $actionName
       ]
     );
   }

Classes/Domain/Repository/ActivePageRepository.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Meramo\Pagemanager\Domain\Repository;
 
-use Meramo\Pagemanager\Domain\Model\ActivePage;
 use TYPO3\CMS\Extbase\Persistence\Repository;
 use \TYPO3\CMS\Extbase\Persistence\Generic\QueryResult;
 use TYPO3\CMS\Core\Database\ConnectionPool;
@@ -34,16 +33,6 @@ class ActivePageRepository extends Repository
     $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
     $queryBuilder->getRestrictions()->removeAll();
 
-    /*
-    SELECT p.uid, p.starttime, p.endtime, p.title, p.roof, u.username, u.realName
-    FROM pages p LEFT JOIN be_users u ON p.cruser_id = u.uid
-    WHERE p.starttime > 0 AND p.endtime > 0 and p.red_status = 12 and p.deleted = 0 and p.hidden = 0
-    GROUP BY p.slug ORDER BY p.endtime ASC;
-
-    SELECT `p`.`uid`, `p`.`starttime`, `p`.`endtime`, `p`.`title`, `p`.`roof`, `p`.`slug`, `u`.`username`, `u`.`realName` FROM `pages` `p` LEFT JOIN `be_users` `u` ON `p`.`cruser_id` = `u`.`uid` WHERE (`p`.`starttime` > 0) 
-    AND (`p`.`endtime` <= 1683040238) AND (`p`.`red_status` = 12) AND (`p`.`deleted` = 0) AND (`p`.`hidden` = 0) GROUP BY `p`.`slug` ORDER BY `p`.`endtime` ASC
-    */
-
     $statement = $queryBuilder
       ->select('p.uid', 'p.starttime', 'p.endtime', 'p.title', 'p.roof', 'p.slug', 'u.username', 'u.realName')
       ->from('pages', 'p')
@@ -69,46 +58,7 @@ class ActivePageRepository extends Repository
     return $result->fetchAllAssociative();
   }
 
-  /**
-   * Queries the pages and be_users to get Records which expired in the last 30 days
-   * 
-   * @return QueryResult|array
-   */
-
-  public function findExpiredRecordsInTheLast30Days()
-  {
-    $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
-    $queryBuilder->getRestrictions()->removeAll();
-
-    $currentDate = new \DateTime("now");
-    $last30Days = $currentDate->sub(new \DateInterval('P30D'));
-    $timestamp = date_format($last30Days, 'U');
-
-    $statement = $queryBuilder
-      ->select('p.uid', 'p.starttime', 'p.endtime', 'p.title', 'p.roof', 'p.slug', 'u.username', 'u.realName')
-      ->from('pages', 'p')
-      //->from('be_users', 'u')
-      ->leftJoin(
-        'p',
-        'be_users',
-        'u',
-        $queryBuilder->expr()->eq('p.cruser_id', $queryBuilder->quoteIdentifier('u.uid'))
-      )
-      ->where(
-        $queryBuilder->expr()->gt('p.starttime', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-        $queryBuilder->expr()->lt('p.endtime', $queryBuilder->createNamedParameter($timestamp, \PDO::PARAM_INT)),
-        $queryBuilder->expr()->eq('p.red_status', $queryBuilder->createNamedParameter(12, \PDO::PARAM_INT)),
-        $queryBuilder->expr()->eq('p.deleted', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-        $queryBuilder->expr()->eq('p.hidden', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT))
-      )
-      ->groupBy('p.slug')
-      ->orderBy('p.endtime', 'ASC');
-
-    $result = $statement->execute();
-
-    return $result->fetchAllAssociative();
-  }
-
+  
 
   /**
    * Queries the pages and be_users to get Records which expired in the last 30 days
@@ -116,38 +66,30 @@ class ActivePageRepository extends Repository
    * @return QueryResult|array
    */
 
-  public function findExpiredRecordsInTheLast90Days()
+  public function findExpiredRecordsInTheLast30OR90Days(int $daysPasst)
   {
-    $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
-    $queryBuilder->getRestrictions()->removeAll();
-
     $currentDate = new \DateTime("now");
-    $last90Days = $currentDate->sub(new \DateInterval('P90D'));
-    $timestamp = date_format($last90Days, 'U');
-
-    $statement = $queryBuilder
-      ->select('p.uid', 'p.starttime', 'p.endtime', 'p.title', 'p.roof', 'p.slug', 'u.username', 'u.realName')
-      ->from('pages', 'p')
-      //->from('be_users', 'u')
-      ->leftJoin(
-        'p',
-        'be_users',
-        'u',
-        $queryBuilder->expr()->eq('p.cruser_id', $queryBuilder->quoteIdentifier('u.uid'))
-      )
-      ->where(
-        $queryBuilder->expr()->gt('p.starttime', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-        $queryBuilder->expr()->lt('p.endtime', $queryBuilder->createNamedParameter($timestamp, \PDO::PARAM_INT)),
-        $queryBuilder->expr()->eq('p.red_status', $queryBuilder->createNamedParameter(12, \PDO::PARAM_INT)),
-        $queryBuilder->expr()->eq('p.deleted', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-        $queryBuilder->expr()->eq('p.hidden', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT))
-      )
-      ->groupBy('p.slug')
-      ->orderBy('p.endtime', 'ASC');
-
-      var_dump($queryBuilder->getSQL());
-
-    $result = $statement->execute();
+    $period = ($daysPasst == 30) ? 'P30D' : 'P90D';
+    
+    $timeperiod = $currentDate->sub(new \DateInterval($period));
+    $timestamp = date_format($timeperiod, 'U');
+
+    $connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable('pages');
+
+    $sql = sprintf(
+      'SELECT `p`.`uid`, `p`.`starttime`, `p`.`endtime`, `p`.`title`, `p`.`roof`, `p`.`slug`, `u`.`username`, `u`.`realName`
+       FROM `pages` `p` LEFT JOIN `be_users` `u` on `p`.`cruser_id` = `u`.`uid`
+       WHERE `p`.`starttime` > 0  
+       AND `p`.`red_status` = 22 
+       AND `p`.`deleted` = 0 
+       AND `p`.`hidden` = 1
+       AND (`p`.`endtime` BETWEEN 1 AND %d )
+       GROUP BY `p`.`slug`
+       ORDER BY `p`.`endtime` ASC', $timestamp);
+
+    //var_dump($sql);
+    $statement  = $connection->prepare($sql);
+    $result = $statement->executeQuery();
 
     return $result->fetchAllAssociative();
   }

Resources/Private/Language/locallang.xlf

@@ -27,6 +27,12 @@
       <trans-unit id="pagemanager.fullname">
 				<source>Name</source>
 			</trans-unit>
+      <trans-unit id="pagemanager.paging.first">
+				<source>Erste Seite</source>
+			</trans-unit>
+      <trans-unit id="pagemanager.paging.last">
+				<source>Letzte Seite</source>
+			</trans-unit>
 		</body>
 	</file>
 </xliff>

Resources/Private/Partials/Paging.html

@@ -1,20 +1,21 @@
 <div class="row d-flex justify-content-center">
   <div class="col-sm-4">
     <span>Anzahl der Einträge: {totalrecords}</span>
-    <span>Current Page Number: {paginator.currentPageNumber}</span>
+    <span>Aktuell Seitenummer: {paginator.currentPageNumber}</span>
   </div>
   <div class="col-sm-8">
   <ul class="pagination">
     <f:if condition="{paging.previousPageNumber} && {paging.previousPageNumber} >= {paging.firstPageNumber}">
       <f:then>
         <li class="waves-effect list-group">
-          <a href="{f:uri.action(action:actionName, arguments:{currentPage: 1})}"
-            title="{f:translate(key:'paging.first')}">
+          <a href="{f:uri.action(action: actionName, arguments:{currentPage: 1})}"
+            title="{f:translate(key:'pagemanager.paging.first')}">
             <i class="material-icons">first_page</i>
           </a>
         </li>
         <li class="waves-effect list-group">
-          <a href="{f:uri.action(action:actionName, arguments:{currentPage: paging.previousPageNumber})}">
+          <a href="{f:uri.action(action: actionName, arguments:{currentPage: paging.previousPageNumber})}"
+            title="{f:translate(key:'pagemanager.paging.prevoius')}">
             <i class="material-icons">chevron_left</i>
           </a>
         </li>
@@ -31,20 +32,22 @@
 
     <li><span class="pageNumbers">Seite {paginator.currentPageNumber} von {paging.lastPageNumber} |</span></li>
     <f:for each="{pages}" as="page">
-      <li class="{f:if(condition: '{pages} == {paginator.currentPageNumber}', then:'active', else: 'waves-effect')}">
-        <a class="hide" href="{f:uri.action(action:actionName, arguments:{currentPage: page})}">{page}</a>
+      <li class="{f:if(condition: '{page} == {paginator.currentPageNumber}', then:'active', else: 'waves-effect')}">
+        <a class="hide" href="{f:uri.action(action: actionName, arguments:{currentPage: page})}">{page}</a>
       </li>
     </f:for>
 
     <f:if condition="{paging.nextPageNumber} && {paging.nextPageNumber} <= {paging.lastPageNumber}">
       <f:then>
         <li class="waves-effect list-group">
-          <a href="{f:uri.action(action:actionName, arguments:{currentPage: paging.nextPageNumber})}">
+          <a href="{f:uri.action(action: actionName, arguments:{currentPage: paging.nextPageNumber})}"
+            title="{f:translate(key:'pagemanager.paging.next')}">
             <i class="material-icons">chevron_right</i>
           </a>
         </li>
         <li class="waves-effect list-group">
-          <a href="{f:uri.action(action:actionName, arguments:{currentPage: paging.lastPageNumber})}">
+          <a href="{f:uri.action(action: actionName, arguments:{currentPage: paging.lastPageNumber})}"
+          title="{f:translate(key:'pagemanager.paging.last')}">
             <i class="material-icons">last_page</i>
           </a>
         </li>

Resources/Private/Templates/Backend/Index.html

@@ -50,7 +50,7 @@
         </f:if>
     </table>
     <!-- Render your paging -->
-    <f:render partial="Paging.html" arguments="{totalrecords: totalRecords, cpage: cPage, paging: paging, pages: pages, paginator: paginator}" />
+    <f:render partial="Paging.html" arguments="{totalrecords: totalRecords, cpage: cPage, paging: paging, pages: pages, paginator: paginator, actionName: actionName}" />
 
 </f:section>
 

Resources/Private/Templates/Backend/ShowLast30.html

@@ -47,6 +47,5 @@
         </f:if>
     </table>
     <!-- Render your paging -->
-    <f:render partial="Paging.html" arguments="{totalrecords: totalRecords, cpage: cPage, paging: paging, pages: pages, paginator: paginator}" />
-
+    <f:render partial="Paging.html" arguments="{totalrecords: totalRecords, cpage: cPage, paging: paging, pages: pages, paginator: paginator, actionName: actionName}" />
 </f:section>

Resources/Private/Templates/Backend/ShowLast90.html

@@ -47,6 +47,6 @@
         </f:if>
     </table>
     <!-- Render your paging -->
-    <f:render partial="Paging.html" arguments="{totalrecords: totalRecords, cpage: cPage, paging: paging, pages: pages, paginator: paginator}" />
+    <f:render partial="Paging.html" arguments="{totalrecords: totalRecords, cpage: cPage, paging: paging, pages: pages, paginator: paginator, actionName: actionName}" />
 
 </f:section>