Test fixes

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

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'] ?? '')
+        $history->score = !empty($request->getDataString('score') ?? '')
-            ? (EncryptionHelper::encryptShared($request->getDataString('score') ?? '', $_SERVER['OMS_PRIVATE_KEY_I']))
+            && 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);

Docs/Dev/en/structure.md

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

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;
 
 /**

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;

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]],

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;
 
 /**

Theme/Backend/Lang/de.lang.php

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

Theme/Backend/Lang/en.lang.php

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

info.json

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