diff --git a/Admin/Install/db.json b/Admin/Install/db.json index f356e42..7b2724e 100755 --- a/Admin/Install/db.json +++ b/Admin/Install/db.json @@ -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 diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 5918762..c40c202 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -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); diff --git a/Docs/Dev/en/structure.md b/Docs/Dev/en/structure.md deleted file mode 100755 index a9b8189..0000000 --- a/Docs/Dev/en/structure.md +++ /dev/null @@ -1,5 +0,0 @@ -# Structure - -## ER - -![ER](Modules/HumanResourceManagement/Docs/Dev/img/er.png) \ No newline at end of file diff --git a/Docs/Dev/img/er.png b/Docs/Dev/img/er.png deleted file mode 100644 index e08114a..0000000 Binary files a/Docs/Dev/img/er.png and /dev/null differ diff --git a/Models/EmployeeEducationHistory.php b/Models/EmployeeEducationHistory.php index 64fe066..a135c09 100755 --- a/Models/EmployeeEducationHistory.php +++ b/Models/EmployeeEducationHistory.php @@ -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; /** diff --git a/Models/EmployeeHistory.php b/Models/EmployeeHistory.php index 5c19963..9f53757 100755 --- a/Models/EmployeeHistory.php +++ b/Models/EmployeeHistory.php @@ -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; diff --git a/Models/EmployeeMapper.php b/Models/EmployeeMapper.php index 346c4dd..1ab535c 100755 --- a/Models/EmployeeMapper.php +++ b/Models/EmployeeMapper.php @@ -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]], diff --git a/Models/EmployeeWorkHistory.php b/Models/EmployeeWorkHistory.php index cf0aeff..4ef4d81 100755 --- a/Models/EmployeeWorkHistory.php +++ b/Models/EmployeeWorkHistory.php @@ -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; /** diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 837aed6..ad69487 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -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', ]]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index d77732f..9632fba 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -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', ]]; diff --git a/info.json b/info.json index 62eb771..ee5252e 100755 --- a/info.json +++ b/info.json @@ -12,7 +12,7 @@ }, "creator": { "name": "Jingga", - "website": "jingga.app" + "website": "https://jingga.app" }, "description": "Human Resources module.", "directory": "HumanResourceManagement",