From 010b2afab3949eb8d9b0024ac5270b0a902f10c9 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 13 Mar 2017 18:33:53 +0100 Subject: [PATCH] Fix client view --- Controller.php | 8 + Theme/Backend/clients-create.tpl.php | 302 ++++++++++++++------------ Theme/Backend/clients-list.tpl.php | 14 +- Theme/Backend/clients-profile.tpl.php | 296 +++++++++++++++++++++++++ Theme/Backend/clients-single.tpl.php | 19 -- 5 files changed, 480 insertions(+), 159 deletions(-) create mode 100644 Theme/Backend/clients-profile.tpl.php delete mode 100644 Theme/Backend/clients-single.tpl.php diff --git a/Controller.php b/Controller.php index 1f97075..90fea99 100644 --- a/Controller.php +++ b/Controller.php @@ -18,6 +18,8 @@ namespace Modules\ClientManagement; use Modules\Navigation\Models\Navigation; use Modules\Navigation\Views\NavigationView; +use Modules\ClientManagement\Models\Client; +use Modules\ClientManagement\Models\ClientMapper; use phpOMS\Contract\RenderableInterface; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; @@ -97,6 +99,9 @@ class Controller extends ModuleAbstract implements WebInterface $view->setTemplate('/Modules/ClientManagement/Theme/Backend/clients-list'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003102001, $request, $response)); + $client = ClientMapper::getNewest(50); + $view->addData('client', $client); + return $view; } @@ -135,6 +140,9 @@ class Controller extends ModuleAbstract implements WebInterface $view->setTemplate('/Modules/ClientManagement/Theme/Backend/clients-profile'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003102001, $request, $response)); + $client = ClientMapper::get((int) $request->getData('id')); + $view->setData('client', $client); + return $view; } diff --git a/Theme/Backend/clients-create.tpl.php b/Theme/Backend/clients-create.tpl.php index 75df31d..0e62ab5 100644 --- a/Theme/Backend/clients-create.tpl.php +++ b/Theme/Backend/clients-create.tpl.php @@ -95,174 +95,198 @@ echo $this->getData('nav')->render(); ?>
-
-

getText('Address') ?>

-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+

getText('Address') ?>

+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-

getText('PaymentTerm') ?>

-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+

getText('PaymentTerm') ?>

+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-

getText('Payment') ?>

-
-
- -
-
-
-
-
+
+
+
+

getText('Payment') ?>

+
+
+ +
+
+
+
+
+
+
-
+
-
-

getText('Price') ?>

-
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+

getText('Price') ?>

+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-

getText('AreaManager') ?>

-
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+

getText('AreaManager') ?>

+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
app, $this->request, $this->response); $footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig'); $footerView->setPages(20); $footerView->setPage(1); ?> -
- - - - - - - - -
getText('Logs') ?>
IP - getText('ID', 0, 0); ?> - getText('Name'); ?> - getText('Log'); ?> - getText('Date'); ?> -
render(); ?> -
request->getOrigin(); ?> - request->getAccount(); ?> - request->getAccount(); ?> - Creating customer - format('Y-m-d H:i:s') ?> -
+
+ + + + + + + + +
getText('Logs') ?>
IP + getText('ID', 0, 0); ?> + getText('Name'); ?> + getText('Log'); ?> + getText('Date'); ?> +
render(); ?> +
request->getOrigin(); ?> + request->getAccount(); ?> + request->getAccount(); ?> + Creating customer + format('Y-m-d H:i:s') ?> +
+
+
diff --git a/Theme/Backend/clients-list.tpl.php b/Theme/Backend/clients-list.tpl.php index ddc9d1b..5d87a07 100644 --- a/Theme/Backend/clients-list.tpl.php +++ b/Theme/Backend/clients-list.tpl.php @@ -19,6 +19,8 @@ $footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig'); $footerView->setPages(20); $footerView->setPage(1); +$clients = $this->getData('client'); + echo $this->getData('nav')->render(); ?>