From 01a6f744a7f25b68ae88a57c9235c3c60739949c Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Tue, 2 Apr 2024 21:40:47 +0000
Subject: [PATCH] template fixes + bug fixes + style fixes

---
 Controller/BackendController.php         | 16 +++++------
 Theme/Backend/Lang/de.lang.php           | 36 ++++++++++++------------
 Theme/Backend/Lang/en.lang.php           | 36 ++++++++++++------------
 Theme/Backend/contract-list.tpl.php      |  4 +--
 Theme/Backend/contract-type-list.tpl.php |  2 +-
 5 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 09595a8..08d12d2 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -61,9 +61,9 @@ final class BackendController extends Controller
             ->limit(25);
 
         if ($request->getData('ptype') === 'p') {
-            $view->data['contracts'] = $mapper->where('id', $request->getDataInt('id') ?? 0, '<')->execute();
+            $view->data['contracts'] = $mapper->where('id', $request->getDataInt('offset') ?? 0, '<')->execute();
         } elseif ($request->getData('ptype') === 'n') {
-            $view->data['contracts'] = $mapper->where('id', $request->getDataInt('id') ?? 0, '>')->execute();
+            $view->data['contracts'] = $mapper->where('id', $request->getDataInt('offset') ?? 0, '>')->execute();
         } else {
             $view->data['contracts'] = $mapper->where('id', 0, '>')->execute();
         }
@@ -96,9 +96,9 @@ final class BackendController extends Controller
             ->limit(25);
 
         if ($request->getData('ptype') === 'p') {
-            $view->data['types'] = $mapper->where('id', $request->getDataInt('id') ?? 0, '<')->execute();
+            $view->data['types'] = $mapper->where('id', $request->getDataInt('offset') ?? 0, '<')->execute();
         } elseif ($request->getData('ptype') === 'n') {
-            $view->data['types'] = $mapper->where('id', $request->getDataInt('id') ?? 0, '>')->execute();
+            $view->data['types'] = $mapper->where('id', $request->getDataInt('offset') ?? 0, '>')->execute();
         } else {
             $view->data['types'] = $mapper->where('id', 0, '>')->execute();
         }
@@ -172,20 +172,20 @@ final class BackendController extends Controller
             ->with('account')
             ->where('parent', (int) $request->getData('id'))
             ->sort('createdAt', OrderType::DESC)
-            ->execute();
+            ->executeGetArray();
 
         $view->data['contractTypes'] = ContractTypeMapper::getAll()
             ->with('l11n')
             ->where('l11n/language', $response->header->l11n->language)
-            ->execute();
+            ->executeGetArray();
 
         $view->data['units'] = UnitMapper::getAll()
-            ->execute();
+            ->executeGetArray();
 
         $view->data['attributeTypes'] = ContractAttributeTypeMapper::getAll()
             ->with('l11n')
             ->where('l11n/language', $response->header->l11n->language)
-            ->execute();
+            ->executeGetArray();
 
         $view->data['editor']       = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
         $view->data['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response);
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
index 3038944..7c7279b 100755
--- a/Theme/Backend/Lang/de.lang.php
+++ b/Theme/Backend/Lang/de.lang.php
@@ -13,22 +13,22 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'     => 'Account',
-    'AutoRenewal' => 'Automatische Verlängerung',
-    'Contract'    => 'Vertrag',
-    'Contracts'   => 'Verträge',
-    'Costs'       => 'Kosten',
-    'Description' => 'Beschreibung',
-    'End'         => 'Ende',
-    'Files'       => 'Dateien',
-    'Name'        => 'Name',
-    'Overview'    => 'Übersicht',
-    'Parties'     => 'Parteien',
-    'Start'       => 'Start',
-    'Termination' => 'Beendigung',
-    'Title'       => 'Titel',
-    'Type'        => 'Typ',
-    'Unit'        => 'Unit',
-    'With'        => 'Mit',
-    'ContractTypes'        => 'Vertragsarten',
+    'Account'       => 'Account',
+    'AutoRenewal'   => 'Automatische Verlängerung',
+    'Contract'      => 'Vertrag',
+    'Contracts'     => 'Verträge',
+    'Costs'         => 'Kosten',
+    'Description'   => 'Beschreibung',
+    'End'           => 'Ende',
+    'Files'         => 'Dateien',
+    'Name'          => 'Name',
+    'Overview'      => 'Übersicht',
+    'Parties'       => 'Parteien',
+    'Start'         => 'Start',
+    'Termination'   => 'Beendigung',
+    'Title'         => 'Titel',
+    'Type'          => 'Typ',
+    'Unit'          => 'Unit',
+    'With'          => 'Mit',
+    'ContractTypes' => 'Vertragsarten',
 ]];
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index b562737..0a3d7a0 100755
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -13,22 +13,22 @@
 declare(strict_types=1);
 
 return ['ContractManagement' => [
-    'Account'     => 'Account',
-    'AutoRenewal' => 'Auto Renewal',
-    'Contract'    => 'Contract',
-    'Contracts'   => 'Contracts',
-    'Costs'       => 'Costs',
-    'Description' => 'Description',
-    'End'         => 'End',
-    'Files'       => 'Files',
-    'Name'        => '',
-    'Overview'    => 'Overview',
-    'Parties'     => 'Parties',
-    'Start'       => 'Start',
-    'Termination' => 'Termination',
-    'Title'       => 'Title',
-    'Type'        => 'Type',
-    'Unit'        => 'Unit',
-    'With'        => 'With',
-    'ContractTypes'        => 'Contract Types',
+    'Account'       => 'Account',
+    'AutoRenewal'   => 'Auto Renewal',
+    'Contract'      => 'Contract',
+    'Contracts'     => 'Contracts',
+    'Costs'         => 'Costs',
+    'Description'   => 'Description',
+    'End'           => 'End',
+    'Files'         => 'Files',
+    'Name'          => '',
+    'Overview'      => 'Overview',
+    'Parties'       => 'Parties',
+    'Start'         => 'Start',
+    'Termination'   => 'Termination',
+    'Title'         => 'Title',
+    'Type'          => 'Type',
+    'Unit'          => 'Unit',
+    'With'          => 'With',
+    'ContractTypes' => 'Contract Types',
 ]];
diff --git a/Theme/Backend/contract-list.tpl.php b/Theme/Backend/contract-list.tpl.php
index a5d2010..c9b3dff 100755
--- a/Theme/Backend/contract-list.tpl.php
+++ b/Theme/Backend/contract-list.tpl.php
@@ -20,8 +20,8 @@ use phpOMS\Uri\UriFactory;
  */
 $contracts = $this->data['contracts'] ?? [];
 
-$previous = empty($contracts) ? '{/base}/contract/list' : '{/base}/contract/list?{?}&id=' . \reset($contracts)->id . '&ptype=p';
-$next     = empty($contracts) ? '{/base}/contract/list' : '{/base}/contract/list?{?}&id=' . \end($contracts)->id . '&ptype=n';
+$previous = empty($contracts) ? '{/base}/contract/list' : '{/base}/contract/list?{?}&offset=' . \reset($contracts)->id . '&ptype=p';
+$next     = empty($contracts) ? '{/base}/contract/list' : '{/base}/contract/list?{?}&offset=' . \end($contracts)->id . '&ptype=n';
 
 $now = new \DateTime('now');
 
diff --git a/Theme/Backend/contract-type-list.tpl.php b/Theme/Backend/contract-type-list.tpl.php
index 0bdee36..c7a9775 100644
--- a/Theme/Backend/contract-type-list.tpl.php
+++ b/Theme/Backend/contract-type-list.tpl.php
@@ -24,7 +24,7 @@ echo $this->data['nav']->render(); ?>
         <section class="portlet">
             <div class="portlet-head">
                 <?= $this->getHtml('ContractTypes'); ?>
-                <a class="button end-xs save" href="<?= UriFactory::build('{/base}/'); ?>contract/type/create"><?= $this->getHtml('New', '0', '0'); ?></a>
+                <a class="button end-xs save" href="<?= UriFactory::build('{/base}/contract/type/create'); ?>"><?= $this->getHtml('New', '0', '0'); ?></a>
                 <i class="g-icon download btn end-xs">download</i>
             </div>
             <div class="slider">