From a554e0ff2d1fc6f9b7b8a538ce2fc1e7ebae8cd4 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 7 Apr 2024 17:31:41 +0000 Subject: [PATCH] ui fixes --- Admin/Routes/Web/Backend.php | 8 ++++++ Controller/ApiController.php | 4 +-- Controller/BackendController.php | 39 ++++++++++++----------------- Models/ExpenseElementTypeMapper.php | 2 +- Models/ExpenseTypeMapper.php | 2 +- Theme/Backend/expense-view.tpl.php | 6 ++--- 6 files changed, 31 insertions(+), 30 deletions(-) diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index d2539a3..f015e98 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -22,6 +22,7 @@ return [ [ 'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesList', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, @@ -33,6 +34,7 @@ return [ [ 'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesExpenseCreate', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, @@ -44,6 +46,7 @@ return [ [ 'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesExpense', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, @@ -55,6 +58,7 @@ return [ [ 'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesElement', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, @@ -66,6 +70,7 @@ return [ [ 'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesElementCreate', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, @@ -77,6 +82,7 @@ return [ [ 'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesTypeList', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, @@ -88,6 +94,7 @@ return [ [ 'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesType', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, @@ -99,6 +106,7 @@ return [ [ 'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesTypeCreate', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 3d60b2e..812443d 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -1001,7 +1001,7 @@ final class ApiController extends Controller } /** - * Api method to create item files + * Api method to create Note * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -1039,7 +1039,7 @@ final class ApiController extends Controller } /** - * Validate item note create request + * Validate note create request * * @param RequestAbstract $request Request * diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 02be5d3..f101acc 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -15,6 +15,7 @@ declare(strict_types=1); namespace Modules\BusinessExpenses\Controller; use Modules\BusinessExpenses\Models\ExpenseMapper; +use Modules\BusinessExpenses\Models\ExpenseTypeMapper; use phpOMS\Contract\RenderableInterface; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; @@ -78,7 +79,7 @@ final class BackendController extends Controller $view->setTemplate('/Modules/BusinessExpenses/Theme/Backend/expense-view'); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001001001, $request, $response); - $expense = ExpenseMapper::get() + $view->data['expense'] = ExpenseMapper::get() ->with('from') ->with('notes') ->with('elements') @@ -87,8 +88,6 @@ final class BackendController extends Controller ->where('id', (int) $request->getData('id')) ->execute(); - $view->data['expense'] = $expense; - $view->data['expense-notes'] = new \Modules\Editor\Theme\Backend\Components\Compound\BaseView($this->app->l11nManager, $request, $response); return $view; @@ -113,12 +112,16 @@ final class BackendController extends Controller $view->setTemplate('/Modules/BusinessExpenses/Theme/Backend/expense-view'); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001001001, $request, $response); - $expense = ExpenseMapper::get() + $view->data['expense'] = ExpenseMapper::get() ->with('from') + ->with('notes') + ->with('elements') + ->with('elements/type') + ->with('elements/type/l11n') ->where('id', (int) $request->getData('id')) ->execute(); - $view->data['expense'] = $expense; + $view->data['expense-notes'] = new \Modules\Editor\Theme\Backend\Components\Compound\BaseView($this->app->l11nManager, $request, $response); return $view; } @@ -139,16 +142,14 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); - $view->setTemplate('/Modules/BusinessExpenses/Theme/Backend/expense-view'); + $view->setTemplate('/Modules/BusinessExpenses/Theme/Backend/expense-type-list'); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001001001, $request, $response); - $expense = ExpenseMapper::get() - ->with('from') - ->where('id', (int) $request->getData('id')) + $view->data['types'] = ExpenseTypeMapper::getAll() + ->with('l11n') + ->where('l11n/language', $request->header->l11n->language) ->execute(); - $view->data['expense'] = $expense; - return $view; } @@ -171,13 +172,12 @@ final class BackendController extends Controller $view->setTemplate('/Modules/BusinessExpenses/Theme/Backend/expense-view'); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001001001, $request, $response); - $expense = ExpenseMapper::get() - ->with('from') + $view->data['type'] = ExpenseTypeMapper::get() + ->with('l11n') ->where('id', (int) $request->getData('id')) + ->where('l11n/language', $request->header->l11n->language) ->execute(); - $view->data['expense'] = $expense; - return $view; } @@ -197,16 +197,9 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); - $view->setTemplate('/Modules/BusinessExpenses/Theme/Backend/expense-view'); + $view->setTemplate('/Modules/BusinessExpenses/Theme/Backend/expense-type-view'); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001001001, $request, $response); - $expense = ExpenseMapper::get() - ->with('from') - ->where('id', (int) $request->getData('id')) - ->execute(); - - $view->data['expense'] = $expense; - return $view; } } diff --git a/Models/ExpenseElementTypeMapper.php b/Models/ExpenseElementTypeMapper.php index 0e9b8ce..cc4b26e 100644 --- a/Models/ExpenseElementTypeMapper.php +++ b/Models/ExpenseElementTypeMapper.php @@ -18,7 +18,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; use phpOMS\Localization\BaseStringL11nType; /** - * Item mapper class. + * ExpenseElementType mapper class. * * @package Modules\BusinessExpenses\Models * @license OMS License 2.0 diff --git a/Models/ExpenseTypeMapper.php b/Models/ExpenseTypeMapper.php index a90cf40..202d4c9 100644 --- a/Models/ExpenseTypeMapper.php +++ b/Models/ExpenseTypeMapper.php @@ -18,7 +18,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; use phpOMS\Localization\BaseStringL11nType; /** - * Item mapper class. + * ExpenseType mapper class. * * @package Modules\BusinessExpenses\Models * @license OMS License 2.0 diff --git a/Theme/Backend/expense-view.tpl.php b/Theme/Backend/expense-view.tpl.php index e62064b..51271ac 100644 --- a/Theme/Backend/expense-view.tpl.php +++ b/Theme/Backend/expense-view.tpl.php @@ -265,9 +265,9 @@ echo $this->data['nav']->render(); ?> start->format('H:i'); ?> getBreak() / 3600); ?>h getBreak() / 60) % 60); ?>m getEnd() !== null ? $session->getEnd()->format('H:i') : ''; ?> - getBusy() / 3600); ?>h getBusy() / 60) % 60); ?>m + busy / 3600); ?>h busy / 60) % 60); ?>m getBusy(); + $busy['week'] += $session->busy; if ($session->start->getTimestamp() < $startWeek->getTimestamp() || $count === $sessionCount ) : ?> @@ -281,7 +281,7 @@ echo $this->data['nav']->render(); ?> endif; ?> getBusy(); + $busy['month'] += $session->busy; if ($session->start->getTimestamp() < $startMonth->getTimestamp() || $count === $sessionCount ) : ?>