Continue with getter/setter cleanup

This commit is contained in:
Dennis Eichhorn 2023-05-30 15:44:14 +02:00
parent cc8117dda4
commit da2be763d2
13 changed files with 35 additions and 47 deletions

View File

@ -48,7 +48,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Accounting/Theme/Backend/entries'); $view->setTemplate('/Modules/Accounting/Theme/Backend/entries');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response);
return $view; return $view;
} }
@ -69,7 +69,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Accounting/Theme/Backend/journal-list'); $view->setTemplate('/Modules/Accounting/Theme/Backend/journal-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response);
return $view; return $view;
} }
@ -90,7 +90,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Accounting/Theme/Backend/stack-list'); $view->setTemplate('/Modules/Accounting/Theme/Backend/stack-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002605001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002605001, $request, $response);
return $view; return $view;
} }
@ -111,7 +111,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Accounting/Theme/Backend/stack-predefined-list'); $view->setTemplate('/Modules/Accounting/Theme/Backend/stack-predefined-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002605001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002605001, $request, $response);
return $view; return $view;
} }
@ -132,7 +132,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Accounting/Theme/Backend/stack-create'); $view->setTemplate('/Modules/Accounting/Theme/Backend/stack-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002605001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002605001, $request, $response);
return $view; return $view;
} }
@ -153,7 +153,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Accounting/Theme/Backend/stack-entries'); $view->setTemplate('/Modules/Accounting/Theme/Backend/stack-entries');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002605001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002605001, $request, $response);
return $view; return $view;
} }
@ -174,7 +174,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Accounting/Theme/Backend/stack-archive-list'); $view->setTemplate('/Modules/Accounting/Theme/Backend/stack-archive-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002605001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002605001, $request, $response);
return $view; return $view;
} }
@ -195,7 +195,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Accounting/Theme/Backend/gl-list'); $view->setTemplate('/Modules/Accounting/Theme/Backend/gl-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002604001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002604001, $request, $response);
return $view; return $view;
} }
@ -216,7 +216,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Accounting/Theme/Backend/gl-create'); $view->setTemplate('/Modules/Accounting/Theme/Backend/gl-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002604001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002604001, $request, $response);
return $view; return $view;
} }
@ -237,7 +237,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Accounting/Theme/Backend/gl-profile'); $view->setTemplate('/Modules/Accounting/Theme/Backend/gl-profile');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002604001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002604001, $request, $response);
return $view; return $view;
} }
@ -258,7 +258,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Accounting/Theme/Backend/gl-profile'); $view->setTemplate('/Modules/Accounting/Theme/Backend/gl-profile');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002604001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002604001, $request, $response);
return $view; return $view;
} }
@ -279,7 +279,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Accounting/Theme/Backend/gl-profile'); $view->setTemplate('/Modules/Accounting/Theme/Backend/gl-profile');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002604001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002604001, $request, $response);
return $view; return $view;
} }
@ -300,7 +300,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Accounting/Theme/Backend/gl-profile'); $view->setTemplate('/Modules/Accounting/Theme/Backend/gl-profile');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002604001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002604001, $request, $response);
return $view; return $view;
} }
@ -321,20 +321,14 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Accounting/Theme/Backend/costcenter-list'); $view->setTemplate('/Modules/Accounting/Theme/Backend/costcenter-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002602001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002602001, $request, $response);
if ($request->getData('ptype') === 'p') { if ($request->getData('ptype') === 'p') {
$view->setData('costcenter', $view->data['costcenter'] = CostCenterMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '<')->limit(25)->execute();
CostCenterMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '<')->limit(25)->execute()
);
} elseif ($request->getData('ptype') === 'n') { } elseif ($request->getData('ptype') === 'n') {
$view->setData('costcenter', $view->data['costcenter'] = CostCenterMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '>')->limit(25)->execute();
CostCenterMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '>')->limit(25)->execute()
);
} else { } else {
$view->setData('costcenter', $view->data['costcenter'] = CostCenterMapper::getAll()->where('id', 0, '>')->limit(25)->execute();
CostCenterMapper::getAll()->where('id', 0, '>')->limit(25)->execute()
);
} }
return $view; return $view;
@ -356,20 +350,14 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Accounting/Theme/Backend/costobject-list'); $view->setTemplate('/Modules/Accounting/Theme/Backend/costobject-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002603001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002603001, $request, $response);
if ($request->getData('ptype') === 'p') { if ($request->getData('ptype') === 'p') {
$view->setData('costobject', $view->data['costobject'] = CostObjectMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '<')->limit(25)->execute();
CostObjectMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '<')->limit(25)->execute()
);
} elseif ($request->getData('ptype') === 'n') { } elseif ($request->getData('ptype') === 'n') {
$view->setData('costobject', $view->data['costobject'] = CostObjectMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '>')->limit(25)->execute();
CostObjectMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '>')->limit(25)->execute()
);
} else { } else {
$view->setData('costobject', $view->data['costobject'] = CostObjectMapper::getAll()->where('id', 0, '>')->limit(25)->execute();
CostObjectMapper::getAll()->where('id', 0, '>')->limit(25)->execute()
);
} }
return $view; return $view;

View File

@ -18,12 +18,12 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
* @var \Modules\Tag\Models\CostCenter[] $costcenter * @var \Modules\Tag\Models\CostCenter[] $costcenter
*/ */
$costcenter = $this->getData('costcenter'); $costcenter = $this->data['costcenter'];
$previous = empty($costcenter) ? '{/base}/tag/list' : '{/base}/tag/list?{?}&id=' . \reset($costcenter)->id . '&ptype=p'; $previous = empty($costcenter) ? '{/base}/tag/list' : '{/base}/tag/list?{?}&id=' . \reset($costcenter)->id . '&ptype=p';
$next = empty($costcenter) ? '{/base}/tag/list' : '{/base}/tag/list?{?}&id=' . \end($costcenter)->id . '&ptype=n'; $next = empty($costcenter) ? '{/base}/tag/list' : '{/base}/tag/list?{?}&id=' . \end($costcenter)->id . '&ptype=n';
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="portlet"> <div class="portlet">

View File

@ -18,12 +18,12 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
* @var \Modules\Tag\Models\CostObject[] $costobject * @var \Modules\Tag\Models\CostObject[] $costobject
*/ */
$costobject = $this->getData('costobject'); $costobject = $this->data['costobject'];
$previous = empty($costobject) ? '{/base}/tag/list' : '{/base}/tag/list?{?}&id=' . \reset($costobject)->id . '&ptype=p'; $previous = empty($costobject) ? '{/base}/tag/list' : '{/base}/tag/list?{?}&id=' . \reset($costobject)->id . '&ptype=p';
$next = empty($costobject) ? '{/base}/tag/list' : '{/base}/tag/list?{?}&id=' . \end($costobject)->id . '&ptype=n'; $next = empty($costobject) ? '{/base}/tag/list' : '{/base}/tag/list?{?}&id=' . \end($costobject)->id . '&ptype=n';
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="portlet"> <div class="portlet">

View File

@ -12,7 +12,7 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
//echo $this->getData('nav')->render(); //echo $this->data['nav']->render();
$footerView = new \phpOMS\Views\PaginationView($this->l11nManager, $this->request, $this->response); $footerView = new \phpOMS\Views\PaginationView($this->l11nManager, $this->request, $this->response);
$footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig'); $footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig');

View File

@ -12,7 +12,7 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<section class="box w-50"> <section class="box w-50">
<header><h1><?= $this->getHtml('GL'); ?></h1></header> <header><h1><?= $this->getHtml('GL'); ?></h1></header>

View File

@ -23,7 +23,7 @@ $footerView->setPages(25);
$footerView->setPage(1); $footerView->setPage(1);
$footerView->setResults(1); $footerView->setResults(1);
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">

View File

@ -12,4 +12,4 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
echo $this->getData('nav')->render(); echo $this->data['nav']->render();

View File

@ -23,7 +23,7 @@ $footerView->setPages(25);
$footerView->setPage(1); $footerView->setPage(1);
$footerView->setResults(1); $footerView->setResults(1);
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="box w-100"> <div class="box w-100">
<table class="default sticky"> <table class="default sticky">

View File

@ -23,7 +23,7 @@ $footerView->setPages(25);
$footerView->setPage(1); $footerView->setPage(1);
$footerView->setResults(1); $footerView->setResults(1);
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="box w-100"> <div class="box w-100">
<table class="default sticky"> <table class="default sticky">

View File

@ -15,7 +15,7 @@ declare(strict_types=1);
/** /**
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
*/ */
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<section class="box w-50"> <section class="box w-50">
<header><h1><?= $this->getHtml('Stack'); ?></h1></header> <header><h1><?= $this->getHtml('Stack'); ?></h1></header>

View File

@ -12,4 +12,4 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
echo $this->getData('nav')->render(); echo $this->data['nav']->render();

View File

@ -23,7 +23,7 @@ $footerView->setPages(25);
$footerView->setPage(1); $footerView->setPage(1);
$footerView->setResults(1); $footerView->setResults(1);
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">

View File

@ -23,7 +23,7 @@ $footerView->setPages(25);
$footerView->setPage(1); $footerView->setPage(1);
$footerView->setResults(1); $footerView->setResults(1);
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="box w-100"> <div class="box w-100">
<table class="default sticky"> <table class="default sticky">