Jingga/oms-InvestmentManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-InvestmentManagement.git synced 2026-01-10 19:28:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-12 00:52:07 +00:00
parent 82938e523c
commit 0051c9327c
2 changed files with 60 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Admin/Install/Navigation.install.json
View File

@ -5,7 +5,7 @@
"type": 2,
"subtype": 1,
"name": "Investments",
"uri": "{/base}/finance/investment/list?{?}",
"uri": "{/base}/finance/investment/list",
"target": "self",
"icon": null,
"order": 5,
@ -19,7 +19,7 @@
"type": 3,
"subtype": 1,
"name": "List",
"uri": "{/base}/finance/investment/list?{?}",
"uri": "{/base}/finance/investment/list",
"target": "self",
"icon": null,
"order": 1,
@ -34,7 +34,7 @@
"type": 3,
"subtype": 1,
"name": "Create",
"uri": "{/base}/finance/investment/create?{?}",
"uri": "{/base}/finance/investment/create",
"target": "self",
"icon": null,
"order": 5,
@ -51,7 +51,7 @@
"type": 2,
"subtype": 1,
"name": "InvestmentInquiries",
"uri": "{/base}/private/investment/list?{?}",
"uri": "{/base}/private/investment/list",
"target": "self",
"icon": null,
"order": 10,
@ -65,7 +65,7 @@
"type": 3,
"subtype": 1,
"name": "List",
"uri": "{/base}/private/investment/list?{?}",
"uri": "{/base}/private/investment/list",
"target": "self",
"icon": null,
"order": 1,
@ -80,7 +80,7 @@
"type": 3,
"subtype": 1,
"name": "Create",
"uri": "{/base}/private/investment/create?{?}",
"uri": "{/base}/private/investment/create",
"target": "self",
"icon": null,
"order": 5,

344
Controller/ApiController.php
View File

@ -25,12 +25,8 @@ use Modules\InvestmentManagement\Models\InvestmentObject;
use Modules\InvestmentManagement\Models\InvestmentObjectMapper;
use Modules\InvestmentManagement\Models\InvestmentStatus;
use Modules\ItemManagement\Models\NullItem;
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 Modules\SupplierManagement\Models\NullSupplier;
use phpOMS\Localization\BaseStringL11n;
use phpOMS\Localization\BaseStringL11nType;
@ -129,99 +125,29 @@ final class ApiController extends Controller
{
$path = $this->createInvestmentDir($investment);
$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: $investment->id,
mapper: InvestmentMapper::class,
field: 'files'
);
foreach ($uploaded as $media) {
$this->createModelRelation(
$request->header->account,
$investment->id,
$media->id,
InvestmentMapper::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,
$investment->id,
$media->id,
InvestmentMapper::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
);
}
}
@ -252,85 +178,39 @@ final class ApiController extends Controller
$investment = InvestmentMapper::get()->where('id', (int) $request->getData('investment'))->execute();
$path = $this->createInvestmentDir($investment);
$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: $investment->id,
mapper: InvestmentMapper::class,
field: 'files'
);
$collection = null;
foreach ($uploaded as $media) {
$this->createModelRelation(
$request->header->account,
$investment->id,
$media->id,
InvestmentMapper::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,
$investment->id,
(int) $media,
InvestmentMapper::class,
'files',
'',
$request->getOrigin()
$path
);
}
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media added to investment.', [
'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,
]);
}
@ -575,99 +455,29 @@ final class ApiController extends Controller
{
$path = $this->createInvestmentObjectDir($investment);
$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: $investment->id,
mapper: InvestmentMapper::class,
field: 'files'
);
foreach ($uploaded as $media) {
$this->createModelRelation(
$request->header->account,
$investment->id,
$media->id,
InvestmentObjectMapper::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,
$investment->id,
$media->id,
InvestmentObjectMapper::class,
InvestmentMapper::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
);
}
}
@ -698,85 +508,39 @@ final class ApiController extends Controller
$investment = InvestmentObjectMapper::get()->where('id', (int) $request->getData('option'))->execute();
$path = $this->createInvestmentObjectDir($investment);
$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: $investment->id,
mapper: InvestmentObjectMapper::class,
field: 'files'
);
$collection = null;
foreach ($uploaded as $media) {
$this->createModelRelation(
$request->header->account,
$investment->id,
$media->id,
InvestmentObjectMapper::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,
$investment->id,
(int) $media,
InvestmentObjectMapper::class,
'files',
'',
$request->getOrigin()
$path
);
}
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media added to investment.', [
'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,
]);
}