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

update

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-02-04 20:34:12 +00:00
parent a302b31734
commit 4c73576746
3 changed files with 110 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
Controller/ApiDriverController.php
View File

@ -187,8 +187,10 @@ final class ApiDriverController extends Controller
{ {
$path = $this->createDriverDir($driver); $path = $this->createDriverDir($driver);
$collection = null;
if (!empty($uploadedFiles = $request->files)) { if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
names: [], names: [],
fileNames: [], fileNames: [],
files: $uploadedFiles, files: $uploadedFiles,
@ -198,7 +200,6 @@ final class ApiDriverController extends Controller
pathSettings: PathSettings::FILE_PATH pathSettings: PathSettings::FILE_PATH
); );
$collection = null;
foreach ($uploaded as $media) { foreach ($uploaded as $media) {
$this->createModelRelation( $this->createModelRelation(
$request->header->account, $request->header->account,
@ -235,54 +236,51 @@ final class ApiDriverController extends Controller
} }
} }
if (!empty($mediaFiles = $request->getDataJson('media'))) { $mediaFiles = $request->getDataJson('media');
$collection = null; foreach ($mediaFiles as $file) {
/** @var \Modules\Media\Models\Media $media */
$media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute();
foreach ($mediaFiles as $file) { $this->createModelRelation(
/** @var \Modules\Media\Models\Media $media */ $request->header->account,
$media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute(); $driver->id,
$media->id,
DriverMapper::class,
'files',
'',
$request->getOrigin()
);
$this->createModelRelation( $ref = new Reference();
$request->header->account, $ref->name = $media->name;
$driver->id, $ref->source = new NullMedia($media->id);
$media->id, $ref->createdBy = new NullAccount($request->header->account);
DriverMapper::class, $ref->setVirtualPath($path);
'files',
'',
$request->getOrigin()
);
$ref = new Reference(); $this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin());
$ref->name = $media->name;
$ref->source = new NullMedia($media->id);
$ref->createdBy = new NullAccount($request->header->account);
$ref->setVirtualPath($path);
$this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin()); if ($collection === null) {
/** @var \Modules\Media\Models\Collection $collection */
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
if ($collection === null) { if ($collection->id === 0) {
/** @var \Modules\Media\Models\Collection $collection */ $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute(); $path,
$request->header->account,
if ($collection->id === 0) { __DIR__ . '/../../../Modules/Media/Files' . $path
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection( );
$path,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files' . $path
);
}
} }
$this->createModelRelation(
$request->header->account,
$collection->id,
$ref->id,
CollectionMapper::class,
'sources',
'',
$request->getOrigin()
);
} }
$this->createModelRelation(
$request->header->account,
$collection->id,
$ref->id,
CollectionMapper::class,
'sources',
'',
$request->getOrigin()
);
} }
} }
@ -334,7 +332,7 @@ final class ApiDriverController extends Controller
$uploaded = []; $uploaded = [];
if (!empty($uploadedFiles = $request->files)) { if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
names: [], names: [],
fileNames: [], fileNames: [],
files: $uploadedFiles, files: $uploadedFiles,
@ -395,18 +393,17 @@ final class ApiDriverController extends Controller
} }
} }
if (!empty($mediaFiles = $request->getDataJson('media'))) { $mediaFiles = $request->getDataJson('media');
foreach ($mediaFiles as $media) { foreach ($mediaFiles as $media) {
$this->createModelRelation( $this->createModelRelation(
$request->header->account, $request->header->account,
$driver->id, $driver->id,
(int) $media, (int) $media,
DriverMapper::class, DriverMapper::class,
'files', 'files',
'', '',
$request->getOrigin() $request->getOrigin()
); );
}
} }
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media added to driver.', [ $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media added to driver.', [

109
Controller/ApiVehicleController.php
View File

@ -562,8 +562,10 @@ final class ApiVehicleController extends Controller
{ {
$path = $this->createVehicleDir($vehicle); $path = $this->createVehicleDir($vehicle);
$collection = null;
if (!empty($uploadedFiles = $request->files)) { if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
names: [], names: [],
fileNames: [], fileNames: [],
files: $uploadedFiles, files: $uploadedFiles,
@ -573,7 +575,6 @@ final class ApiVehicleController extends Controller
pathSettings: PathSettings::FILE_PATH pathSettings: PathSettings::FILE_PATH
); );
$collection = null;
foreach ($uploaded as $media) { foreach ($uploaded as $media) {
$this->createModelRelation( $this->createModelRelation(
$request->header->account, $request->header->account,
@ -610,54 +611,51 @@ final class ApiVehicleController extends Controller
} }
} }
if (!empty($mediaFiles = $request->getDataJson('media'))) { $mediaFiles = $request->getDataJson('media');
$collection = null; foreach ($mediaFiles as $file) {
/** @var \Modules\Media\Models\Media $media */
$media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute();
foreach ($mediaFiles as $file) { $this->createModelRelation(
/** @var \Modules\Media\Models\Media $media */ $request->header->account,
$media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute(); $vehicle->id,
$media->id,
VehicleMapper::class,
'files',
'',
$request->getOrigin()
);
$this->createModelRelation( $ref = new Reference();
$request->header->account, $ref->name = $media->name;
$vehicle->id, $ref->source = new NullMedia($media->id);
$media->id, $ref->createdBy = new NullAccount($request->header->account);
VehicleMapper::class, $ref->setVirtualPath($path);
'files',
'',
$request->getOrigin()
);
$ref = new Reference(); $this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin());
$ref->name = $media->name;
$ref->source = new NullMedia($media->id);
$ref->createdBy = new NullAccount($request->header->account);
$ref->setVirtualPath($path);
$this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin()); if ($collection === null) {
/** @var \Modules\Media\Models\Collection $collection */
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
if ($collection === null) { if ($collection->id === 0) {
/** @var \Modules\Media\Models\Collection $collection */ $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute(); $path,
$request->header->account,
if ($collection->id === 0) { __DIR__ . '/../../../Modules/Media/Files' . $path
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection( );
$path,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files' . $path
);
}
} }
$this->createModelRelation(
$request->header->account,
$collection->id,
$ref->id,
CollectionMapper::class,
'sources',
'',
$request->getOrigin()
);
} }
$this->createModelRelation(
$request->header->account,
$collection->id,
$ref->id,
CollectionMapper::class,
'sources',
'',
$request->getOrigin()
);
} }
} }
@ -710,7 +708,7 @@ final class ApiVehicleController extends Controller
$uploaded = []; $uploaded = [];
if (!empty($uploadedFiles = $request->files)) { if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
names: [], names: [],
fileNames: [], fileNames: [],
files: $uploadedFiles, files: $uploadedFiles,
@ -771,18 +769,17 @@ final class ApiVehicleController extends Controller
} }
} }
if (!empty($mediaFiles = $request->getDataJson('media'))) { $mediaFiles = $request->getDataJson('media');
foreach ($mediaFiles as $media) { foreach ($mediaFiles as $media) {
$this->createModelRelation( $this->createModelRelation(
$request->header->account, $request->header->account,
$vehicle->id, $vehicle->id,
(int) $media, (int) $media,
VehicleMapper::class, VehicleMapper::class,
'files', 'files',
'', '',
$request->getOrigin() $request->getOrigin()
); );
}
} }
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media added to vehicle.', [ $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media added to vehicle.', [

4
Controller/BackendController.php
View File

@ -442,6 +442,8 @@ final class BackendController extends Controller
$view->data['inspections'] = $inspections; $view->data['inspections'] = $inspections;
// @feature Create a new read mapper function that returns relation models instead of its own model
// https://github.com/Karaka-Management/phpOMS/issues/320
$query = new Builder($this->app->dbPool->get()); $query = new Builder($this->app->dbPool->get());
$results = $query->selectAs(VehicleMapper::HAS_MANY['files']['external'], 'file') $results = $query->selectAs(VehicleMapper::HAS_MANY['files']['external'], 'file')
->from(VehicleMapper::TABLE) ->from(VehicleMapper::TABLE)
@ -527,6 +529,8 @@ final class BackendController extends Controller
->where('type/l11n/language', $response->header->l11n->language) ->where('type/l11n/language', $response->header->l11n->language)
->execute(); ->execute();
// @feature Create a new read mapper function that returns relation models instead of its own model
// https://github.com/Karaka-Management/phpOMS/issues/320
$query = new Builder($this->app->dbPool->get()); $query = new Builder($this->app->dbPool->get());
$results = $query->selectAs(DriverMapper::HAS_MANY['files']['external'], 'file') $results = $query->selectAs(DriverMapper::HAS_MANY['files']['external'], 'file')
->from(DriverMapper::TABLE) ->from(DriverMapper::TABLE)