Jingga/oms-FleetManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-FleetManagement.git synced 2026-02-10 02:18:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bump

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-01-30 21:29:21 +00:00
parent 30d0aaf2ce
commit a302b31734
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Controller/BackendController.php
View File

@ -456,25 +456,25 @@ final class BackendController extends Controller
->where(VehicleMapper::HAS_MANY['files']['self'], '=', $vehicle->id)
->where(MediaTypeMapper::TABLE . '.' . MediaTypeMapper::getColumnByMember('name'), '=', 'vehicle_profile_image');
$vehicleImage = MediaMapper::get()
$view->data['vehicleImage'] = MediaMapper::get()
->with('types')
->where('id', $results)
->limit(1)
->execute();
$view->data['vehicleImage'] = $vehicleImage;
$vehicleTypes = VehicleTypeMapper::getAll()
$view->data['types'] = VehicleTypeMapper::getAll()
->with('l11n')
->where('l11n/language', $response->header->l11n->language)
->execute();
$view->data['types'] = $vehicleTypes;
$units = UnitMapper::getAll()
$view->data['units'] = UnitMapper::getAll()
->execute();
$view->data['units'] = $units;
/** @var \Modules\Attribute\Models\AttributeType[] */
$view->data['attributeTypes'] = VehicleAttributeTypeMapper::getAll()
->with('l11n')
->where('l11n/language', $response->header->l11n->language)
->execute();
$view->data['attributeView'] = new \Modules\Attribute\Theme\Backend\Components\AttributeView($this->app->l11nManager, $request, $response);
$view->data['attributeView']->data['default_localization'] = $this->app->l11nServer;
@ -520,15 +520,13 @@ final class BackendController extends Controller
$view->data['driver'] = $driver;
$inspections = DriverInspectionMapper::getAll()
$view->data['inspections'] = DriverInspectionMapper::getAll()
->with('type')
->with('type/l11n')
->where('reference', $driver->id)
->where('type/l11n/language', $response->header->l11n->language)
->execute();
$view->data['inspections'] = $inspections;
$query = new Builder($this->app->dbPool->get());
$results = $query->selectAs(DriverMapper::HAS_MANY['files']['external'], 'file')
->from(DriverMapper::TABLE)
@ -543,13 +541,17 @@ final class BackendController extends Controller
->where(DriverMapper::HAS_MANY['files']['self'], '=', $driver->id)
->where(MediaTypeMapper::TABLE . '.' . MediaTypeMapper::getColumnByMember('name'), '=', 'driver_profile_image');
$driverImage = MediaMapper::get()
$view->data['driverImage'] = MediaMapper::get()
->with('types')
->where('id', $results)
->limit(1)
->execute();
$view->data['driverImage'] = $driverImage;
/** @var \Modules\Attribute\Models\AttributeType[] */
$view->data['attributeTypes'] = DriverAttributeTypeMapper::getAll()
->with('l11n')
->where('l11n/language', $response->header->l11n->language)
->execute();
$view->data['attributeView'] = new \Modules\Attribute\Theme\Backend\Components\AttributeView($this->app->l11nManager, $request, $response);
$view->data['attributeView']->data['default_localization'] = $this->app->l11nServer;

2
Models/Driver/DriverMapper.php
View File

@ -56,7 +56,7 @@ final class DriverMapper extends DataMapperFactory
'mapper' => MediaMapper::class,
'table' => 'fleetmgmt_driver_media',
'external' => 'fleetmgmt_driver_media_media',
'self' => 'fleetmgmt_driver_media_vehicle',
'self' => 'fleetmgmt_driver_media_driver',
],
'attributes' => [
'mapper' => DriverAttributeMapper::class,