diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 8598060..8c7a143 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -19,7 +19,7 @@ use Modules\Organization\Models\DepartmentMapper; use Modules\Organization\Models\Position; use Modules\Organization\Models\PositionMapper; use Modules\Organization\Models\UnitMapper; - +use phpOMS\Asset\AssetType; use phpOMS\Contract\RenderableInterface; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; @@ -106,6 +106,10 @@ final class BackendController extends Controller */ public function viewOrganigram(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { + $response->get('Content') + ->getData('head') + ->addAsset(AssetType::CSS, 'Modules/Organization/Theme/Backend/css/styles.css'); + $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Organization/Theme/Backend/organigram'); diff --git a/Theme/Backend/css/styles.css b/Theme/Backend/css/styles.css new file mode 100644 index 0000000..a50d192 --- /dev/null +++ b/Theme/Backend/css/styles.css @@ -0,0 +1,15 @@ +.organigram .portlet { + margin: 0 auto; } +.organigram .unit { + margin: 1rem auto; } +.organigram .departments { + margin: .5rem; + box-sizing: border-box; + display: flex; + flex: 0 0 auto; + flex-direction: column; + flex-wrap: wrap; + border: 1px solid #ebedf2; } +.organigram .position { + margin: 0 auto; + padding: 1rem; } diff --git a/Theme/Backend/css/styles.scss b/Theme/Backend/css/styles.scss new file mode 100644 index 0000000..481145d --- /dev/null +++ b/Theme/Backend/css/styles.scss @@ -0,0 +1,25 @@ +.organigram { + .portlet { + margin: 0 auto; + } + + .unit { + margin: 1rem auto; + } + + .departments { + margin: .5rem; + box-sizing: border-box; + display: flex; + flex: 0 0 auto; + flex-direction: column; + flex-wrap: wrap; + + border: 1px solid #ebedf2; + } + + .position { + margin: 0 auto; + padding: 1rem; + } +} \ No newline at end of file diff --git a/Theme/Backend/organigram.tpl.php b/Theme/Backend/organigram.tpl.php index 4dfbe5a..cb9642a 100644 --- a/Theme/Backend/organigram.tpl.php +++ b/Theme/Backend/organigram.tpl.php @@ -24,16 +24,16 @@ $unitRoot = $unitTree[null][0]['children']; // departments // positions ?> -
+
-
+
getParent()->getId()]['index'] = $unitTree[null][$unitEle['obj']->getParent()->getId()]['index'] + 1; ?> getId(); ?> -
-
getName(); ?>
+
+
getName(); ?>
@@ -45,11 +45,12 @@ $unitRoot = $unitTree[null][0]['children']; $depTree[$unitId][$depEle['obj']->getParent()->getId()]['index'] = $depTree[$unitId][$depEle['obj']->getParent()->getId()]['index'] + 1; ?> -
-
getName(); ?>
+
+
+
getName(); ?>
-
+
    getId(); @@ -74,8 +75,9 @@ $unitRoot = $unitTree[null][0]['children'];
+
-
+