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

bug fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-10-11 19:17:40 +00:00
parent 3f042aa3d3
commit 7de2f3e895
3 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Admin/Routes/Web/Api.php
View File

@ -31,6 +31,46 @@ return [
], ],
], ],
], ],
'^.*/humanresource/staff/file(\?.*|$)$' => [
[
'dest' => '\Modules\HumanResourceManagement\Controller\ApiController:apiMediaAddToVehicle',
'verb' => RouteVerb::PUT,
'csrf' => true,
'active' => true,
'permission' => [
'module' => ApiController::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionCategory::HR,
],
],
],
'^.*/humanresource/staff/note(\?.*$|$)' => [
[
'dest' => '\Modules\HumanResourceManagement\Controller\ApiController:apiNoteCreate',
'verb' => RouteVerb::PUT,
'csrf' => true,
'active' => true,
'permission' => [
'module' => ApiController::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionCategory::EMPLOYEE_NOTE,
],
],
[
'dest' => '\Modules\HumanResourceManagement\Controller\ApiController:apiNoteUpdate',
'verb' => RouteVerb::SET,
'csrf' => true,
'active' => true,
'permission' => [
'module' => ApiController::NAME,
'type' => PermissionType::MODIFY,
'state' => PermissionCategory::EMPLOYEE_NOTE,
],
],
],
'^.*/humanresource/staff/history(\?.*$|$)' => [ '^.*/humanresource/staff/history(\?.*$|$)' => [
[ [
'dest' => '\Modules\HumanResourceManagement\Controller\ApiController:apiEmployeeHistoryCreate', 'dest' => '\Modules\HumanResourceManagement\Controller\ApiController:apiEmployeeHistoryCreate',

10
Controller/ApiController.php
View File

@ -464,7 +464,7 @@ final class ApiController extends Controller
} }
/** @var \Modules\HumanResourceManagement\Models\Employee $employee */ /** @var \Modules\HumanResourceManagement\Models\Employee $employee */
$employee = EmployeeMapper::get()->where('id', (int) $request->getData('employee'))->execute(); $employee = EmployeeMapper::get()->where('id', (int) $request->getData('ref'))->execute();
$path = $this->createEmployeeDir($employee); $path = $this->createEmployeeDir($employee);
$uploaded = new NullCollection(); $uploaded = new NullCollection();
@ -533,7 +533,7 @@ final class ApiController extends Controller
{ {
$val = []; $val = [];
if (($val['media'] = (!$request->hasData('media') && empty($request->files))) if (($val['media'] = (!$request->hasData('media') && empty($request->files)))
|| ($val['employee'] = !$request->hasData('employee')) || ($val['ref'] = !$request->hasData('ref'))
) { ) {
return $val; return $val;
} }
@ -565,7 +565,7 @@ final class ApiController extends Controller
$request->setData('isencrypted', true, true); $request->setData('isencrypted', true, true);
$request->setData('isvisible', false, true); $request->setData('isvisible', false, true);
$request->setData('virtualpath', '/Modules/HumanResourceManagement/Employee/' . $request->getData('id'), true); $request->setData('virtualpath', '/Modules/HumanResourceManagement/Employee/' . $request->getData('ref'), true);
$this->app->moduleManager->get('Editor', 'Api')->apiEditorCreate($request, $response, $data); $this->app->moduleManager->get('Editor', 'Api')->apiEditorCreate($request, $response, $data);
@ -579,7 +579,7 @@ final class ApiController extends Controller
} }
$model = $responseData['response']; $model = $responseData['response'];
$this->createModelRelation($request->header->account, (int) $request->getData('id'), $model->id, EmployeeMapper::class, 'notes', '', $request->getOrigin()); $this->createModelRelation($request->header->account, (int) $request->getData('ref'), $model->id, EmployeeMapper::class, 'notes', '', $request->getOrigin());
} }
/** /**
@ -594,7 +594,7 @@ final class ApiController extends Controller
private function validateNoteCreate(RequestAbstract $request) : array private function validateNoteCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['id'] = !$request->hasData('id')) if (($val['ref'] = !$request->hasData('ref'))
) { ) {
return $val; return $val;
} }

6
Theme/Backend/staff-view.tpl.php
View File

@ -250,7 +250,7 @@ echo $this->data['nav']->render(); ?>
'week' => 0, 'week' => 0,
]; ];
$type = $this->data['lastSession'] !== null ? $this->data['lastSession']->type : ClockingType::OFFICE; //$type = $this->data['lastSession'] !== null ? $this->data['lastSession']->type : ClockingType::OFFICE;
$status = $this->data['lastSession'] !== null ? $this->data['lastSession']->getStatus() : ClockingStatus::END; $status = $this->data['lastSession'] !== null ? $this->data['lastSession']->getStatus() : ClockingStatus::END;
$startMonth = new SmartDateTime('now'); $startMonth = new SmartDateTime('now');
@ -433,12 +433,12 @@ echo $this->data['nav']->render(); ?>
<input type="radio" id="c-tab-4" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-4' ? ' checked' : ''; ?>> <input type="radio" id="c-tab-4" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-4' ? ' checked' : ''; ?>>
<div class="tab col-simple"> <div class="tab col-simple">
<?= $this->data['media-upload']->render('employee-file', 'files', '', $employee->files); ?> <?= $this->data['media-upload']->render('employee-file', 'files', '', $employee->files, '{/api}humanresource/staff/file?csrf={$CSRF}', (string) $vehicle->id); ?>
</div> </div>
<input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>> <input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>>
<div class="tab col-simple"> <div class="tab col-simple">
<?= $this->data['employee-notes']->render('employee-notes', '', $employee->notes); ?> <?= $this->data['employee-notes']->render('employee-notes', '', $employee->notes, '{/api}humanresource/staff/note?csrf={$CSRF}', (string) $vehicle->id); ?>
</div> </div>
<input type="radio" id="c-tab-7" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-7' ? ' checked' : ''; ?>> <input type="radio" id="c-tab-7" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-7' ? ' checked' : ''; ?>>