mirror of
https://github.com/Karaka-Management/oms-FleetManagement.git
synced 2026-04-29 15:28:41 +00:00
bump
This commit is contained in:
Dennis Eichhorn
parent
4c73576746
commit
ebdd6901c6
35
.github/dev_bug_report.md
vendored
35
.github/dev_bug_report.md
vendored
|
|
@ -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.
|
||||
18
.github/dev_feature_request.md
vendored
18
.github/dev_feature_request.md
vendored
|
|
@ -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.
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
"type": 2,
|
||||
"subtype": 1,
|
||||
"name": "Vehicles",
|
||||
"uri": "{/base}/fleet/vehicle/list",
|
||||
"uri": "{/base}/fleet/vehicle/list?{?}",
|
||||
"target": "self",
|
||||
"icon": null,
|
||||
"order": 1,
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
"type": 3,
|
||||
"subtype": 1,
|
||||
"name": "List",
|
||||
"uri": "{/base}/fleet/vehicle/list",
|
||||
"uri": "{/base}/fleet/vehicle/list?{?}",
|
||||
"target": "self",
|
||||
"icon": null,
|
||||
"order": 1,
|
||||
|
|
@ -65,7 +65,7 @@
|
|||
"type": 2,
|
||||
"subtype": 1,
|
||||
"name": "Drivers",
|
||||
"uri": "{/base}/fleet/driver/list",
|
||||
"uri": "{/base}/fleet/driver/list?{?}",
|
||||
"target": "self",
|
||||
"icon": null,
|
||||
"order": 1,
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
"type": 3,
|
||||
"subtype": 1,
|
||||
"name": "List",
|
||||
"uri": "{/base}/fleet/driver/list",
|
||||
"uri": "{/base}/fleet/driver/list?{?}",
|
||||
"target": "self",
|
||||
"icon": null,
|
||||
"order": 1,
|
||||
|
|
@ -111,7 +111,7 @@
|
|||
"type": 2,
|
||||
"subtype": 1,
|
||||
"name": "Inspections",
|
||||
"uri": "{/base}/fleet/inspection/list",
|
||||
"uri": "{/base}/fleet/inspection/list?{?}",
|
||||
"target": "self",
|
||||
"icon": null,
|
||||
"order": 1,
|
||||
|
|
@ -125,7 +125,7 @@
|
|||
"type": 3,
|
||||
"subtype": 1,
|
||||
"name": "List",
|
||||
"uri": "{/base}/fleet/inspection/list",
|
||||
"uri": "{/base}/fleet/inspection/list?{?}",
|
||||
"target": "self",
|
||||
"icon": null,
|
||||
"order": 1,
|
||||
|
|
@ -148,6 +148,21 @@
|
|||
"permission": { "permission": 4, "category": null, "element": null },
|
||||
"parent": 1003504001,
|
||||
"children": []
|
||||
},
|
||||
{
|
||||
"id": 1003504301,
|
||||
"pid": "/fleet/inspection",
|
||||
"type": 3,
|
||||
"subtype": 1,
|
||||
"name": "DriverInspectionTypes",
|
||||
"uri": "{/base}/fleet/inspection/type/list?{?}",
|
||||
"target": "self",
|
||||
"icon": null,
|
||||
"order": 5,
|
||||
"from": "FleetManagement",
|
||||
"permission": { "permission": 4, "category": null, "element": null },
|
||||
"parent": 1003504001,
|
||||
"children": []
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ final class Installer extends InstallerAbstract
|
|||
$fuelTypes = [];
|
||||
|
||||
/** @var \Modules\FleetManagement\Controller\ApiVehicleController $module */
|
||||
$module = $app->moduleManager->getModuleInstance('FleetManagement', 'ApiVehicle');
|
||||
$module = $app->moduleManager->get('FleetManagement', 'ApiVehicle');
|
||||
|
||||
/** @var array $type */
|
||||
foreach ($types as $type) {
|
||||
|
|
@ -186,7 +186,7 @@ final class Installer extends InstallerAbstract
|
|||
$vehicleTypes = [];
|
||||
|
||||
/** @var \Modules\FleetManagement\Controller\ApiVehicleController $module */
|
||||
$module = $app->moduleManager->getModuleInstance('FleetManagement', 'ApiVehicle');
|
||||
$module = $app->moduleManager->get('FleetManagement', 'ApiVehicle');
|
||||
|
||||
/** @var array $type */
|
||||
foreach ($types as $type) {
|
||||
|
|
@ -247,7 +247,7 @@ final class Installer extends InstallerAbstract
|
|||
$inspectionTypes = [];
|
||||
|
||||
/** @var \Modules\FleetManagement\Controller\ApiVehicleController $module */
|
||||
$module = $app->moduleManager->getModuleInstance('FleetManagement', 'ApiVehicle');
|
||||
$module = $app->moduleManager->get('FleetManagement', 'ApiVehicle');
|
||||
|
||||
/** @var array $type */
|
||||
foreach ($types as $type) {
|
||||
|
|
@ -308,7 +308,7 @@ final class Installer extends InstallerAbstract
|
|||
$inspectionTypes = [];
|
||||
|
||||
/** @var \Modules\FleetManagement\Controller\ApiDriverController $module */
|
||||
$module = $app->moduleManager->getModuleInstance('FleetManagement', 'ApiDriver');
|
||||
$module = $app->moduleManager->get('FleetManagement', 'ApiDriver');
|
||||
|
||||
/** @var array $type */
|
||||
foreach ($types as $type) {
|
||||
|
|
@ -369,7 +369,7 @@ final class Installer extends InstallerAbstract
|
|||
$itemAttrType = [];
|
||||
|
||||
/** @var \Modules\FleetManagement\Controller\ApiVehicleAttributeController $module */
|
||||
$module = $app->moduleManager->getModuleInstance('FleetManagement', 'ApiVehicleAttribute');
|
||||
$module = $app->moduleManager->get('FleetManagement', 'ApiVehicleAttribute');
|
||||
|
||||
/** @var array $attribute */
|
||||
foreach ($attributes as $attribute) {
|
||||
|
|
@ -437,7 +437,7 @@ final class Installer extends InstallerAbstract
|
|||
$itemAttrValue = [];
|
||||
|
||||
/** @var \Modules\FleetManagement\Controller\ApiVehicleAttributeController $module */
|
||||
$module = $app->moduleManager->getModuleInstance('FleetManagement', 'ApiVehicleAttribute');
|
||||
$module = $app->moduleManager->get('FleetManagement', 'ApiVehicleAttribute');
|
||||
|
||||
foreach ($attributes as $attribute) {
|
||||
$itemAttrValue[$attribute['name']] = [];
|
||||
|
|
@ -510,7 +510,7 @@ final class Installer extends InstallerAbstract
|
|||
$itemAttrType = [];
|
||||
|
||||
/** @var \Modules\FleetManagement\Controller\ApiDriverAttributeController $module */
|
||||
$module = $app->moduleManager->getModuleInstance('FleetManagement', 'ApiDriverAttribute');
|
||||
$module = $app->moduleManager->get('FleetManagement', 'ApiDriverAttribute');
|
||||
|
||||
/** @var array $attribute */
|
||||
foreach ($attributes as $attribute) {
|
||||
|
|
@ -578,7 +578,7 @@ final class Installer extends InstallerAbstract
|
|||
$itemAttrValue = [];
|
||||
|
||||
/** @var \Modules\FleetManagement\Controller\ApiDriverAttributeController $module */
|
||||
$module = $app->moduleManager->getModuleInstance('FleetManagement', 'ApiDriverAttribute');
|
||||
$module = $app->moduleManager->get('FleetManagement', 'ApiDriverAttribute');
|
||||
|
||||
foreach ($attributes as $attribute) {
|
||||
$itemAttrValue[$attribute['name']] = [];
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ use Modules\FleetManagement\Models\Attribute\VehicleAttributeTypeMapper;
|
|||
use Modules\FleetManagement\Models\Driver\DriverInspectionMapper;
|
||||
use Modules\FleetManagement\Models\Driver\DriverMapper;
|
||||
use Modules\FleetManagement\Models\InspectionMapper;
|
||||
use Modules\FleetManagement\Models\InspectionTypeMapper;
|
||||
use Modules\FleetManagement\Models\VehicleMapper;
|
||||
use Modules\FleetManagement\Models\VehicleTypeMapper;
|
||||
use Modules\Media\Models\MediaMapper;
|
||||
|
|
@ -177,7 +178,7 @@ final class BackendController extends Controller
|
|||
$view = new View($this->app->l11nManager, $request, $response);
|
||||
|
||||
$view->setTemplate('/Modules/FleetManagement/Theme/Backend/inspection-list');
|
||||
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003502001, $request, $response);
|
||||
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003501001, $request, $response);
|
||||
|
||||
$list = InspectionMapper::getAll()
|
||||
->sort('id', 'DESC')
|
||||
|
|
@ -204,10 +205,10 @@ final class BackendController extends Controller
|
|||
{
|
||||
$view = new View($this->app->l11nManager, $request, $response);
|
||||
|
||||
$view->setTemplate('/Modules/FleetManagement/Theme/Backend/inspection-list');
|
||||
$view->setTemplate('/Modules/FleetManagement/Theme/Backend/inspection-type-list');
|
||||
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003502001, $request, $response);
|
||||
|
||||
$list = InspectionMapper::getAll()
|
||||
$list = InspectionTypeMapper::getAll()
|
||||
->sort('id', 'DESC')
|
||||
->execute();
|
||||
|
||||
|
|
|
|||
|
|
@ -242,8 +242,8 @@ echo $this->data['nav']->render();
|
|||
</div>
|
||||
<div class="portlet-foot">
|
||||
<input id="bAttributeAdd" formmethod="put" type="submit" class="add-form" value="<?= $this->getHtml('Add', '0', '0'); ?>">
|
||||
<input id="bAttributeSave" formmethod="post" type="submit" class="save-form hidden button save" value="<?= $this->getHtml('Update', '0', '0'); ?>">
|
||||
<input type="submit" class="cancel-form hidden button close" value="<?= $this->getHtml('Cancel', '0', '0'); ?>">
|
||||
<input id="bAttributeSave" formmethod="post" type="submit" class="save-form vh button save" value="<?= $this->getHtml('Update', '0', '0'); ?>">
|
||||
<input type="submit" class="cancel-form vh button close" value="<?= $this->getHtml('Cancel', '0', '0'); ?>">
|
||||
</div>
|
||||
</form>
|
||||
</section>
|
||||
|
|
@ -271,7 +271,7 @@ echo $this->data['nav']->render();
|
|||
<tr data-id="" draggable="false">
|
||||
<td>
|
||||
<i class="g-icon btn update-form">settings</i>
|
||||
<input id="milageTable-remove-0" type="checkbox" class="hidden">
|
||||
<input id="milageTable-remove-0" type="checkbox" class="vh">
|
||||
<label for="milageTable-remove-0" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
|
||||
<span class="checked-visibility">
|
||||
<label for="milageTable-remove-0" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
|
||||
|
|
@ -291,7 +291,7 @@ echo $this->data['nav']->render();
|
|||
<td>
|
||||
<i class="g-icon btn update-form">settings</i>
|
||||
<?php if (!$value->type->isRequired) : ?>
|
||||
<input id="milageTable-remove-<?= $value->id; ?>" type="checkbox" class="hidden">
|
||||
<input id="milageTable-remove-<?= $value->id; ?>" type="checkbox" class="vh">
|
||||
<label for="milageTable-remove-<?= $value->id; ?>" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
|
||||
<span class="checked-visibility">
|
||||
<label for="milageTable-remove-<?= $value->id; ?>" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
|
||||
|
|
|
|||
|
|
@ -242,8 +242,8 @@ echo $this->data['nav']->render();
|
|||
</div>
|
||||
<div class="portlet-foot">
|
||||
<input id="bAttributeAdd" formmethod="put" type="submit" class="add-form" value="<?= $this->getHtml('Add', '0', '0'); ?>">
|
||||
<input id="bAttributeSave" formmethod="post" type="submit" class="save-form hidden button save" value="<?= $this->getHtml('Update', '0', '0'); ?>">
|
||||
<input type="submit" class="cancel-form hidden button close" value="<?= $this->getHtml('Cancel', '0', '0'); ?>">
|
||||
<input id="bAttributeSave" formmethod="post" type="submit" class="save-form vh button save" value="<?= $this->getHtml('Update', '0', '0'); ?>">
|
||||
<input type="submit" class="cancel-form vh button close" value="<?= $this->getHtml('Cancel', '0', '0'); ?>">
|
||||
</div>
|
||||
</form>
|
||||
</section>
|
||||
|
|
@ -271,7 +271,7 @@ echo $this->data['nav']->render();
|
|||
<tr data-id="" draggable="false">
|
||||
<td>
|
||||
<i class="g-icon btn update-form">settings</i>
|
||||
<input id="milageTable-remove-0" type="checkbox" class="hidden">
|
||||
<input id="milageTable-remove-0" type="checkbox" class="vh">
|
||||
<label for="milageTable-remove-0" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
|
||||
<span class="checked-visibility">
|
||||
<label for="milageTable-remove-0" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
|
||||
|
|
@ -291,7 +291,7 @@ echo $this->data['nav']->render();
|
|||
<td>
|
||||
<i class="g-icon btn update-form">settings</i>
|
||||
<?php if (!$value->type->isRequired) : ?>
|
||||
<input id="milageTable-remove-<?= $value->id; ?>" type="checkbox" class="hidden">
|
||||
<input id="milageTable-remove-<?= $value->id; ?>" type="checkbox" class="vh">
|
||||
<label for="milageTable-remove-<?= $value->id; ?>" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
|
||||
<span class="checked-visibility">
|
||||
<label for="milageTable-remove-<?= $value->id; ?>" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
|
||||
|
|
|
|||
17
Theme/Backend/inspection-list.tpl.php
Normal file
17
Theme/Backend/inspection-list.tpl.php
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
<?php
|
||||
/**
|
||||
* Jingga
|
||||
*
|
||||
* PHP Version 8.1
|
||||
*
|
||||
* @package Modules\ItemManagement
|
||||
* @copyright Dennis Eichhorn
|
||||
* @license OMS License 2.0
|
||||
* @version 1.0.0
|
||||
* @link https://jingga.app
|
||||
*/
|
||||
declare(strict_types=1);
|
||||
|
||||
use phpOMS\Uri\UriFactory;
|
||||
|
||||
echo $this->data['nav']->render(); ?>
|
||||
17
Theme/Backend/inspection-type-list.tpl.php
Normal file
17
Theme/Backend/inspection-type-list.tpl.php
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
<?php
|
||||
/**
|
||||
* Jingga
|
||||
*
|
||||
* PHP Version 8.1
|
||||
*
|
||||
* @package Modules\ItemManagement
|
||||
* @copyright Dennis Eichhorn
|
||||
* @license OMS License 2.0
|
||||
* @version 1.0.0
|
||||
* @link https://jingga.app
|
||||
*/
|
||||
declare(strict_types=1);
|
||||
|
||||
use phpOMS\Uri\UriFactory;
|
||||
|
||||
echo $this->data['nav']->render(); ?>
|
||||
|
|
@ -287,8 +287,8 @@ echo $this->data['nav']->render();
|
|||
</div>
|
||||
<div class="portlet-foot">
|
||||
<input id="bAttributeAdd" formmethod="put" type="submit" class="add-form" value="<?= $this->getHtml('Add', '0', '0'); ?>">
|
||||
<input id="bAttributeSave" formmethod="post" type="submit" class="save-form hidden button save" value="<?= $this->getHtml('Update', '0', '0'); ?>">
|
||||
<input type="submit" class="cancel-form hidden button close" value="<?= $this->getHtml('Cancel', '0', '0'); ?>">
|
||||
<input id="bAttributeSave" formmethod="post" type="submit" class="save-form vh button save" value="<?= $this->getHtml('Update', '0', '0'); ?>">
|
||||
<input type="submit" class="cancel-form vh button close" value="<?= $this->getHtml('Cancel', '0', '0'); ?>">
|
||||
</div>
|
||||
</form>
|
||||
</section>
|
||||
|
|
@ -316,7 +316,7 @@ echo $this->data['nav']->render();
|
|||
<tr data-id="" draggable="false">
|
||||
<td>
|
||||
<i class="g-icon btn update-form">settings</i>
|
||||
<input id="milageTable-remove-0" type="checkbox" class="hidden">
|
||||
<input id="milageTable-remove-0" type="checkbox" class="vh">
|
||||
<label for="milageTable-remove-0" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
|
||||
<span class="checked-visibility">
|
||||
<label for="milageTable-remove-0" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
|
||||
|
|
@ -336,7 +336,7 @@ echo $this->data['nav']->render();
|
|||
<td>
|
||||
<i class="g-icon btn update-form">settings</i>
|
||||
<?php if (!$value->type->isRequired) : ?>
|
||||
<input id="milageTable-remove-<?= $value->id; ?>" type="checkbox" class="hidden">
|
||||
<input id="milageTable-remove-<?= $value->id; ?>" type="checkbox" class="vh">
|
||||
<label for="milageTable-remove-<?= $value->id; ?>" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
|
||||
<span class="checked-visibility">
|
||||
<label for="milageTable-remove-<?= $value->id; ?>" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
|
||||
|
|
|
|||
|
|
@ -301,8 +301,8 @@ echo $this->data['nav']->render();
|
|||
</div>
|
||||
<div class="portlet-foot">
|
||||
<input id="bAttributeAdd" formmethod="put" type="submit" class="add-form" value="<?= $this->getHtml('Add', '0', '0'); ?>">
|
||||
<input id="bAttributeSave" formmethod="post" type="submit" class="save-form hidden button save" value="<?= $this->getHtml('Update', '0', '0'); ?>">
|
||||
<input type="submit" class="cancel-form hidden button close" value="<?= $this->getHtml('Cancel', '0', '0'); ?>">
|
||||
<input id="bAttributeSave" formmethod="post" type="submit" class="save-form vh button save" value="<?= $this->getHtml('Update', '0', '0'); ?>">
|
||||
<input type="submit" class="cancel-form vh button close" value="<?= $this->getHtml('Cancel', '0', '0'); ?>">
|
||||
</div>
|
||||
</form>
|
||||
</section>
|
||||
|
|
@ -330,7 +330,7 @@ echo $this->data['nav']->render();
|
|||
<tr data-id="" draggable="false">
|
||||
<td>
|
||||
<i class="g-icon btn update-form">settings</i>
|
||||
<input id="milageTable-remove-0" type="checkbox" class="hidden">
|
||||
<input id="milageTable-remove-0" type="checkbox" class="vh">
|
||||
<label for="milageTable-remove-0" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
|
||||
<span class="checked-visibility">
|
||||
<label for="milageTable-remove-0" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
|
||||
|
|
@ -350,7 +350,7 @@ echo $this->data['nav']->render();
|
|||
<td>
|
||||
<i class="g-icon btn update-form">settings</i>
|
||||
<?php if (!$value->type->isRequired) : ?>
|
||||
<input id="milageTable-remove-<?= $value->id; ?>" type="checkbox" class="hidden">
|
||||
<input id="milageTable-remove-<?= $value->id; ?>" type="checkbox" class="vh">
|
||||
<label for="milageTable-remove-<?= $value->id; ?>" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
|
||||
<span class="checked-visibility">
|
||||
<label for="milageTable-remove-<?= $value->id; ?>" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user