diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 3146ea0..c710c4b 100644 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -28,4 +28,4 @@ return [ ], ], ], -]; \ No newline at end of file +]; diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 5747078..3d33511 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -15,24 +15,23 @@ declare(strict_types=1); namespace Modules\HumanResourceTimeRecording\Controller; use DateTime; +use Modules\HumanResourceManagement\Models\EmployeeMapper; +use Modules\HumanResourceManagement\Models\NullEmployee; use Modules\HumanResourceTimeRecording\Models\ClockingStatus; use Modules\HumanResourceTimeRecording\Models\ClockingType; use Modules\HumanResourceTimeRecording\Models\NullSession; use Modules\HumanResourceTimeRecording\Models\PermissionState; use Modules\HumanResourceTimeRecording\Models\Session; use Modules\HumanResourceTimeRecording\Models\SessionElement; + use Modules\HumanResourceTimeRecording\Models\SessionElementMapper; use Modules\HumanResourceTimeRecording\Models\SessionMapper; - use phpOMS\Account\PermissionType; +use phpOMS\DataStorage\Database\RelationType; use phpOMS\Message\NotificationLevel; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Model\Message\FormValidation; -use phpOMS\Utils\Parser\Markdown\Markdown; -use Modules\HumanResourceManagement\Models\EmployeeMapper; -use Modules\HumanResourceManagement\Models\NullEmployee; -use phpOMS\DataStorage\Database\RelationType; /** * HumanResourceTimeRecording controller class. diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 0196f8e..0be0d53 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -15,15 +15,14 @@ declare(strict_types=1); namespace Modules\HumanResourceTimeRecording\Controller; use Modules\Dashboard\Models\DashboardElementInterface; -use Modules\HumanResourceTimeRecording\Models\SessionMapper; +use Modules\HumanResourceManagement\Models\EmployeeMapper; +use Modules\HumanResourceTimeRecording\Models\SessionMapper; use phpOMS\Contract\RenderableInterface; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; -use phpOMS\Views\View; -use Modules\HumanResourceManagement\Models\EmployeeMapper; use phpOMS\Stdlib\Base\SmartDateTime; -use phpOMS\Views\PaginationView; +use phpOMS\Views\View; /** * TimeRecording controller class. diff --git a/Controller/Controller.php b/Controller/Controller.php index b38acb1..0ff21c8 100644 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -30,7 +30,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Module path. * - * @var string + * @var string * @since 1.0.0 */ public const MODULE_PATH = __DIR__ . '/../'; @@ -38,7 +38,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Module version. * - * @var string + * @var string * @since 1.0.0 */ public const MODULE_VERSION = '1.0.0'; @@ -46,7 +46,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Module name. * - * @var string + * @var string * @since 1.0.0 */ public const MODULE_NAME = 'HumanResourceTimeRecording'; @@ -54,7 +54,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Module id. * - * @var int + * @var int * @since 1.0.0 */ public const MODULE_ID = 1006300000; @@ -62,7 +62,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Providing. * - * @var string[] + * @var string[] * @since 1.0.0 */ protected static array $providing = []; @@ -70,7 +70,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Dependencies. * - * @var string[] + * @var string[] * @since 1.0.0 */ protected static array $dependencies = []; diff --git a/Models/Session.php b/Models/Session.php index b9d71bb..1325303 100644 --- a/Models/Session.php +++ b/Models/Session.php @@ -29,7 +29,7 @@ class Session implements ArrayableInterface, \JsonSerializable /** * Session ID. * - * @var int + * @var int * @since 1.0.0 */ private int $id = 0; @@ -37,7 +37,7 @@ class Session implements ArrayableInterface, \JsonSerializable /** * Session start * - * @var \DateTime + * @var \DateTime * @since 1.0.0 */ private \DateTime $start; @@ -45,7 +45,7 @@ class Session implements ArrayableInterface, \JsonSerializable /** * Session end * - * @var null|\DateTime + * @var null|\DateTime * @since 1.0.0 */ private ?\DateTime $end = null; @@ -53,7 +53,7 @@ class Session implements ArrayableInterface, \JsonSerializable /** * Busy time. * - * @var int + * @var int * @since 1.0.0 */ private int $busy = 0; @@ -61,7 +61,7 @@ class Session implements ArrayableInterface, \JsonSerializable /** * Session type. * - * @var int + * @var int * @since 1.0.0 */ private int $type = ClockingType::OFFICE; @@ -69,7 +69,7 @@ class Session implements ArrayableInterface, \JsonSerializable /** * Session elements. * - * @var array + * @var array * @since 1.0.0 */ private array $sessionElements = []; @@ -77,7 +77,7 @@ class Session implements ArrayableInterface, \JsonSerializable /** * Employee. * - * @var int|Employee + * @var int|Employee * @since 1.0.0 */ private $employee = 0; diff --git a/Models/SessionElement.php b/Models/SessionElement.php index 41ef654..5b92dc2 100644 --- a/Models/SessionElement.php +++ b/Models/SessionElement.php @@ -29,7 +29,7 @@ class SessionElement implements ArrayableInterface, \JsonSerializable /** * Session element ID. * - * @var int + * @var int * @since 1.0.0 */ private int $id = 0; @@ -37,7 +37,7 @@ class SessionElement implements ArrayableInterface, \JsonSerializable /** * Session element status. * - * @var int + * @var int * @since 1.0.0 */ private int $status = ClockingStatus::START; @@ -45,7 +45,7 @@ class SessionElement implements ArrayableInterface, \JsonSerializable /** * DateTime * - * @var \DateTime + * @var \DateTime * @since 1.0.0 */ private \DateTime $dt; @@ -53,7 +53,7 @@ class SessionElement implements ArrayableInterface, \JsonSerializable /** * Session id this element belongs to * - * @var int|Session + * @var int|Session * @since 1.0.0 */ private $session = 0; diff --git a/Models/SessionElementMapper.php b/Models/SessionElementMapper.php index 46726d6..e05ccb7 100644 --- a/Models/SessionElementMapper.php +++ b/Models/SessionElementMapper.php @@ -29,7 +29,7 @@ final class SessionElementMapper extends DataMapperAbstract /** * Columns. * - * @var array> + * @var array> * @since 1.0.0 */ protected static array $columns = [ @@ -42,7 +42,7 @@ final class SessionElementMapper extends DataMapperAbstract /** * Belongs to. * - * @var array> + * @var array> * @since 1.0.0 */ protected static array $belongsTo = [ @@ -55,7 +55,7 @@ final class SessionElementMapper extends DataMapperAbstract /** * Primary table. * - * @var string + * @var string * @since 1.0.0 */ protected static string $table = 'hr_timerecording_session_element'; @@ -63,7 +63,7 @@ final class SessionElementMapper extends DataMapperAbstract /** * Primary field name. * - * @var string + * @var string * @since 1.0.0 */ protected static string $primaryField = 'hr_timerecording_session_element_id'; diff --git a/Models/SessionMapper.php b/Models/SessionMapper.php index ee7a744..ec86beb 100644 --- a/Models/SessionMapper.php +++ b/Models/SessionMapper.php @@ -33,7 +33,7 @@ final class SessionMapper extends DataMapperAbstract /** * Columns. * - * @var array> + * @var array> * @since 1.0.0 */ protected static array $columns = [ @@ -48,7 +48,7 @@ final class SessionMapper extends DataMapperAbstract /** * Has many relation. * - * @var array> + * @var array> * @since 1.0.0 */ protected static array $hasMany = [ @@ -63,7 +63,7 @@ final class SessionMapper extends DataMapperAbstract /** * Belongs to. * - * @var array> + * @var array> * @since 1.0.0 */ protected static array $belongsTo = [ @@ -76,7 +76,7 @@ final class SessionMapper extends DataMapperAbstract /** * Primary table. * - * @var string + * @var string * @since 1.0.0 */ protected static string $table = 'hr_timerecording_session'; @@ -84,7 +84,7 @@ final class SessionMapper extends DataMapperAbstract /** * Primary field name. * - * @var string + * @var string * @since 1.0.0 */ protected static string $primaryField = 'hr_timerecording_session_id'; @@ -92,7 +92,7 @@ final class SessionMapper extends DataMapperAbstract /** * Created at column * - * @var string + * @var string * @since 1.0.0 */ protected static string $createdAt = 'hr_timerecording_session_start'; diff --git a/Theme/Backend/dashboard.tpl.php b/Theme/Backend/dashboard.tpl.php index 961a2e8..d9eb728 100644 --- a/Theme/Backend/dashboard.tpl.php +++ b/Theme/Backend/dashboard.tpl.php @@ -13,8 +13,6 @@ declare(strict_types=1); -use \Modules\HumanResourceTimeRecording\Models\ClockingType; -use \Modules\HumanResourceTimeRecording\Models\ClockingStatus; $sessions = $this->getData('sessions'); diff --git a/Theme/Backend/private-dashboard.tpl.php b/Theme/Backend/private-dashboard.tpl.php index fe669a2..816077e 100644 --- a/Theme/Backend/private-dashboard.tpl.php +++ b/Theme/Backend/private-dashboard.tpl.php @@ -12,8 +12,8 @@ */ declare(strict_types=1); -use \Modules\HumanResourceTimeRecording\Models\ClockingType; use \Modules\HumanResourceTimeRecording\Models\ClockingStatus; +use \Modules\HumanResourceTimeRecording\Models\ClockingType; use \phpOMS\Stdlib\Base\SmartDateTime; /** @var Session[] $sessions */ diff --git a/Theme/Timeterminal/overview.tpl.php b/Theme/Timeterminal/overview.tpl.php index 29f81ab..772e182 100644 --- a/Theme/Timeterminal/overview.tpl.php +++ b/Theme/Timeterminal/overview.tpl.php @@ -13,8 +13,8 @@ declare(strict_types=1); -use \Modules\HumanResourceTimeRecording\Models\ClockingType; use \Modules\HumanResourceTimeRecording\Models\ClockingStatus; +use \Modules\HumanResourceTimeRecording\Models\ClockingType; $sessions = $this->getData('sessions');