From 5f1439ccad4228f10a9bb522179b53eca712ae39 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 29 Oct 2021 14:49:55 +0200 Subject: [PATCH] bug and media fixes --- Admin/Routes/Web/Backend.php | 32 +++++++++++----------- Controller/ApiController.php | 19 +++++++------ Controller/BackendController.php | 6 ++-- Models/SurveyTemplate.php | 4 +-- Models/SurveyTemplateElementL11n.php | 10 +++---- Models/SurveyTemplateElementL11nMapper.php | 10 +++---- Models/SurveyTemplateElementMapper.php | 13 +++------ Models/SurveyTemplateL11n.php | 8 +++--- Models/SurveyTemplateL11nMapper.php | 10 +++---- Models/SurveyTemplateLabelL11n.php | 6 ++-- Models/SurveyTemplateLabelL11nMapper.php | 8 +++--- Models/SurveyTemplateMapper.php | 15 +++++----- 12 files changed, 68 insertions(+), 73 deletions(-) diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index fe39410..b43d511 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -31,45 +31,45 @@ return [ ], '^.*/survey/list.*$' => [ [ - 'dest' => '\Modules\Surveys\Controller\BackendController:viewSurveysList', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Surveys\Controller\BackendController:viewSurveysList', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::SURVEY_TEMPLATE, + 'type' => PermissionType::READ, + 'state' => PermissionState::SURVEY_TEMPLATE, ], ], ], '^.*/survey/create.*$' => [ [ - 'dest' => '\Modules\Surveys\Controller\BackendController:viewSurveysCreate', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Surveys\Controller\BackendController:viewSurveysCreate', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::SURVEY_TEMPLATE, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::SURVEY_TEMPLATE, ], ], ], '^.*/survey/edit.*$' => [ [ - 'dest' => '\Modules\Surveys\Controller\BackendController:viewSurveysEdit', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Surveys\Controller\BackendController:viewSurveysEdit', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::SURVEY_TEMPLATE, + 'type' => PermissionType::READ, + 'state' => PermissionState::SURVEY_TEMPLATE, ], ], ], '^.*/survey(\?.*|$)$' => [ [ - 'dest' => '\Modules\Surveys\Controller\BackendController:viewSurveysSurvey', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Surveys\Controller\BackendController:viewSurveysSurvey', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::SURVEY_ANSWER, + 'type' => PermissionType::READ, + 'state' => PermissionState::SURVEY_ANSWER, ], ], ], diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 2c55abc..7753c80 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -15,17 +15,19 @@ declare(strict_types=1); namespace Modules\Surveys\Controller; use Modules\Admin\Models\NullAccount; -use Modules\Tag\Models\NullTag; +use Modules\Media\Models\NullMedia; +use Modules\Surveys\Models\SurveyAnswer; +use Modules\Surveys\Models\SurveyElementType; +use Modules\Surveys\Models\SurveyStatus; use Modules\Surveys\Models\SurveyTemplate; -use Modules\Surveys\Models\SurveyTemplateL11n; -use Modules\Surveys\Models\SurveyTemplateLabelL11n; use Modules\Surveys\Models\SurveyTemplateElement; use Modules\Surveys\Models\SurveyTemplateElementL11n; use Modules\Surveys\Models\SurveyTemplateElementMapper; +use Modules\Surveys\Models\SurveyTemplateL11n; +use Modules\Surveys\Models\SurveyTemplateLabelL11n; use Modules\Surveys\Models\SurveyTemplateMapper; -use Modules\Surveys\Models\SurveyStatus; -use Modules\Surveys\Models\SurveyElementType; -use Modules\Media\Models\NullMedia; +use Modules\Tag\Models\NullTag; +use phpOMS\Localization\ISO639x1Enum; use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\NotificationLevel; @@ -33,8 +35,6 @@ use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Model\Message\FormValidation; use phpOMS\Utils\Parser\Markdown\Markdown; -use phpOMS\Localization\ISO639x1Enum; -use Modules\Surveys\Models\SurveyAnswer; /** * Api controller for the survey module. @@ -138,7 +138,8 @@ final class ApiController extends Controller if (!empty($uploadedFiles = $request->getFiles() ?? [])) { $uploaded = $this->app->moduleManager->get('Media')->uploadFiles( - [''], + [], + [], $uploadedFiles, $request->header->account, __DIR__ . '/../../../Modules/Media/Files/Modules/Surveys', diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 0773322..3e0258e 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -14,13 +14,13 @@ declare(strict_types=1); namespace Modules\Surveys\Controller; +use Modules\Media\Models\CollectionMapper; +use Modules\Surveys\Models\SurveyTemplateMapper; +use phpOMS\Asset\AssetType; use phpOMS\Contract\RenderableInterface; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Views\View; -use Modules\Surveys\Models\SurveyTemplateMapper; -use Modules\Media\Models\CollectionMapper; -use phpOMS\Asset\AssetType; /** * Surveys controller class. diff --git a/Models/SurveyTemplate.php b/Models/SurveyTemplate.php index 10ee464..881ab2c 100644 --- a/Models/SurveyTemplate.php +++ b/Models/SurveyTemplate.php @@ -14,10 +14,10 @@ declare(strict_types=1); namespace Modules\Surveys\Models; -use phpOMS\Localization\ISO639x1Enum; use Modules\Admin\Models\Account; -use Modules\Tag\Models\Tag; use Modules\Media\Models\Media; +use Modules\Tag\Models\Tag; +use phpOMS\Localization\ISO639x1Enum; /** * Survey class. diff --git a/Models/SurveyTemplateElementL11n.php b/Models/SurveyTemplateElementL11n.php index 57af212..890034f 100644 --- a/Models/SurveyTemplateElementL11n.php +++ b/Models/SurveyTemplateElementL11n.php @@ -163,12 +163,12 @@ class SurveyTemplateElementL11n implements \JsonSerializable, ArrayableInterface public function toArray() : array { return [ - 'id' => $this->id, - 'text' => $this->text, - 'description' => $this->description, + 'id' => $this->id, + 'text' => $this->text, + 'description' => $this->description, 'descriptionPlain' => $this->descriptionPlain, - 'element' => $this->element, - 'language' => $this->language, + 'element' => $this->element, + 'language' => $this->language, ]; } diff --git a/Models/SurveyTemplateElementL11nMapper.php b/Models/SurveyTemplateElementL11nMapper.php index 8394d5e..a521cce 100644 --- a/Models/SurveyTemplateElementL11nMapper.php +++ b/Models/SurveyTemplateElementL11nMapper.php @@ -33,12 +33,12 @@ final class SurveyTemplateElementL11nMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $columns = [ - 'survey_template_element_l11n_id' => ['name' => 'survey_template_element_l11n_id', 'type' => 'int', 'internal' => 'id'], - 'survey_template_element_l11n_text' => ['name' => 'survey_template_element_l11n_text', 'type' => 'string', 'internal' => 'text', 'autocomplete' => true], - 'survey_template_element_l11n_description' => ['name' => 'survey_template_element_l11n_description', 'type' => 'string', 'internal' => 'description'], + 'survey_template_element_l11n_id' => ['name' => 'survey_template_element_l11n_id', 'type' => 'int', 'internal' => 'id'], + 'survey_template_element_l11n_text' => ['name' => 'survey_template_element_l11n_text', 'type' => 'string', 'internal' => 'text', 'autocomplete' => true], + 'survey_template_element_l11n_description' => ['name' => 'survey_template_element_l11n_description', 'type' => 'string', 'internal' => 'description'], 'survey_template_element_l11n_description_plain' => ['name' => 'survey_template_element_l11n_description_plain', 'type' => 'string', 'internal' => 'descriptionPlain'], - 'survey_template_element_l11n_element' => ['name' => 'survey_template_element_l11n_element', 'type' => 'int', 'internal' => 'element'], - 'survey_template_element_l11n_language' => ['name' => 'survey_template_element_l11n_language', 'type' => 'string', 'internal' => 'language'], + 'survey_template_element_l11n_element' => ['name' => 'survey_template_element_l11n_element', 'type' => 'int', 'internal' => 'element'], + 'survey_template_element_l11n_language' => ['name' => 'survey_template_element_l11n_language', 'type' => 'string', 'internal' => 'language'], ]; /** diff --git a/Models/SurveyTemplateElementMapper.php b/Models/SurveyTemplateElementMapper.php index c85e8f7..9429998 100644 --- a/Models/SurveyTemplateElementMapper.php +++ b/Models/SurveyTemplateElementMapper.php @@ -14,12 +14,7 @@ declare(strict_types=1); namespace Modules\Surveys\Models; -use Modules\Admin\Models\AccountMapper; -use Modules\Media\Models\CollectionMapper; -use Modules\Media\Models\MediaMapper; -use Modules\Tag\Models\TagMapper; use phpOMS\DataStorage\Database\DataMapperAbstract; -use phpOMS\DataStorage\Database\RelationType; /** * Mapper class. @@ -38,11 +33,11 @@ final class SurveyTemplateElementMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $columns = [ - 'survey_template_element_id' => ['name' => 'survey_template_element_id', 'type' => 'int', 'internal' => 'id'], - 'survey_template_element_type' => ['name' => 'survey_template_element_type', 'type' => 'int', 'internal' => 'type'], - 'survey_template_element_order' => ['name' => 'survey_template_element_order', 'type' => 'int', 'internal' => 'order'], + 'survey_template_element_id' => ['name' => 'survey_template_element_id', 'type' => 'int', 'internal' => 'id'], + 'survey_template_element_type' => ['name' => 'survey_template_element_type', 'type' => 'int', 'internal' => 'type'], + 'survey_template_element_order' => ['name' => 'survey_template_element_order', 'type' => 'int', 'internal' => 'order'], 'survey_template_element_optional' => ['name' => 'survey_template_element_optional', 'type' => 'bool', 'internal' => 'isOptional'], - 'survey_template_element_values' => ['name' => 'survey_template_element_values', 'type' => 'Json', 'internal' => 'values'], + 'survey_template_element_values' => ['name' => 'survey_template_element_values', 'type' => 'Json', 'internal' => 'values'], 'survey_template_element_template' => ['name' => 'survey_template_element_template', 'type' => 'int', 'internal' => 'template'], ]; diff --git a/Models/SurveyTemplateL11n.php b/Models/SurveyTemplateL11n.php index f31a10e..01e842c 100644 --- a/Models/SurveyTemplateL11n.php +++ b/Models/SurveyTemplateL11n.php @@ -163,11 +163,11 @@ class SurveyTemplateL11n implements \JsonSerializable, ArrayableInterface public function toArray() : array { return [ - 'id' => $this->id, - 'title' => $this->title, + 'id' => $this->id, + 'title' => $this->title, 'description' => $this->description, - 'template' => $this->template, - 'language' => $this->language, + 'template' => $this->template, + 'language' => $this->language, ]; } diff --git a/Models/SurveyTemplateL11nMapper.php b/Models/SurveyTemplateL11nMapper.php index 7762170..7366712 100644 --- a/Models/SurveyTemplateL11nMapper.php +++ b/Models/SurveyTemplateL11nMapper.php @@ -33,12 +33,12 @@ final class SurveyTemplateL11nMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $columns = [ - 'survey_template_l11n_id' => ['name' => 'survey_template_l11n_id', 'type' => 'int', 'internal' => 'id'], - 'survey_template_l11n_title' => ['name' => 'survey_template_l11n_title', 'type' => 'string', 'internal' => 'title', 'autocomplete' => true], - 'survey_template_l11n_description' => ['name' => 'survey_template_l11n_description', 'type' => 'string', 'internal' => 'description'], + 'survey_template_l11n_id' => ['name' => 'survey_template_l11n_id', 'type' => 'int', 'internal' => 'id'], + 'survey_template_l11n_title' => ['name' => 'survey_template_l11n_title', 'type' => 'string', 'internal' => 'title', 'autocomplete' => true], + 'survey_template_l11n_description' => ['name' => 'survey_template_l11n_description', 'type' => 'string', 'internal' => 'description'], 'survey_template_l11n_description_plain' => ['name' => 'survey_template_l11n_description_plain', 'type' => 'string', 'internal' => 'descriptionPlain'], - 'survey_template_l11n_template' => ['name' => 'survey_template_l11n_template', 'type' => 'int', 'internal' => 'template'], - 'survey_template_l11n_language' => ['name' => 'survey_template_l11n_language', 'type' => 'string', 'internal' => 'language'], + 'survey_template_l11n_template' => ['name' => 'survey_template_l11n_template', 'type' => 'int', 'internal' => 'template'], + 'survey_template_l11n_language' => ['name' => 'survey_template_l11n_language', 'type' => 'string', 'internal' => 'language'], ]; /** diff --git a/Models/SurveyTemplateLabelL11n.php b/Models/SurveyTemplateLabelL11n.php index a7f0e88..4411d2e 100644 --- a/Models/SurveyTemplateLabelL11n.php +++ b/Models/SurveyTemplateLabelL11n.php @@ -151,10 +151,10 @@ class SurveyTemplateLabelL11n implements \JsonSerializable, ArrayableInterface public function toArray() : array { return [ - 'id' => $this->id, - 'title' => $this->title, + 'id' => $this->id, + 'title' => $this->title, 'element' => $this->element, - 'language' => $this->language, + 'language' => $this->language, ]; } diff --git a/Models/SurveyTemplateLabelL11nMapper.php b/Models/SurveyTemplateLabelL11nMapper.php index 324c2b6..1aafb41 100644 --- a/Models/SurveyTemplateLabelL11nMapper.php +++ b/Models/SurveyTemplateLabelL11nMapper.php @@ -33,11 +33,11 @@ final class SurveyTemplateLabelL11nMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $columns = [ - 'survey_template_element_label_l11n_id' => ['name' => 'survey_template_element_label_l11n_id', 'type' => 'int', 'internal' => 'id'], - 'survey_template_element_label_l11n_title' => ['name' => 'survey_template_element_label_l11n_title', 'type' => 'string', 'internal' => 'title', 'autocomplete' => true], + 'survey_template_element_label_l11n_id' => ['name' => 'survey_template_element_label_l11n_id', 'type' => 'int', 'internal' => 'id'], + 'survey_template_element_label_l11n_title' => ['name' => 'survey_template_element_label_l11n_title', 'type' => 'string', 'internal' => 'title', 'autocomplete' => true], 'survey_template_element_label_l11n_element' => ['name' => 'survey_template_element_label_l11n_element', 'type' => 'int', 'internal' => 'element'], - 'survey_template_element_label_l11n_order' => ['name' => 'survey_template_element_label_l11n_order', 'type' => 'int', 'internal' => 'order'], - 'survey_template_element_label_l11n_language' => ['name' => 'survey_template_element_label_l11n_language', 'type' => 'string', 'internal' => 'language'], + 'survey_template_element_label_l11n_order' => ['name' => 'survey_template_element_label_l11n_order', 'type' => 'int', 'internal' => 'order'], + 'survey_template_element_label_l11n_language' => ['name' => 'survey_template_element_label_l11n_language', 'type' => 'string', 'internal' => 'language'], ]; /** diff --git a/Models/SurveyTemplateMapper.php b/Models/SurveyTemplateMapper.php index a09728c..8ecee8a 100644 --- a/Models/SurveyTemplateMapper.php +++ b/Models/SurveyTemplateMapper.php @@ -15,7 +15,6 @@ declare(strict_types=1); namespace Modules\Surveys\Models; use Modules\Admin\Models\AccountMapper; -use Modules\Media\Models\CollectionMapper; use Modules\Media\Models\MediaMapper; use Modules\Tag\Models\TagMapper; use phpOMS\DataStorage\Database\DataMapperAbstract; @@ -38,14 +37,14 @@ final class SurveyTemplateMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $columns = [ - 'survey_template_id' => ['name' => 'survey_template_id', 'type' => 'int', 'internal' => 'id'], - 'survey_template_status' => ['name' => 'survey_template_status', 'type' => 'int', 'internal' => 'status'], + 'survey_template_id' => ['name' => 'survey_template_id', 'type' => 'int', 'internal' => 'id'], + 'survey_template_status' => ['name' => 'survey_template_status', 'type' => 'int', 'internal' => 'status'], 'survey_template_public_result' => ['name' => 'survey_template_public_result', 'type' => 'bool', 'internal' => 'hasPublicResult'], - 'survey_template_start' => ['name' => 'survey_template_start', 'type' => 'DateTime', 'internal' => 'start'], - 'survey_template_end' => ['name' => 'survey_template_end', 'type' => 'DateTime', 'internal' => 'end'], - 'survey_template_virtual' => ['name' => 'survey_template_virtual', 'type' => 'string', 'internal' => 'virtualPath'], - 'survey_template_created_by' => ['name' => 'survey_template_created_by', 'type' => 'int', 'internal' => 'createdBy'], - 'survey_template_created_at' => ['name' => 'survey_template_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt'], + 'survey_template_start' => ['name' => 'survey_template_start', 'type' => 'DateTime', 'internal' => 'start'], + 'survey_template_end' => ['name' => 'survey_template_end', 'type' => 'DateTime', 'internal' => 'end'], + 'survey_template_virtual' => ['name' => 'survey_template_virtual', 'type' => 'string', 'internal' => 'virtualPath'], + 'survey_template_created_by' => ['name' => 'survey_template_created_by', 'type' => 'int', 'internal' => 'createdBy'], + 'survey_template_created_at' => ['name' => 'survey_template_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt'], ]; /**