From 4822b1f20c9ab04b4d81236c08832795783beed6 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 16 May 2024 02:14:54 +0000 Subject: [PATCH] Test fixes --- Controller/ApiClockingTypeController.php | 10 +++--- Controller/ApiController.php | 2 -- Docs/Dev/en/structure.md | 5 --- Docs/Dev/img/er.png | Bin 25525 -> 0 bytes Models/ClockingType.php | 1 - Models/ClockingTypeL11nMapper.php | 6 ++-- Models/ClockingTypeMapper.php | 12 +++---- Models/Session.php | 4 +-- info.json | 2 +- tests/Models/SessionMapperTest.php | 6 ++-- tests/Models/SessionTest.php | 44 +++++++++++------------ 11 files changed, 42 insertions(+), 50 deletions(-) delete mode 100755 Docs/Dev/en/structure.md delete mode 100644 Docs/Dev/img/er.png 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 47b286ea65e14db3088c018e781e3ee4c5cbd425..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25525 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 ['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();