diff --git a/.github/dev_bug_report.md b/.github/dev_bug_report.md deleted file mode 100755 index ef93e56..0000000 --- a/.github/dev_bug_report.md +++ /dev/null @@ -1,35 +0,0 @@ ---- -name: Dev Bug Report -about: Create a report to help us improve -title: '' -labels: stat_backlog, type_bug -assignees: '' - ---- - -# Bug Description -A clear and concise description of what the bug is. - -# How to Reproduce - -Steps to reproduce the behavior: - -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -## Minimal Code Example - -``` -// your code ... -``` - -# Expected Behavior -A clear and concise description of what you expected to happen. - -# Screenshots -If applicable, add screenshots to help explain your problem. - -# Additional Information -Add any other context about the problem here. diff --git a/.github/dev_feature_request.md b/.github/dev_feature_request.md deleted file mode 100755 index 9573c35..0000000 --- a/.github/dev_feature_request.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Dev Feature Request -about: Suggest an idea for this project -title: '' -labels: stat_backlog, type_feature -assignees: '' - ---- - -# What is the feature you request -* A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -* A clear and concise description of what you want to happen. - -# Alternatives -A clear and concise description of any alternative solutions or features you've considered. - -# Additional Information -Add any other context or screenshots about the feature request here. diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index b2d030f..3bbb810 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -19,7 +19,7 @@ "type": 2, "subtype": 1, "name": "Equipments", - "uri": "{/base}/equipment/list", + "uri": "{/base}/equipment/list?{?}", "target": "self", "icon": null, "order": 1, @@ -33,7 +33,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/base}/equipment/list", + "uri": "{/base}/equipment/list?{?}", "target": "self", "icon": null, "order": 1, @@ -65,7 +65,7 @@ "type": 2, "subtype": 1, "name": "Inspections", - "uri": "{/base}/equipment/inspection/list", + "uri": "{/base}/equipment/inspection/list?{?}", "target": "self", "icon": null, "order": 1, @@ -79,7 +79,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/base}/equipment/inspection/list", + "uri": "{/base}/equipment/inspection/list?{?}", "target": "self", "icon": null, "order": 1, diff --git a/Admin/Installer.php b/Admin/Installer.php index 0ff45bf..0e6227b 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -94,7 +94,7 @@ final class Installer extends InstallerAbstract $equipmentTypes = []; /** @var \Modules\EquipmentManagement\Controller\ApiEquipmentTypeController $module */ - $module = $app->moduleManager->getModuleInstance('EquipmentManagement', 'ApiEquipmentType'); + $module = $app->moduleManager->get('EquipmentManagement', 'ApiEquipmentType'); /** @var array $type */ foreach ($types as $type) { @@ -155,7 +155,7 @@ final class Installer extends InstallerAbstract $inspectionTypes = []; /** @var \Modules\EquipmentManagement\Controller\ApiInspectionTypeController $module */ - $module = $app->moduleManager->getModuleInstance('EquipmentManagement', 'ApiInspectionType'); + $module = $app->moduleManager->get('EquipmentManagement', 'ApiInspectionType'); /** @var array $type */ foreach ($types as $type) { @@ -216,7 +216,7 @@ final class Installer extends InstallerAbstract $itemAttrType = []; /** @var \Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController $module */ - $module = $app->moduleManager->getModuleInstance('EquipmentManagement', 'ApiEquipmentAttribute'); + $module = $app->moduleManager->get('EquipmentManagement', 'ApiEquipmentAttribute'); /** @var array $attribute */ foreach ($attributes as $attribute) { @@ -284,7 +284,7 @@ final class Installer extends InstallerAbstract $itemAttrValue = []; /** @var \Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController $module */ - $module = $app->moduleManager->getModuleInstance('EquipmentManagement', 'ApiEquipmentAttribute'); + $module = $app->moduleManager->get('EquipmentManagement', 'ApiEquipmentAttribute'); foreach ($attributes as $attribute) { $itemAttrValue[$attribute['name']] = []; diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 66c8a8e..d794b3a 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -77,7 +77,18 @@ return [ '^.*/equipment/inspection/list(\?.*$|$)' => [ [ - 'dest' => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementEquipmentList', + 'dest' => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementInspectionList', + 'verb' => RouteVerb::GET, + 'permission' => [ + 'module' => BackendController::NAME, + 'type' => PermissionType::READ, + 'state' => PermissionCategory::EQUIPMENT, + ], + ], + ], + '^.*/equipment/inspection/type/list(\?.*$|$)' => [ + [ + 'dest' => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementInspectionTypeList', 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::NAME, diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 1b15738..d531466 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -19,6 +19,7 @@ use Modules\EquipmentManagement\Models\Attribute\EquipmentAttributeTypeMapper; use Modules\EquipmentManagement\Models\EquipmentMapper; use Modules\EquipmentManagement\Models\EquipmentTypeMapper; use Modules\EquipmentManagement\Models\InspectionMapper; +use Modules\EquipmentManagement\Models\InspectionTypeMapper; use Modules\Media\Models\MediaMapper; use Modules\Media\Models\MediaTypeMapper; use Modules\Organization\Models\UnitMapper; @@ -256,4 +257,60 @@ 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 Returns a renderable object + * + * @since 1.0.0 + * @codeCoverageIgnore + */ + public function viewEquipmentManagementInspectionList(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface + { + $view = new View($this->app->l11nManager, $request, $response); + + $view->setTemplate('/Modules/EquipmentManagement/Theme/Backend/inspection-list'); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1008401001, $request, $response); + + $list = InspectionMapper::getAll() + ->sort('id', 'DESC') + ->execute(); + + $view->data['inspections'] = $list; + + return $view; + } + + /** + * Routing end-point for application behavior. + * + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param array $data Generic data + * + * @return RenderableInterface Returns a renderable object + * + * @since 1.0.0 + * @codeCoverageIgnore + */ + public function viewEquipmentManagementInspectionTypeList(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface + { + $view = new View($this->app->l11nManager, $request, $response); + + $view->setTemplate('/Modules/EquipmentManagement/Theme/Backend/inspection-type-list'); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1008401001, $request, $response); + + $list = InspectionTypeMapper::getAll() + ->sort('id', 'DESC') + ->execute(); + + $view->data['inspections'] = $list; + + return $view; + } } diff --git a/Theme/Backend/inspection-list.tpl.php b/Theme/Backend/inspection-list.tpl.php new file mode 100644 index 0000000..5a570c2 --- /dev/null +++ b/Theme/Backend/inspection-list.tpl.php @@ -0,0 +1,17 @@ +data['nav']->render(); ?> \ No newline at end of file diff --git a/Theme/Backend/inspection-type-list.tpl.php b/Theme/Backend/inspection-type-list.tpl.php new file mode 100644 index 0000000..5a570c2 --- /dev/null +++ b/Theme/Backend/inspection-type-list.tpl.php @@ -0,0 +1,17 @@ +data['nav']->render(); ?> \ No newline at end of file