diff --git a/Controller/ApiClockingTypeController.php b/Controller/ApiClockingTypeController.php index 0141346..5cda92c 100644 --- a/Controller/ApiClockingTypeController.php +++ b/Controller/ApiClockingTypeController.php @@ -72,11 +72,11 @@ final class ApiClockingTypeController extends Controller */ private function createClockingTypeFromRequest(RequestAbstract $request) : ClockingType { - $clockingType = new ClockingType($request->getDataString('name') ?? ''); - $clockingType->isWork = $request->getDataBool('is_work') ?? false; + $clockingType = new ClockingType($request->getDataString('name') ?? ''); + $clockingType->isWork = $request->getDataBool('is_work') ?? false; $clockingType->customFutureTimeAllowed = $request->getDataBool('custom_future_time_allowed') ?? false; - $clockingType->customPastTimeAllowed = $request->getDataBool('custom_past_time_allowed') ?? false; - $clockingType->correctionAllowed = $request->getDataBool('correction_allowed') ?? false; + $clockingType->customPastTimeAllowed = $request->getDataBool('custom_past_time_allowed') ?? false; + $clockingType->correctionAllowed = $request->getDataBool('correction_allowed') ?? false; $clockingType->setL11n( $request->getDataString('title') ?? '', ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN @@ -207,7 +207,7 @@ final class ApiClockingTypeController extends Controller * Method to update ClockingType from request. * * @param RequestAbstract $request Request - * @param ClockingType $new Model to modify + * @param ClockingType $new Model to modify * * @return ClockingType * diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 6b86f5d..41e0cd8 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -14,11 +14,9 @@ declare(strict_types=1); namespace Modules\HumanResourceTimeRecording\Controller; -use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\NullAccount; use Modules\HumanResourceManagement\Models\EmployeeMapper; use Modules\HumanResourceTimeRecording\Models\ClockingStatus; -use Modules\HumanResourceTimeRecording\Models\ClockingType; use Modules\HumanResourceTimeRecording\Models\NullClockingType; use Modules\HumanResourceTimeRecording\Models\PermissionCategory; use Modules\HumanResourceTimeRecording\Models\Session; diff --git a/Docs/Dev/en/structure.md b/Docs/Dev/en/structure.md deleted file mode 100755 index 5c9a583..0000000 --- a/Docs/Dev/en/structure.md +++ /dev/null @@ -1,5 +0,0 @@ -# Structure - -## ER - -![ER](Modules/HumanResourceTimeRecording/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 47b286e..0000000 Binary files a/Docs/Dev/img/er.png and /dev/null differ diff --git a/Models/ClockingType.php b/Models/ClockingType.php index fa25678..3229372 100755 --- a/Models/ClockingType.php +++ b/Models/ClockingType.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace Modules\HumanResourceTimeRecording\Models; -use Modules\Media\Models\Collection; use phpOMS\Localization\BaseStringL11n; use phpOMS\Localization\ISO639x1Enum; diff --git a/Models/ClockingTypeL11nMapper.php b/Models/ClockingTypeL11nMapper.php index 27845a1..406ea42 100644 --- a/Models/ClockingTypeL11nMapper.php +++ b/Models/ClockingTypeL11nMapper.php @@ -4,7 +4,7 @@ * * PHP Version 8.2 * - * @package Modules\HumanResourceTimerecording\Models + * @package Modules\HumanResourceTimeRecording\Models * @copyright Dennis Eichhorn * @license OMS License 2.0 * @version 1.0.0 @@ -12,7 +12,7 @@ */ declare(strict_types=1); -namespace Modules\HumanResourceTimerecording\Models; +namespace Modules\HumanResourceTimeRecording\Models; use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; use phpOMS\Localization\BaseStringL11n; @@ -20,7 +20,7 @@ use phpOMS\Localization\BaseStringL11n; /** * Clocking type l11n mapper class. * - * @package Modules\HumanResourceTimerecording\Models + * @package Modules\HumanResourceTimeRecording\Models * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 diff --git a/Models/ClockingTypeMapper.php b/Models/ClockingTypeMapper.php index c65ca2b..27cc80e 100644 --- a/Models/ClockingTypeMapper.php +++ b/Models/ClockingTypeMapper.php @@ -36,12 +36,12 @@ final class ClockingTypeMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'hr_timerecording_type_id' => ['name' => 'hr_timerecording_type_id', 'type' => 'int', 'internal' => 'id'], - 'hr_timerecording_type_name' => ['name' => 'hr_timerecording_type_name', 'type' => 'string', 'internal' => 'name'], - 'hr_timerecording_type_custom_future' => ['name' => 'hr_timerecording_type_custom_future', 'type' => 'bool', 'internal' => 'customFutureTimeAllowed'], - 'hr_timerecording_type_custom_past' => ['name' => 'hr_timerecording_type_custom_past', 'type' => 'bool', 'internal' => 'customPastTimeAllowed'], - 'hr_timerecording_type_correction' => ['name' => 'hr_timerecording_type_correction', 'type' => 'bool', 'internal' => 'correctionAllowed'], - 'hr_timerecording_type_work' => ['name' => 'hr_timerecording_type_work', 'type' => 'bool', 'internal' => 'isWork'], + 'hr_timerecording_type_id' => ['name' => 'hr_timerecording_type_id', 'type' => 'int', 'internal' => 'id'], + 'hr_timerecording_type_name' => ['name' => 'hr_timerecording_type_name', 'type' => 'string', 'internal' => 'name'], + 'hr_timerecording_type_custom_future' => ['name' => 'hr_timerecording_type_custom_future', 'type' => 'bool', 'internal' => 'customFutureTimeAllowed'], + 'hr_timerecording_type_custom_past' => ['name' => 'hr_timerecording_type_custom_past', 'type' => 'bool', 'internal' => 'customPastTimeAllowed'], + 'hr_timerecording_type_correction' => ['name' => 'hr_timerecording_type_correction', 'type' => 'bool', 'internal' => 'correctionAllowed'], + 'hr_timerecording_type_work' => ['name' => 'hr_timerecording_type_work', 'type' => 'bool', 'internal' => 'isWork'], ]; /** diff --git a/Models/Session.php b/Models/Session.php index bd5ccc8..40663a9 100755 --- a/Models/Session.php +++ b/Models/Session.php @@ -66,7 +66,7 @@ class Session implements \JsonSerializable /** * Session type. * - * @var int + * @var ClockingType * @since 1.0.0 */ public ClockingType $type; @@ -154,7 +154,7 @@ class Session implements \JsonSerializable && ($e->status === ClockingStatus::PAUSE || $e->status === ClockingStatus::END) ) { $busyTime += $e->datetime->getTimestamp() - $lastStart->getTimestamp(); - $state = 0; + $state = 0; } } diff --git a/info.json b/info.json index 0fe3c31..f832603 100755 --- a/info.json +++ b/info.json @@ -12,7 +12,7 @@ }, "creator": { "name": "Jingga", - "website": "jingga.app" + "website": "https://jingga.app" }, "directory": "HumanResourceTimeRecording", "dependencies": { diff --git a/tests/Models/SessionMapperTest.php b/tests/Models/SessionMapperTest.php index 441b403..c9686f4 100755 --- a/tests/Models/SessionMapperTest.php +++ b/tests/Models/SessionMapperTest.php @@ -31,9 +31,9 @@ final class SessionMapperTest extends \PHPUnit\Framework\TestCase { $session = new Session(new NullAccount(1)); - $dt = new \DateTime(\date('Y-m-d', \strtotime('now')) . ' 7:55:34'); - $element = new SessionElement($session, $dt); - $element->status = ClockingStatus::START; + $dt = new \DateTime(\date('Y-m-d', \strtotime('now')) . ' 7:55:34'); + $element = new SessionElement($session, $dt); + $element->status = ClockingStatus::START; $session->sessionElements[] = $element; $id = SessionMapper::create()->execute($session); diff --git a/tests/Models/SessionTest.php b/tests/Models/SessionTest.php index 4d4903d..a44a573 100755 --- a/tests/Models/SessionTest.php +++ b/tests/Models/SessionTest.php @@ -51,16 +51,16 @@ final class SessionTest extends \PHPUnit\Framework\TestCase #[\PHPUnit\Framework\Attributes\Group('module')] public function testStatusInputOutput() : void { - $element = new SessionElement(null, new \DateTime('2021-10-05')); - $element->status = ClockingStatus::START; + $element = new SessionElement(null, new \DateTime('2021-10-05')); + $element->status = ClockingStatus::START; $this->session->sessionElements[] = $element; - $element = new SessionElement(null, new \DateTime('2021-10-06')); - $element->status = ClockingStatus::PAUSE; + $element = new SessionElement(null, new \DateTime('2021-10-06')); + $element->status = ClockingStatus::PAUSE; $this->session->sessionElements[] = $element; - $element = new SessionElement(null, new \DateTime('2021-10-07')); - $element->status = ClockingStatus::CONTINUE; + $element = new SessionElement(null, new \DateTime('2021-10-07')); + $element->status = ClockingStatus::CONTINUE; $this->session->sessionElements[] = $element; $this->session->recalculate(); @@ -71,38 +71,38 @@ final class SessionTest extends \PHPUnit\Framework\TestCase #[\PHPUnit\Framework\Attributes\Group('module')] public function testBusyBreakInputOutput() : void { - $element = new SessionElement(null, new \DateTime('2021-10-05 02:00:00')); - $element->status = ClockingStatus::START; + $element = new SessionElement(null, new \DateTime('2021-10-05 02:00:00')); + $element->status = ClockingStatus::START; $this->session->sessionElements[] = $element; // this is ignored because the session is already started - $element = new SessionElement(null, new \DateTime('2021-10-05 03:00:00')); - $element->status = ClockingStatus::START; + $element = new SessionElement(null, new \DateTime('2021-10-05 03:00:00')); + $element->status = ClockingStatus::START; $this->session->sessionElements[] = $element; - $element = new SessionElement(null, new \DateTime('2021-10-05 04:00:00')); - $element->status = ClockingStatus::PAUSE; + $element = new SessionElement(null, new \DateTime('2021-10-05 04:00:00')); + $element->status = ClockingStatus::PAUSE; $this->session->sessionElements[] = $element; - $element = new SessionElement(null, new \DateTime('2021-10-05 04:30:00')); - $element->status = ClockingStatus::CONTINUE; + $element = new SessionElement(null, new \DateTime('2021-10-05 04:30:00')); + $element->status = ClockingStatus::CONTINUE; $this->session->sessionElements[] = $element; - $element = new SessionElement(null, new \DateTime('2021-10-05 07:00:00')); - $element->status = ClockingStatus::PAUSE; + $element = new SessionElement(null, new \DateTime('2021-10-05 07:00:00')); + $element->status = ClockingStatus::PAUSE; $this->session->sessionElements[] = $element; - $element = new SessionElement(null, new \DateTime('2021-10-05 08:30:00')); - $element->status = ClockingStatus::CONTINUE; + $element = new SessionElement(null, new \DateTime('2021-10-05 08:30:00')); + $element->status = ClockingStatus::CONTINUE; $this->session->sessionElements[] = $element; - $element = new SessionElement(null, new \DateTime('2021-10-05 11:00:00')); - $element->status = ClockingStatus::END; + $element = new SessionElement(null, new \DateTime('2021-10-05 11:00:00')); + $element->status = ClockingStatus::END; $this->session->sessionElements[] = $element; // this is ignored because the session is already stopped - $element = new SessionElement(null, new \DateTime('2021-10-05 11:30:00')); - $element->status = ClockingStatus::END; + $element = new SessionElement(null, new \DateTime('2021-10-05 11:30:00')); + $element->status = ClockingStatus::END; $this->session->sessionElements[] = $element; $this->session->recalculate();