mirror of
https://github.com/Karaka-Management/oms-ResearchDevelopment.git
synced 2026-02-10 10:28:41 +00:00
Merge branch 'develop' of https://github.com/Karaka-Management/oms-ResearchDevelopment into develop
This commit is contained in:
commit
38ec48eece
|
|
@ -45,7 +45,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/ResearchDevelopment/Theme/Backend/rnd-list');
|
$view->setTemplate('/Modules/ResearchDevelopment/Theme/Backend/rnd-list');
|
||||||
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002202001, $request, $response));
|
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002202001, $request, $response);
|
||||||
|
|
||||||
return $view;
|
return $view;
|
||||||
}
|
}
|
||||||
|
|
@ -66,7 +66,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/ResearchDevelopment/Theme/Backend/rnd-create');
|
$view->setTemplate('/Modules/ResearchDevelopment/Theme/Backend/rnd-create');
|
||||||
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002202001, $request, $response));
|
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002202001, $request, $response);
|
||||||
|
|
||||||
return $view;
|
return $view;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
echo $this->getData('nav')->render(); ?>
|
echo $this->data['nav']->render(); ?>
|
||||||
|
|
||||||
<section class="box w-50">
|
<section class="box w-50">
|
||||||
<header><h1><?= $this->getHtml('Project'); ?></h1></header>
|
<header><h1><?= $this->getHtml('Project'); ?></h1></header>
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ $footerView->setPages(25);
|
||||||
$footerView->setPage(1);
|
$footerView->setPage(1);
|
||||||
$footerView->setResults(1);
|
$footerView->setResults(1);
|
||||||
|
|
||||||
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">
|
||||||
|
|
@ -41,9 +41,9 @@ echo $this->getData('nav')->render(); ?>
|
||||||
<tr><td colspan="5">
|
<tr><td colspan="5">
|
||||||
<tbody>
|
<tbody>
|
||||||
<?php $c = 0; foreach ([] as $key => $value) : ++$c;
|
<?php $c = 0; foreach ([] as $key => $value) : ++$c;
|
||||||
$url = \phpOMS\Uri\UriFactory::build('{/prefix}checklist/single?{?}&id=' . $value->getId()); ?>
|
$url = \phpOMS\Uri\UriFactory::build('{/prefix}checklist/single?{?}&id=' . $value->id); ?>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
|
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->id); ?></a>
|
||||||
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
|
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
|
||||||
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getParent()); ?></a>
|
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getParent()); ?></a>
|
||||||
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getUnit()); ?></a>
|
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getUnit()); ?></a>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user