Jingga/oms-Script
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Script.git synced 2026-01-24 18:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use global namespace

Browse Source
This commit is contained in:
Dennis Eichhorn 2019-04-27 00:13:26 +02:00
parent bbb90428fc
commit 3c118c7f5a
5 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Controller/ApiController.php
View File

@ -135,7 +135,7 @@ final class ApiController extends Controller
default:
$response->getHeader()->set('Content-Type', 'text/html; charset=utf-8');
// todo: use html template here instead which uses the tcoll/template!!!
$view->setTemplate(\substr($view->getData('tcoll')['template']->getPath(), 0, -8));
$view->setTemplate('/' . \substr($view->getData('tcoll')['template']->getPath(), 0, -8));
}
}
@ -161,12 +161,19 @@ final class ApiController extends Controller
$lowerPath = \strtolower($tMedia->getPath());
if (StringUtils::endsWith($lowerPath, '.lang.php')) {
$tcoll['lang'][$tMedia->getName()] = $tMedia;
} elseif (StringUtils::endsWith($lowerPath, '.xlsx.php') || StringUtils::endsWith($lowerPath, '.xls.php')) {
$language = \explode('.', $lowerPath)[0];
$tcoll['lang'][$language] = $tMedia;
} elseif (StringUtils::endsWith($lowerPath, '.xlsx.php')
|| StringUtils::endsWith($lowerPath, '.xls.php')
) {
$tcoll['excel'][$tMedia->getName()] = $tMedia;
} elseif (StringUtils::endsWith($lowerPath, '.docx.php') || StringUtils::endsWith($lowerPath, '.doc.php')) {
} elseif (StringUtils::endsWith($lowerPath, '.docx.php')
|| StringUtils::endsWith($lowerPath, '.doc.php')
) {
$tcoll['word'][$tMedia->getName()] = $tMedia;
} elseif (StringUtils::endsWith($lowerPath, '.pptx.php') || StringUtils::endsWith($lowerPath, '.ppt.php')) {
} elseif (StringUtils::endsWith($lowerPath, '.pptx.php')
|| StringUtils::endsWith($lowerPath, '.ppt.php')
) {
$tcoll['powerpoint'][$tMedia->getName()] = $tMedia;
} elseif (StringUtils::endsWith($lowerPath, '.pdf.php')) {
$tcoll['pdf'][$tMedia->getName()] = $tMedia;
@ -194,7 +201,7 @@ final class ApiController extends Controller
);
$rcoll = [];
$report = end($report);
$report = \end($report);
$report = $report === false ? new NullReport() : $report;
if (!($report instanceof NullReport)) {

4
Controller/BackendController.php
View File

@ -149,7 +149,7 @@ final class BackendController extends Controller
$files = $template->getSource()->getSources();
foreach ($files as $tMedia) {
$lowerPath = strtolower($tMedia->getPath());
$lowerPath = \strtolower($tMedia->getPath());
if (StringUtils::endsWith($lowerPath, '.lang.php')) {
$tcoll['lang'] = $tMedia;
@ -192,7 +192,7 @@ final class BackendController extends Controller
);
$rcoll = [];
$report = end($report);
$report = \end($report);
$report = $report === false ? new NullReport() : $report;
if (!($report instanceof NullReport)) {

2
Models/Template.php
View File

@ -144,7 +144,7 @@ class Template implements \JsonSerializable
public function getNewestReport() : Report
{
if (!empty($this->reports)) {
return end($this->reports());
return \end($this->reports());
}
return new NullReport();

6
Theme/Backend/helper-list.tpl.php
View File

@ -19,9 +19,9 @@ $templates = $this->getData('reports');
$footerView = new \phpOMS\Views\PaginationView($this->app, $this->request, $this->response);
$footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig');
$footerView->setPages(count($templates) / 25);
$footerView->setPages(\count($templates) / 25);
$footerView->setPage(1);
$footerView->setResults(count($templates));
$footerView->setResults(\count($templates));
echo $this->getData('nav')->render(); ?>
@ -40,7 +40,7 @@ echo $this->getData('nav')->render(); ?>
<tr>
<td colspan="4">
<tbody>
<?php if (count($templates) == 0) : ?>
<?php if (\count($templates) == 0) : ?>
<tr class="empty">
<td colspan="4"><?= $this->getHtml('Empty', 0, 0); ?>
<?php endif; ?>

6
Theme/Backend/helper-single.tpl.php
View File

@ -28,12 +28,12 @@ echo $this->getData('nav')->render(); ?>
<div class="row" style="height: calc(100% - 85px);">
<div class="col-xs-12">
<div class="box wf-100" style="height: 100%;">
<iframe src="<?= \phpOMS\Uri\UriFactory::build('{/prefix}helper/report/export/?id=' . $template->getId()); ?>" allowfullscreen></iframe>
<iframe src="<?= \phpOMS\Uri\UriFactory::build('{/api}helper/report/export/?id=' . $template->getId()); ?>" allowfullscreen></iframe>
</div>
</div>
<!--
<div class="col-xs-12 col-md-3">
<?php if (count($reportLanguage) > 1) : ?>
<?php if (\count($reportLanguage) > 1) : ?>
<section class="box wf-100">
<header><h1><?= $this->getHtml('Reports') ?></h1></header>
@ -41,7 +41,7 @@ echo $this->getData('nav')->render(); ?>
<form action="<?= \phpOMS\Uri\UriFactory::build('{/api}helper/template'); ?>" method="post">
<table class="layout wf-100">
<tbody>
<?php if (count($reportLanguage) > 1) : ?>
<?php if (\count($reportLanguage) > 1) : ?>
<tr>
<td><label for="iLang"><?= $this->getHtml('Language'); ?></label>
<tr>