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

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

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 13:59:07 +00:00
commit 0bc45924e2
10 changed files with 33 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Controller/ApiController.php
View File

@ -82,7 +82,7 @@ final class ApiController extends Controller
public function apiSurveyTemplateCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateSurveyTemplateCreate($request))) {
$response->set($request->uri->__toString(), new FormValidation($val));
$response->data[$request->uri->__toString()] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -141,7 +141,7 @@ final class ApiController extends Controller
}
}
if (!empty($uploadedFiles = $request->getFiles())) {
if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
[],
[],
@ -205,7 +205,7 @@ final class ApiController extends Controller
public function apiSurveyTemplateElementCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateSurveyTemplateElementCreate($request))) {
$response->set($request->uri->__toString(), new FormValidation($val));
$response->data[$request->uri->__toString()] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -293,7 +293,7 @@ final class ApiController extends Controller
public function apiSurveyAnswerCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateSurveyAnswerCreate($request))) {
$response->set($request->uri->__toString(), new FormValidation($val));
$response->data[$request->uri->__toString()] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;

34
Controller/BackendController.php
View File

@ -47,7 +47,7 @@ final class BackendController extends Controller
*/
public function setUpBackend(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
$head = $response->get('Content')->getData('head');
$head = $response->get('Content')->head;
$head->addAsset(AssetType::CSS, '/Modules/Surveys/Theme/Backend/styles.css?v=1.0.0');
}
@ -67,21 +67,21 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Surveys/Theme/Backend/surveys-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000801001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000801001, $request, $response);
$path = \str_replace('+', ' ', (string) ($request->getData('path') ?? '/'));
$surveys = SurveyTemplateMapper::getByVirtualPath($path)
->where('tags/title/language', $response->getLanguage())
->where('l11n/language', $response->getLanguage())
->where('tags/title/language', $response->header->l11n->language)
->where('l11n/language', $response->header->l11n->language)
->execute();
list($collection, $parent) = CollectionMapper::getCollectionsByPath($path);
$view->addData('parent', $parent);
$view->addData('collections', $collection);
$view->addData('path', $path);
$view->addData('surveys', $surveys);
$view->addData('account', $this->app->accountManager->get($request->header->account));
$view->data['parent'] = $parent;
$view->data['collections'] = $collection;
$view->data['path'] = $path;
$view->data['surveys'] = $surveys;
$view->data['account'] = $this->app->accountManager->get($request->header->account);
return $view;
}
@ -102,7 +102,7 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Surveys/Theme/Backend/surveys-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000801001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000801001, $request, $response);
return $view;
}
@ -123,7 +123,7 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Surveys/Theme/Backend/surveys-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000801001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000801001, $request, $response);
/** @var \Modules\Surveys\Models\SurveyTemplate $survey */
$survey = SurveyTemplateMapper::get()
@ -136,13 +136,13 @@ final class BackendController extends Controller
->with('tags')
->with('tags/title')
->where('id', $request->getData('id'))
->where('tags/title/language', $response->getLanguage())
->where('l11n/language', $response->getLanguage())
->where('elements/l11n/language', $response->getLanguage())
->where('elements/labels/language', $response->getLanguage())
->where('tags/title/language', $response->header->l11n->language)
->where('l11n/language', $response->header->l11n->language)
->where('elements/l11n/language', $response->header->l11n->language)
->where('elements/labels/language', $response->header->l11n->language)
->execute();
$view->addData('survey', $survey);
$view->data['survey'] = $survey;
return $view;
}
@ -163,7 +163,7 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Surveys/Theme/Backend/surveys-survey');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000801001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000801001, $request, $response);
return $view;
}

12
Models/SurveyTemplateElementL11n.php
View File

@ -92,18 +92,6 @@ class SurveyTemplateElementL11n implements \JsonSerializable
$this->language = $language;
}
/**
* Get id
*
* @return int
*
* @since 1.0.0
*/
public function getId() : int
{
return $this->id;
}
/**
* Get language
*

12
Models/SurveyTemplateL11n.php
View File

@ -108,18 +108,6 @@ class SurveyTemplateL11n implements \JsonSerializable
$this->language = $language;
}
/**
* Get id
*
* @return int
*
* @since 1.0.0
*/
public function getId() : int
{
return $this->id;
}
/**
* Get language
*

12
Models/SurveyTemplateLabelL11n.php
View File

@ -80,18 +80,6 @@ class SurveyTemplateLabelL11n implements \JsonSerializable
$this->language = $language;
}
/**
* Get id
*
* @return int
*
* @since 1.0.0
*/
public function getId() : int
{
return $this->id;
}
/**
* Get language
*

4
Theme/Backend/surveys-create.tpl.php
View File

@ -15,9 +15,9 @@ declare(strict_types=1);
use Modules\Surveys\Models\SurveyElementType;
/** @var null|Modules\Surveys\Models\SurveyTemplate $survey */
$survey = $this->getData('survey');
$survey = $this->data['survey'];
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="tabview tab-2">
<div class="box wf-100 col-xs-12">

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

@ -18,21 +18,21 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this
* @var \Modules\Surveys\Models\Survey[] $surveys
*/
$surveys = $this->getData('surveys') ?? [];
$surveys = $this->data['surveys'] ?? [];
/** @var \Modules\Admin\Models\Account $account */
$account = $this->getData('account');
$account = $this->data['account'];
$accountDir = $account->id . ' ' . $account->login;
/** @var \Modules\Media\Models\Collection[] */
$collections = $this->getData('collections');
$collections = $this->data['collections'];
$mediaPath = \urldecode($this->getData('path') ?? '/');
$previous = empty($surveys) ? '{/base}/survey/list' : '{/base}/survey/list?{?}&id=' . \reset($surveys)->id . '&ptype=p';
$next = empty($surveys) ? '{/base}/survey/list' : '{/base}/survey/list?{?}&id=' . \end($surveys)->id . '&ptype=n';
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12">

4
tests/Models/SurveyTemplateElementL11nTest.php
View File

@ -42,7 +42,7 @@ final class SurveyTemplateElementL11nTest extends \PHPUnit\Framework\TestCase
self::assertEquals('', $this->l11n->text);
self::assertEquals('', $this->l11n->description);
self::assertEquals('', $this->l11n->descriptionPlain);
self::assertEquals(ISO639x1Enum::_EN, $this->l11n->getLanguage());
self::assertEquals(ISO639x1Enum::_EN, $this->l11n->language);
}
/**
@ -72,7 +72,7 @@ final class SurveyTemplateElementL11nTest extends \PHPUnit\Framework\TestCase
public function testLanguageInputOutput() : void
{
$this->l11n->setLanguage(ISO639x1Enum::_DE);
self::assertEquals(ISO639x1Enum::_DE, $this->l11n->getLanguage());
self::assertEquals(ISO639x1Enum::_DE, $this->l11n->language);
}
/**

4
tests/Models/SurveyTemplateL11nTest.php
View File

@ -42,7 +42,7 @@ final class SurveyTemplateL11nTest extends \PHPUnit\Framework\TestCase
self::assertEquals('', $this->l11n->title);
self::assertEquals('', $this->l11n->description);
self::assertEquals('', $this->l11n->descriptionPlain);
self::assertEquals(ISO639x1Enum::_EN, $this->l11n->getLanguage());
self::assertEquals(ISO639x1Enum::_EN, $this->l11n->language);
}
/**
@ -72,7 +72,7 @@ final class SurveyTemplateL11nTest extends \PHPUnit\Framework\TestCase
public function testLanguageInputOutput() : void
{
$this->l11n->setLanguage(ISO639x1Enum::_DE);
self::assertEquals(ISO639x1Enum::_DE, $this->l11n->getLanguage());
self::assertEquals(ISO639x1Enum::_DE, $this->l11n->language);
}
/**

4
tests/Models/SurveyTemplateLabelL11nTest.php
View File

@ -40,7 +40,7 @@ final class SurveyTemplateLabelL11nTest extends \PHPUnit\Framework\TestCase
{
self::assertEquals(0, $this->l11n->id);
self::assertEquals('', $this->l11n->title);
self::assertEquals(ISO639x1Enum::_EN, $this->l11n->getLanguage());
self::assertEquals(ISO639x1Enum::_EN, $this->l11n->language);
}
/**
@ -60,7 +60,7 @@ final class SurveyTemplateLabelL11nTest extends \PHPUnit\Framework\TestCase
public function testLanguageInputOutput() : void
{
$this->l11n->setLanguage(ISO639x1Enum::_DE);
self::assertEquals(ISO639x1Enum::_DE, $this->l11n->getLanguage());
self::assertEquals(ISO639x1Enum::_DE, $this->l11n->language);
}
/**