Restructure

This commit is contained in:
Dennis Eichhorn 2015-12-31 18:05:19 +01:00
parent feb6438a18
commit fefddd601f
9 changed files with 17 additions and 14 deletions

View File

@ -15,7 +15,7 @@
*/ */
namespace Modules\HumanResourceManagement\Admin; namespace Modules\HumanResourceManagement\Admin;
use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\Pool;
use phpOMS\Module\ActivateAbstract; use phpOMS\Module\ActivateAbstract;

View File

@ -15,7 +15,7 @@
*/ */
namespace Modules\HumanResourceManagement\Admin; namespace Modules\HumanResourceManagement\Admin;
use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\Pool;
use phpOMS\Module\DeactivateAbstract; use phpOMS\Module\DeactivateAbstract;

View File

@ -14,6 +14,7 @@
* @link http://orange-management.com * @link http://orange-management.com
*/ */
namespace Modules\HumanResourceManagement\Admin\Install; namespace Modules\HumanResourceManagement\Admin\Install;
use phpOMS\DataStorage\Database\Pool;
/** /**
* Navigation class. * Navigation class.
@ -33,6 +34,7 @@ class Navigation
$navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);
$class = '\\Modules\\Navigation\\Admin\\Installer'; $class = '\\Modules\\Navigation\\Admin\\Installer';
/** @var $class \Modules\Navigation\Admin\Installer */
$class::installExternal($dbPool, $navData); $class::installExternal($dbPool, $navData);
} }
} }

View File

@ -15,7 +15,7 @@
*/ */
namespace Modules\HumanResourceManagement\Admin; namespace Modules\HumanResourceManagement\Admin;
use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\Pool;
use phpOMS\Module\UninstallAbstract; use phpOMS\Module\UninstallAbstract;

View File

@ -15,9 +15,10 @@
*/ */
namespace Modules\HumanResourceManagement\Admin; namespace Modules\HumanResourceManagement\Admin;
use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\Pool;
use phpOMS\Module\UpdateAbstract; use phpOMS\Module\UpdateAbstract;
use phpOMS\System\FileSystem;
/** /**
* Navigation class. * Navigation class.
@ -38,6 +39,8 @@ class Update extends UpdateAbstract
*/ */
public static function update(Pool $dbPool, array $info) public static function update(Pool $dbPool, array $info)
{ {
FileSystem::deletePath(__DIR__ . '/Update');
mkdir('Update');
parent::update($dbPool, $info); parent::update($dbPool, $info);
} }
} }

View File

@ -62,7 +62,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @var \string * @var \string
* @since 1.0.0 * @since 1.0.0
*/ */
protected static $module = 'HumanResourceManagement'; const MODULE_NAME = 'HumanResourceManagement';
/** /**
* Localization files. * Localization files.
@ -71,7 +71,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @since 1.0.0 * @since 1.0.0
*/ */
protected static $localization = [ protected static $localization = [
RequestDestination::BACKEND => ['backend'], RequestDestination::BACKEND => [''],
]; ];
/** /**
@ -80,9 +80,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @var \string * @var \string
* @since 1.0.0 * @since 1.0.0
*/ */
protected static $providing = [ protected static $providing = [];
'Content',
];
/** /**
* Dependencies. * Dependencies.
@ -116,7 +114,7 @@ class Controller extends ModuleAbstract implements WebInterface
public function viewHrList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewHrList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/HumanResourceManagement/Theme/backend/staff-list'); $view->setTemplate('/Modules/HumanResourceManagement/Theme/Backend/staff-list');
$view->addData('nav', $this->createNavigation(1002402001, $request, $response)); $view->addData('nav', $this->createNavigation(1002402001, $request, $response));
return $view; return $view;
@ -135,7 +133,7 @@ class Controller extends ModuleAbstract implements WebInterface
public function viewHrDepartmentList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewHrDepartmentList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/HumanResourceManagement/Theme/backend/department-list'); $view->setTemplate('/Modules/HumanResourceManagement/Theme/Backend/department-list');
$view->addData('nav', $this->createNavigation(1003001001, $request, $response)); $view->addData('nav', $this->createNavigation(1003001001, $request, $response));
return $view; return $view;
@ -155,7 +153,7 @@ class Controller extends ModuleAbstract implements WebInterface
{ {
$nav = Navigation::getInstance($request, $this->app->dbPool); $nav = Navigation::getInstance($request, $this->app->dbPool);
$navView = new NavigationView($this->app, $request, $response); $navView = new NavigationView($this->app, $request, $response);
$navView->setTemplate('/Modules/Navigation/Theme/backend/mid'); $navView->setTemplate('/Modules/Navigation/Theme/Backend/mid');
$navView->setNav($nav->getNav()); $navView->setNav($nav->getNav());
$navView->setLanguage($request->getL11n()->language); $navView->setLanguage($request->getL11n()->language);
$navView->setParent($pageId); $navView->setParent($pageId);

View File

@ -36,7 +36,7 @@
"type": 5, "type": 5,
"from": "HumanResourceManagement", "from": "HumanResourceManagement",
"for": "Navigation", "for": "Navigation",
"file": "nav.backend" "file": "Navigation"
}, },
{ {
"pid": [ "pid": [
@ -44,7 +44,7 @@
], ],
"type": 5, "type": 5,
"for": "Content", "for": "Content",
"file": "backend", "file": "",
"from": "HumanResourceManagement" "from": "HumanResourceManagement"
} }
] ]