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

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

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 13:58:39 +00:00
commit 54459835eb
15 changed files with 70 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Controller/ApiController.php
View File

@ -195,7 +195,7 @@ final class ApiController extends Controller
public function apiUnitCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateUnitCreate($request))) {
$response->set('unit_create', new FormValidation($val));
$response->data['unit_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -252,7 +252,7 @@ final class ApiController extends Controller
public function apiUnitMainAddressSet(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateUnitMainAddressSet($request))) {
$response->set('unit_address_set', new FormValidation($val));
$response->data['unit_address_set'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -391,7 +391,7 @@ final class ApiController extends Controller
*/
public function apiUnitImageSet(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
$uploadedFiles = $request->getFiles();
$uploadedFiles = $request->files;
if (empty($uploadedFiles)) {
$this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Unit', 'Invalid unit image', $uploadedFiles);
$response->header->status = RequestStatusCode::R_400;
@ -553,7 +553,7 @@ final class ApiController extends Controller
public function apiPositionCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validatePositionCreate($request))) {
$response->set('position_create', new FormValidation($val));
$response->data['position_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -871,7 +871,7 @@ final class ApiController extends Controller
public function apiUnitAttributeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateUnitAttributeCreate($request))) {
$response->set('attribute_create', new FormValidation($val));
$response->data['attribute_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -950,7 +950,7 @@ final class ApiController extends Controller
public function apiUnitAttributeTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateUnitAttributeTypeL11nCreate($request))) {
$response->set('attr_type_l11n_create', new FormValidation($val));
$response->data['attr_type_l11n_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -975,7 +975,7 @@ final class ApiController extends Controller
$attrL11n = new BaseStringL11n();
$attrL11n->ref = $request->getDataInt('type') ?? 0;
$attrL11n->setLanguage(
$request->getDataString('language') ?? $request->getLanguage()
$request->getDataString('language') ?? $request->header->l11n->language
);
$attrL11n->content = $request->getDataString('title') ?? '';
@ -1019,7 +1019,7 @@ final class ApiController extends Controller
public function apiUnitAttributeTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateUnitAttributeTypeCreate($request))) {
$response->set('attr_type_create', new FormValidation($val));
$response->data['attr_type_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -1090,7 +1090,7 @@ final class ApiController extends Controller
public function apiUnitAttributeValueCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateUnitAttributeValueCreate($request))) {
$response->set('attr_value_create', new FormValidation($val));
$response->data['attr_value_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -1178,7 +1178,7 @@ final class ApiController extends Controller
public function apiUnitAttributeValueL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateUnitAttributeValueL11nCreate($request))) {
$response->set('attr_value_l11n_create', new FormValidation($val));
$response->data['attr_value_l11n_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -1203,7 +1203,7 @@ final class ApiController extends Controller
$attrL11n = new BaseStringL11n();
$attrL11n->ref = $request->getDataInt('value') ?? 0;
$attrL11n->setLanguage(
$request->getDataString('language') ?? $request->getLanguage()
$request->getDataString('language') ?? $request->header->l11n->language
);
$attrL11n->content = $request->getDataString('title') ?? '';

82
Controller/BackendController.php
View File

@ -54,7 +54,7 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/unit-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004703001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004703001, $request, $response);
$mapper = UnitMapper::getAll()
->with('parent')
@ -62,11 +62,11 @@ final class BackendController extends Controller
->limit(25);
if ($request->getData('ptype') === 'p') {
$view->setData('units', $mapper->where('id', $request->getDataInt('id') ?? 0, '<')->execute());
$view->data['units'] = $mapper->where('id', $request->getDataInt('id') ?? 0, '<')->execute();
} elseif ($request->getData('ptype') === 'n') {
$view->setData('units', $mapper->where('id', $request->getDataInt('id') ?? 0, '>')->execute());
$view->data['units'] = $mapper->where('id', $request->getDataInt('id') ?? 0, '>')->execute();
} else {
$view->setData('units', $mapper->where('id', 0, '>')->execute());
$view->data['units'] = $mapper->where('id', 0, '>')->execute();
}
return $view;
@ -89,10 +89,10 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/unit-profile');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004703001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004703001, $request, $response);
$selectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('unit-selector', $selectorView);
$view->data['unit-selector'] = $selectorView;
$unit = UnitMapper::get()
->with('parent')
@ -101,10 +101,10 @@ final class BackendController extends Controller
->where('id', (int) $request->getData('id'))
->execute();
$view->addData('unit', $unit);
$view->data['unit'] = $unit;
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor);
$view->data['editor'] = $editor;
return $view;
}
@ -134,17 +134,17 @@ final class BackendController extends Controller
/** @var Unit[] $units */
$units = UnitMapper::getAll()->with('parent')->execute();
$unitTree = $this->createOrgTree($units);
$view->setData('unitTree', $unitTree);
$view->data['unitTree'] = $unitTree;
/** @var Department[] $departments */
$departments = DepartmentMapper::getAll()->with('parent')->with('unit')->execute();
$depTree = $this->createOrgTree($departments);
$view->setData('departmentTree', $depTree);
$view->data['departmentTree'] = $depTree;
/** @var Position[] $positions */
$positions = PositionMapper::getAll()->with('parent')->with('unit')->with('department')->execute();
$posTree = $this->createOrgTree($positions);
$view->setData('positionTree', $posTree);
$view->data['positionTree'] = $posTree;
return $view;
}
@ -196,16 +196,16 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/unit-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004703001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004703001, $request, $response);
$uploadView = new \Modules\Media\Theme\Backend\Components\InlinePreview\BaseView($this->app->l11nManager, $request, $response);
$view->addData('media-preview-upload', $uploadView);
$view->data['media-preview-upload'] = $uploadView;
$selectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('unit-selector', $selectorView);
$view->data['unit-selector'] = $selectorView;
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor);
$view->data['editor'] = $editor;
return $view;
}
@ -227,10 +227,10 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/department-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004704001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004704001, $request, $response);
$pageLimit = 25;
$view->addData('pageLimit', $pageLimit);
$view->data['pageLimit'] = $pageLimit;
$mapper = DepartmentMapper::getAll()->with('parent')->with('unit')->limit($pageLimit + 1);
@ -245,12 +245,12 @@ final class BackendController extends Controller
/** @var \Modules\Organization\Models\Department[] $departments */
$departments = $mapper->execute();
$view->setData('hasMore', ($count = \count($departments)) > $pageLimit);
$view->data['hasMore'] = ($count = \count($departments)) > $pageLimit;
if ($count > $pageLimit) {
\array_pop($departments);
}
$view->setData('departments', $departments);
$view->data['departments'] = $departments;
return $view;
}
@ -272,18 +272,18 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/department-profile');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004704001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004704001, $request, $response);
$selectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('department-selector', $selectorView);
$view->data['department-selector'] = $selectorView;
$unitSelectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('unit-selector', $unitSelectorView);
$view->data['unit-selector'] = $unitSelectorView;
$view->addData('department', DepartmentMapper::get()->with('parent')->with('unit')->where('id', (int) $request->getData('id'))->execute());
$view->data['department'] = DepartmentMapper::get()->with('parent')->with('unit')->where('id', (int) $request->getData('id'))->execute();
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor);
$view->data['editor'] = $editor;
return $view;
}
@ -305,16 +305,16 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/department-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004704001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004704001, $request, $response);
$selectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('department-selector', $selectorView);
$view->data['department-selector'] = $selectorView;
$unitSelectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('unit-selector', $unitSelectorView);
$view->data['unit-selector'] = $unitSelectorView;
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor);
$view->data['editor'] = $editor;
return $view;
}
@ -336,14 +336,14 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/position-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004705001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004705001, $request, $response);
if ($request->getData('ptype') === 'p') {
$view->setData('positions', PositionMapper::getAll()->with('parent')->with('department')->where('id', $request->getDataInt('id') ?? 0, '<')->limit(25)->execute());
$view->data['positions'] = PositionMapper::getAll()->with('parent')->with('department')->where('id', $request->getDataInt('id') ?? 0, '<')->limit(25)->execute();
} elseif ($request->getData('ptype') === 'n') {
$view->setData('positions', PositionMapper::getAll()->with('parent')->with('department')->where('id', $request->getDataInt('id') ?? 0, '>')->limit(25)->execute());
$view->data['positions'] = PositionMapper::getAll()->with('parent')->with('department')->where('id', $request->getDataInt('id') ?? 0, '>')->limit(25)->execute();
} else {
$view->setData('positions', PositionMapper::getAll()->with('parent')->with('department')->where('id', 0, '>')->limit(25)->execute());
$view->data['positions'] = PositionMapper::getAll()->with('parent')->with('department')->where('id', 0, '>')->limit(25)->execute();
}
return $view;
@ -366,18 +366,18 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/position-profile');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004705001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004705001, $request, $response);
$selectorView = new \Modules\Organization\Theme\Backend\Components\PositionTagSelector\PositionTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('position-selector', $selectorView);
$view->data['position-selector'] = $selectorView;
$departmentSelectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('department-selector', $departmentSelectorView);
$view->data['department-selector'] = $departmentSelectorView;
$view->addData('position', PositionMapper::get()->with('parent')->with('department')->where('id', (int) $request->getData('id'))->execute());
$view->data['position'] = PositionMapper::get()->with('parent')->with('department')->where('id', (int) $request->getData('id'))->execute();
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor);
$view->data['editor'] = $editor;
return $view;
}
@ -399,16 +399,16 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/position-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004705001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004705001, $request, $response);
$selectorView = new \Modules\Organization\Theme\Backend\Components\PositionTagSelector\PositionTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('position-selector', $selectorView);
$view->data['position-selector'] = $selectorView;
$departmentSelectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('department-selector', $departmentSelectorView);
$view->data['department-selector'] = $departmentSelectorView;
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor);
$view->data['editor'] = $editor;
return $view;
}

12
Models/Department.php
View File

@ -94,18 +94,6 @@ class Department implements \JsonSerializable
$this->unit = new NullUnit();
}
/**
* Get id
*
* @return int
*
* @since 1.0.0
*/
public function getId() : int
{
return $this->id;
}
/**
* Get status
*

12
Models/Position.php
View File

@ -91,18 +91,6 @@ class Position implements \JsonSerializable
$this->department = new NullDepartment();
}
/**
* Get id
*
* @return int
*
* @since 1.0.0
*/
public function getId() : int
{
return $this->id;
}
/**
* Get status
*

12
Models/Unit.php
View File

@ -101,18 +101,6 @@ class Unit implements \JsonSerializable
$this->mainAddress = new NullAddress();
}
/**
* Get id
*
* @return int
*
* @since 1.0.0
*/
public function getId() : int
{
return $this->id;
}
/**
* Get status
*

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

@ -15,7 +15,7 @@ declare(strict_types=1);
use phpOMS\Uri\UriFactory;
/** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12 col-md-6">

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

@ -18,7 +18,7 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this
* @var \Modules\Organization\Models\Department[] $departments
*/
$departments = $this->getData('departments') ?? [];
$departments = $this->data['departments'] ?? [];
$previous = empty($departments)
? 'organization/department/list'
@ -29,7 +29,7 @@ $next = empty($departments)
. ($this->getData('hasMore') ? \end($departments)->id : $this->request->getData('id'))
. '&ptype=n';
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12">

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

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

6
Theme/Backend/organigram.tpl.php
View File

@ -15,9 +15,9 @@ declare(strict_types=1);
/**
* @var \phpOMS\Views\View $this
*/
$unitTree = $this->getData('unitTree');
$depTree = $this->getData('departmentTree');
$posTree = $this->getData('positionTree');
$unitTree = $this->data['unitTree'];
$depTree = $this->data['departmentTree'];
$posTree = $this->data['positionTree'];
function renderTree($parent, $ref, &$unitTree, &$depTree, &$posTree, $type = 'unit')
{

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

@ -16,7 +16,7 @@ use Modules\Organization\Models\Status;
use phpOMS\Uri\UriFactory;
/** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12 col-md-6">

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

@ -18,12 +18,12 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this
* @var \Modules\Organization\Models\Position[] $positions
*/
$positions = $this->getData('positions') ?? [];
$positions = $this->data['positions'] ?? [];
$previous = empty($positions) ? 'organization/position/list' : '{/base}/organization/position/list?{?}&id=' . \reset($positions)->id . '&ptype=p';
$next = empty($positions) ? 'organization/position/list' : '{/base}/organization/position/list?{?}&id=' . \end($positions)->id . '&ptype=n';
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12">

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

@ -18,9 +18,9 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this
* @var \Modules\Organization\Models\Position;
*/
$position = $this->getData('position');
$position = $this->data['position'];
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12 col-md-6">

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

@ -21,7 +21,7 @@ $countryCodes = ISO3166TwoEnum::getConstants();
$countries = ISO3166NameEnum::getConstants();
/** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<form id="fUnitCreate" method="put" action="<?= UriFactory::build('{/api}organization/unit'); ?>">
<div class="row">

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

@ -18,12 +18,12 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this
* @var \Modules\Organization\Models\Unit[] $units
*/
$units = $this->getData('units') ?? [];
$units = $this->data['units'] ?? [];
$previous = empty($units) ? 'organization/unit/list' : '{/base}/organization/unit/list?{?}&id=' . \reset($units)->id . '&ptype=p';
$next = empty($units) ? 'organization/unit/list' : '{/base}/organization/unit/list?{?}&id=' . \end($units)->id . '&ptype=n';
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12">

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

@ -21,12 +21,12 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this
* @var \Modules\Organization\Models\Unit $unit;
*/
$unit = $this->getData('unit');
$unit = $this->data['unit'];
$countryCodes = ISO3166TwoEnum::getConstants();
$countries = ISO3166NameEnum::getConstants();
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<form id="iUnitUploadForm" action="<?= UriFactory::build('{/api}organization/unit/image?id={?id}'); ?>" method="post"><input class="preview" data-action='[{"listener": "change", "key": 1, "action": [{"key": 1, "type": "form.submit", "selector": "#iUnitUploadForm"}]}]' id="iUnitUpload" name="unitImage" type="file" accept="image/png,image/gif,image/jpeg" style="display: none;"></form>