From eb227593f56389116a43151ca5fddf857b03498b 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 | 15 ++ Theme/Backend/Lang/de.lang.php | 3 + Theme/Backend/Lang/en.lang.php | 3 + Theme/Backend/budgeting-dashboard.tpl.php | 175 ++++++++++++---------- 4 files changed, 113 insertions(+), 83 deletions(-) diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 497c57b..2b76a34 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -10,6 +10,7 @@ return [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingDashboard', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, @@ -21,6 +22,7 @@ return [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingIncomeStatement', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, @@ -32,6 +34,7 @@ return [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingBalance', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, @@ -43,6 +46,7 @@ return [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingSales', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, @@ -54,6 +58,7 @@ return [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingMaterial', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, @@ -65,6 +70,7 @@ return [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingOpex', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, @@ -76,6 +82,7 @@ return [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingHR', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, @@ -87,6 +94,7 @@ return [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingInvestment', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, @@ -98,6 +106,7 @@ return [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingLoan', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, @@ -109,6 +118,7 @@ return [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingCashFlow', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, @@ -120,6 +130,7 @@ return [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingProfitCenter', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, @@ -131,6 +142,7 @@ return [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingProjects', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, @@ -142,6 +154,7 @@ return [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingMarketing', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, @@ -153,6 +166,7 @@ return [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingEvent', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, @@ -164,6 +178,7 @@ return [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingLeasing', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 62c4218..22a91de 100644 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -18,4 +18,7 @@ return ['BudgetManagement' => [ 'Monthly' => 'Monatlich', 'Category' => 'Kategorie', 'Total' => 'Gesamt', + 'A' => 'G', + 'Q' => 'M', + 'P' => 'P', ]]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index cc36904..ccc7d88 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -18,4 +18,7 @@ return ['BudgetManagement' => [ 'Monthly' => 'Monthly', 'Category' => 'Category', 'Total' => 'Total', + 'A' => 'A', + 'Q' => 'Q', + 'P' => 'P', ]]; diff --git a/Theme/Backend/budgeting-dashboard.tpl.php b/Theme/Backend/budgeting-dashboard.tpl.php index 818f7a0..ad45e44 100644 --- a/Theme/Backend/budgeting-dashboard.tpl.php +++ b/Theme/Backend/budgeting-dashboard.tpl.php @@ -72,7 +72,7 @@ echo $this->data['nav']->render(); min-height: 34px; } - .data-row div { + .data-row > div { padding: .2rem 3px .2rem 3px; display: flex; flex-direction: column; @@ -87,7 +87,7 @@ echo $this->data['nav']->render(); background: #efefef; } - .data-row div:nth-child(n+3) { + .data-row > div:nth-child(n+3) { width: 95px; justify-content: start; } @@ -151,22 +151,22 @@ echo $this->data['nav']->render();
printHtml($segment->l11n); ?>
-
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
+
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
data['segmentation']['section']->defaults as $section) : ?> @@ -177,22 +177,22 @@ echo $this->data['nav']->render();
printHtml($section->l11n); ?>
-
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
+
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
data['segmentation']['sales_group']->defaults as $salesgroup) : ?> @@ -203,22 +203,22 @@ echo $this->data['nav']->render();
printHtml($salesgroup->l11n); ?>
-
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
+
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
data['segmentation']['product_group']->defaults as $productgroup) : ?> @@ -228,45 +228,54 @@ echo $this->data['nav']->render();
-
printHtml($productgroup->l11n); ?>
-
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
+
+
+
printHtml($productgroup->l11n); ?>
+
+
getHtml('A'); ?>
+
getHtml('Q'); ?>
+
getHtml('P'); ?>
+
+
+
+
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
data['items'] ?? [] as $item) : ?>
printHtml($item->l11n); ?>
-
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
-
+0.00%
+
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%
+
+0.00%