Jingga/oms-HumanResourceTimeRecording
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-HumanResourceTimeRecording.git synced 2026-01-11 11:58:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove some getter/setter

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-11-24 17:31:20 +01:00
parent bdb81a5b1b
commit 787e492c40
7 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Application/Timerecording/Application.php
View File

@ -127,7 +127,7 @@ final class Application
function() use ($request, $response) {
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Web/Timerecording/Error/403_inline');
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
$response->header->status = RequestStatusCode::R_403;
return $view;
},
@ -152,7 +152,7 @@ final class Application
if ($request->getData('CSRF') !== null
&& !\hash_equals($this->app->sessionManager->get('CSRF'), $request->getData('CSRF'))
) {
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
$response->header->status = RequestStatusCode::R_403;
return;
}
@ -171,21 +171,21 @@ final class Application
$pageView->setData('orgId', $this->app->orgId);
$aid = Auth::authenticate($this->app->sessionManager);
$request->getHeader()->setAccount($aid);
$response->getHeader()->setAccount($aid);
$request->header->account = $aid;
$response->header->account = $aid;
$account = $this->loadAccount($request);
if (!($account instanceof NullAccount)) {
$response->getHeader()->setL11n($account->getL11n());
$response->header->l11n = $account->l11n;
} elseif ($this->app->sessionManager->get('language') !== null) {
$response->getHeader()->getL11n()
$response->header->l11n
->loadFromLanguage(
$this->app->sessionManager->get('language'),
$this->app->sessionManager->get('country') ?? '*'
);
} elseif ($this->app->cookieJar->get('language') !== null) {
$response->getHeader()->getL11n()
$response->header->l11n
->loadFromLanguage(
$this->app->cookieJar->get('language'),
$this->app->cookieJar->get('country') ?? '*'
@ -199,7 +199,7 @@ final class Application
__DIR__ . '/lang/' . $response->getLanguage() . '.lang.php'
);
$response->getHeader()->set('content-language', $response->getLanguage(), true);
$response->header->set('content-language', $response->getLanguage(), true);
/* Create html head */
$this->initResponseHead($head, $request, $response);
@ -223,7 +223,7 @@ final class Application
$dispatched = $this->app->dispatcher->dispatch(
$this->app->router->route(
$request->getUri()->getRoute(),
$request->uri->getRoute(),
$request->getData('CSRF'),
$request->getRouteVerb(),
$this->app->appName,
@ -251,7 +251,7 @@ final class Application
{
return (int) (
$request->getData('u') ?? (
$config['domains'][$request->getUri()->getHost()]['org'] ?? $this->app->appSettings->get(
$config['domains'][$request->uri->host]['org'] ?? $this->app->appSettings->get(
SettingsEnum::DEFAULT_ORGANIZATION
) ?? 1
)
@ -270,7 +270,7 @@ final class Application
*/
private function create406Response(HttpResponse $response, View $pageView) : void
{
$response->getHeader()->setStatusCode(RequestStatusCode::R_406);
$response->header->status = RequestStatusCode::R_406;
$pageView->setTemplate('/Web/Timerecording/Error/406');
$this->loadLanguageFromPath(
$response->getLanguage(),
@ -290,7 +290,7 @@ final class Application
*/
private function create503Response(HttpResponse $response, View $pageView) : void
{
$response->getHeader()->setStatusCode(RequestStatusCode::R_503);
$response->header->status = RequestStatusCode::R_503;
$pageView->setTemplate('/Web/Timerecording/Error/503');
$this->loadLanguageFromPath(
$response->getLanguage(),
@ -331,7 +331,7 @@ final class Application
*/
private function loadAccount(HttpRequest $request) : Account
{
$account = AccountMapper::getWithPermissions($request->getHeader()->getAccount());
$account = AccountMapper::getWithPermissions($request->header->account);
$this->app->accountManager->add($account);
return $account;
@ -349,7 +349,7 @@ final class Application
*/
private function create403Response(HttpResponse $response, View $pageView) : void
{
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
$response->header->status = RequestStatusCode::R_403;
$pageView->setTemplate('/Web/Timerecording/Error/403');
$this->loadLanguageFromPath(
$response->getLanguage(),
@ -382,7 +382,7 @@ final class Application
$head->addAsset(AssetType::JSLATE, 'Modules/Navigation/Controller.js', ['type' => 'module']);
$script = '';
$response->getHeader()->set(
$response->header->set(
'content-security-policy',
'base-uri \'self\'; script-src \'self\' blob: \'sha256-'
. \base64_encode(\hash('sha256', $script, true))
@ -401,7 +401,7 @@ final class Application
$css = \preg_replace('!\s+!', ' ', $css);
$head->setStyle('core', $css ?? '');
$head->setTitle('Orange Management Timerecording');
$head->title = 'Orange Management Timerecording';
}
/**
@ -417,7 +417,7 @@ final class Application
*/
private function createLoggedOutResponse(HttpResponse $response, Head $head, View $pageView) : void
{
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
$response->header->status = RequestStatusCode::R_403;
$pageView->setTemplate('/Web/Timerecording/login');
$head->addAsset(AssetType::JS, 'Web/Timerecording/js/login.js', ['type' => 'module']);
}
@ -436,7 +436,7 @@ final class Application
private function createDefaultPageView(HttpRequest $request, HttpResponse $response, TimerecordingView $pageView) : void
{
$pageView->setOrganizations(UnitMapper::getAll());
$pageView->setProfile(ProfileMapper::getFor($request->getHeader()->getAccount(), 'account'));
$pageView->setProfile(ProfileMapper::getFor($request->header->account, 'account'));
$pageView->setData('nav', $this->getNavigation($request, $response));
$pageView->setTemplate('/Web/Timerecording/index');

4
Application/Timerecording/TimerecordingView.php
View File

@ -92,11 +92,11 @@ class TimerecordingView extends View
*/
public function getProfileImage() : string
{
if ($this->profile === null || $this->profile->getImage()->getPath() === '') {
if ($this->profile === null || $this->profile->image->getPath() === '') {
return UriFactory::build('Web/Timerecording/img/user_default_' . \mt_rand(1, 6) . '.png');
}
return UriFactory::build($this->profile->getImage()->getPath());
return UriFactory::build($this->profile->image->getPath());
}
/**

4
Application/Timerecording/index.tpl.php
View File

@ -32,14 +32,14 @@ $dispatch = $this->getData('dispatch') ?? [];
<meta name="msapplication-navbutton-color" content="#712b91">
<meta name="apple-mobile-web-app-status-bar-style" content="#712b91">
<meta name="description" content="<?= $this->getHtml(':meta', '0', '0'); ?>">
<?= $head->getMeta()->render(); ?>
<?= $head->meta->render(); ?>
<base href="<?= \phpOMS\Uri\UriFactory::build('{/base}'); ?>/">
<link rel="manifest" href="<?= \phpOMS\Uri\UriFactory::build('Web/Timerecording/manifest.json'); ?>">
<link rel="shortcut icon" href="<?= \phpOMS\Uri\UriFactory::build('Web/Timerecording/img/favicon.ico'); ?>" type="image/x-icon">
<title><?= $this->printHtml($head->getTitle()); ?></title>
<title><?= $this->printHtml($head->title); ?></title>
<?= $head->renderAssets(); ?>

4
Application/Timerecording/login.tpl.php
View File

@ -24,8 +24,8 @@ $head = $this->getData('head');
<meta name="description" content="<?= $this->getHtml(':meta', '0', '0'); ?>">
<link rel="manifest" href="<?= \phpOMS\Uri\UriFactory::build('Web/Timerecording/manifest.json'); ?>">
<link rel="shortcut icon" href="<?= \phpOMS\Uri\UriFactory::build('Web/Timerecording/img/favicon.ico'); ?>" type="image/x-icon">
<?= $head->getMeta()->render(); ?>
<title><?= $this->printHtml($head->getTitle()); ?></title>
<?= $head->meta->render(); ?>
<title><?= $this->printHtml($head->title); ?></title>
<style><?= $head->renderStyle(); ?></style>
<script><?= $head->renderScript(); ?></script>
<?= $head->renderAssets(); ?>

24
Controller/ApiController.php
View File

@ -58,10 +58,10 @@ final class ApiController extends Controller
*/
public function apiSessionsListForEmployeeGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$account = (int) ($request->getData('account') ?? $request->getHeader()->getAccount());
$account = (int) ($request->getData('account') ?? $request->header->account);
if ($request->getData('account') !== null) {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
if (!$this->app->accountManager->get($request->header->account)->hasPermission(
PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::SESSION_FOREIGN
)) {
$this->fillJsonResponse($request, $response, NotificationLevel::HIDDEN, '', '', []);
@ -96,7 +96,7 @@ final class ApiController extends Controller
return;
}
$this->createModel($request->getHeader()->getAccount(), $session, SessionMapper::class, 'session', $request->getOrigin());
$this->createModel($request->header->account, $session, SessionMapper::class, 'session', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Session', 'Session successfully created', $session);
}
@ -111,10 +111,10 @@ final class ApiController extends Controller
*/
private function createSessionFromRequest(RequestAbstract $request) : ?Session
{
$account = (int) ($request->getData('account') ?? $request->getHeader()->getAccount());
$account = (int) ($request->getData('account') ?? $request->header->account);
if ($request->getData('account') !== null) {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
if (!$this->app->accountManager->get($request->header->account)->hasPermission(
PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::SESSION_FOREIGN
)) {
return null;
@ -170,8 +170,8 @@ final class ApiController extends Controller
}
if (!empty($val = $this->validateSessionElementCreate($request))) {
$response->set($request->getUri()->__toString(), new FormValidation($val));
$response->getHeader()->setStatusCode(RequestStatusCode::R_400);
$response->set($request->uri->__toString(), new FormValidation($val));
$response->header->status = RequestStatusCode::R_400;
return;
}
@ -188,7 +188,7 @@ final class ApiController extends Controller
SessionMapper::update($session);
}
$this->createModel($request->getHeader()->getAccount(), $element, SessionElementMapper::class, 'element', $request->getOrigin());
$this->createModel($request->header->account, $element, SessionElementMapper::class, 'element', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Session Element', 'Session Element successfully created', $element);
}
@ -223,7 +223,7 @@ final class ApiController extends Controller
*/
private function createSessionElementFromRequest(RequestAbstract $request) : ?SessionElement
{
$account = (int) ($request->getData('account') ?? $request->getHeader()->getAccount());
$account = (int) ($request->getData('account') ?? $request->header->account);
/** @var Session $session */
$session = SessionMapper::get((int) $request->getData('session'), RelationType::ALL, 6);
@ -234,15 +234,15 @@ final class ApiController extends Controller
}
// account and owner of the session don't match = exception!
if ($session->getEmployee()->getProfile()->getAccount()->getId() !== $account) {
if ($session->getEmployee()->profile->account->getId() !== $account) {
return null;
}
// check permissions to edit session and create session element of a foreign account
if ($request->getData('account') !== null
|| $session->getEmployee()->getProfile()->getAccount()->getId() !== $request->getHeader()->getAccount()
|| $session->getEmployee()->profile->account->getId() !== $request->header->account
) {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
if (!$this->app->accountManager->get($request->header->account)->hasPermission(
PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::SESSION_ELEMENT_FOREIGN
)) {
return null;

4
Controller/BackendController.php
View File

@ -67,7 +67,7 @@ final class BackendController extends Controller implements DashboardElementInte
$view->setTemplate('/Modules/HumanResourceTimeRecording/Theme/Backend/private-dashboard');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006303001, $request, $response));
$employee = EmployeeMapper::getFromAccount($request->getHeader()->getAccount())->getId();
$employee = EmployeeMapper::getFromAccount($request->header->account)->getId();
$lastOpenSession = SessionMapper::getMostPlausibleOpenSessionForEmployee($employee);
$start = new SmartDateTime('now');
@ -103,7 +103,7 @@ final class BackendController extends Controller implements DashboardElementInte
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006303001, $request, $response));
$session = SessionMapper::get((int) $request->getData('id'));
$employee = EmployeeMapper::getFromAccount($request->getHeader()->getAccount())->getId();
$employee = EmployeeMapper::getFromAccount($request->header->account)->getId();
if ($session->getEmployee()->getId() !== $employee) {
$view->addData('session', new NullSession());

4
Theme/Backend/dashboard.tpl.php
View File

@ -38,8 +38,8 @@ echo $this->getData('nav')->render(); ?>
<td><?= $session->getStart()->format('Y-m-d'); ?>
<td><span class="tag"><?= $this->getHtml('CT' . $session->getType()); ?></span>
<td>
<?= $this->printHtml($session->getEmployee()->getProfile()->getAccount()->getName1()); ?>,
<?= $this->printHtml($session->getEmployee()->getProfile()->getAccount()->getName2()); ?>
<?= $this->printHtml($session->getEmployee()->profile->account->name1); ?>,
<?= $this->printHtml($session->getEmployee()->profile->account->name2); ?>
<td><?= $session->getStart()->format('H:i:s'); ?>
<td><?= (int) ($session->getBreak() / 3600); ?>h <?= ((int) ($session->getBreak() / 60) % 60); ?>m
<td><?= $session->getEnd() !== null ? $session->getEnd()->format('H:i') : ''; ?>