Jingga/oms-ProjectManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ProjectManagement.git synced 2026-01-11 15:48:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Karaka-Management/oms-ProjectManagement into develop

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 13:58:45 +00:00
commit 0ebbd0b2ab
7 changed files with 14 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Controller/BackendController.php
View File

@ -49,10 +49,10 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/ProjectManagement/Theme/Backend/projectmanagement-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001701001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001701001, $request, $response);
$projects = ProjectMapper::getAll()->sort('id', OrderType::DESC)->limit(25);
$view->addData('projects', $projects);
$view->data['projects'] = $projects;
return $view;
}
@ -73,7 +73,7 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/ProjectManagement/Theme/Backend/projectmanagement-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001701001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001701001, $request, $response);
return $view;
}
@ -93,27 +93,27 @@ final class BackendController extends Controller
public function viewProjectManagementProfile(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/Calendar/Theme/Backend/css/styles.css?v=1.0.0');
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/ProjectManagement/Theme/Backend/projectmanagement-profile');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001701001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001701001, $request, $response);
$taskListView = new \Modules\Tasks\Theme\Backend\Components\Tasks\ListView($this->app->l11nManager, $request, $response);
$taskListView->setTemplate('/Modules/Tasks/Theme/Backend/Components/Tasks/list');
$view->addData('tasklist', $taskListView);
$view->data['tasklist'] = $taskListView;
$calendarView = new \Modules\Calendar\Theme\Backend\Components\Calendar\BaseView($this->app->l11nManager, $request, $response);
$calendarView->setTemplate('/Modules/Calendar/Theme/Backend/Components/Calendar/mini');
$view->addData('calendar', $calendarView);
$view->data['calendar'] = $calendarView;
$mediaListView = new \Modules\Media\Views\MediaView($this->app->l11nManager, $request, $response);
$mediaListView->setTemplate('/Modules/Media/Theme/Backend/Components/Media/list');
$view->addData('medialist', $mediaListView);
$view->data['medialist'] = $mediaListView;
$project = ProjectMapper::get()->where('id', (int) $request->getData('id'))->execute();
$view->addData('project', $project);
$view->data['project'] = $project;
return $view;
}

12
Models/ProjectAttribute.php
View File

@ -67,18 +67,6 @@ class ProjectAttribute implements \JsonSerializable
$this->value = new NullProjectAttributeValue();
}
/**
* Get id
*
* @return int
*
* @since 1.0.0
*/
public function getId() : int
{
return $this->id;
}
/**
* {@inheritdoc}
*/

12
Models/ProjectAttributeType.php
View File

@ -89,18 +89,6 @@ class ProjectAttributeType implements \JsonSerializable
$this->setL11n($name);
}
/**
* Get id
*
* @return int
*
* @since 1.0.0
*/
public function getId() : int
{
return $this->id;
}
/**
* Set l11n
*

11
Models/ProjectAttributeValue.php
View File

@ -108,17 +108,6 @@ class ProjectAttributeValue implements \JsonSerializable
*/
private ?BaseStringL11n $l11n = null;
/**
* Get id
*
* @return int
*
* @since 1.0.0
*/
public function getId() : int
{
return $this->id;
}
/**
* Set value

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

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

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

@ -17,9 +17,9 @@ $footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig');
$footerView->setPages(20);
$footerView->setPage(1);
$list = $this->getData('projects');
$list = $this->data['projects'];
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12">

4
Theme/Backend/projectmanagement-profile.tpl.php
View File

@ -12,9 +12,9 @@
*/
declare(strict_types=1);
$project = $this->getData('project');
$project = $this->data['project'];
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12 col-md-6">