Jingga/oms-QA
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-QA.git synced 2026-02-15 07:18:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 13:58:48 +00:00
commit deebb55fd6
9 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Admin/Install/Application/QA/Application.php
View File

@ -154,7 +154,7 @@ final class Application
if ($account->id > 0) { if ($account->id > 0) {
$response->header->l11n = $account->l11n; $response->header->l11n = $account->l11n;
} elseif ($this->app->sessionManager->get('language') !== null } elseif ($this->app->sessionManager->get('language') !== null
&& $response->header->l11n->getLanguage() !== $this->app->sessionManager->get('language') && $response->header->l11n->language !== $this->app->sessionManager->get('language')
) { ) {
$response->header->l11n $response->header->l11n
->loadFromLanguage( ->loadFromLanguage(
@ -165,7 +165,7 @@ final class Application
$this->app->setResponseLanguage($request, $response, $this->config); $this->app->setResponseLanguage($request, $response, $this->config);
} }
if (!\in_array($response->getLanguage(), $this->config['language'])) { if (!\in_array($response->header->l11n->language, $this->config['language'])) {
$response->header->l11n->setLanguage($this->app->l11nServer->getLanguage()); $response->header->l11n->setLanguage($this->app->l11nServer->getLanguage());
} }
@ -173,7 +173,7 @@ final class Application
$head = new Head(); $head = new Head();
$pageView->setData('unitId', $this->app->unitId); $pageView->setData('unitId', $this->app->unitId);
$pageView->setData('head', $head); $pageView->data['head'] = $head;
$response->set('Content', $pageView); $response->set('Content', $pageView);
/* App only allows GET */ /* App only allows GET */
@ -190,14 +190,14 @@ final class Application
return; return;
} }
UriFactory::setQuery('/lang', $response->getLanguage()); UriFactory::setQuery('/lang', $response->header->l11n->language);
$this->loadLanguageFromPath( $this->loadLanguageFromPath(
$response->getLanguage(), $response->header->l11n->language,
__DIR__ . '/lang/' . $response->getLanguage() . '.lang.php' __DIR__ . '/lang/' . $response->header->l11n->language . '.lang.php'
); );
$response->header->set('content-language', $response->getLanguage(), true); $response->header->set('content-language', $response->header->l11n->language, true);
/* Create html head */ /* Create html head */
$this->initResponseHead($head, $request, $response); $this->initResponseHead($head, $request, $response);
@ -255,8 +255,8 @@ final class Application
$response->header->status = RequestStatusCode::R_406; $response->header->status = RequestStatusCode::R_406;
$pageView->setTemplate('/Web/{APPNAME}/Error/406'); $pageView->setTemplate('/Web/{APPNAME}/Error/406');
$this->loadLanguageFromPath( $this->loadLanguageFromPath(
$response->getLanguage(), $response->header->l11n->language,
__DIR__ . '/Error/lang/' . $response->getLanguage() . '.lang.php' __DIR__ . '/Error/lang/' . $response->header->l11n->language . '.lang.php'
); );
} }
@ -275,8 +275,8 @@ final class Application
$response->header->status = RequestStatusCode::R_503; $response->header->status = RequestStatusCode::R_503;
$pageView->setTemplate('/Web/{APPNAME}/Error/503'); $pageView->setTemplate('/Web/{APPNAME}/Error/503');
$this->loadLanguageFromPath( $this->loadLanguageFromPath(
$response->getLanguage(), $response->header->l11n->language,
__DIR__ . '/Error/lang/' . $response->getLanguage() . '.lang.php' __DIR__ . '/Error/lang/' . $response->header->l11n->language . '.lang.php'
); );
} }
@ -334,8 +334,8 @@ final class Application
$response->header->status = RequestStatusCode::R_403; $response->header->status = RequestStatusCode::R_403;
$pageView->setTemplate('/Web/{APPNAME}/Error/403'); $pageView->setTemplate('/Web/{APPNAME}/Error/403');
$this->loadLanguageFromPath( $this->loadLanguageFromPath(
$response->getLanguage(), $response->header->l11n->language,
__DIR__ . '/Error/lang/' . $response->getLanguage() . '.lang.php' __DIR__ . '/Error/lang/' . $response->header->l11n->language . '.lang.php'
); );
} }

4
Admin/Install/Application/QA/index.tpl.php
View File

@ -16,13 +16,13 @@ declare(strict_types=1);
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;
/** @var phpOMS\Model\Html\Head $head */ /** @var phpOMS\Model\Html\Head $head */
$head = $this->getData('head'); $head = $this->head;
/** @var array $dispatch */ /** @var array $dispatch */
$dispatch = $this->getData('dispatch') ?? []; $dispatch = $this->getData('dispatch') ?? [];
?> ?>
<!DOCTYPE HTML> <!DOCTYPE HTML>
<html lang="<?= $this->printHtml($this->response->getLanguage()); ?>"> <html lang="<?= $this->printHtml($this->response->header->l11n->language); ?>">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">

4
Admin/Settings/Theme/Backend/settings.tpl.php
View File

@ -18,9 +18,9 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
* @var \Modules\QA\Models\QAApp[] $apps * @var \Modules\QA\Models\QAApp[] $apps
*/ */
$apps = $this->getData('apps') ?? []; $apps = $this->data['apps'] ?? [];
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">

14
Controller/ApiController.php
View File

@ -117,7 +117,7 @@ final class ApiController extends Controller
public function apiQAQuestionCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiQAQuestionCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateQAQuestionCreate($request))) { if (!empty($val = $this->validateQAQuestionCreate($request))) {
$response->set('qa_question_create', new FormValidation($val)); $response->data['qa_question_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -172,7 +172,7 @@ final class ApiController extends Controller
} }
} }
if (!empty($uploadedFiles = $request->getFiles())) { if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
[], [],
[], [],
@ -238,7 +238,7 @@ final class ApiController extends Controller
public function apiQAAnswerCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiQAAnswerCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateQAAnswerCreate($request))) { if (!empty($val = $this->validateQAAnswerCreate($request))) {
$response->set('qa_answer_create', new FormValidation($val)); $response->data['qa_answer_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -270,7 +270,7 @@ final class ApiController extends Controller
$answer->setStatus((int) $request->getData('status')); $answer->setStatus((int) $request->getData('status'));
$answer->createdBy = new Profile(new NullAccount($request->header->account)); $answer->createdBy = new Profile(new NullAccount($request->header->account));
if (!empty($uploadedFiles = $request->getFiles())) { if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
[], [],
[], [],
@ -393,7 +393,7 @@ final class ApiController extends Controller
public function apiQAAppCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiQAAppCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateQAAppCreate($request))) { if (!empty($val = $this->validateQAAppCreate($request))) {
$response->set('qa_app_create', new FormValidation($val)); $response->data['qa_app_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -458,7 +458,7 @@ final class ApiController extends Controller
public function apiChangeQAQuestionVote(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiChangeQAQuestionVote(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateQuestionVote($request))) { if (!empty($val = $this->validateQuestionVote($request))) {
$response->set('qa_question_vote', new FormValidation($val)); $response->data['qa_question_vote'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -533,7 +533,7 @@ final class ApiController extends Controller
public function apiChangeQAAnswerVote(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiChangeQAAnswerVote(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateAnswerVote($request))) { if (!empty($val = $this->validateAnswerVote($request))) {
$response->set('qa_answer_vote', new FormValidation($val)); $response->data['qa_answer_vote'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;

34
Controller/BackendController.php
View File

@ -49,7 +49,7 @@ final class BackendController extends Controller
*/ */
public function setUpBackend(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void 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/QA/Theme/Backend/styles.css?v=1.0.0'); $head->addAsset(AssetType::CSS, '/Modules/QA/Theme/Backend/styles.css?v=1.0.0');
} }
@ -69,7 +69,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/QA/Theme/Backend/qa-dashboard'); $view->setTemplate('/Modules/QA/Theme/Backend/qa-dashboard');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006001001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1006001001, $request, $response);
/** @var \Modules\QA\Models\QAQuestion[] $list */ /** @var \Modules\QA\Models\QAQuestion[] $list */
$list = QAQuestionMapper::getAll() $list = QAQuestionMapper::getAll()
@ -80,15 +80,15 @@ final class BackendController extends Controller
->with('answers/votes') ->with('answers/votes')
->with('tags') ->with('tags')
->with('tags/title') ->with('tags/title')
->where('tags/title/language', $response->getLanguage()) ->where('tags/title/language', $response->header->l11n->language)
->where('language', $response->getLanguage()) ->where('language', $response->header->l11n->language)
->limit(50)->execute(); ->limit(50)->execute();
$view->setData('questions', $list); $view->data['questions'] = $list;
/** @var \Modules\QA\Models\QAApp[] $apps */ /** @var \Modules\QA\Models\QAApp[] $apps */
$apps = QAAppMapper::getAll()->execute(); $apps = QAAppMapper::getAll()->execute();
$view->setData('apps', $apps); $view->data['apps'] = $apps;
return $view; return $view;
} }
@ -109,7 +109,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/QA/Theme/Backend/qa-question'); $view->setTemplate('/Modules/QA/Theme/Backend/qa-question');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006001001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1006001001, $request, $response);
/** @var \Modules\QA\Models\QAQuestion $question */ /** @var \Modules\QA\Models\QAQuestion $question */
$question = QAQuestionMapper::get() $question = QAQuestionMapper::get()
@ -124,13 +124,13 @@ final class BackendController extends Controller
->with('tags/title') ->with('tags/title')
->with('media') ->with('media')
->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->addData('question', $question); $view->data['question'] = $question;
$scores = QAHelperMapper::getAccountScore($question->getAccounts()); $scores = QAHelperMapper::getAccountScore($question->getAccounts());
$view->addData('scores', $scores); $view->data['scores'] = $scores;
return $view; return $view;
} }
@ -151,11 +151,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/QA/Theme/Backend/qa-question-create'); $view->setTemplate('/Modules/QA/Theme/Backend/qa-question-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006001001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1006001001, $request, $response);
/** @var \Modules\QA\Models\QAQuestion $question */ /** @var \Modules\QA\Models\QAQuestion $question */
$question = QAQuestionMapper::get()->where('id', (int) $request->getData('id'))->execute(); $question = QAQuestionMapper::get()->where('id', (int) $request->getData('id'))->execute();
$view->addData('question', $question); $view->data['question'] = $question;
return $view; return $view;
} }
@ -174,17 +174,17 @@ final class BackendController extends Controller
public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response);
$id = $request->getDataString('id') ?? ''; $id = $request->getDataString('id') ?? '';
/** @var \Model\Setting[] $settings */ /** @var \Model\Setting[] $settings */
$settings = SettingMapper::getAll()->where('module', $id)->execute(); $settings = SettingMapper::getAll()->where('module', $id)->execute();
$view->setData('settings', $settings); $view->data['settings'] = $settings;
/** @var \Modules\QA\Models\QAApp[] $apps */ /** @var \Modules\QA\Models\QAApp[] $apps */
$apps = QAAppMapper::getAll()->execute(); $apps = QAAppMapper::getAll()->execute();
$view->setData('apps', $apps); $view->data['apps'] = $apps;
$view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings'); $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings');
@ -206,9 +206,9 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings-app'); $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings-app');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response);
$view->addData('app', QAAppMapper::get()->where('id', (int) $request->getData('app'))->execute()); $view->data['app'] = QAAppMapper::get()->where('id', (int) $request->getData('app'))->execute();
return $view; return $view;
} }

6
Theme/Backend/qa-dashboard.tpl.php
View File

@ -15,12 +15,12 @@ declare(strict_types=1);
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;
/** @var \Modules\QA\Modles\QAQuestion[] $questions */ /** @var \Modules\QA\Modles\QAQuestion[] $questions */
$questions = $this->getData('questions'); $questions = $this->data['questions'];
/** @var \Modules\QA\Modles\QAApp[] $apps */ /** @var \Modules\QA\Modles\QAApp[] $apps */
$apps = $this->getData('apps'); $apps = $this->data['apps'];
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12 box"> <div class="col-xs-12 box">

6
Theme/Backend/qa-question.tpl.php
View File

@ -15,15 +15,15 @@ declare(strict_types=1);
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;
/** @var \Modules\QA\Models\QAQuestion $question */ /** @var \Modules\QA\Models\QAQuestion $question */
$question = $this->getData('question'); $question = $this->data['question'];
/** @var \Modules\QA\Models\QAAnswer[] $answers */ /** @var \Modules\QA\Models\QAAnswer[] $answers */
$answers = $question->getAnswersByScore(); $answers = $question->getAnswersByScore();
/** @var array $scores */ /** @var array $scores */
$scores = $this->getData('scores'); $scores = $this->data['scores'];
echo $this->getData('nav')->render(); echo $this->data['nav']->render();
?> ?>
<div class="row qa"> <div class="row qa">

4
Theme/Backend/qa-tag-edit.tpl.php
View File

@ -12,10 +12,10 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
$tag = $this->getData('tag'); $tag = $this->data['tag'];
/** @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">

4
Theme/Backend/qa-tag-list.tpl.php
View File

@ -12,10 +12,10 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
$tags = $this->getData('tags'); $tags = $this->data['tags'];
/** @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">