diff --git a/Models/Session.php b/Models/Session.php index 3ea9d32..a8e6de0 100755 --- a/Models/Session.php +++ b/Models/Session.php @@ -149,18 +149,6 @@ class Session implements \JsonSerializable $this->busy = $busyTime; } - /** - * Get all session elements - * - * @return SessionElement[] - * - * @since 1.0.0 - */ - public function getSessionElements() : array - { - return $this->sessionElements; - } - /** * Compare session elements * diff --git a/Theme/Backend/dashboard.tpl.php b/Theme/Backend/dashboard.tpl.php index 4dbd7c3..7dee247 100755 --- a/Theme/Backend/dashboard.tpl.php +++ b/Theme/Backend/dashboard.tpl.php @@ -21,7 +21,7 @@ echo $this->data['nav']->render(); ?>
-
+
getHtml('Status'); ?>download
@@ -54,6 +54,7 @@ echo $this->data['nav']->render(); ?>
busy / 3600)) . 'h' : ''; ?> busy / 60) % 60) . 'm' : ''; ?>
-
+
+
diff --git a/Theme/Backend/private-session.tpl.php b/Theme/Backend/private-session.tpl.php index 007b1c2..1bca0e7 100755 --- a/Theme/Backend/private-session.tpl.php +++ b/Theme/Backend/private-session.tpl.php @@ -14,28 +14,34 @@ declare(strict_types=1); /** @var \Modules\HumanResourceTimeRecording\Models\Session $session */ $session = $this->data['session']; -$elements = $session->getSessionElements(); +$elements = $session->sessionElements; echo $this->data['nav']->render(); ?> -
-
+
+
start->format('Y-m-d'); ?>
- - + -
start->format('Y-m-d'); ?>download
getHtml('Status'); ?> getHtml('Time'); ?> getHtml('Date'); ?>
getHtml('CS' . $element->getStatus()); ?> + getHtml('CS' . $element->status); ?> datetime->format('H:i:s'); ?> datetime->format('Y-m-d'); ?> + +
getHtml('Empty', '0', '0'); ?> +
-
+
\ No newline at end of file diff --git a/Theme/Timeterminal/overview.tpl.php b/Theme/Timeterminal/overview.tpl.php index 444b0de..f2538da 100755 --- a/Theme/Timeterminal/overview.tpl.php +++ b/Theme/Timeterminal/overview.tpl.php @@ -81,7 +81,7 @@ echo $this->data['nav']->render(); ?>
- +
diff --git a/tests/Models/SessionTest.php b/tests/Models/SessionTest.php index 447aa4c..572226e 100755 --- a/tests/Models/SessionTest.php +++ b/tests/Models/SessionTest.php @@ -41,7 +41,7 @@ final class SessionTest extends \PHPUnit\Framework\TestCase self::assertEquals(0, $this->session->id); self::assertEquals(0, $this->session->busy); self::assertEquals(0, $this->session->getBreak()); - self::assertEquals([], $this->session->getSessionElements()); + self::assertEquals([], $this->session->sessionElements); self::assertEquals(ClockingType::OFFICE, $this->session->type); self::assertEquals(ClockingStatus::START, $this->session->getStatus()); self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->session->start->format('Y-m-d')); @@ -107,14 +107,6 @@ final class SessionTest extends \PHPUnit\Framework\TestCase self::assertEquals(7 * 60 * 60, $this->session->busy); } - #[\PHPUnit\Framework\Attributes\Group('module')] - public function testSessionElementInputOutput() : void - { - $element = new SessionElement(null, new \DateTime('now')); - $this->session->addSessionElement($element); - self::assertCount(1, $this->session->getSessionElements()); - } - #[\PHPUnit\Framework\Attributes\Group('module')] public function testSerialize() : void {
getHtml('Recordings'); ?>download