mirror of
https://github.com/Karaka-Management/oms-FleetManagement.git
synced 2026-01-11 04:48:41 +00:00
general fixes
This commit is contained in:
parent
87edec7bfc
commit
694de69e52
|
|
@ -24,6 +24,7 @@ use Modules\FleetManagement\Models\Attribute\VehicleAttributeTypeMapper;
|
||||||
use Modules\FleetManagement\Models\Attribute\VehicleAttributeValueL11nMapper;
|
use Modules\FleetManagement\Models\Attribute\VehicleAttributeValueL11nMapper;
|
||||||
use Modules\FleetManagement\Models\Attribute\VehicleAttributeValueMapper;
|
use Modules\FleetManagement\Models\Attribute\VehicleAttributeValueMapper;
|
||||||
use Modules\FleetManagement\Models\Driver\DriverInspectionMapper;
|
use Modules\FleetManagement\Models\Driver\DriverInspectionMapper;
|
||||||
|
use Modules\FleetManagement\Models\Driver\DriverInspectionTypeMapper;
|
||||||
use Modules\FleetManagement\Models\Driver\DriverMapper;
|
use Modules\FleetManagement\Models\Driver\DriverMapper;
|
||||||
use Modules\FleetManagement\Models\Inspection;
|
use Modules\FleetManagement\Models\Inspection;
|
||||||
use Modules\FleetManagement\Models\InspectionMapper;
|
use Modules\FleetManagement\Models\InspectionMapper;
|
||||||
|
|
@ -243,7 +244,7 @@ final class BackendController extends Controller
|
||||||
$view->setTemplate('/Modules/FleetManagement/Theme/Backend/inspection-type-list');
|
$view->setTemplate('/Modules/FleetManagement/Theme/Backend/inspection-type-list');
|
||||||
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003502001, $request, $response);
|
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003502001, $request, $response);
|
||||||
|
|
||||||
$view->data['inspections'] = InspectionTypeMapper::getAll()
|
$view->data['types'] = InspectionTypeMapper::getAll()
|
||||||
->with('l11n')
|
->with('l11n')
|
||||||
->where('l11n/language', $response->header->l11n->language)
|
->where('l11n/language', $response->header->l11n->language)
|
||||||
->sort('id', 'DESC')
|
->sort('id', 'DESC')
|
||||||
|
|
@ -270,7 +271,7 @@ final class BackendController extends Controller
|
||||||
$view->setTemplate('/Modules/FleetManagement/Theme/Backend/inspection-type-list');
|
$view->setTemplate('/Modules/FleetManagement/Theme/Backend/inspection-type-list');
|
||||||
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003502001, $request, $response);
|
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003502001, $request, $response);
|
||||||
|
|
||||||
$view->data['inspections'] = InspectionTypeMapper::getAll()
|
$view->data['types'] = DriverInspectionTypeMapper::getAll()
|
||||||
->with('l11n')
|
->with('l11n')
|
||||||
->where('l11n/language', $response->header->l11n->language)
|
->where('l11n/language', $response->header->l11n->language)
|
||||||
->sort('id', 'DESC')
|
->sort('id', 'DESC')
|
||||||
|
|
@ -279,6 +280,28 @@ final class BackendController extends Controller
|
||||||
return $view;
|
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 viewFleetManagementInspectionCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
|
||||||
|
{
|
||||||
|
$view = new View($this->app->l11nManager, $request, $response);
|
||||||
|
|
||||||
|
$view->setTemplate('/Modules/FleetManagement/Theme/Backend/inspection-view');
|
||||||
|
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003502001, $request, $response);
|
||||||
|
|
||||||
|
return $view;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Routing end-point for application behavior.
|
* Routing end-point for application behavior.
|
||||||
*
|
*
|
||||||
|
|
@ -298,10 +321,6 @@ final class BackendController extends Controller
|
||||||
$view->setTemplate('/Modules/FleetManagement/Theme/Backend/inspection-view');
|
$view->setTemplate('/Modules/FleetManagement/Theme/Backend/inspection-view');
|
||||||
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003502001, $request, $response);
|
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003502001, $request, $response);
|
||||||
|
|
||||||
$view->data['inspections'] = InspectionMapper::getAll()
|
|
||||||
->sort('id', 'DESC')
|
|
||||||
->executeGetArray();
|
|
||||||
|
|
||||||
return $view;
|
return $view;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -514,6 +533,36 @@ final class BackendController extends Controller
|
||||||
$view->setTemplate('/Modules/FleetManagement/Theme/Backend/inspection-view');
|
$view->setTemplate('/Modules/FleetManagement/Theme/Backend/inspection-view');
|
||||||
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003502001, $request, $response);
|
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003502001, $request, $response);
|
||||||
|
|
||||||
|
$view->data['inspections'] = InspectionMapper::getAll()
|
||||||
|
->where('id', (int) $request->getData('id'))
|
||||||
|
->executeGetArray();
|
||||||
|
|
||||||
|
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 viewFleetManagementDriverInspectionView(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
|
||||||
|
{
|
||||||
|
$view = new View($this->app->l11nManager, $request, $response);
|
||||||
|
|
||||||
|
$view->setTemplate('/Modules/FleetManagement/Theme/Backend/inspection-view');
|
||||||
|
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003502001, $request, $response);
|
||||||
|
|
||||||
|
$view->data['inspections'] = DriverInspectionMapper::getAll()
|
||||||
|
->where('id', (int) $request->getData('id'))
|
||||||
|
->executeGetArray();
|
||||||
|
|
||||||
return $view;
|
return $view;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -49,5 +49,6 @@ return ['FleetManagement' => [
|
||||||
'Type' => 'Typ',
|
'Type' => 'Typ',
|
||||||
'Upcoming' => 'Upcoming',
|
'Upcoming' => 'Upcoming',
|
||||||
'Vehicles' => 'Fahrzeuge',
|
'Vehicles' => 'Fahrzeuge',
|
||||||
|
'Vehicle' => 'Fahrzeug',
|
||||||
'Vin' => 'Vin',
|
'Vin' => 'Vin',
|
||||||
]];
|
]];
|
||||||
|
|
|
||||||
|
|
@ -49,5 +49,6 @@ return ['FleetManagement' => [
|
||||||
'Type' => 'Type',
|
'Type' => 'Type',
|
||||||
'Upcoming' => 'Upcoming',
|
'Upcoming' => 'Upcoming',
|
||||||
'Vehicles' => 'Vehicles',
|
'Vehicles' => 'Vehicles',
|
||||||
|
'Vehicle' => 'Vehicle',
|
||||||
'Vin' => 'Vin',
|
'Vin' => 'Vin',
|
||||||
]];
|
]];
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user