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

Merge branch 'develop' of https://github.com/Karaka-Management/oms-HumanResourceManagement into develop

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 13:52:24 +00:00
commit a030f2d432
10 changed files with 33 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Controller/ApiController.php
View File

@ -85,7 +85,7 @@ final class ApiController extends Controller
public function apiEmployeeFromAccountCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateEmployeeFromAccountCreate($request))) {
$response->set('employee_create', new FormValidation($val));
$response->data['employee_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -154,7 +154,7 @@ final class ApiController extends Controller
public function apiEmployeeNewCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateEmployeeNewCreate($request))) {
$response->set('employee_create', new FormValidation($val));
$response->data['employee_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -225,7 +225,7 @@ final class ApiController extends Controller
public function apiEmployeeHistoryCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateEmployeeHistoryCreate($request))) {
$response->set('history_create', new FormValidation($val));
$response->data['history_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -297,7 +297,7 @@ final class ApiController extends Controller
public function apiEmployeeWorkHistoryCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateEmployeeWorkHistoryCreate($request))) {
$response->set('history_work_create', new FormValidation($val));
$response->data['history_work_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -373,7 +373,7 @@ final class ApiController extends Controller
public function apiEmployeeEducationHistoryCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateEmployeeEducationHistoryCreate($request))) {
$response->set('history_education_create', new FormValidation($val));
$response->data['history_education_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;

27
Controller/BackendController.php
View File

@ -49,15 +49,14 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/HumanResourceManagement/Theme/Backend/staff-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002402001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002402001, $request, $response);
$view->setData('employees', EmployeeMapper::getAll()
$view->data['employees'] = EmployeeMapper::getAll()
->with('profile')
->with('profile/account')
->with('companyHistory')
->with('companyHistory/unit')
->execute()
);
->execute();
return $view;
}
@ -78,10 +77,10 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/HumanResourceManagement/Theme/Backend/staff-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002402001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002402001, $request, $response);
$accSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response);
$view->addData('accSelector', $accSelector);
$view->data['accSelector'] = $accSelector;
return $view;
}
@ -102,7 +101,7 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/HumanResourceManagement/Theme/Backend/staff-profile');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002402001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002402001, $request, $response);
$employee = EmployeeMapper::get()
->with('profile')
@ -125,7 +124,7 @@ final class BackendController extends Controller
->sort('workHistory/start', OrderType::DESC)
->execute();
$view->addData('employee', $employee);
$view->data['employee'] = $employee;
return $view;
}
@ -146,9 +145,9 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/HumanResourceManagement/Theme/Backend/department-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002403001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002403001, $request, $response);
$view->setData('departments', DepartmentMapper::getAll());
$view->data['departments'] = DepartmentMapper::getAll();
return $view;
}
@ -169,9 +168,9 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/HumanResourceManagement/Theme/Backend/position-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002403001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002403001, $request, $response);
$view->setData('departments', DepartmentMapper::getAll());
$view->data['departments'] = DepartmentMapper::getAll();
return $view;
}
@ -192,10 +191,10 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/HumanResourceManagement/Theme/Backend/position-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002402001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002402001, $request, $response);
$accSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response);
$view->addData('accSelector', $accSelector);
$view->data['accSelector'] = $accSelector;
return $view;
}

22
Models/Employee.php
View File

@ -53,14 +53,6 @@ class Employee implements \JsonSerializable
*/
public $image = null;
/**
* Files.
*
* @var Media[]
* @since 1.0.0
*/
private array $files = [];
/**
* Employee department/position history.
*
@ -163,18 +155,6 @@ class Employee implements \JsonSerializable
return \hash_equals($this->semiPrivateHash, $hash);
}
/**
* Get files
*
* @return Media[]
*
* @since 1.0.0
*/
public function getFiles() : array
{
return $this->files;
}
/**
* Get media file by type
*
@ -350,4 +330,6 @@ class Employee implements \JsonSerializable
{
return $this->toArray();
}
use \Modules\Media\Models\MediaListTrait;
}

22
Models/EmployeeEducationHistory.php
View File

@ -52,14 +52,6 @@ class EmployeeEducationHistory implements \JsonSerializable
public string $score = '';
/**
* Files.
*
* @var Media[]
* @since 1.0.0
*/
private array $files = [];
/**
* Start date
*
@ -102,18 +94,6 @@ class EmployeeEducationHistory implements \JsonSerializable
return $this->id;
}
/**
* Get files
*
* @return Media[]
*
* @since 1.0.0
*/
public function getFiles() : array
{
return $this->files;
}
/**
* Get media file by type
*
@ -177,4 +157,6 @@ class EmployeeEducationHistory implements \JsonSerializable
{
return $this->toArray();
}
use \Modules\Media\Models\MediaListTrait;
}

22
Models/EmployeeHistory.php
View File

@ -73,14 +73,6 @@ class EmployeeHistory implements \JsonSerializable
*/
public Position $position;
/**
* Files.
*
* @var Media[]
* @since 1.0.0
*/
private array $files = [];
/**
* Start date
*
@ -125,18 +117,6 @@ class EmployeeHistory implements \JsonSerializable
return $this->id;
}
/**
* Get files
*
* @return Media[]
*
* @since 1.0.0
*/
public function getFiles() : array
{
return $this->files;
}
/**
* Get media file by type
*
@ -200,4 +180,6 @@ class EmployeeHistory implements \JsonSerializable
{
return $this->toArray();
}
use \Modules\Media\Models\MediaListTrait;
}

22
Models/EmployeeWorkHistory.php
View File

@ -48,14 +48,6 @@ class EmployeeWorkHistory implements \JsonSerializable
public string $jobTitle = '';
/**
* Files.
*
* @var Media[]
* @since 1.0.0
*/
private array $files = [];
/**
* Start date
*
@ -98,18 +90,6 @@ class EmployeeWorkHistory implements \JsonSerializable
return $this->id;
}
/**
* Get files
*
* @return Media[]
*
* @since 1.0.0
*/
public function getFiles() : array
{
return $this->files;
}
/**
* Get media file by type
*
@ -171,4 +151,6 @@ class EmployeeWorkHistory implements \JsonSerializable
{
return $this->toArray();
}
use \Modules\Media\Models\MediaListTrait;
}

4
Theme/Backend/department-list.tpl.php
View File

@ -25,9 +25,9 @@ $footerView->setPages(25);
$footerView->setPage(1);
$footerView->setResults(1);
$departments = $this->getData('departments');
$departments = $this->data['departments'];
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12">

2
Theme/Backend/staff-create.tpl.php
View File

@ -18,7 +18,7 @@ use \Modules\HumanResourceManagement\Models\EmployeeActivityStatus;
* @var \phpOMS\Views\View $this
*/
echo $this->getData('nav')->render();
echo $this->data['nav']->render();
?>
<div class="row">

4
Theme/Backend/staff-list.tpl.php
View File

@ -19,9 +19,9 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this
*/
$employees = $this->getData('employees');
$employees = $this->data['employees'];
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12">

4
Theme/Backend/staff-profile.tpl.php
View File

@ -14,13 +14,13 @@ declare(strict_types=1);
use phpOMS\Uri\UriFactory;
$employee = $this->getData('employee');
$employee = $this->data['employee'];
$history = $employee->getHistory();
$educationHistory = $employee->getEducationHistory();
$workHistory = $employee->getWorkHistory();
$recentHistory = $employee->getNewestHistory();
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="tabview tab-2">
<div class="box wf-100 col-xs-12">