diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 1078326..617a69f 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -55,7 +55,7 @@ use phpOMS\Views\View; final class ApiController extends Controller { /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param HttpRequest $request Request * @param HttpResponse $response Response @@ -346,7 +346,10 @@ final class ApiController extends Controller } } - $view = new View($this->app->l11nManager, $request, $response); + $view = new View($this->app->l11nManager, $request, $response); + $rcoll = []; + $report = null; + if (!$template->isStandalone) { /** @var Report $report */ $report = ReportMapper::get() @@ -358,9 +361,6 @@ final class ApiController extends Controller ->limit(1) ->execute(); - $rcoll = []; - $report = $report === false ? new NullReport() : $report; - if ($report->id > 0) { $files = $report->source->getSources(); @@ -368,11 +368,10 @@ final class ApiController extends Controller $rcoll[$media->name . '.' . $media->extension] = $media; } } - - $view->data['report'] = $report; - $view->data['rcoll'] = $rcoll; } + $view->data['report'] = $report; + $view->data['rcoll'] = $rcoll; $view->data['tcoll'] = $tcoll; $view->data['lang'] = $request->getData('lang') ?? $request->header->l11n->language; $view->data['template'] = $template; @@ -382,7 +381,7 @@ final class ApiController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -557,7 +556,7 @@ final class ApiController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 59b6872..1bb0fc4 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -38,7 +38,7 @@ use phpOMS\Views\View; final class BackendController extends Controller { /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -77,7 +77,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -103,7 +103,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -129,7 +129,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -199,17 +199,19 @@ final class BackendController extends Controller } } + $rcoll = []; + $report = null; if (!$template->isStandalone) { if (!isset($tcoll['template'])) { throw new \Exception('No template file detected.'); } - /** @var \Modules\Helper\Models\Report[] $report */ - $report = ReportMapper::get()->where('template', $template->id)->sort('id', OrderType::DESC)->limit(1)->execute(); - - $rcoll = []; - $report = \end($report); - $report = $report === false ? new NullReport() : $report; + /** @var \Modules\Helper\Models\Report $report */ + $report = ReportMapper::get() + ->where('template', $template->id) + ->sort('id', OrderType::DESC) + ->limit(1) + ->execute(); if ($report->id > 0) { /** @var Media[] $files */ @@ -219,13 +221,12 @@ final class BackendController extends Controller $rcoll[$media->name . '.' . $media->extension] = $media; } } - - $view->data['report'] = $report; - $view->data['rcoll'] = $rcoll; } + $view->data['report'] = $report; $view->data['unit'] = $this->app->unitId; $view->data['tcoll'] = $tcoll; + $view->data['rcoll'] = $rcoll; $view->data['lang'] = $request->getData('lang') ?? $request->header->l11n->language; $view->data['template'] = $template; $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response); diff --git a/Models/PermissionCategory.php b/Models/PermissionCategory.php index 152cca3..f9b7e25 100755 --- a/Models/PermissionCategory.php +++ b/Models/PermissionCategory.php @@ -17,7 +17,7 @@ namespace Modules\Helper\Models; use phpOMS\Stdlib\Base\Enum; /** - * Permision state enum. + * Permission category enum. * * @package Modules\Helper\Models * @license OMS License 2.0 diff --git a/Models/PermissionState.php b/Models/PermissionState.php index 152cca3..f9b7e25 100755 --- a/Models/PermissionState.php +++ b/Models/PermissionState.php @@ -17,7 +17,7 @@ namespace Modules\Helper\Models; use phpOMS\Stdlib\Base\Enum; /** - * Permision state enum. + * Permission category enum. * * @package Modules\Helper\Models * @license OMS License 2.0 diff --git a/Theme/Backend/helper-create.tpl.php b/Theme/Backend/helper-create.tpl.php index d8c8a48..b99e8bd 100755 --- a/Theme/Backend/helper-create.tpl.php +++ b/Theme/Backend/helper-create.tpl.php @@ -30,7 +30,7 @@ echo $this->data['nav']->render(); ?> - - - -
-
+
- folder_open - .. - - - - - - - $value) : ++$count; - $url = UriFactory::build('{/base}/helper/list?path=' . \rtrim($value->getVirtualPath(), '/') . '/' . $value->name); - ?> -
- folder_open - printHtml($value->name); ?> - - printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->createdBy->name1, $value->createdBy->name2, $value->createdBy->name3, $value->createdBy->login ?? ''])); ?> - printHtml($value->createdAt->format('Y-m-d')); ?> - - $template) : ++$count; + $template) : ++$count; $url = UriFactory::build('{/base}/helper/report/view?{?}&id=' . $template->id); ?>
printHtml($template->name); ?> - getTags(); foreach ($tags as $tag) : ?> + getTags(); + foreach ($tags as $tag) : ?> icon) ? '' : ''; ?>printHtml($tag->getL11n()); ?> printHtml($this->renderUserName('%3$s %2$s %1$s', [$template->createdBy->name1, $template->createdBy->name2, $template->createdBy->name3, $template->createdBy->login ?? ''])); ?> printHtml($template->createdAt->format('Y-m-d')); ?> - - + +
getHtml('Empty', '0', '0'); ?> - +
diff --git a/Theme/Backend/helper-single.tpl.php b/Theme/Backend/helper-single.tpl.php index 3e705a0..2b859b6 100755 --- a/Theme/Backend/helper-single.tpl.php +++ b/Theme/Backend/helper-single.tpl.php @@ -19,10 +19,10 @@ use phpOMS\Uri\UriFactory; * @var \phpOMS\Views\View $this */ -/** @var \Modules\Media\Models\Collection $tcoll */ +/** @var \Modules\Media\Models\Collection[] $tcoll */ $tcoll = $this->data['tcoll']; -/** @var \Modules\Media\Models\Collection $rcoll */ +/** @var \Modules\Media\Models\Collection[] $rcoll */ $rcoll = $this->data['rcoll']; /** @var string $cLang */ @@ -43,11 +43,11 @@ $lang = $reportLanguage[$cLang] ?? []; $settings = isset($tcoll['cfg']) ? \json_decode(\file_get_contents(__DIR__ . '/../../../../' . \ltrim($tcoll['cfg']->getPath(), '/')), true) : []; echo $this->data['nav']->render(); ?> -
-
-
-
- +
+
+
+
+
@@ -97,7 +97,7 @@ echo $this->data['nav']->render(); ?>
@@ -116,7 +116,7 @@ echo $this->data['nav']->render(); ?>
-
getHtml('Load'); ?>
+
getHtml('Load'); ?>
@@ -126,7 +126,9 @@ echo $this->data['nav']->render(); ?>
- isStandalone && !($report instanceof \Modules\Helper\Models\NullReport)) : ?> + isStandalone + && !($report instanceof \Modules\Helper\Models\NullReport) + ) : ?> @@ -153,7 +155,9 @@ echo $this->data['nav']->render(); ?>
getHtml('Report'); ?>
getHtml('Tags'); ?> - getTags(); foreach ($tags as $tag) : ?> + getTags(); + foreach ($tags as $tag) : ?> icon) ? '' : ''; ?>printHtml($tag->getL11n()); ?>
diff --git a/Theme/Backend/helper-template-create.tpl.php b/Theme/Backend/helper-template-create.tpl.php index b0827d0..4a7b891 100755 --- a/Theme/Backend/helper-template-create.tpl.php +++ b/Theme/Backend/helper-template-create.tpl.php @@ -24,7 +24,7 @@ echo $this->data['nav']->render(); ?>
-
+
getData('editor')->render('report-editor'); ?>
getData('editor')->getData('text')->render('report-editor', 'description', 'helper-template-create'); ?> @@ -37,7 +37,7 @@ echo $this->data['nav']->render(); ?>
-
+
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 1792537..2b6dcd5 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -60,6 +60,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->app = new class() extends ApplicationAbstract { protected string $appName = 'Api'; + protected int $appId = 1; }; diff --git a/tests/EventCourse/EventCourse.tpl.php b/tests/EventCourse/EventCourse.tpl.php index 104ea3b..a25b3c7 100755 --- a/tests/EventCourse/EventCourse.tpl.php +++ b/tests/EventCourse/EventCourse.tpl.php @@ -31,18 +31,18 @@ require __DIR__ . '/Worker.php';
    -
    • -
    • -
    • -
    • -
    • +
  • +
  • +
  • +
  • +
request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>>
- +
@@ -92,7 +92,7 @@ require __DIR__ . '/Worker.php';
-
download
+
@@ -131,7 +131,7 @@ require __DIR__ . '/Worker.php';
-
download
+
@@ -170,7 +170,7 @@ require __DIR__ . '/Worker.php';
-
download
+
@@ -211,7 +211,7 @@ require __DIR__ . '/Worker.php'; request->uri->fragment === 'c-tab-2' ? ' checked' : ''; ?>>
-
download
+
@@ -238,7 +238,7 @@ require __DIR__ . '/Worker.php';
-
download
+
@@ -261,7 +261,7 @@ require __DIR__ . '/Worker.php';
-
download
+
@@ -286,7 +286,7 @@ require __DIR__ . '/Worker.php'; request->uri->fragment === 'c-tab-3' ? ' checked' : ''; ?>>
-
download
+
@@ -309,7 +309,7 @@ require __DIR__ . '/Worker.php';
-
download
+
@@ -334,7 +334,7 @@ require __DIR__ . '/Worker.php'; request->uri->fragment === 'c-tab-4' ? ' checked' : ''; ?>>
-
download
+
@@ -357,7 +357,7 @@ require __DIR__ . '/Worker.php';
-
download
+
@@ -380,7 +380,7 @@ require __DIR__ . '/Worker.php';
-
download
+
@@ -405,7 +405,7 @@ require __DIR__ . '/Worker.php'; request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>>
-
download
+
@@ -428,7 +428,7 @@ require __DIR__ . '/Worker.php';
-
download
+
diff --git a/tests/depreciation/view.tpl.php b/tests/depreciation/view.tpl.php index 89370bf..9aa3ab2 100755 --- a/tests/depreciation/view.tpl.php +++ b/tests/depreciation/view.tpl.php @@ -38,7 +38,7 @@ $duration = (int) ($this->request->getData('duration') ?? 10); - +
download