mirror of
https://github.com/Karaka-Management/oms-HumanResourceTimeRecording.git
synced 2026-02-12 02:48:40 +00:00
fix bugs
This commit is contained in:
parent
55f89cb385
commit
5840080ee3
|
|
@ -26,7 +26,7 @@
|
||||||
},
|
},
|
||||||
"hr_timerecording_session_busy": {
|
"hr_timerecording_session_busy": {
|
||||||
"name": "hr_timerecording_session_busy",
|
"name": "hr_timerecording_session_busy",
|
||||||
"type": "DATETIME",
|
"type": "INT",
|
||||||
"null": false
|
"null": false
|
||||||
},
|
},
|
||||||
"hr_timerecording_session_employee": {
|
"hr_timerecording_session_employee": {
|
||||||
|
|
|
||||||
53
Controller/TimerecordingController.php
Normal file
53
Controller/TimerecordingController.php
Normal file
|
|
@ -0,0 +1,53 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Orange Management
|
||||||
|
*
|
||||||
|
* PHP Version 7.4
|
||||||
|
*
|
||||||
|
* @package Modules\HumanResourceTimeRecording
|
||||||
|
* @copyright Dennis Eichhorn
|
||||||
|
* @license OMS License 1.0
|
||||||
|
* @version 1.0.0
|
||||||
|
* @link https://orange-management.org
|
||||||
|
*/
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Modules\HumanResourceTimeRecording\Controller;
|
||||||
|
|
||||||
|
use phpOMS\Contract\RenderableInterface;
|
||||||
|
use phpOMS\Message\RequestAbstract;
|
||||||
|
use phpOMS\Message\ResponseAbstract;
|
||||||
|
use phpOMS\Views\View;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* TimeRecording controller class.
|
||||||
|
*
|
||||||
|
* @package Modules\HumanResourceTimeRecording
|
||||||
|
* @license OMS License 1.0
|
||||||
|
* @link https://orange-management.org
|
||||||
|
* @since 1.0.0
|
||||||
|
*/
|
||||||
|
final class TimerecordingController extends Controller
|
||||||
|
{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Routing end-point for application behaviour.
|
||||||
|
*
|
||||||
|
* @param RequestAbstract $request Request
|
||||||
|
* @param ResponseAbstract $response Response
|
||||||
|
* @param mixed $data Generic data
|
||||||
|
*
|
||||||
|
* @return RenderableInterface
|
||||||
|
*
|
||||||
|
* @since 1.0.0
|
||||||
|
* @codeCoverageIgnore
|
||||||
|
*/
|
||||||
|
public function viewDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
|
||||||
|
{
|
||||||
|
$view = new View($this->app, $request, $response);
|
||||||
|
$view->setTemplate('/Modules/HumanResourceTimeRecording/Theme/Timeterminal/overview');
|
||||||
|
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006301001, $request, $response));
|
||||||
|
|
||||||
|
return $view;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -14,6 +14,8 @@ declare(strict_types=1);
|
||||||
|
|
||||||
namespace Modules\HumanResourceTimeRecording\Models;
|
namespace Modules\HumanResourceTimeRecording\Models;
|
||||||
|
|
||||||
|
use phpOMS\Contract\ArrayableInterface;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Session model
|
* Session model
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,8 @@ declare(strict_types=1);
|
||||||
|
|
||||||
namespace Modules\HumanResourceTimeRecording\Models;
|
namespace Modules\HumanResourceTimeRecording\Models;
|
||||||
|
|
||||||
|
use phpOMS\Contract\ArrayableInterface;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Session element model
|
* Session element model
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -13,18 +13,22 @@
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
return ['HumanResourceTimeRecording' => [
|
return ['HumanResourceTimeRecording' => [
|
||||||
'CS0' => 'Start',
|
'Break' => 'Break',
|
||||||
'CS1' => 'Pause',
|
'CS0' => 'Start',
|
||||||
'CS2' => 'Continue',
|
'CS1' => 'Pause',
|
||||||
'CS3' => 'End',
|
'CS2' => 'Continue',
|
||||||
'CT0' => 'Office',
|
'CS3' => 'End',
|
||||||
'CT1' => 'Remote',
|
'CT0' => 'Office',
|
||||||
'CT2' => 'Home',
|
'CT1' => 'Remote',
|
||||||
'CT3' => 'Vacation',
|
'CT2' => 'Home',
|
||||||
'CT4' => 'Sick',
|
'CT3' => 'Vacation',
|
||||||
'CT5' => 'On the move',
|
'CT4' => 'Sick',
|
||||||
'End' => 'End',
|
'CT5' => 'On the move',
|
||||||
'Start' => 'Start',
|
'Date' => 'Date',
|
||||||
'Status' => 'Status',
|
'End' => 'End',
|
||||||
'Type' => 'Type',
|
'Recordings' => 'Recordings',
|
||||||
|
'Start' => 'Start',
|
||||||
|
'Status' => 'Status',
|
||||||
|
'Total' => 'Total',
|
||||||
|
'Type' => 'Type',
|
||||||
]];
|
]];
|
||||||
|
|
|
||||||
|
|
@ -64,10 +64,21 @@ echo $this->getData('nav')->render(); ?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-4 col-xs-12">
|
<div class="col-md-4 col-xs-12">
|
||||||
<section class="box wf-100">
|
<div class="box wf-100">
|
||||||
<div class="inner">
|
<table id="accountList" class="default">
|
||||||
</div>
|
<caption><?= $this->getHtml('Recordings') ?><i class="fa fa-download floatRight download btn"></i></caption>
|
||||||
</section>
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<td><?= $this->getHtml('Date'); ?>
|
||||||
|
<td><?= $this->getHtml('Start') ?>
|
||||||
|
<td><?= $this->getHtml('Break') ?>
|
||||||
|
<td><?= $this->getHtml('End') ?>
|
||||||
|
<td><?= $this->getHtml('Total') ?>
|
||||||
|
<tfoot>
|
||||||
|
<tr><td colspan="5">
|
||||||
|
<tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
0
Theme/Timeterminal/overview.tpl.php
Normal file
0
Theme/Timeterminal/overview.tpl.php
Normal file
|
|
@ -17,7 +17,8 @@
|
||||||
"description": "The administration module.",
|
"description": "The administration module.",
|
||||||
"directory": "HumanResourceTimeRecording",
|
"directory": "HumanResourceTimeRecording",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Admin": "1.0.0"
|
"Admin": "1.0.0",
|
||||||
|
"HumanResourceManagement": "1.0.0"
|
||||||
},
|
},
|
||||||
"providing": {
|
"providing": {
|
||||||
"Navigation": "*",
|
"Navigation": "*",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user