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

Continue with getter/setter cleanup

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 15:44:26 +02:00
parent e140abdf53
commit f707b2faad
9 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Controller/ApiController.php
View File

@ -124,7 +124,7 @@ final class ApiController extends Controller
$view = $this->createView($instance, $request, $response);
$this->setWorkflowResponseHeader($view, $instance->template->name, $request, $response);
$view->setData('path', __DIR__ . '/../../../');
$view->data['path'] = __DIR__ . '/../../../';
$response->set('export', $view);
}
@ -323,11 +323,11 @@ final class ApiController extends Controller
$view = new View($this->app->l11nManager, $request, $response);
$view->addData('tcoll', $tcoll);
$view->addData('lang', $request->getData('lang') ?? $request->header->l11n->language);
$view->addData('instance', $instance);
$view->addData('template', $instance->template);
$view->addData('basepath', __DIR__ . '/../../../');
$view->data['tcoll'] = $tcoll;
$view->data['lang'] = $request->getData('lang') ?? $request->header->l11n->language;
$view->data['instance'] = $instance;
$view->data['template'] = $instance->template;
$view->data['basepath'] = __DIR__ . '/../../../';
return $view;
}

32
Controller/BackendController.php
View File

@ -50,7 +50,7 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Workflow/Theme/Backend/workflow-template-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response);
$path = \str_replace('+', ' ', (string) ($request->getData('path') ?? '/'));
$templates = WorkflowTemplateMapper::getAll()
@ -63,11 +63,11 @@ final class BackendController extends Controller
list($collection, $parent) = CollectionMapper::getCollectionsByPath($path);
$view->addData('parent', $parent);
$view->addData('collections', $collection);
$view->addData('path', $path);
$view->addData('reports', $templates);
$view->addData('account', $this->app->accountManager->get($request->header->account));
$view->data['parent'] = $parent;
$view->data['collections'] = $collection;
$view->data['path'] = $path;
$view->data['reports'] = $templates;
$view->data['account'] = $this->app->accountManager->get($request->header->account);
return $view;
}
@ -87,7 +87,7 @@ final class BackendController extends Controller
public function viewWorkflowTemplate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{
$view = new View($this->app->l11nManager, $request, $response);
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response);
/** @var \Modules\Workflow\Models\WorkflowTemplate $template */
$template = WorkflowTemplateMapper::get()
@ -97,7 +97,7 @@ final class BackendController extends Controller
->where('id', (int) $request->getData('id'))
->execute();
$view->setData('template', $template);
$view->data['template'] = $template;
if ($template->source->findFile('template-profile.tpl.php')->id > 0) {
require_once $template->source->findFile('WorkflowController.php')->getPath();
@ -109,7 +109,7 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/Workflow/Theme/Backend/workflow-template');
}
$head = $response->get('Content')->getData('head');
$head = $response->get('Content')->head;
$head->addAsset(AssetType::JSLATE, 'Resources/mermaid/mermaid.min.js?v=1.0.0');
$head->addAsset(AssetType::JSLATE, 'Modules/Workflow/Controller.js?v=1.0.0', ['type' => 'module']);
@ -132,7 +132,7 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Workflow/Theme/Backend/workflow-template-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response);
return $view;
}
@ -153,12 +153,12 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Workflow/Theme/Backend/workflow-dashboard');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response);
$instances = WorkflowInstanceAbstractMapper::getAll()
->execute();
$view->setData('instances', $instances);
$view->data['instances'] = $instances;
return $view;
}
@ -179,13 +179,13 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Workflow/Theme/Backend/workflow-instance-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response);
/** @var \Modules\Workflow\Models\WorkflowInstanceAbstract $instances */
$instances = WorkflowInstanceAbstractMapper::getAll()
->execute();
$view->setData('instances', $instances);
$view->data['instances'] = $instances;
return $view;
}
@ -205,7 +205,7 @@ final class BackendController extends Controller
public function viewInstance(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{
$view = new View($this->app->l11nManager, $request, $response);
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005501001, $request, $response);
/** @var \Modules\Workflow\Models\WorkflowInstanceAbstract $instance */
$instance = WorkflowInstanceAbstractMapper::get()
@ -220,7 +220,7 @@ final class BackendController extends Controller
->limit()
->execute();
$view->addData('template', $template);
$view->data['template'] = $template;
if ($template->source->findFile('instance-profile.tpl.php')->id > 0) {
require_once $template->source->findFile('WorkflowController.php')->getPath();

2
Theme/Backend/workflow-create.tpl.php
View File

@ -13,4 +13,4 @@
declare(strict_types=1);
/** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render();
echo $this->data['nav']->render();

4
Theme/Backend/workflow-dashboard.tpl.php
View File

@ -15,9 +15,9 @@ declare(strict_types=1);
/**
* @var \phpOMS\Views\View $this
*/
$instances = $this->getData('instances') ?? [];
$instances = $this->data['instances'] ?? [];
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12">

4
Theme/Backend/workflow-instance-list.tpl.php
View File

@ -15,9 +15,9 @@ declare(strict_types=1);
/**
* @var \phpOMS\Views\View $this
*/
$instances = $this->getData('instances') ?? [];
$instances = $this->data['instances'] ?? [];
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12">

2
Theme/Backend/workflow-instance.tpl.php
View File

@ -13,4 +13,4 @@
declare(strict_types=1);
/** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render();
echo $this->data['nav']->render();

2
Theme/Backend/workflow-template-create.tpl.php
View File

@ -13,4 +13,4 @@
declare(strict_types=1);
/** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render();
echo $this->data['nav']->render();

8
Theme/Backend/workflow-template-list.tpl.php
View File

@ -18,21 +18,21 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this
* @var \Modules\Workflow\Models\Template[] $templates
*/
$templates = $this->getData('reports');
$templates = $this->data['reports'];
/** @var \Modules\Admin\Models\Account $account */
$account = $this->getData('account');
$account = $this->data['account'];
$accountDir = $account->id . ' ' . $account->login;
/** @var \Modules\Media\Models\Collection[] */
$collections = $this->getData('collections');
$collections = $this->data['collections'];
$mediaPath = \urldecode($this->getData('path') ?? '/');
$previous = empty($templates) ? 'workflow/template/list' : '{/base}/workflow/template/list?{?}&id=' . \reset($templates)->id . '&ptype=p';
$next = empty($templates) ? 'workflow/template/list' : '{/base}/workflow/template/list?{?}&id=' . \end($templates)->id . '&ptype=n';
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12">
<div class="portlet">

4
Theme/Backend/workflow-template.tpl.php
View File

@ -18,7 +18,7 @@ use phpOMS\Views\View;
* @var \phpOMS\Views\View $this
* @var \Modules\Workflow\Models\Template $template
*/
$template = $this->getData('template');
$template = $this->data['template'];
$actions = \json_decode(\file_get_contents(__DIR__ . '/../../Definitions/actions.json'), true);
@ -84,7 +84,7 @@ function renderElements(array $leaf, array $actions) : void
}
}
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<?php
if (!empty($template->schema)) :