Jingga/oms-Script
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Script.git synced 2026-02-06 16:38:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Karaka-Management/oms-Helper into develop

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 13:52:20 +00:00
commit 8f74efd986
8 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Controller/ApiController.php
View File

@ -71,7 +71,7 @@ final class ApiController extends Controller
public function apiHelperExport(HttpRequest $request, HttpResponse $response, mixed $data = null) : void public function apiHelperExport(HttpRequest $request, HttpResponse $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateExport($request))) { if (!empty($val = $this->validateExport($request))) {
$response->set('export', new FormValidation($val)); $response->data['export'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -107,7 +107,7 @@ final class ApiController extends Controller
$view = $this->createView($template, $request, $response); $view = $this->createView($template, $request, $response);
$this->setHelperResponseHeader($view, $template->name, $request, $response); $this->setHelperResponseHeader($view, $template->name, $request, $response);
$view->setData('path', __DIR__ . '/../../../'); $view->data['path'] = __DIR__ . '/../../../';
$response->set('export', $view); $response->set('export', $view);
} }
@ -370,14 +370,14 @@ final class ApiController extends Controller
} }
} }
$view->addData('report', $report); $view->data['report'] = $report;
$view->addData('rcoll', $rcoll); $view->data['rcoll'] = $rcoll;
} }
$view->addData('tcoll', $tcoll); $view->data['tcoll'] = $tcoll;
$view->addData('lang', $request->getData('lang') ?? $request->getLanguage()); $view->data['lang'] = $request->getData('lang') ?? $request->header->l11n->language;
$view->addData('template', $template); $view->data['template'] = $template;
$view->addData('basepath', __DIR__ . '/../../../'); $view->data['basepath'] = __DIR__ . '/../../../';
return $view; return $view;
} }
@ -398,11 +398,11 @@ final class ApiController extends Controller
public function apiTemplateCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiTemplateCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$dbFiles = $request->getDataJson('media-list'); $dbFiles = $request->getDataJson('media-list');
$uploadedFiles = $request->getFiles(); $uploadedFiles = $request->files;
$files = []; $files = [];
if (!empty($val = $this->validateTemplateCreate($request))) { if (!empty($val = $this->validateTemplateCreate($request))) {
$response->set('template_create', new FormValidation($val)); $response->data['template_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -495,7 +495,7 @@ final class ApiController extends Controller
{ {
$val = []; $val = [];
if (($val['name'] = !$request->hasData('name')) if (($val['name'] = !$request->hasData('name'))
|| ($val['files'] = empty($request->getFiles())) || ($val['files'] = empty($request->files))
) { ) {
return $val; return $val;
} }
@ -570,7 +570,7 @@ final class ApiController extends Controller
public function apiReportCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiReportCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateReportCreate($request))) { if (!empty($val = $this->validateReportCreate($request))) {
$response->set('report_create', new FormValidation($val)); $response->data['report_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -586,7 +586,7 @@ final class ApiController extends Controller
$files = $this->app->moduleManager->get('Media')->uploadFiles( $files = $this->app->moduleManager->get('Media')->uploadFiles(
$request->getDataList('names'), $request->getDataList('names'),
$request->getDataList('filenames'), $request->getDataList('filenames'),
$request->getFiles(), $request->files,
$request->header->account, $request->header->account,
__DIR__ . '/../../../Modules/Media/Files' __DIR__ . '/../../../Modules/Media/Files'
); );

42
Controller/BackendController.php
View File

@ -54,7 +54,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/Helper/Theme/Backend/helper-list'); $view->setTemplate('/Modules/Helper/Theme/Backend/helper-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response);
$path = \str_replace('+', ' ', (string) ($request->getData('path') ?? '/')); $path = \str_replace('+', ' ', (string) ($request->getData('path') ?? '/'));
$templates = TemplateMapper::getAll() $templates = TemplateMapper::getAll()
@ -62,16 +62,16 @@ final class BackendController extends Controller
->with('tags') ->with('tags')
->with('tags/title') ->with('tags/title')
->where('virtualPath', $path) ->where('virtualPath', $path)
->where('tags/title/language', $response->getLanguage()) ->where('tags/title/language', $response->header->l11n->language)
->execute(); ->execute();
list($collection, $parent) = CollectionMapper::getCollectionsByPath($path); list($collection, $parent) = CollectionMapper::getCollectionsByPath($path);
$view->addData('parent', $parent); $view->data['parent'] = $parent;
$view->addData('collections', $collection); $view->data['collections'] = $collection;
$view->addData('path', $path); $view->data['path'] = $path;
$view->addData('reports', $templates); $view->data['reports'] = $templates;
$view->addData('account', $this->app->accountManager->get($request->header->account)); $view->data['account'] = $this->app->accountManager->get($request->header->account);
return $view; return $view;
} }
@ -93,11 +93,11 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Helper/Theme/Backend/helper-template-create'); $view->setTemplate('/Modules/Helper/Theme/Backend/helper-template-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response);
$view->addData('media-upload', new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response)); $view->data['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response);
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor); $view->data['editor'] = $editor;
return $view; return $view;
} }
@ -119,11 +119,11 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Helper/Theme/Backend/helper-create'); $view->setTemplate('/Modules/Helper/Theme/Backend/helper-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response);
$view->addData('media-upload', new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response)); $view->data['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response);
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor); $view->data['editor'] = $editor;
return $view; return $view;
} }
@ -155,7 +155,7 @@ final class BackendController extends Controller
->with('source') ->with('source')
->with('source/sources') ->with('source/sources')
->where('id', (int) $request->getData('id')) ->where('id', (int) $request->getData('id'))
->where('tags/title/language', $response->getLanguage()) ->where('tags/title/language', $response->header->l11n->language)
->execute(); ->execute();
$view->setTemplate('/Modules/Helper/Theme/Backend/helper-single'); $view->setTemplate('/Modules/Helper/Theme/Backend/helper-single');
@ -220,15 +220,15 @@ final class BackendController extends Controller
} }
} }
$view->addData('report', $report); $view->data['report'] = $report;
$view->addData('rcoll', $rcoll); $view->data['rcoll'] = $rcoll;
} }
$view->addData('unit', $this->app->unitId); $view->data['unit'] = $this->app->unitId;
$view->addData('tcoll', $tcoll); $view->data['tcoll'] = $tcoll;
$view->addData('lang', $request->getData('lang') ?? $request->getLanguage()); $view->data['lang'] = $request->getData('lang') ?? $request->header->l11n->language;
$view->addData('template', $template); $view->data['template'] = $template;
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response);
return $view; return $view;
} }

2
Theme/Backend/helper-create.tpl.php
View File

@ -19,7 +19,7 @@ use phpOMS\Uri\UriFactory;
*/ */
$templateList = \Modules\Helper\Models\TemplateMapper::getAll()->execute(); $templateList = \Modules\Helper\Models\TemplateMapper::getAll()->execute();
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12 col-md-6"> <div class="col-xs-12 col-md-6">

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

@ -18,21 +18,21 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
* @var \Modules\Helper\Models\Template[] $templates * @var \Modules\Helper\Models\Template[] $templates
*/ */
$templates = $this->getData('reports'); $templates = $this->data['reports'];
/** @var \Modules\Admin\Models\Account $account */ /** @var \Modules\Admin\Models\Account $account */
$account = $this->getData('account'); $account = $this->data['account'];
$accountDir = $account->id . ' ' . $account->login; $accountDir = $account->id . ' ' . $account->login;
/** @var \Modules\Media\Models\Collection[] */ /** @var \Modules\Media\Models\Collection[] */
$collections = $this->getData('collections'); $collections = $this->data['collections'];
$mediaPath = \urldecode($this->getData('path') ?? '/'); $mediaPath = \urldecode($this->getData('path') ?? '/');
$previous = empty($templates) ? '{/base}/helper/list' : '{/base}/helper/list?{?}&id=' . \reset($templates)->id . '&ptype=p'; $previous = empty($templates) ? '{/base}/helper/list' : '{/base}/helper/list?{?}&id=' . \reset($templates)->id . '&ptype=p';
$next = empty($templates) ? '{/base}/helper/list' : 'helper/list?{?}&id=' . \end($templates)->id . '&ptype=n'; $next = empty($templates) ? '{/base}/helper/list' : 'helper/list?{?}&id=' . \end($templates)->id . '&ptype=n';
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">
<div class="box"> <div class="box">

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

@ -20,19 +20,19 @@ use phpOMS\Uri\UriFactory;
*/ */
/** @var \Modules\Media\Models\Collection $tcoll */ /** @var \Modules\Media\Models\Collection $tcoll */
$tcoll = $this->getData('tcoll'); $tcoll = $this->data['tcoll'];
/** @var \Modules\Media\Models\Collection $rcoll */ /** @var \Modules\Media\Models\Collection $rcoll */
$rcoll = $this->getData('rcoll'); $rcoll = $this->data['rcoll'];
/** @var string $cLang */ /** @var string $cLang */
$cLang = $this->getData('lang'); $cLang = $this->data['lang'];
/** @var \Modules\Helper\Models\Template $template */ /** @var \Modules\Helper\Models\Template $template */
$template = $this->getData('template'); $template = $this->data['template'];
/** @var \Modules\Helper\Models\Report $report */ /** @var \Modules\Helper\Models\Report $report */
$report = $this->getData('report'); $report = $this->data['report'];
/** @noinspection PhpIncludeInspection */ /** @noinspection PhpIncludeInspection */
/** @var array<string, array<string, string>> $reportLanguage */ /** @var array<string, array<string, string>> $reportLanguage */
@ -42,12 +42,12 @@ $reportLanguage = isset($tcoll['lang']) ? include __DIR__ . '/../../../../' . \l
$lang = $reportLanguage[$cLang] ?? []; $lang = $reportLanguage[$cLang] ?? [];
$settings = isset($tcoll['cfg']) ? \json_decode(\file_get_contents(__DIR__ . '/../../../../' . \ltrim($tcoll['cfg']->getPath(), '/')), true) : []; $settings = isset($tcoll['cfg']) ? \json_decode(\file_get_contents(__DIR__ . '/../../../../' . \ltrim($tcoll['cfg']->getPath(), '/')), true) : [];
echo $this->getData('nav')->render(); ?> echo $this->data['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 col-md-9">
<div class="portlet"> <div class="portlet">
<div class="portlet-body"> <div class="portlet-body">
<iframe data-form="iUiSettings" data-name="iframeHelper" id="iHelperFrame" src="<?= UriFactory::build('{/api}helper/report/export/?{?}&id=' . $template->id); ?>&u=<?= $this->getData('unit'); ?>" allowfullscreen></iframe> <iframe data-form="iUiSettings" data-name="iframeHelper" id="iHelperFrame" src="<?= UriFactory::build('{/api}helper/report/export/?{?}&id=' . $template->id); ?>&u=<?= $this->data['unit']; ?>" allowfullscreen></iframe>
</div> </div>
</div> </div>
</div> </div>

2
Theme/Backend/helper-template-create.tpl.php
View File

@ -13,7 +13,7 @@
declare(strict_types=1); declare(strict_types=1);
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12 col-md-6"> <div class="col-xs-12 col-md-6">

12
tests/depreciation/view.doc.php
View File

@ -10,12 +10,12 @@ use PhpOffice\PhpWord\Style\Language;
/** /**
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
*/ */
$tcoll = $this->getData('tcoll'); $tcoll = $this->data['tcoll'];
$rcoll = $this->getData('rcoll'); $rcoll = $this->data['rcoll'];
$cLang = $this->getData('lang'); $cLang = $this->data['lang'];
$template = $this->getData('template'); $template = $this->data['template'];
$report = $this->getData('report'); $report = $this->data['report'];
$basepath = \rtrim($this->getData('basepath') ?? '', '/'); $basepath = \rtrim($this->data['basepath'] ?? '', '/');
/** @noinspection PhpIncludeInspection */ /** @noinspection PhpIncludeInspection */
$reportLanguage = include $basepath . '/' . \ltrim($tcoll['lang']->getPath(), '/'); $reportLanguage = include $basepath . '/' . \ltrim($tcoll['lang']->getPath(), '/');

8
tests/depreciation/view.pdf.php
View File

@ -5,13 +5,13 @@ use phpOMS\Autoloader;
require_once Autoloader::findPaths('Resources\tcpdf\tcpdf')[0]; require_once Autoloader::findPaths('Resources\tcpdf\tcpdf')[0];
$cLang = $this->getData('lang'); $cLang = $this->data['lang'];
/** @noinspection PhpIncludeInspection */ /** @noinspection PhpIncludeInspection */
$reportLanguage = include $basepath . '/' . \ltrim($tcoll['lang']->getPath(), '/'); $reportLanguage = include $basepath . '/' . \ltrim($tcoll['lang']->getPath(), '/');
$lang = $reportLanguage[$cLang]; $lang = $reportLanguage[$cLang];
$amount = (float) ($this->request->getData('amount') ?? 10000.0); $amount = $this->request->getDataFloat('amount') ?? 10000.0;
$duration = (int) ($this->request->getData('duration') ?? 10); $duration = $this->request->getDataInt('duration') ?? 10;
$pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false); $pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
@ -40,7 +40,7 @@ $pdf->Rect(0, 0, $pdf->getPageWidth(), 5, 'F');
$pdf->SetFont('helvetica', '', 32); $pdf->SetFont('helvetica', '', 32);
$pdf->SetTextColor(54, 151, 219); $pdf->SetTextColor(54, 151, 219);
$pdf->Write(0, 'Demo Mailing - ' . $this->request->getData('date') ?? 'Y-m-d', '', 0, 'C', true, 0, false, false, 0); $pdf->Write(0, 'Demo Mailing - ' . $this->request->getDataString('date') ?? 'Y-m-d', '', 0, 'C', true, 0, false, false, 0);
$pdf->Image(__DIR__ . '/logo.png', $pdf->getPageWidth() / 2 - 60 / 2, 40, 60, 60, 'PNG', '', 'C', true, 300, '', false, false, 0, false, false, false); $pdf->Image(__DIR__ . '/logo.png', $pdf->getPageWidth() / 2 - 60 / 2, 40, 60, 60, 'PNG', '', 'C', true, 300, '', false, false, 0, false, false, false);