Jingga/oms-HumanResourceManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-HumanResourceManagement.git synced 2026-02-15 12:18: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:06 +00:00
parent 23ebcab323
commit 034918a977
2 changed files with 21 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@
"type": 2, "type": 2,
"subtype": 1, "subtype": 1,
"name": "Employees", "name": "Employees",
"uri": "{/base}/humanresource/staff/list?{?}", "uri": "{/base}/humanresource/staff/list",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 1, "order": 1,
@ -33,7 +33,7 @@
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "List", "name": "List",
"uri": "{/base}/humanresource/staff/list?{?}", "uri": "{/base}/humanresource/staff/list",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 1, "order": 1,
@ -49,7 +49,7 @@
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "Create", "name": "Create",
"uri": "{/base}/humanresource/staff/create?{?}", "uri": "{/base}/humanresource/staff/create",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 5, "order": 5,
@ -67,7 +67,7 @@
"type": 2, "type": 2,
"subtype": 1, "subtype": 1,
"name": "Departments", "name": "Departments",
"uri": "{/base}/humanresource/department/list?{?}", "uri": "{/base}/humanresource/department/list",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 1, "order": 1,
@ -82,7 +82,7 @@
"type": 2, "type": 2,
"subtype": 1, "subtype": 1,
"name": "Positions", "name": "Positions",
"uri": "{/base}/humanresource/position/list?{?}", "uri": "{/base}/humanresource/position/list",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 1, "order": 1,

79
Controller/ApiController.php
View File

@ -24,8 +24,7 @@ use Modules\HumanResourceManagement\Models\EmployeeMapper;
use Modules\HumanResourceManagement\Models\EmployeeWorkHistory; use Modules\HumanResourceManagement\Models\EmployeeWorkHistory;
use Modules\HumanResourceManagement\Models\EmployeeWorkHistoryMapper; use Modules\HumanResourceManagement\Models\EmployeeWorkHistoryMapper;
use Modules\HumanResourceManagement\Models\PermissionCategory; use Modules\HumanResourceManagement\Models\PermissionCategory;
use Modules\Media\Models\CollectionMapper; use Modules\Media\Models\NullCollection;
use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\PathSettings; use Modules\Media\Models\PathSettings;
use Modules\Organization\Models\NullDepartment; use Modules\Organization\Models\NullDepartment;
use Modules\Organization\Models\NullPosition; use Modules\Organization\Models\NullPosition;
@ -457,85 +456,39 @@ final class ApiController extends Controller
$employee = EmployeeMapper::get()->where('id', (int) $request->getData('employee'))->execute(); $employee = EmployeeMapper::get()->where('id', (int) $request->getData('employee'))->execute();
$path = $this->createEmployeeDir($employee); $path = $this->createEmployeeDir($employee);
$uploaded = []; $uploaded = new NullCollection();
if (!empty($uploadedFiles = $request->files)) { if (!empty($request->files)) {
$uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
names: [], names: [],
fileNames: [], fileNames: [],
files: $uploadedFiles, files: $request->files,
account: $request->header->account, account: $request->header->account,
basePath: __DIR__ . '/../../../Modules/Media/Files' . $path, basePath: __DIR__ . '/../../../Modules/Media/Files' . $path,
virtualPath: $path, virtualPath: $path,
pathSettings: PathSettings::FILE_PATH, pathSettings: PathSettings::FILE_PATH,
hasAccountRelation: false, hasAccountRelation: false,
readContent: $request->getDataBool('parse_content') ?? false readContent: $request->getDataBool('parse_content') ?? false,
type: $request->getDataInt('type'),
rel: $employee->id,
mapper: EmployeeMapper::class,
field: 'files'
); );
$collection = null;
foreach ($uploaded as $media) {
$this->createModelRelation(
$request->header->account,
$employee->id,
$media->id,
EmployeeMapper::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'); if (!empty($media = $request->getDataJson('media'))) {
foreach ($mediaFiles as $media) { $this->app->moduleManager->get('Media', 'Api')->addMediaToCollectionAndModel(
$this->createModelRelation(
$request->header->account, $request->header->account,
$media,
$employee->id, $employee->id,
(int) $media,
EmployeeMapper::class, EmployeeMapper::class,
'files', 'files',
'', $path
$request->getOrigin()
); );
} }
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media added to employee.', [ $this->fillJsonResponse($request, $response, NotificationLevel::OK, '', $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SuccessfulAdd'), [
'upload' => $uploaded, 'upload' => $uploaded->sources,
'media' => $mediaFiles, 'media' => $media,
]); ]);
} }