diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 0c88dfe..67c8b27 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, @@ -48,7 +48,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/base}/equipment/create?{?}", + "uri": "{/base}/equipment/create", "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, @@ -94,7 +94,7 @@ "type": 3, "subtype": 1, "name": "InspectionTypes", - "uri": "{/base}/equipment/inspection/type/list?{?}", + "uri": "{/base}/equipment/inspection/type/list", "target": "self", "icon": null, "order": 5, @@ -111,7 +111,7 @@ "type": 2, "subtype": 1, "name": "Attributes", - "uri": "{/base}/equipment/attribute/type/list?{?}", + "uri": "{/base}/equipment/attribute/type/list", "target": "self", "icon": null, "order": 5, @@ -125,7 +125,7 @@ "type": 3, "subtype": 1, "name": "Types", - "uri": "{/base}/equipment/attribute/type/list?{?}", + "uri": "{/base}/equipment/attribute/type/list", "target": "self", "icon": null, "order": 15, @@ -140,7 +140,7 @@ "type": 3, "subtype": 1, "name": "Values", - "uri": "{/base}/equipment/attribute/value/list?{?}", + "uri": "{/base}/equipment/attribute/value/list", "target": "self", "icon": null, "order": 15, diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 9362746..6bf043b 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -14,17 +14,12 @@ declare(strict_types=1); namespace Modules\EquipmentManagement\Controller; -use Modules\Admin\Models\NullAccount; use Modules\EquipmentManagement\Models\Equipment; use Modules\EquipmentManagement\Models\EquipmentMapper; use Modules\EquipmentManagement\Models\EquipmentStatus; use Modules\EquipmentManagement\Models\PermissionCategory; -use Modules\Media\Models\CollectionMapper; -use Modules\Media\Models\MediaMapper; -use Modules\Media\Models\NullMedia; +use Modules\Media\Models\NullCollection; use Modules\Media\Models\PathSettings; -use Modules\Media\Models\Reference; -use Modules\Media\Models\ReferenceMapper; use phpOMS\Account\PermissionType; use phpOMS\Localization\NullBaseStringL11nType; use phpOMS\Message\Http\RequestStatusCode; @@ -112,99 +107,29 @@ final class ApiController extends Controller { $path = $this->createEquipmentDir($equipment); - $collection = null; - - if (!empty($uploadedFiles = $request->files)) { - $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles( + if (!empty($request->files)) { + $this->app->moduleManager->get('Media', 'Api')->uploadFiles( names: [], fileNames: [], - files: $uploadedFiles, + files: $request->files, account: $request->header->account, basePath: __DIR__ . '/../../../Modules/Media/Files' . $path, virtualPath: $path, - pathSettings: PathSettings::FILE_PATH + pathSettings: PathSettings::FILE_PATH, + rel: $equipment->id, + mapper: EquipmentMapper::class, + field: 'files' ); - - foreach ($uploaded as $media) { - $this->createModelRelation( - $request->header->account, - $equipment->id, - $media->id, - EquipmentMapper::class, - 'files', - '', - $request->getOrigin() - ); - - if ($collection === null) { - /** @var \Modules\Media\Models\Collection $collection */ - $collection = MediaMapper::getParentCollection($path)->limit(1)->execute(); - - if ($collection->id === 0) { - $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection( - $path, - $request->header->account, - __DIR__ . '/../../../Modules/Media/Files' . $path - ); - } - } - - $this->createModelRelation( - $request->header->account, - $collection->id, - $media->id, - CollectionMapper::class, - 'sources', - '', - $request->getOrigin() - ); - } } - $mediaFiles = $request->getDataJson('media'); - foreach ($mediaFiles as $file) { - /** @var \Modules\Media\Models\Media $media */ - $media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute(); - - $this->createModelRelation( + if (!empty($media = $request->getDataJson('media'))) { + $this->app->moduleManager->get('Media', 'Api')->addMediaToCollectionAndModel( $request->header->account, + $media, $equipment->id, - $media->id, EquipmentMapper::class, 'files', - '', - $request->getOrigin() - ); - - $ref = new Reference(); - $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->id === 0) { - $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() + $path ); } } @@ -256,85 +181,39 @@ final class ApiController extends Controller $equipment = EquipmentMapper::get()->where('id', (int) $request->getData('equipment'))->execute(); $path = $this->createEquipmentDir($equipment); - $uploaded = []; - if (!empty($uploadedFiles = $request->files)) { + $uploaded = new NullCollection(); + if (!empty($request->files)) { $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles( names: [], fileNames: [], - files: $uploadedFiles, + files: $request->files, account: $request->header->account, basePath: __DIR__ . '/../../../Modules/Media/Files' . $path, virtualPath: $path, pathSettings: PathSettings::FILE_PATH, hasAccountRelation: false, - readContent: $request->getDataBool('parse_content') ?? false + readContent: $request->getDataBool('parse_content') ?? false, + type: $request->getDataInt('type'), + rel: $equipment->id, + mapper: EquipmentMapper::class, + field: 'files' ); - - $collection = null; - foreach ($uploaded as $media) { - $this->createModelRelation( - $request->header->account, - $equipment->id, - $media->id, - EquipmentMapper::class, - 'files', - '', - $request->getOrigin() - ); - - if ($request->hasData('type')) { - $this->createModelRelation( - $request->header->account, - $media->id, - $request->getDataInt('type'), - MediaMapper::class, - 'types', - '', - $request->getOrigin() - ); - } - - if ($collection === null) { - /** @var \Modules\Media\Models\Collection $collection */ - $collection = MediaMapper::getParentCollection($path)->limit(1)->execute(); - - if ($collection->id === 0) { - $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection( - $path, - $request->header->account, - __DIR__ . '/../../../Modules/Media/Files' . $path, - ); - } - } - - $this->createModelRelation( - $request->header->account, - $collection->id, - $media->id, - CollectionMapper::class, - 'sources', - '', - $request->getOrigin() - ); - } } - $mediaFiles = $request->getDataJson('media'); - foreach ($mediaFiles as $media) { - $this->createModelRelation( + if (!empty($media = $request->getDataJson('media'))) { + $this->app->moduleManager->get('Media', 'Api')->addMediaToCollectionAndModel( $request->header->account, + $media, $equipment->id, - (int) $media, EquipmentMapper::class, 'files', - '', - $request->getOrigin() + $path ); } - $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media added to equipment.', [ - 'upload' => $uploaded, - 'media' => $mediaFiles, + $this->fillJsonResponse($request, $response, NotificationLevel::OK, '', $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SuccessfulAdd'), [ + 'upload' => $uploaded->sources, + 'media' => $media, ]); }