diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 1159947..458e064 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -249,7 +249,7 @@ final class ApiController extends Controller $request->getData('name') ?? '', $uploadedFiles, $request->getHeader()->getAccount(), - __DIR__ . '/../../../Modules/Media/Files', + 'Modules/Media/Files', '/Modules/Organization' ); diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 7e9f5d9..6f789c8 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -55,9 +55,9 @@ final class BackendController extends Controller $view->setTemplate('/Modules/Organization/Theme/Backend/unit-list'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004703001, $request, $response)); - if ($request->getData('ptype') === '-') { + if ($request->getData('ptype') === 'p') { $view->setData('units', UnitMapper::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25)); - } elseif ($request->getData('ptype') === '+') { + } elseif ($request->getData('ptype') === 'n') { $view->setData('units', UnitMapper::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25)); } else { $view->setData('units', UnitMapper::getAfterPivot(0, null, 25)); @@ -232,9 +232,9 @@ final class BackendController extends Controller $view->setTemplate('/Modules/Organization/Theme/Backend/department-list'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004704001, $request, $response)); - if ($request->getData('ptype') === '-') { + if ($request->getData('ptype') === 'p') { $view->setData('departments', DepartmentMapper::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25)); - } elseif ($request->getData('ptype') === '+') { + } elseif ($request->getData('ptype') === 'n') { $view->setData('departments', DepartmentMapper::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25)); } else { $view->setData('departments', DepartmentMapper::getAfterPivot(0, null, 25)); @@ -326,9 +326,9 @@ final class BackendController extends Controller $view->setTemplate('/Modules/Organization/Theme/Backend/position-list'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004705001, $request, $response)); - if ($request->getData('ptype') === '-') { + if ($request->getData('ptype') === 'p') { $view->setData('positions', PositionMapper::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25)); - } elseif ($request->getData('ptype') === '+') { + } elseif ($request->getData('ptype') === 'n') { $view->setData('positions', PositionMapper::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25)); } else { $view->setData('positions', PositionMapper::getAfterPivot(0, null, 25)); diff --git a/Theme/Backend/css/styles.css b/Theme/Backend/css/styles.css index a50d192..8a0ba83 100755 --- a/Theme/Backend/css/styles.css +++ b/Theme/Backend/css/styles.css @@ -1,15 +1,17 @@ .organigram .portlet { - margin: 0 auto; } + margin: 0 auto; + margin-bottom: 1rem; } .organigram .unit { margin: 1rem auto; } .organigram .departments { margin: .5rem; + padding: 1rem 1rem 0 1rem; box-sizing: border-box; display: flex; flex: 0 0 auto; flex-direction: column; flex-wrap: wrap; - border: 1px solid #ebedf2; } + border: 1px solid rgb(218, 218, 218); } .organigram .position { margin: 0 auto; padding: 1rem; } diff --git a/Theme/Backend/css/styles.scss b/Theme/Backend/css/styles.scss index 481145d..0404114 100755 --- a/Theme/Backend/css/styles.scss +++ b/Theme/Backend/css/styles.scss @@ -1,6 +1,7 @@ .organigram { .portlet { margin: 0 auto; + margin-bottom: 1rem; } .unit { @@ -9,13 +10,13 @@ .departments { margin: .5rem; + padding: 1rem 1rem 0 1rem; box-sizing: border-box; display: flex; flex: 0 0 auto; flex-direction: column; flex-wrap: wrap; - - border: 1px solid #ebedf2; + border: 1px solid rgb(218, 218, 218); } .position { diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php index 3154f89..b9deee9 100755 --- a/Theme/Backend/department-list.tpl.php +++ b/Theme/Backend/department-list.tpl.php @@ -20,8 +20,8 @@ use phpOMS\Uri\UriFactory; */ $departments = $this->getData('departments') ?? []; -$previous = empty($departments) ? '{/prefix}organization/department/list' : '{/prefix}organization/department/list?{?}&id=' . \reset($departments)->getId() . '&ptype=-'; -$next = empty($departments) ? '{/prefix}organization/department/list' : '{/prefix}organization/department/list?{?}&id=' . \end($departments)->getId() . '&ptype=+'; +$previous = empty($departments) ? '{/prefix}organization/department/list' : '{/prefix}organization/department/list?{?}&id=' . \reset($departments)->getId() . '&ptype=p'; +$next = empty($departments) ? '{/prefix}organization/department/list' : '{/prefix}organization/department/list?{?}&id=' . \end($departments)->getId() . '&ptype=n'; echo $this->getData('nav')->render(); ?> diff --git a/Theme/Backend/position-list.tpl.php b/Theme/Backend/position-list.tpl.php index 9689d4e..c64449a 100755 --- a/Theme/Backend/position-list.tpl.php +++ b/Theme/Backend/position-list.tpl.php @@ -20,8 +20,8 @@ use phpOMS\Uri\UriFactory; */ $positions = $this->getData('positions') ?? []; -$previous = empty($positions) ? '{/prefix}organization/position/list' : '{/prefix}organization/position/list?{?}&id=' . \reset($positions)->getId() . '&ptype=-'; -$next = empty($positions) ? '{/prefix}organization/position/list' : '{/prefix}organization/position/list?{?}&id=' . \end($positions)->getId() . '&ptype=+'; +$previous = empty($positions) ? '{/prefix}organization/position/list' : '{/prefix}organization/position/list?{?}&id=' . \reset($positions)->getId() . '&ptype=p'; +$next = empty($positions) ? '{/prefix}organization/position/list' : '{/prefix}organization/position/list?{?}&id=' . \end($positions)->getId() . '&ptype=n'; echo $this->getData('nav')->render(); ?> diff --git a/Theme/Backend/unit-list.tpl.php b/Theme/Backend/unit-list.tpl.php index 81f0b43..6a1f03a 100755 --- a/Theme/Backend/unit-list.tpl.php +++ b/Theme/Backend/unit-list.tpl.php @@ -21,8 +21,8 @@ use phpOMS\Uri\UriFactory; */ $units = $this->getData('units') ?? []; -$previous = empty($units) ? '{/prefix}organization/unit/list' : '{/prefix}organization/unit/list?{?}&id=' . \reset($units)->getId() . '&ptype=-'; -$next = empty($units) ? '{/prefix}organization/unit/list' : '{/prefix}organization/unit/list?{?}&id=' . \end($units)->getId() . '&ptype=+'; +$previous = empty($units) ? '{/prefix}organization/unit/list' : '{/prefix}organization/unit/list?{?}&id=' . \reset($units)->getId() . '&ptype=p'; +$next = empty($units) ? '{/prefix}organization/unit/list' : '{/prefix}organization/unit/list?{?}&id=' . \end($units)->getId() . '&ptype=n'; echo $this->getData('nav')->render(); ?>