add todos and improve db schema

This commit is contained in:
Dennis Eichhorn 2020-01-01 21:05:12 +01:00
parent 527dbe481c
commit c0a90b73a4
2 changed files with 2 additions and 8 deletions

View File

@ -12,7 +12,6 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
/** /**
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
*/ */
@ -220,9 +219,6 @@ echo $this->getData('nav')->render(); ?>
/* /*
* Media Add * Media Add
*/ */
// TODO: add media upload drop panel
$tabView->addTab($this->getHtml('Helper', 'New'), $createPanel->render() . $mediaPanel->render(), 'Backend', 'new'); $tabView->addTab($this->getHtml('Helper', 'New'), $createPanel->render() . $mediaPanel->render(), 'Backend', 'new');
?> ?>
<?= $this->printHtml($tabView->render()); ?> <?= $this->printHtml($tabView->render()); ?>

View File

@ -15,7 +15,6 @@ declare(strict_types=1);
/** /**
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
*/ */
// TODO: load template in new view that doesn't get access to anything otherwise user can interact with app in bad ways
$tcoll = $this->getData('tcoll'); $tcoll = $this->getData('tcoll');
$rcoll = $this->getData('rcoll'); $rcoll = $this->getData('rcoll');
$cLang = $this->getData('lang'); $cLang = $this->getData('lang');
@ -24,7 +23,7 @@ $report = $this->getData('report');
/** @noinspection PhpIncludeInspection */ /** @noinspection PhpIncludeInspection */
$reportLanguage = isset($tcoll['lang']) ? include __DIR__ . '/../../../../' . \ltrim($tcoll['lang']->getPath(), '/') : []; $reportLanguage = isset($tcoll['lang']) ? include __DIR__ . '/../../../../' . \ltrim($tcoll['lang']->getPath(), '/') : [];
$lang = $reportLanguage[$cLang] ?? []; $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);">
@ -33,7 +32,6 @@ echo $this->getData('nav')->render(); ?>
<iframe src="<?= \phpOMS\Uri\UriFactory::build('{/api}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> </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">
@ -128,5 +126,5 @@ echo $this->getData('nav')->render(); ?>
</table> </table>
</div> </div>
</section> </section>
</div>--> </div>
</div> </div>