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

fix pagination and some media bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-07-30 21:28:05 +02:00
parent 5a16673331
commit 2bfed75f23
7 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Controller/ApiController.php
View File

@ -249,7 +249,7 @@ final class ApiController extends Controller
$request->getData('name') ?? '', $request->getData('name') ?? '',
$uploadedFiles, $uploadedFiles,
$request->getHeader()->getAccount(), $request->getHeader()->getAccount(),
__DIR__ . '/../../../Modules/Media/Files', 'Modules/Media/Files',
'/Modules/Organization' '/Modules/Organization'
); );

12
Controller/BackendController.php
View File

@ -55,9 +55,9 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/Organization/Theme/Backend/unit-list'); $view->setTemplate('/Modules/Organization/Theme/Backend/unit-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004703001, $request, $response)); $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)); $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)); $view->setData('units', UnitMapper::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25));
} else { } else {
$view->setData('units', UnitMapper::getAfterPivot(0, null, 25)); $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->setTemplate('/Modules/Organization/Theme/Backend/department-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004704001, $request, $response)); $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)); $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)); $view->setData('departments', DepartmentMapper::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25));
} else { } else {
$view->setData('departments', DepartmentMapper::getAfterPivot(0, null, 25)); $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->setTemplate('/Modules/Organization/Theme/Backend/position-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004705001, $request, $response)); $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)); $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)); $view->setData('positions', PositionMapper::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25));
} else { } else {
$view->setData('positions', PositionMapper::getAfterPivot(0, null, 25)); $view->setData('positions', PositionMapper::getAfterPivot(0, null, 25));

6
Theme/Backend/css/styles.css
View File

@ -1,15 +1,17 @@
.organigram .portlet { .organigram .portlet {
margin: 0 auto; } margin: 0 auto;
margin-bottom: 1rem; }
.organigram .unit { .organigram .unit {
margin: 1rem auto; } margin: 1rem auto; }
.organigram .departments { .organigram .departments {
margin: .5rem; margin: .5rem;
padding: 1rem 1rem 0 1rem;
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
flex: 0 0 auto; flex: 0 0 auto;
flex-direction: column; flex-direction: column;
flex-wrap: wrap; flex-wrap: wrap;
border: 1px solid #ebedf2; } border: 1px solid rgb(218, 218, 218); }
.organigram .position { .organigram .position {
margin: 0 auto; margin: 0 auto;
padding: 1rem; } padding: 1rem; }

5
Theme/Backend/css/styles.scss
View File

@ -1,6 +1,7 @@
.organigram { .organigram {
.portlet { .portlet {
margin: 0 auto; margin: 0 auto;
margin-bottom: 1rem;
} }
.unit { .unit {
@ -9,13 +10,13 @@
.departments { .departments {
margin: .5rem; margin: .5rem;
padding: 1rem 1rem 0 1rem;
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
flex: 0 0 auto; flex: 0 0 auto;
flex-direction: column; flex-direction: column;
flex-wrap: wrap; flex-wrap: wrap;
border: 1px solid rgb(218, 218, 218);
border: 1px solid #ebedf2;
} }
.position { .position {

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

@ -20,8 +20,8 @@ use phpOMS\Uri\UriFactory;
*/ */
$departments = $this->getData('departments') ?? []; $departments = $this->getData('departments') ?? [];
$previous = empty($departments) ? '{/prefix}organization/department/list' : '{/prefix}organization/department/list?{?}&id=' . \reset($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=+'; $next = empty($departments) ? '{/prefix}organization/department/list' : '{/prefix}organization/department/list?{?}&id=' . \end($departments)->getId() . '&ptype=n';
echo $this->getData('nav')->render(); ?> echo $this->getData('nav')->render(); ?>

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

@ -20,8 +20,8 @@ use phpOMS\Uri\UriFactory;
*/ */
$positions = $this->getData('positions') ?? []; $positions = $this->getData('positions') ?? [];
$previous = empty($positions) ? '{/prefix}organization/position/list' : '{/prefix}organization/position/list?{?}&id=' . \reset($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=+'; $next = empty($positions) ? '{/prefix}organization/position/list' : '{/prefix}organization/position/list?{?}&id=' . \end($positions)->getId() . '&ptype=n';
echo $this->getData('nav')->render(); ?> echo $this->getData('nav')->render(); ?>

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

@ -21,8 +21,8 @@ use phpOMS\Uri\UriFactory;
*/ */
$units = $this->getData('units') ?? []; $units = $this->getData('units') ?? [];
$previous = empty($units) ? '{/prefix}organization/unit/list' : '{/prefix}organization/unit/list?{?}&id=' . \reset($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=+'; $next = empty($units) ? '{/prefix}organization/unit/list' : '{/prefix}organization/unit/list?{?}&id=' . \end($units)->getId() . '&ptype=n';
echo $this->getData('nav')->render(); ?> echo $this->getData('nav')->render(); ?>