Jingga/oms-Tasks
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Tasks.git synced 2026-01-11 15:38: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:25 +02:00
parent ef734384ae
commit 9802d8fcca
6 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Controller/BackendController.php
View File

@ -62,11 +62,11 @@ final class BackendController extends Controller implements DashboardElementInte
$view = new View($this->app->l11nManager, $request, $response);
/** @var \phpOMS\Model\Html\Head $head */
$head = $response->get('Content')->getData('head');
$head = $response->get('Content')->head;
$head->addAsset(AssetType::CSS, 'Modules/Tasks/Theme/Backend/css/styles.css?v=1.0.0');
$view->setTemplate('/Modules/Tasks/Theme/Backend/task-dashboard');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response);
$mapperQuery = TaskMapper::getAnyRelatedToUser($request->header->account)
->with('tags')
@ -77,23 +77,17 @@ final class BackendController extends Controller implements DashboardElementInte
->limit(25);
if ($request->getData('ptype') === 'p') {
$view->setData('tasks',
$mapperQuery->with('createdBy')
$view->data['tasks'] = $mapperQuery->with('createdBy')
->where('id', $request->getDataInt('id') ?? 0, '<')
->execute()
);
->execute();
} elseif ($request->getData('ptype') === 'n') {
$view->setData('tasks',
$mapperQuery->with('createdBy')
$view->data['tasks'] = $mapperQuery->with('createdBy')
->where('id', $request->getDataInt('id') ?? 0, '>')
->execute()
);
->execute();
} else {
$view->setData('tasks',
$mapperQuery->with('createdBy')
$view->data['tasks'] = $mapperQuery->with('createdBy')
->where('id', 0, '>')
->execute()
);
->execute();
}
$openQuery = new Builder($this->app->dbPool->get(), true);
@ -114,7 +108,7 @@ final class BackendController extends Controller implements DashboardElementInte
->query($openQuery)
->execute();
$view->setData('open', $open);
$view->data['open'] = $open;
return $view;
}
@ -126,12 +120,12 @@ final class BackendController extends Controller implements DashboardElementInte
public function viewDashboard(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{
/** @var \phpOMS\Model\Html\Head $head */
$head = $response->get('Content')->getData('head');
$head = $response->get('Content')->head;
$head->addAsset(AssetType::CSS, 'Modules/Tasks/Theme/Backend/css/styles.css?v=1.0.0');
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Tasks/Theme/Backend/dashboard-task');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response);
/** @var \Modules\Tasks\Models\Task[] $tasks */
$tasks = TaskMapper::getAnyRelatedToUser($request->header->account)
@ -143,7 +137,7 @@ final class BackendController extends Controller implements DashboardElementInte
->where('tags/title/language', $response->header->l11n->language)
->execute();
$view->addData('tasks', $tasks);
$view->data['tasks'] = $tasks;
return $view;
}
@ -184,7 +178,7 @@ final class BackendController extends Controller implements DashboardElementInte
}
/** @var \phpOMS\Model\Html\Head $head */
$head = $response->get('Content')->getData('head');
$head = $response->get('Content')->head;
$head->addAsset(AssetType::CSS, 'Modules/Tasks/Theme/Backend/css/styles.css?v=1.0.0');
/** @var \Modules\Tasks\Models\Task $task */
@ -216,14 +210,14 @@ final class BackendController extends Controller implements DashboardElementInte
}
$view->setTemplate('/Modules/Tasks/Theme/Backend/task-single');
$view->addData('task', $task);
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response));
$view->data['task'] = $task;
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response);
$accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response);
$view->addData('accGrpSelector', $accGrpSelector);
$view->data['accGrpSelector'] = $accGrpSelector;
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor);
$view->data['editor'] = $editor;
return $view;
}
@ -245,13 +239,13 @@ final class BackendController extends Controller implements DashboardElementInte
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Tasks/Theme/Backend/task-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response);
$accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response);
$view->addData('accGrpSelector', $accGrpSelector);
$view->data['accGrpSelector'] = $accGrpSelector;
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor);
$view->data['editor'] = $editor;
return $view;
}
@ -272,7 +266,7 @@ final class BackendController extends Controller implements DashboardElementInte
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Tasks/Theme/Backend/task-analysis');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response);
return $view;
}

2
Theme/Backend/dashboard-task.tpl.php
View File

@ -15,7 +15,7 @@ declare(strict_types=1);
use Modules\Tasks\Models\TaskPriority;
use phpOMS\Uri\UriFactory;
$tasksList = $this->getData('tasks') ?? [];
$tasksList = $this->data['tasks'] ?? [];
?>
<div id="tasks-dashboard" class="col-xs-12 col-md-6" draggable="true">

2
Theme/Backend/task-analysis.tpl.php
View File

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

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

@ -16,7 +16,7 @@ use Modules\Tasks\Models\TaskPriority;
use Modules\Tasks\Models\TaskType;
/** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12 col-md-6">

6
Theme/Backend/task-dashboard.tpl.php
View File

@ -17,14 +17,14 @@ use phpOMS\Uri\UriFactory;
/** @var \phpOMS\Views\View $this */
/** @var \Modules\Tasks\Models\Task[] $tasks */
$tasks = $this->getData('tasks') ?? [];
$tasks = $this->data['tasks'] ?? [];
$previous = empty($tasks) ? 'task/dashboard' : 'task/dashboard?{?}&id=' . \reset($tasks)->id . '&ptype=p';
$next = empty($tasks) ? 'task/dashboard' : 'task/dashboard?{?}&id=' . \end($tasks)->id . '&ptype=n';
$open = $this->getData('open');
$open = $this->data['open'];
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="tabview tab-2">
<div class="box wf-100 col-xs-12">

4
Theme/Backend/task-single.tpl.php
View File

@ -20,13 +20,13 @@ use phpOMS\Uri\UriFactory;
/** @var Modules\Tasks\Views\TaskView $this */
/** @var Modules\Tasks\Models\Task $task */
$task = $this->getData('task');
$task = $this->data['task'];
$taskMedia = $task->getMedia();
$elements = $task->invertTaskElements();
$cElements = \count($elements);
$color = $this->getStatus($task->getStatus());
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-md-6 col-xs-12">