Jingga/oms-HumanResourceManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-HumanResourceManagement.git synced 2026-01-11 04:18:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test fixes
Some checks failed
Image optimization / general_image_workflow (push) Has been cancelled
Details
CI / general_module_workflow_php (push) Has been cancelled
Details
CI / general_module_workflow_js (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-05-16 02:14:54 +00:00
parent dfb60a76a8
commit 072ec0e9bf
11 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin/Install/db.json
View File

@ -330,13 +330,13 @@
"unique": true
},
"hr_salary_type_salary": {
"description": "Not all salary types are considered salary by the employee",
"comment": "Not all salary types are considered salary by the employee",
"name": "hr_salary_type_salary",
"type": "TINYINT(1)",
"null": false
},
"hr_salary_type_regular": {
"description": "Not all salary types are regular payments. Can be overwritten by salary",
"comment": "Not all salary types are regular payments. Can be overwritten by salary",
"name": "hr_salary_type_regular",
"type": "TINYINT(1)",
"null": false

6
Controller/ApiController.php
View File

@ -429,8 +429,10 @@ final class ApiController extends Controller
$history->educationTitle = $request->getDataString('title') ?? '';
$history->passed = $request->getDataBool('passed') ?? true;
$history->score = !empty($request->getDataString('score') ?? '') && !empty($_SERVER['OMS_PRIVATE_KEY_I'] ?? '')
? (EncryptionHelper::encryptShared($request->getDataString('score') ?? '', $_SERVER['OMS_PRIVATE_KEY_I']))
$history->score = !empty($request->getDataString('score') ?? '')
&& isset($_SERVER['OMS_PRIVATE_KEY_I'])
&& !empty($_SERVER['OMS_PRIVATE_KEY_I'])
? (EncryptionHelper::encryptShared($request->getDataString('score'), $_SERVER['OMS_PRIVATE_KEY_I']))
: ($request->getDataString('score') ?? '');
$history->address = $this->app->moduleManager->get('Admin', 'Api')->createAddressFromRequest($request);

5
Docs/Dev/en/structure.md
View File

@ -1,5 +0,0 @@
# Structure
## ER
![ER](Modules/HumanResourceManagement/Docs/Dev/img/er.png)

BIN
Docs/Dev/img/er.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 242 KiB

2
Models/EmployeeEducationHistory.php
View File

@ -14,8 +14,6 @@ declare(strict_types=1);
namespace Modules\HumanResourceManagement\Models;
use Modules\Media\Models\Media;
use Modules\Media\Models\NullMedia;
use phpOMS\Stdlib\Base\Address;
/**

2
Models/EmployeeHistory.php
View File

@ -14,8 +14,6 @@ declare(strict_types=1);
namespace Modules\HumanResourceManagement\Models;
use Modules\Media\Models\Media;
use Modules\Media\Models\NullMedia;
use Modules\Organization\Models\Department;
use Modules\Organization\Models\NullDepartment;
use Modules\Organization\Models\NullPosition;

2
Models/EmployeeMapper.php
View File

@ -40,7 +40,7 @@ final class EmployeeMapper extends DataMapperFactory
*/
public const COLUMNS = [
'hr_staff_id' => ['name' => 'hr_staff_id', 'type' => 'int', 'internal' => 'id'],
'hr_staff_status' => ['name' => 'hr_staff_status', 'type' => 'int', 'internal' => 'status'],
'hr_staff_status' => ['name' => 'hr_staff_status', 'type' => 'int', 'internal' => 'status'],
'hr_staff_profile' => ['name' => 'hr_staff_profile', 'type' => 'int', 'internal' => 'profile'],
'hr_staff_smiPHash' => ['name' => 'hr_staff_smiPHash', 'type' => 'string', 'internal' => 'semiPrivateHash', 'private' => true],
'hr_staff_image' => ['name' => 'hr_staff_image', 'type' => 'int', 'internal' => 'image', 'annotations' => ['gdpr' => true]],

2
Models/EmployeeWorkHistory.php
View File

@ -14,8 +14,6 @@ declare(strict_types=1);
namespace Modules\HumanResourceManagement\Models;
use Modules\Media\Models\Media;
use Modules\Media\Models\NullMedia;
use phpOMS\Stdlib\Base\Address;
/**

10
Theme/Backend/Lang/de.lang.php
View File

@ -46,9 +46,9 @@ return ['HumanResourceManagement' => [
'Title' => 'Titel',
'Unit' => 'Einheit',
'Work' => 'Arbeiten',
'Total' => 'Gesamt',
'FTE' => 'MAK',
':status-1' => 'Aktiv',
':status-2' => 'Inaktiv',
':status-3' => 'Nicht Verfügbar',
'Total' => 'Gesamt',
'FTE' => 'MAK',
':status-1' => 'Aktiv',
':status-2' => 'Inaktiv',
':status-3' => 'Nicht Verfügbar',
]];

10
Theme/Backend/Lang/en.lang.php
View File

@ -46,9 +46,9 @@ return ['HumanResourceManagement' => [
'Title' => 'Title',
'Unit' => 'Unit',
'Work' => 'Work',
'Total' => 'Total',
'FTE' => 'FTE',
':status-1' => 'Active',
':status-2' => 'Inactive',
':status-3' => 'Unavailable',
'Total' => 'Total',
'FTE' => 'FTE',
':status-1' => 'Active',
':status-2' => 'Inactive',
':status-3' => 'Unavailable',
]];

2
info.json
View File

@ -12,7 +12,7 @@
},
"creator": {
"name": "Jingga",
"website": "jingga.app"
"website": "https://jingga.app"
},
"description": "Human Resources module.",
"directory": "HumanResourceManagement",