From e65b0b9f9deb00449f866950043689b06fca9585 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 19 Apr 2024 02:08:37 +0000 Subject: [PATCH] general fixes --- Admin/Routes/Web/Backend.php | 2 +- Controller/BackendController.php | 76 +++++++++++++++++++++++++++++++- Theme/Backend/Lang/de.lang.php | 2 +- Theme/Backend/Lang/en.lang.php | 2 +- 4 files changed, 77 insertions(+), 5 deletions(-) diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index f778336..c6455e4 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -68,7 +68,7 @@ return [ ], '^/qualitymanagement/audit/view(\?.*$|$)' => [ [ - 'dest' => '\Modules\QualityManagement\Controller\BackendController:viewQuality', + 'dest' => '\Modules\QualityManagement\Controller\BackendController:viewAudit', 'verb' => RouteVerb::GET, 'active' => true, 'permission' => [ diff --git a/Controller/BackendController.php b/Controller/BackendController.php index f71799f..3606dc1 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -29,6 +29,7 @@ use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Views\View; use Modules\Profile\Models\SettingsEnum as ProfileSettingsEnum; +use phpOMS\Message\Http\RequestStatusCode; /** * QualityManagement controller class. @@ -134,8 +135,6 @@ final class BackendController extends Controller public function viewQualityReport(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface { $view = new ReportView($this->app->l11nManager, $request, $response); - $view->setTemplate('/Modules/QualityManagement/Theme/Backend/report-view'); - $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1008502001, $request, $response); $view->data['report'] = ReportMapper::get() ->with('task') @@ -151,6 +150,16 @@ final class BackendController extends Controller ->where('task/tags/title/language', $request->header->l11n->language) ->execute(); + if ($view->data['report']->id === 0) { + $response->header->status = RequestStatusCode::R_404; + $view->setTemplate('/Web/Backend/Error/404'); + + return $view; + } + + $view->setTemplate('/Modules/QualityManagement/Theme/Backend/report-view'); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1008502001, $request, $response); + /** @var \Model\Setting $profileImage */ $profileImage = $this->app->appSettings->get(names: ProfileSettingsEnum::DEFAULT_PROFILE_IMAGE, module: 'Profile'); @@ -166,4 +175,67 @@ final class BackendController extends Controller return $view; } + + /** + * Routing end-point for application behavior. + * + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param array $data Generic data + * + * @return RenderableInterface + * + * @since 1.0.0 + * @codeCoverageIgnore + */ + public function viewAuditList(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface + { + $view = new View($this->app->l11nManager, $request, $response); + $view->setTemplate('/Modules/QualityManagement/Theme/Backend/audit-list'); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1008502001, $request, $response); + + return $view; + } + + /** + * Routing end-point for application behavior. + * + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param array $data Generic data + * + * @return RenderableInterface + * + * @since 1.0.0 + * @codeCoverageIgnore + */ + public function viewAudit(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface + { + $view = new View($this->app->l11nManager, $request, $response); + $view->setTemplate('/Modules/QualityManagement/Theme/Backend/audit-view'); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1008502001, $request, $response); + + return $view; + } + + /** + * Routing end-point for application behavior. + * + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param array $data Generic data + * + * @return RenderableInterface + * + * @since 1.0.0 + * @codeCoverageIgnore + */ + public function viewAuditCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface + { + $view = new View($this->app->l11nManager, $request, $response); + $view->setTemplate('/Modules/QualityManagement/Theme/Backend/audit-view'); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1008502001, $request, $response); + + return $view; + } } diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index af4064a..c61a40b 100644 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -return ['Support' => [ +return ['QualityManagement' => [ 'Account' => 'Konto', 'All' => 'Alle', 'Assigned' => 'Zugewiesen', diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index d7cfdec..930a46e 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -return ['Support' => [ +return ['QualityManagement' => [ 'Account' => 'Account', 'All' => 'All', 'Assigned' => 'Assigned',