Jingga/oms-Tasks
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Tasks.git synced 2026-01-11 15:38:40 +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:09 +00:00
parent 56af030cb1
commit 98d1d5404a
4 changed files with 56 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
"type": 1, "type": 1,
"subtype": 1, "subtype": 1,
"name": "Tasks", "name": "Tasks",
"uri": "{/base}/task/dashboard?{?}", "uri": "{/base}/task/dashboard",
"target": "self", "target": "self",
"icon": "bolt", "icon": "bolt",
"order": 15, "order": 15,
@ -19,7 +19,7 @@
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "Dashboard", "name": "Dashboard",
"uri": "{/base}/task/dashboard?{?}", "uri": "{/base}/task/dashboard",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 1, "order": 1,
@ -34,7 +34,7 @@
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "List", "name": "List",
"uri": "{/base}/task/list?{?}", "uri": "{/base}/task/list",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 5, "order": 5,
@ -49,7 +49,7 @@
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "Create", "name": "Create",
"uri": "{/base}/task/create?{?}", "uri": "{/base}/task/create",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 10, "order": 10,
@ -64,7 +64,7 @@
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "Analysis", "name": "Analysis",
"uri": "{/base}/task/analysis?{?}", "uri": "{/base}/task/analysis",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 20, "order": 20,

2
Admin/Install/SearchCommands.php
View File

@ -22,6 +22,7 @@ return [
[ [
'dest' => '\Modules\Tasks\Controller\SearchController:searchTag', 'dest' => '\Modules\Tasks\Controller\SearchController:searchTag',
'verb' => RouteVerb::ANY, 'verb' => RouteVerb::ANY,
'active' => true,
'permission' => [ 'permission' => [
'module' => SearchController::NAME, 'module' => SearchController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -32,6 +33,7 @@ return [
[ [
'dest' => '\Modules\Tasks\Controller\SearchController:searchGeneral', 'dest' => '\Modules\Tasks\Controller\SearchController:searchGeneral',
'verb' => RouteVerb::ANY, 'verb' => RouteVerb::ANY,
'active' => true,
'permission' => [ 'permission' => [
'module' => SearchController::NAME, 'module' => SearchController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,

1
Admin/SearchCommands.php
View File

@ -22,6 +22,7 @@ return [
[ [
'dest' => '\Modules\Tasks\Controller\SearchController:searchGeneral', 'dest' => '\Modules\Tasks\Controller\SearchController:searchGeneral',
'verb' => RouteVerb::ANY, 'verb' => RouteVerb::ANY,
'active' => true,
'permission' => [ 'permission' => [
'module' => SearchController::NAME, 'module' => SearchController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,

225
Controller/ApiController.php
View File

@ -17,12 +17,8 @@ namespace Modules\Tasks\Controller;
use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountMapper;
use Modules\Admin\Models\GroupMapper; use Modules\Admin\Models\GroupMapper;
use Modules\Admin\Models\NullAccount; use Modules\Admin\Models\NullAccount;
use Modules\Media\Models\CollectionMapper; use Modules\Media\Models\Media;
use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\NullMedia;
use Modules\Media\Models\PathSettings; use Modules\Media\Models\PathSettings;
use Modules\Media\Models\Reference;
use Modules\Media\Models\ReferenceMapper;
use Modules\Notification\Models\Notification; use Modules\Notification\Models\Notification;
use Modules\Notification\Models\NotificationMapper; use Modules\Notification\Models\NotificationMapper;
use Modules\Notification\Models\NotificationType; use Modules\Notification\Models\NotificationType;
@ -308,31 +304,6 @@ final class ApiController extends Controller
/** @var \Modules\Admin\Models\Account $account */ /** @var \Modules\Admin\Models\Account $account */
$account = AccountMapper::get()->where('id', $request->header->account)->execute(); $account = AccountMapper::get()->where('id', $request->header->account)->execute();
$collection = null;
if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
names: [],
fileNames: [],
files: $uploadedFiles,
account: $request->header->account,
basePath: __DIR__ . '/../../../Modules/Media/Files' . $path,
virtualPath: $path,
pathSettings: PathSettings::FILE_PATH
);
foreach ($uploaded as $media) {
$this->createModelRelation(
$request->header->account,
$task->id,
$media->id,
TaskMapper::class,
'files',
'',
$request->getOrigin()
);
$accountPath = '/Accounts/' $accountPath = '/Accounts/'
. $account->id . ' ' . $account->id . ' '
. $account->login . '/Tasks/' . $account->login . '/Tasks/'
@ -340,87 +311,37 @@ final class ApiController extends Controller
. $task->createdAt->format('m') . '/' . $task->createdAt->format('m') . '/'
. $task->id; . $task->id;
$ref = new Reference(); if (!empty($request->files)) {
$ref->name = $media->name; $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
$ref->source = new NullMedia($media->id); names: [],
$ref->createdBy = new NullAccount($request->header->account); fileNames: [],
$ref->setVirtualPath($accountPath); files: $request->files,
account: $request->header->account,
basePath: __DIR__ . '/../../../Modules/Media/Files' . $path,
virtualPath: $path,
pathSettings: PathSettings::FILE_PATH,
rel: $task->id,
mapper: TaskMapper::class,
field: 'files'
);
$this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin()); if ($account->id !== 0) {
$this->app->moduleManager->get('Media', 'Api')->addMediaToCollectionAndModel(
if ($collection === null) { account: $request->header->account,
/** @var \Modules\Media\Models\Collection $collection */ files: \array_map(function (Media $media) { return $media->id; }, $uploaded->sources),
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute(); collectionPath: $accountPath
if ($collection->id === 0) {
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
$accountPath,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files/Accounts/'
. $account->id . '/Tasks/'
. $task->createdAt->format('Y') . '/'
. $task->createdAt->format('m') . '/'
. $task->id
); );
} }
} }
$this->createModelRelation( if (!empty($media = $request->getDataJson('media'))) {
$request->header->account, $this->app->moduleManager->get('Media', 'Api')->addMediaToCollectionAndModel(
$collection->id,
$ref->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(
$request->header->account, $request->header->account,
$media,
$task->id, $task->id,
$media->id,
TaskMapper::class, TaskMapper::class,
'files', 'files',
'', $path
$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()
); );
} }
} }
@ -653,102 +574,42 @@ final class ApiController extends Controller
/** @var \Modules\Admin\Models\Account $account */ /** @var \Modules\Admin\Models\Account $account */
$account = AccountMapper::get()->where('id', $request->header->account)->execute(); $account = AccountMapper::get()->where('id', $request->header->account)->execute();
$collection = null;
if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
[],
[],
$uploadedFiles,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files' . $path,
$path,
);
foreach ($uploaded as $media) {
$this->createModelRelation(
$request->header->account,
$element->id,
$media->id,
TaskElementMapper::class,
'files',
'',
$request->getOrigin()
);
$accountPath = '/Accounts/' . $account->id . ' ' $accountPath = '/Accounts/' . $account->id . ' '
. $account->login . '/Tasks/' . $account->login . '/Tasks/'
. $task->createdAt->format('Y') . '/' . $task->createdAt->format('Y') . '/'
. $task->createdAt->format('m') . '/' . $task->createdAt->format('m') . '/'
. $task->id; . $task->id;
$ref = new Reference(); if (!empty($request->files)) {
$ref->name = $media->name; $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
$ref->source = new NullMedia($media->id); names: [],
$ref->createdBy = new NullAccount($request->header->account); fileNames: [],
$ref->setVirtualPath($accountPath); files: $request->files,
account: $request->header->account,
$this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin()); basePath: __DIR__ . '/../../../Modules/Media/Files' . $path,
virtualPath: $path,
$collection ??= $this->app->moduleManager->get('Media')->createRecursiveMediaCollection( rel: $element->id,
$accountPath, mapper: TaskElementMapper::class,
$request->header->account, field: 'files'
__DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->id
. '/Tasks/' . $task->createdAt->format('Y') . '/'
. $task->createdAt->format('m') . '/'
. $task->id
); );
$this->createModelRelation( if ($account->id !== 0) {
$request->header->account, $this->app->moduleManager->get('Media', 'Api')->addMediaToCollectionAndModel(
$collection->id, account: $request->header->account,
$ref->id, files: \array_map(function (Media $media) { return $media->id; }, $uploaded->sources),
CollectionMapper::class, collectionPath: $accountPath
'sources',
'',
$request->getOrigin()
); );
} }
} }
$mediaFiles = $request->getDataJson('media'); if (!empty($media = $request->getDataJson('media'))) {
foreach ($mediaFiles as $file) { $this->app->moduleManager->get('Media', 'Api')->addMediaToCollectionAndModel(
/** @var \Modules\Media\Models\Media $media */
$media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute();
$this->createModelRelation(
$request->header->account, $request->header->account,
$media,
$element->id, $element->id,
$media->id,
TaskElementMapper::class, TaskElementMapper::class,
'files', 'files',
'', $path
$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());
$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()
); );
} }
} }