Jingga/oms-Script
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Script.git synced 2026-02-09 01:48:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve display

Browse Source
This commit is contained in:
Dennis Eichhorn 2019-02-12 18:48:51 +01:00
parent 01a55f1d4f
commit 7a88672f00
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Controller/ApiController.php
View File

@ -86,6 +86,7 @@ final class ApiController extends Controller
$view = $this->createView($template, $request, $response); $view = $this->createView($template, $request, $response);
$this->setHelperResponseHeader($view, $template->getName(), $request, $response); $this->setHelperResponseHeader($view, $template->getName(), $request, $response);
$view->setData('path', __DIR__ . '/../../../');
if ($request->getData('download') !== null) { if ($request->getData('download') !== null) {
$response->getHeader()->setDownloadable($template->getName(), (string) $request->getData('type')); $response->getHeader()->setDownloadable($template->getName(), (string) $request->getData('type'));
@ -133,7 +134,8 @@ final class ApiController extends Controller
break; break;
default: default:
$response->getHeader()->set('Content-Type', 'text/html; charset=utf-8'); $response->getHeader()->set('Content-Type', 'text/html; charset=utf-8');
$view->setTemplate('/Modules/' . \substr($view->getData('tcoll')['template']->getPath(), 0, -8)); // todo: use html template here instead which uses the tcoll/template!!!
$view->setTemplate(\substr($view->getData('tcoll')['template']->getPath(), 0, -8));
} }
} }
@ -159,29 +161,29 @@ final class ApiController extends Controller
$lowerPath = \strtolower($tMedia->getPath()); $lowerPath = \strtolower($tMedia->getPath());
if (StringUtils::endsWith($lowerPath, '.lang.php')) { if (StringUtils::endsWith($lowerPath, '.lang.php')) {
$tcoll['lang'] = $tMedia; $tcoll['lang'][$tMedia->getName()] = $tMedia;
} elseif (StringUtils::endsWith($lowerPath, 'worker.php')) {
$tcoll['worker'] = $tMedia;
} elseif (StringUtils::endsWith($lowerPath, '.xlsx.php') || StringUtils::endsWith($lowerPath, '.xls.php')) { } elseif (StringUtils::endsWith($lowerPath, '.xlsx.php') || StringUtils::endsWith($lowerPath, '.xls.php')) {
$tcoll['excel'] = $tMedia; $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; $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; $tcoll['powerpoint'][$tMedia->getName()] = $tMedia;
} elseif (StringUtils::endsWith($lowerPath, '.pdf.php')) { } elseif (StringUtils::endsWith($lowerPath, '.pdf.php')) {
$tcoll['pdf'] = $tMedia; $tcoll['pdf'][$tMedia->getName()] = $tMedia;
} elseif (StringUtils::endsWith($lowerPath, '.csv.php')) { } elseif (StringUtils::endsWith($lowerPath, '.csv.php')) {
$tcoll['csv'] = $tMedia; $tcoll['csv'][$tMedia->getName()] = $tMedia;
} elseif (StringUtils::endsWith($lowerPath, '.json.php')) { } elseif (StringUtils::endsWith($lowerPath, '.json.php')) {
$tcoll['json'] = $tMedia; $tcoll['json'][$tMedia->getName()] = $tMedia;
} elseif (StringUtils::endsWith($lowerPath, '.tpl.php')) { } elseif (StringUtils::endsWith($lowerPath, '.tpl.php')) {
$tcoll['template'] = $tMedia; $tcoll['template'] = $tMedia;
} elseif (StringUtils::endsWith($lowerPath, '.css')) { } elseif (StringUtils::endsWith($lowerPath, '.css')) {
$tcoll['css'] = $tMedia; $tcoll['css'][$tMedia->getName()] = $tMedia;
} elseif (StringUtils::endsWith($lowerPath, '.js')) { } elseif (StringUtils::endsWith($lowerPath, '.js')) {
$tcoll['js'] = $tMedia; $tcoll['js'][$tMedia->getName()] = $tMedia;
} elseif (StringUtils::endsWith($lowerPath, '.sqlite') || StringUtils::endsWith($lowerPath, '.db')) { } elseif (StringUtils::endsWith($lowerPath, '.sqlite') || StringUtils::endsWith($lowerPath, '.db')) {
$tcoll['db'][] = $tMedia; $tcoll['db'][$tMedia->getName()] = $tMedia;
} else {
$tcoll['other'][$tMedia->getName()] = $tMedia;
} }
} }
@ -298,7 +300,8 @@ final class ApiController extends Controller
$helperTemplate->setSource($collectionId); $helperTemplate->setSource($collectionId);
} }
$helperTemplate->setStandalone((bool) $request->getData('standalone') ?? false); // todo: check if this is working. might not work correctly either because name is different or because type is invalid
$helperTemplate->setStandalone((bool) ($request->getData('standalone') ?? false));
$helperTemplate->setExpected(!empty($expected) ? \json_decode($expected, true) : []); $helperTemplate->setExpected(!empty($expected) ? \json_decode($expected, true) : []);
$helperTemplate->setCreatedBy($request->getHeader()->getAccount()); $helperTemplate->setCreatedBy($request->getHeader()->getAccount());
$helperTemplate->setDatatype((int) ($request->getData('datatype') ?? TemplateDataType::OTHER)); $helperTemplate->setDatatype((int) ($request->getData('datatype') ?? TemplateDataType::OTHER));

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

@ -26,12 +26,12 @@ $lang = $reportLanguage[$cLang] ?? [];
echo $this->getData('nav')->render(); ?> echo $this->getData('nav')->render(); ?>
<div class="row" style="height: calc(100% - 85px);"> <div class="row" style="height: calc(100% - 85px);">
<div class="col-xs-12 col-md-9"> <div class="col-xs-12">
<div class="wf-100" style="height: 100%;"> <div class="box wf-100" style="height: 100%;">
<iframe src="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/helper/report/export/?id=' . $template->getId()); ?>" allowfullscreen></iframe> <iframe src="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/helper/report/export/?id=' . $template->getId()); ?>" allowfullscreen></iframe>
</div> </div>
</div> </div>
<!--
<div class="col-xs-12 col-md-3"> <div class="col-xs-12 col-md-3">
<?php if (count($reportLanguage) > 1) : ?> <?php if (count($reportLanguage) > 1) : ?>
<section class="box wf-100"> <section class="box wf-100">
@ -99,7 +99,7 @@ echo $this->getData('nav')->render(); ?>
<div class="inner"> <div class="inner">
<table class="list wf-100"> <table class="list wf-100">
<tbody> <tbody>
<?php if (!$template->isStandalone()) : ?> <?php if (!$template->isStandalone() && !($report instanceof \Modules\Helper\Models\NullReport)) : ?>
<tr> <tr>
<th colspan="2"><?= $this->getHtml('Report') ?> <th colspan="2"><?= $this->getHtml('Report') ?>
<tr> <tr>
@ -126,5 +126,5 @@ echo $this->getData('nav')->render(); ?>
</table> </table>
</div> </div>
</section> </section>
</div> </div>-->
</div> </div>