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

update

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-01-02 23:34:17 +00:00
parent 77d329f40d
commit a6a0c80d88
15 changed files with 64 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Controller/ApiController.php
View File

@ -94,27 +94,29 @@ final class ApiController extends Controller
->limit(1)
->execute();
if ($employee->id === 0) {
return null;
}
$type = $request->getDataInt('type') ?? ClockingType::OFFICE;
$status = $request->getDataInt('status') ?? ClockingStatus::START;
if ($employee->id === 0) {
if (!ClockingStatus::isValidValue($status)) {
return null;
}
$session = new Session($employee);
$session->setType(ClockingType::isValidValue($type) ? $type : ClockingType::OFFICE);
if (ClockingStatus::isValidValue($status)) {
// a custom datetime can only be set if the user is allowed to create a session for a foreign account or if the session is a vacation
$dt = $request->hasData('account') || $type === ClockingType::VACATION
? ($request->getDataDateTime('datetime') ?? new \DateTime('now'))
: new \DateTime('now');
// a custom datetime can only be set if the user is allowed to create a session for a foreign account or if the session is a vacation
$dt = $request->hasData('account') || $type === ClockingType::VACATION
? ($request->getDataDateTime('datetime') ?? new \DateTime('now'))
: new \DateTime('now');
$element = new SessionElement($session, $dt);
$element->setStatus($status);
$element = new SessionElement($session, $dt);
$element->setStatus($status);
$session->addSessionElement($element);
}
$session->addSessionElement($element);
return $session;
}
@ -147,7 +149,9 @@ final class ApiController extends Controller
return;
}
if ($request->hasData('account') && ((int) $request->getData('account')) !== $request->header->account && !$this->app->accountManager->get($request->header->account)->hasPermission(
if ($request->hasData('account')
&& $request->getDataInt('account') !== $request->header->account
&& !$this->app->accountManager->get($request->header->account)->hasPermission(
PermissionType::CREATE, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::SESSION_ELEMENT_FOREIGN
)) {
$response->header->status = RequestStatusCode::R_403;
@ -205,8 +209,6 @@ final class ApiController extends Controller
*/
private function createSessionElementFromRequest(RequestAbstract $request) : ?SessionElement
{
$account = $request->getDataInt('account') ?? $request->header->account;
/** @var Session $session */
$session = SessionMapper::get()->where('id', (int) $request->getData('session'))->execute();

21
Controller/BackendController.php
View File

@ -46,14 +46,25 @@ final class BackendController extends Controller implements DashboardElementInte
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1006301001, $request, $response);
/** @var \Modules\HumanResourceTimeRecording\Models\Session[] $list */
$list = SessionMapper::getLastSessionsFromAllEmployees();
$view->data['sessions'] = $list;
$list = SessionMapper::getLastSessionsFromAllEmployees();
$sessions = [];
foreach ($list as $session) {
$sessions[$session->employee->id] = $session;
}
$view->data['sessions'] = $sessions;
$view->data['employees'] = EmployeeMapper::getAll()
->with('profile')
->with('profile/account')
->execute();
return $view;
}
/**
* Routing end-point for application behaviour.
* Routing end-point for application behavior.
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
@ -99,7 +110,7 @@ final class BackendController extends Controller implements DashboardElementInte
}
/**
* Routing end-point for application behaviour.
* Routing end-point for application behavior.
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
@ -136,7 +147,7 @@ final class BackendController extends Controller implements DashboardElementInte
}
/**
* Routing end-point for application behaviour.
* Routing end-point for application behavior.
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response

2
Controller/TimerecordingController.php
View File

@ -32,7 +32,7 @@ use phpOMS\Views\View;
final class TimerecordingController extends Controller
{
/**
* Routing end-point for application behaviour.
* Routing end-point for application behavior.
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response

2
Models/ClockingType.php
View File

@ -37,4 +37,6 @@ abstract class ClockingType extends Enum
public const SICK = 5;
public const ON_THE_MOVE = 6;
public const NO_DATA = -1;
}

2
Models/PermissionCategory.php
View File

@ -17,7 +17,7 @@ namespace Modules\HumanResourceTimeRecording\Models;
use phpOMS\Stdlib\Base\Enum;
/**
* Permision state enum.
* Permission category enum.
*
* @package Modules\HumanResourceTimeRecording\Models
* @license OMS License 2.0

2
Models/Session.php
View File

@ -65,7 +65,7 @@ class Session implements \JsonSerializable
* @var int
* @since 1.0.0
*/
public int $type = ClockingType::OFFICE;
public int $type = ClockingType::NO_DATA;
/**
* Session elements.

5
Models/SessionMapper.php
View File

@ -115,11 +115,12 @@ final class SessionMapper extends DataMapperFactory
->groupBy(self::TABLE . '.hr_timerecording_session_employee');
$query = self::getQuery();
$query->innerJoin($join, 'tm')
$query->leftJoin($join, 'tm')
->on(self::TABLE . '_d1.hr_timerecording_session_employee', '=', 'tm.hr_timerecording_session_employee')
->andOn(self::TABLE . '_d1.hr_timerecording_session_start', '=', 'tm.maxDate');
return self::getAll()->execute($query);
return self::getAll()
->execute($query);
}
/**

1
Theme/Backend/Lang/de.lang.php
View File

@ -24,6 +24,7 @@ return ['HumanResourceTimeRecording' => [
'CT4' => 'Urlaub',
'CT5' => 'Krank',
'CT6' => 'Unterwegs',
'CT-1' => 'Keine Daten',
'D0' => 'Sonntag',
'D1' => 'Montag',
'D2' => 'Dienstag',

1
Theme/Backend/Lang/en.lang.php
View File

@ -24,6 +24,7 @@ return ['HumanResourceTimeRecording' => [
'CT4' => 'Vacation',
'CT5' => 'Sick',
'CT6' => 'On the move',
'CT-1' => 'No data',
'D0' => 'Sunday',
'D1' => 'Monday',
'D2' => 'Tuesday',

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

@ -12,36 +12,41 @@
*/
declare(strict_types=1);
$sessions = $this->data['sessions'];
use Modules\HumanResourceTimeRecording\Models\ClockingType;
$date = new \DateTime('now');
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12">
<div class="box wf-100">
<table id="accountList" class="default">
<caption><?= $this->getHtml('Recordings'); ?><i class="g-icon end-xs download btn">download</i></caption>
<div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Status'); ?><i class="g-icon download btn end-xs">download</i></div>
<div class="slider">
<table id="employeeList" class="default sticky">
<thead>
<tr>
<td><?= $this->getHtml('Date'); ?>
<td><?= $this->getHtml('Type'); ?>
<td><?= $this->getHtml('Employee'); ?>
<td class="wf-100"><?= $this->getHtml('Employee'); ?>
<td><?= $this->getHtml('Start'); ?>
<td><?= $this->getHtml('Break'); ?>
<td><?= $this->getHtml('End'); ?>
<td><?= $this->getHtml('Total'); ?>
<tbody>
<?php foreach ($sessions as $session) : ?>
<?php foreach ($this->data['employees'] as $employee) :
$session = $this->data['sessions'][$employee->id] ?? null;
?>
<tr>
<td><?= $session->getStart()->format('Y-m-d'); ?>
<td><span class="tag"><?= $this->getHtml('CT' . $session->getType()); ?></span>
<td><?= $session?->getStart()->format('Y-m-d') ?? $date->format('Y-m-d H:i:s'); ?>
<td><span class="tag"><?= $this->getHtml('CT' . ($session?->type ?? ClockingType::NO_DATA)); ?></span>
<td>
<?= $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') : ''; ?>
<td><?= (int) ($session->getBusy() / 3600); ?>h <?= ((int) ($session->getBusy() / 60) % 60); ?>m
<?= $this->printHtml($employee->profile->account->name1); ?>,
<?= $this->printHtml($employee->profile->account->name2); ?>
<td><?= $session?->getStart()->format('H:i:s'); ?>
<td><?= $session !== null ? ((int) ($session->getBreak() / 3600)) . 'h' : ''; ?> <?= $session !== null ? ((int) ($session->getBreak() / 60) % 60) . 'm' : ''; ?>
<td><?= $session?->getEnd() !== null ? $session->getEnd()->format('H:i') : ''; ?>
<td><?= $session !== null ? ((int) ($session->getBusy() / 3600)) . 'h' : ''; ?> <?= $session !== null ? ((int) ($session->getBusy() / 60) % 60) . 'm' : ''; ?>
<?php endforeach; ?>
</table>
</div>

2
Theme/Backend/private-dashboard.tpl.php
View File

@ -113,7 +113,7 @@ echo $this->data['nav']->render(); ?>
<div class="col-xs-12">
<section class="portlet">
<div class="portlet-head"><?= $this->getHtml('Recordings'); ?><i class="g-icon download btn end-xs">download</i></div>
<table id="recordingList" class="default">
<table id="recordingList" class="default sticky">
<thead>
<tr>
<td><?= $this->getHtml('Date'); ?>

2
Theme/Backend/private-session.tpl.php
View File

@ -21,7 +21,7 @@ echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12">
<div class="box wf-100">
<table id="accountList" class="default">
<table id="sessionList" class="default sticky">
<caption><?= $session->start->format('Y-m-d'); ?><i class="g-icon end-xs download btn">download</i></caption>
<thead>
<tr>

2
Theme/Timeterminal/overview.tpl.php
View File

@ -81,7 +81,7 @@ echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12">
<div class="box wf-100">
<table id="accountList" class="default">
<table id="accountList" class="default sticky">
<caption><?= $this->getHtml('Recordings'); ?><i class="g-icon end-xs download btn">download</i></caption>
<thead>
<tr>

1
info.json
View File

@ -14,7 +14,6 @@
"name": "Jingga",
"website": "jingga.app"
},
"description": "The administration module.",
"directory": "HumanResourceTimeRecording",
"dependencies": {
"Admin": "1.0.0",

1
tests/Controller/ApiControllerTest.php
View File

@ -61,6 +61,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$this->app = new class() extends ApplicationAbstract
{
protected string $appName = 'Api';
protected int $appId = 1;
};