diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 3956f9f..d2539a3 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -40,7 +40,7 @@ return [ ], ], ], - '^/businessexpenses/expense(\?.*$|$)' => [ + '^/businessexpenses/expense/view(\?.*$|$)' => [ [ 'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesExpense', 'verb' => RouteVerb::GET, @@ -51,6 +51,28 @@ return [ ], ], ], + '^/businessexpenses/expense/element/view(\?.*$|$)' => [ + [ + 'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesElement', + 'verb' => RouteVerb::GET, + 'permission' => [ + 'module' => BackendController::NAME, + 'type' => PermissionType::READ, + 'state' => PermissionCategory::EXPENSE, + ], + ], + ], + '^/businessexpenses/expense/element/create(\?.*$|$)' => [ + [ + 'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesElementCreate', + 'verb' => RouteVerb::GET, + 'permission' => [ + 'module' => BackendController::NAME, + 'type' => PermissionType::CREATE, + 'state' => PermissionCategory::EXPENSE, + ], + ], + ], '^/businessexpenses/type/list(\?.*$|$)' => [ [ 'dest' => '\Modules\BusinessExpenses\Controller\BackendController:viewBusinessExpensesTypeList', diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 90e6d2d..02be5d3 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -52,7 +52,7 @@ final class BackendController extends Controller $list = ExpenseMapper::getAll() ->with('from') - ->execute(); + ->executeGetArray(); $view->data['expenses'] = $list; diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index fe4e25a..53e1a0a 100644 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -33,4 +33,5 @@ return ['BusinessExpenses' => [ 'Overview' => 'Übersicht', 'Clocking' => 'Zeiterfassung', 'Type' => 'Typ', + 'Upload' => 'Hochladen', ]]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index b2f259c..07b9ca4 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -33,4 +33,5 @@ return ['BusinessExpenses' => [ 'Overview' => 'Overview', 'Clocking' => 'Clocking', 'Type' => 'Type', + 'Upload' => 'Upload', ]]; diff --git a/Theme/Backend/expense-list.tpl.php b/Theme/Backend/expense-list.tpl.php index 79075a3..43038e0 100644 --- a/Theme/Backend/expense-list.tpl.php +++ b/Theme/Backend/expense-list.tpl.php @@ -113,8 +113,8 @@ echo $this->data['nav']->render(); ?> $value) : ++$count; - $url = UriFactory::build('{/base}/businessexpenses/expense?{?}&id=' . $value->id); - ?> + $url = UriFactory::build('{/base}/businessexpenses/expense/view?{?}&id=' . $value->id); + ?> id; ?> diff --git a/Theme/Backend/expense-view.tpl.php b/Theme/Backend/expense-view.tpl.php index 21766ca..e62064b 100644 --- a/Theme/Backend/expense-view.tpl.php +++ b/Theme/Backend/expense-view.tpl.php @@ -14,6 +14,7 @@ declare(strict_types=1); use Modules\BusinessExpenses\Models\NullExpense; +use phpOMS\Uri\UriFactory; /** @var \phpOMS\Views\View $this */ $expense = $this->getData('expense') ?? new NullExpense(); @@ -106,7 +107,14 @@ echo $this->data['nav']->render(); ?>
-
getHtml('Expenses'); ?>download
+
+ getHtml('Expenses'); ?> + download + +
@@ -128,13 +136,15 @@ echo $this->data['nav']->render(); ?> - elements as $element) : ?> - + elements as $element) : + $url = UriFactory::build('{/base}/businessexpenses/expense/element/view?{?}&id=' . $element->id); + ?> +
getHtml('End'); ?> getHtml('Type'); ?>
- id; ?> - start->format('Y-m-d H:i'); ?> - end?->format('Y-m-d H:i'); ?> - printHtml($element->type->l11n); ?> + id; ?> + start->format('Y-m-d H:i'); ?> + end?->format('Y-m-d H:i'); ?> + printHtml($element->type->l11n); ?>