diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 6202be1..1277af2 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -45,7 +45,7 @@ final class BackendController extends Controller implements DashboardElementInte $view->setTemplate('/Modules/HumanResourceTimeRecording/Theme/Backend/dashboard'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006301001, $request, $response)); - $list = SessionMapper::getLastSessionsFromAllEmployees(new \DateTime('now')); + $list = SessionMapper::getLastSessionsFromAllEmployees(); $view->addData('sessions', $list); return $view; @@ -149,7 +149,7 @@ final class BackendController extends Controller implements DashboardElementInte $view->setTemplate('/Modules/HumanResourceTimeRecording/Theme/Backend/hr-stats'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006301001, $request, $response)); - $list = SessionMapper::getLastSessionsFromAllEmployees(new \DateTime('now')); + $list = SessionMapper::getLastSessionsFromAllEmployees(); $view->addData('sessions', $list); return $view; diff --git a/Models/SessionMapper.php b/Models/SessionMapper.php index de45e99..082c494 100755 --- a/Models/SessionMapper.php +++ b/Models/SessionMapper.php @@ -101,13 +101,9 @@ final class SessionMapper extends DataMapperFactory * * @return Session[] * - * @todo Karaka/Modules#189 - * Currently the last work session of all employees is returned. This should be optionally reduced to only return active employees. - * Alternatively it might make sense to limit the last session by an oldest date. - * * @since 1.0.0 */ - public static function getLastSessionsFromAllEmployees(\DateTime $dt = null) : array + public static function getLastSessionsFromAllEmployees() : array { $join = new Builder(self::$db); $join->select(self::TABLE . '.hr_timerecording_session_employee') diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index d46fd31..b5d36a8 100755 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -257,6 +257,25 @@ $CONFIG = [ 'root' => '/', 'https' => false, ], + 'app' => [ + 'path' => __DIR__, + 'default' => [ + 'app' => 'Backend', + 'id' => 'backend', + 'lang' => 'en', + 'theme' => 'Backend', + 'org' => 1, + ], + 'domains' => [ + '127.0.0.1' => [ + 'app' => 'Backend', + 'id' => 'backend', + 'lang' => 'en', + 'theme' => 'Backend', + 'org' => 1, + ], + ], + ], 'socket' => [ 'master' => [ 'host' => '127.0.0.1',