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

improve baseline

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-02-06 23:54:01 +01:00
parent 2e6cbcb9dd
commit 2801462e83
7 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Controller/BackendController.php
View File

@ -49,7 +49,7 @@ final class BackendController extends Controller
*/
public function viewUnitList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$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));
@ -73,16 +73,16 @@ final class BackendController extends Controller
*/
public function viewUnitProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$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));
$selectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app, $request, $response);
$selectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('unit-selector', $selectorView);
$view->addData('unit', UnitMapper::get((int) $request->getData('id')));
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app, $request, $response);
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor);
return $view;
@ -102,7 +102,7 @@ final class BackendController extends Controller
*/
public function viewOrganigram(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/organigram');
@ -176,18 +176,18 @@ final class BackendController extends Controller
*/
public function viewUnitCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$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));
$uploadView = new \Modules\Media\Theme\Backend\Components\InlinePreview\BaseView($this->app, $request, $response);
$uploadView = new \Modules\Media\Theme\Backend\Components\InlinePreview\BaseView($this->app->l11nManager, $request, $response);
$view->addData('media-preview-upload', $uploadView);
$selectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app, $request, $response);
$selectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('unit-selector', $selectorView);
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app, $request, $response);
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor);
return $view;
@ -207,7 +207,7 @@ final class BackendController extends Controller
*/
public function viewDepartmentList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$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));
@ -231,20 +231,20 @@ final class BackendController extends Controller
*/
public function viewDepartmentProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$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));
$selectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app, $request, $response);
$selectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('department-selector', $selectorView);
$unitSelectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app, $request, $response);
$unitSelectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('unit-selector', $unitSelectorView);
$view->addData('department', DepartmentMapper::get((int) $request->getData('id')));
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app, $request, $response);
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor);
return $view;
@ -264,18 +264,18 @@ final class BackendController extends Controller
*/
public function viewDepartmentCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$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));
$selectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app, $request, $response);
$selectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('department-selector', $selectorView);
$unitSelectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app, $request, $response);
$unitSelectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('unit-selector', $unitSelectorView);
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app, $request, $response);
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor);
return $view;
@ -295,7 +295,7 @@ final class BackendController extends Controller
*/
public function viewPositionList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$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));
@ -319,20 +319,20 @@ final class BackendController extends Controller
*/
public function viewPositionProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$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));
$selectorView = new \Modules\Organization\Theme\Backend\Components\PositionTagSelector\PositionTagSelectorView($this->app, $request, $response);
$selectorView = new \Modules\Organization\Theme\Backend\Components\PositionTagSelector\PositionTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('position-selector', $selectorView);
$departmentSelectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app, $request, $response);
$departmentSelectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('department-selector', $departmentSelectorView);
$view->addData('position', PositionMapper::get((int) $request->getData('id')));
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app, $request, $response);
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor);
return $view;
@ -352,18 +352,18 @@ final class BackendController extends Controller
*/
public function viewPositionCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$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));
$selectorView = new \Modules\Organization\Theme\Backend\Components\PositionTagSelector\PositionTagSelectorView($this->app, $request, $response);
$selectorView = new \Modules\Organization\Theme\Backend\Components\PositionTagSelector\PositionTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('position-selector', $selectorView);
$departmentSelectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app, $request, $response);
$departmentSelectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('department-selector', $departmentSelectorView);
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app, $request, $response);
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor);
return $view;

6
Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorPopupView.php
View File

@ -14,7 +14,7 @@ declare(strict_types=1);
namespace Modules\Organization\Theme\Backend\Components\DepartmentTagSelector;
use phpOMS\ApplicationAbstract;
use phpOMS\Localization\L11nManager;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Views\View;
@ -35,9 +35,9 @@ class DepartmentTagSelectorPopupView extends View
/**
* {@inheritdoc}
*/
public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response)
public function __construct(L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response)
{
parent::__construct($app, $request, $response);
parent::__construct($l11n, $request, $response);
$this->setTemplate('/Modules/Organization/Theme/Backend/Components/DepartmentTagSelector/department-selector-popup');
}

8
Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorView.php
View File

@ -14,7 +14,7 @@ declare(strict_types=1);
namespace Modules\Organization\Theme\Backend\Components\DepartmentTagSelector;
use phpOMS\ApplicationAbstract;
use phpOMS\Localization\L11nManager;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Views\View;
@ -36,12 +36,12 @@ class DepartmentTagSelectorView extends View
/**
* {@inheritdoc}
*/
public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response)
public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response)
{
parent::__construct($app, $request, $response);
parent::__construct($l11n, $request, $response);
$this->setTemplate('/Modules/Organization/Theme/Backend/Components/DepartmentTagSelector/department-selector');
$view = new DepartmentTagSelectorPopupView($app, $request, $response);
$view = new DepartmentTagSelectorPopupView($l11n, $request, $response);
$this->addData('department-selector-popup', $view);
}

6
Theme/Backend/Components/PositionTagSelector/PositionTagSelectorPopupView.php
View File

@ -14,7 +14,7 @@ declare(strict_types=1);
namespace Modules\Organization\Theme\Backend\Components\PositionTagSelector;
use phpOMS\ApplicationAbstract;
use phpOMS\Localization\L11nManager;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Views\View;
@ -35,9 +35,9 @@ class PositionTagSelectorPopupView extends View
/**
* {@inheritdoc}
*/
public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response)
public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response)
{
parent::__construct($app, $request, $response);
parent::__construct($l11n, $request, $response);
$this->setTemplate('/Modules/Organization/Theme/Backend/Components/PositionTagSelector/position-selector-popup');
}

8
Theme/Backend/Components/PositionTagSelector/PositionTagSelectorView.php
View File

@ -14,7 +14,7 @@ declare(strict_types=1);
namespace Modules\Organization\Theme\Backend\Components\PositionTagSelector;
use phpOMS\ApplicationAbstract;
use phpOMS\Localization\L11nManager;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Views\View;
@ -36,12 +36,12 @@ class PositionTagSelectorView extends View
/**
* {@inheritdoc}
*/
public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response)
public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response)
{
parent::__construct($app, $request, $response);
parent::__construct($l11n, $request, $response);
$this->setTemplate('/Modules/Organization/Theme/Backend/Components/PositionTagSelector/position-selector');
$view = new PositionTagSelectorPopupView($app, $request, $response);
$view = new PositionTagSelectorPopupView($l11n, $request, $response);
$this->addData('position-selector-popup', $view);
}

6
Theme/Backend/Components/UnitTagSelector/UnitTagSelectorPopupView.php
View File

@ -14,7 +14,7 @@ declare(strict_types=1);
namespace Modules\Organization\Theme\Backend\Components\UnitTagSelector;
use phpOMS\ApplicationAbstract;
use phpOMS\Localization\L11nManager;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Views\View;
@ -35,9 +35,9 @@ class UnitTagSelectorPopupView extends View
/**
* {@inheritdoc}
*/
public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response)
public function __construct(L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response)
{
parent::__construct($app, $request, $response);
parent::__construct($l11n, $request, $response);
$this->setTemplate('/Modules/Organization/Theme/Backend/Components/UnitTagSelector/unit-selector-popup');
}

8
Theme/Backend/Components/UnitTagSelector/UnitTagSelectorView.php
View File

@ -14,7 +14,7 @@ declare(strict_types=1);
namespace Modules\Organization\Theme\Backend\Components\UnitTagSelector;
use phpOMS\ApplicationAbstract;
use phpOMS\Localization\L11nManager;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Views\View;
@ -36,12 +36,12 @@ class UnitTagSelectorView extends View
/**
* {@inheritdoc}
*/
public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response)
public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response)
{
parent::__construct($app, $request, $response);
parent::__construct($l11n, $request, $response);
$this->setTemplate('/Modules/Organization/Theme/Backend/Components/UnitTagSelector/unit-selector');
$view = new UnitTagSelectorPopupView($app, $request, $response);
$view = new UnitTagSelectorPopupView($l11n, $request, $response);
$this->addData('unit-selector-popup', $view);
}