mirror of
https://github.com/Karaka-Management/oms-ProjectManagement.git
synced 2026-02-13 06:18:40 +00:00
Merge branch 'develop' of https://github.com/Karaka-Management/oms-ProjectManagement into develop
This commit is contained in:
commit
0ebbd0b2ab
|
|
@ -49,10 +49,10 @@ final class BackendController extends Controller
|
||||||
{
|
{
|
||||||
$view = new View($this->app->l11nManager, $request, $response);
|
$view = new View($this->app->l11nManager, $request, $response);
|
||||||
$view->setTemplate('/Modules/ProjectManagement/Theme/Backend/projectmanagement-list');
|
$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);
|
$projects = ProjectMapper::getAll()->sort('id', OrderType::DESC)->limit(25);
|
||||||
$view->addData('projects', $projects);
|
$view->data['projects'] = $projects;
|
||||||
|
|
||||||
return $view;
|
return $view;
|
||||||
}
|
}
|
||||||
|
|
@ -73,7 +73,7 @@ final class BackendController extends Controller
|
||||||
{
|
{
|
||||||
$view = new View($this->app->l11nManager, $request, $response);
|
$view = new View($this->app->l11nManager, $request, $response);
|
||||||
$view->setTemplate('/Modules/ProjectManagement/Theme/Backend/projectmanagement-create');
|
$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;
|
return $view;
|
||||||
}
|
}
|
||||||
|
|
@ -93,27 +93,27 @@ final class BackendController extends Controller
|
||||||
public function viewProjectManagementProfile(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
|
public function viewProjectManagementProfile(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
|
||||||
{
|
{
|
||||||
/** @var \phpOMS\Model\Html\Head $head */
|
/** @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');
|
$head->addAsset(AssetType::CSS, '/Modules/Calendar/Theme/Backend/css/styles.css?v=1.0.0');
|
||||||
|
|
||||||
$view = new View($this->app->l11nManager, $request, $response);
|
$view = new View($this->app->l11nManager, $request, $response);
|
||||||
$view->setTemplate('/Modules/ProjectManagement/Theme/Backend/projectmanagement-profile');
|
$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 = new \Modules\Tasks\Theme\Backend\Components\Tasks\ListView($this->app->l11nManager, $request, $response);
|
||||||
$taskListView->setTemplate('/Modules/Tasks/Theme/Backend/Components/Tasks/list');
|
$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 = new \Modules\Calendar\Theme\Backend\Components\Calendar\BaseView($this->app->l11nManager, $request, $response);
|
||||||
$calendarView->setTemplate('/Modules/Calendar/Theme/Backend/Components/Calendar/mini');
|
$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 = new \Modules\Media\Views\MediaView($this->app->l11nManager, $request, $response);
|
||||||
$mediaListView->setTemplate('/Modules/Media/Theme/Backend/Components/Media/list');
|
$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();
|
$project = ProjectMapper::get()->where('id', (int) $request->getData('id'))->execute();
|
||||||
$view->addData('project', $project);
|
$view->data['project'] = $project;
|
||||||
|
|
||||||
return $view;
|
return $view;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -67,18 +67,6 @@ class ProjectAttribute implements \JsonSerializable
|
||||||
$this->value = new NullProjectAttributeValue();
|
$this->value = new NullProjectAttributeValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get id
|
|
||||||
*
|
|
||||||
* @return int
|
|
||||||
*
|
|
||||||
* @since 1.0.0
|
|
||||||
*/
|
|
||||||
public function getId() : int
|
|
||||||
{
|
|
||||||
return $this->id;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@inheritdoc}
|
* {@inheritdoc}
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -89,18 +89,6 @@ class ProjectAttributeType implements \JsonSerializable
|
||||||
$this->setL11n($name);
|
$this->setL11n($name);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get id
|
|
||||||
*
|
|
||||||
* @return int
|
|
||||||
*
|
|
||||||
* @since 1.0.0
|
|
||||||
*/
|
|
||||||
public function getId() : int
|
|
||||||
{
|
|
||||||
return $this->id;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set l11n
|
* Set l11n
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -108,17 +108,6 @@ class ProjectAttributeValue implements \JsonSerializable
|
||||||
*/
|
*/
|
||||||
private ?BaseStringL11n $l11n = null;
|
private ?BaseStringL11n $l11n = null;
|
||||||
|
|
||||||
/**
|
|
||||||
* Get id
|
|
||||||
*
|
|
||||||
* @return int
|
|
||||||
*
|
|
||||||
* @since 1.0.0
|
|
||||||
*/
|
|
||||||
public function getId() : int
|
|
||||||
{
|
|
||||||
return $this->id;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set value
|
* Set value
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
echo $this->getData('nav')->render(); ?>
|
echo $this->data['nav']->render(); ?>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-xs-12 col-md-6">
|
<div class="col-xs-12 col-md-6">
|
||||||
|
|
|
||||||
|
|
@ -17,9 +17,9 @@ $footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig');
|
||||||
$footerView->setPages(20);
|
$footerView->setPages(20);
|
||||||
$footerView->setPage(1);
|
$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="row">
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-12">
|
||||||
|
|
|
||||||
|
|
@ -12,9 +12,9 @@
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
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="row">
|
||||||
<div class="col-xs-12 col-md-6">
|
<div class="col-xs-12 col-md-6">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user