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

Automated formatting changes

Browse Source
This commit is contained in:
Formatter Bot 2021-06-23 22:17:18 +00:00
parent 356237d0f8
commit fd9a5ce821
9 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin/Install/Navigation.php
View File

@ -29,8 +29,8 @@ class Navigation
/** /**
* Install navigation providing * Install navigation providing
* *
* @param string $path Module path * @param string $path Module path
* @param ApplicationAbstract $app Application * @param ApplicationAbstract $app Application
* *
* @return void * @return void
* *

29
Controller/ApiController.php
View File

@ -15,11 +15,16 @@ declare(strict_types=1);
namespace Modules\QA\Controller; namespace Modules\QA\Controller;
use Modules\Admin\Models\NullAccount; use Modules\Admin\Models\NullAccount;
use Modules\Profile\Models\Profile;
use Modules\QA\Models\NullQAAnswerVote;
use Modules\QA\Models\NullQACategory; use Modules\QA\Models\NullQACategory;
use Modules\QA\Models\NullQAQuestion; use Modules\QA\Models\NullQAQuestion;
use Modules\QA\Models\NullQAQuestionVote;
use Modules\QA\Models\QAAnswer; use Modules\QA\Models\QAAnswer;
use Modules\QA\Models\QAAnswerMapper; use Modules\QA\Models\QAAnswerMapper;
use Modules\QA\Models\QAAnswerStatus; use Modules\QA\Models\QAAnswerStatus;
use Modules\QA\Models\QAAnswerVote;
use Modules\QA\Models\QAAnswerVoteMapper;
use Modules\QA\Models\QACategory; use Modules\QA\Models\QACategory;
use Modules\QA\Models\QACategoryL11n; use Modules\QA\Models\QACategoryL11n;
use Modules\QA\Models\QACategoryL11nMapper; use Modules\QA\Models\QACategoryL11nMapper;
@ -29,12 +34,7 @@ use Modules\QA\Models\QAQuestionMapper;
use Modules\QA\Models\QAQuestionStatus; use Modules\QA\Models\QAQuestionStatus;
use Modules\QA\Models\QAQuestionVote; use Modules\QA\Models\QAQuestionVote;
use Modules\QA\Models\QAQuestionVoteMapper; use Modules\QA\Models\QAQuestionVoteMapper;
use Modules\QA\Models\QAAnswerVote;
use Modules\QA\Models\QAAnswerVoteMapper;
use Modules\QA\Models\NullQAQuestionVote;
use Modules\QA\Models\NullQAAnswerVote;
use Modules\Tag\Models\NullTag; use Modules\Tag\Models\NullTag;
use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\HttpResponse;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\NotificationLevel; use phpOMS\Message\NotificationLevel;
@ -42,7 +42,6 @@ use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation; use phpOMS\Model\Message\FormValidation;
use phpOMS\Utils\Parser\Markdown\Markdown; use phpOMS\Utils\Parser\Markdown\Markdown;
use Modules\Profile\Models\Profile;
/** /**
* Task class. * Task class.
@ -311,7 +310,7 @@ final class ApiController extends Controller
*/ */
public function updateAnsweredStatusFromRequest(RequestAbstract $request) : QAAnswer public function updateAnsweredStatusFromRequest(RequestAbstract $request) : QAAnswer
{ {
$answer = QAAnswerMapper::get((int) $request->getData('id')); $answer = QAAnswerMapper::get((int) $request->getData('id'));
$answer->isAccepted = $request->getData('accepted', 'bool') ?? false; $answer->isAccepted = $request->getData('accepted', 'bool') ?? false;
return $answer; return $answer;
@ -481,15 +480,15 @@ final class ApiController extends Controller
$questionVote = QAQuestionVoteMapper::findVote((int) $request->getData('id'), $request->header->account); $questionVote = QAQuestionVoteMapper::findVote((int) $request->getData('id'), $request->header->account);
if ($questionVote === false || $questionVote instanceof NullQAQuestionVote || $questionVote === null) { if ($questionVote === false || $questionVote instanceof NullQAQuestionVote || $questionVote === null) {
$new = new QAQuestionVote(); $new = new QAQuestionVote();
$new->score = (int) $request->getData('type'); $new->score = (int) $request->getData('type');
$new->question = (int) $request->getData('id'); $new->question = (int) $request->getData('id');
$new->createdBy = new NullAccount($request->header->account); $new->createdBy = new NullAccount($request->header->account);
$this->createModel($request->header->account, $new, QAQuestionVoteMapper::class, 'qa_question_vote', $request->getOrigin()); $this->createModel($request->header->account, $new, QAQuestionVoteMapper::class, 'qa_question_vote', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Vote', 'Sucessfully voted.', $new); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Vote', 'Sucessfully voted.', $new);
} else { } else {
$new = clone $questionVote; $new = clone $questionVote;
$new->score = (int) $request->getData('type'); $new->score = (int) $request->getData('type');
$this->updateModel($request->header->account, $questionVote, $new, QAQuestionVoteMapper::class, 'qa_question_vote', $request->getOrigin()); $this->updateModel($request->header->account, $questionVote, $new, QAQuestionVoteMapper::class, 'qa_question_vote', $request->getOrigin());
@ -543,15 +542,15 @@ final class ApiController extends Controller
$answerVote = QAAnswerVoteMapper::findVote((int) $request->getData('id'), $request->header->account); $answerVote = QAAnswerVoteMapper::findVote((int) $request->getData('id'), $request->header->account);
if ($answerVote === false || $answerVote instanceof NullQAAnswerVote || $answerVote === null) { if ($answerVote === false || $answerVote instanceof NullQAAnswerVote || $answerVote === null) {
$new = new QAAnswerVote(); $new = new QAAnswerVote();
$new->score = (int) $request->getData('type'); $new->score = (int) $request->getData('type');
$new->answer = (int) $request->getData('id'); $new->answer = (int) $request->getData('id');
$new->createdBy = new NullAccount($request->header->account); $new->createdBy = new NullAccount($request->header->account);
$this->createModel($request->header->account, $new, QAAnswerVoteMapper::class, 'qa_answer_vote', $request->getOrigin()); $this->createModel($request->header->account, $new, QAAnswerVoteMapper::class, 'qa_answer_vote', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Vote', 'Sucessfully voted.', $new); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Vote', 'Sucessfully voted.', $new);
} else { } else {
$new = clone $answerVote; $new = clone $answerVote;
$new->score = (int) $request->getData('type'); $new->score = (int) $request->getData('type');
$this->updateModel($request->header->account, $answerVote, $new, QAAnswerVoteMapper::class, 'qa_answer_vote', $request->getOrigin()); $this->updateModel($request->header->account, $answerVote, $new, QAAnswerVoteMapper::class, 'qa_answer_vote', $request->getOrigin());

2
Models/QAAnswerMapper.php
View File

@ -54,7 +54,7 @@ final class QAAnswerMapper extends DataMapperAbstract
'createdBy' => [ 'createdBy' => [
'mapper' => ProfileMapper::class, 'mapper' => ProfileMapper::class,
'external' => 'qa_answer_created_by', 'external' => 'qa_answer_created_by',
'by' => 'account' 'by' => 'account',
], ],
'question' => [ 'question' => [
'mapper' => QAQuestionMapper::class, 'mapper' => QAQuestionMapper::class,

6
Models/QAAnswerVoteMapper.php
View File

@ -14,8 +14,8 @@ declare(strict_types=1);
namespace Modules\QA\Models; namespace Modules\QA\Models;
use phpOMS\DataStorage\Database\DataMapperAbstract;
use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountMapper;
use phpOMS\DataStorage\Database\DataMapperAbstract;
/** /**
* Mapper class. * Mapper class.
@ -35,8 +35,8 @@ final class QAAnswerVoteMapper extends DataMapperAbstract
*/ */
protected static array $columns = [ protected static array $columns = [
'qa_answer_vote_id' => ['name' => 'qa_answer_vote_id', 'type' => 'int', 'internal' => 'id'], 'qa_answer_vote_id' => ['name' => 'qa_answer_vote_id', 'type' => 'int', 'internal' => 'id'],
'qa_answer_vote_score' => ['name' => 'qa_answer_vote_score', 'type' => 'int', 'internal' => 'score'], 'qa_answer_vote_score' => ['name' => 'qa_answer_vote_score', 'type' => 'int', 'internal' => 'score'],
'qa_answer_vote_answer' => ['name' => 'qa_answer_vote_answer', 'type' => 'int', 'internal' => 'answer', 'readonly' => true], 'qa_answer_vote_answer' => ['name' => 'qa_answer_vote_answer', 'type' => 'int', 'internal' => 'answer', 'readonly' => true],
'qa_answer_vote_created_by' => ['name' => 'qa_answer_vote_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], 'qa_answer_vote_created_by' => ['name' => 'qa_answer_vote_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true],
'qa_answer_vote_created_at' => ['name' => 'qa_answer_vote_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true], 'qa_answer_vote_created_at' => ['name' => 'qa_answer_vote_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
]; ];

2
Models/QAQuestion.php
View File

@ -15,8 +15,8 @@ declare(strict_types=1);
namespace Modules\QA\Models; namespace Modules\QA\Models;
use Modules\Profile\Models\NullProfile; use Modules\Profile\Models\NullProfile;
use Modules\Tag\Models\Tag;
use Modules\Profile\Models\Profile; use Modules\Profile\Models\Profile;
use Modules\Tag\Models\Tag;
/** /**
* Task class. * Task class.

4
Models/QAQuestionMapper.php
View File

@ -94,9 +94,9 @@ final class QAQuestionMapper extends DataMapperAbstract
*/ */
protected static array $belongsTo = [ protected static array $belongsTo = [
'createdBy' => [ 'createdBy' => [
'mapper' => ProfileMapper::class, 'mapper' => ProfileMapper::class,
'external' => 'qa_question_created_by', 'external' => 'qa_question_created_by',
'by' => 'account' 'by' => 'account',
], ],
]; ];

6
Models/QAQuestionVoteMapper.php
View File

@ -14,8 +14,8 @@ declare(strict_types=1);
namespace Modules\QA\Models; namespace Modules\QA\Models;
use phpOMS\DataStorage\Database\DataMapperAbstract;
use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountMapper;
use phpOMS\DataStorage\Database\DataMapperAbstract;
/** /**
* Mapper class. * Mapper class.
@ -35,8 +35,8 @@ final class QAQuestionVoteMapper extends DataMapperAbstract
*/ */
protected static array $columns = [ protected static array $columns = [
'qa_question_vote_id' => ['name' => 'qa_question_vote_id', 'type' => 'int', 'internal' => 'id'], 'qa_question_vote_id' => ['name' => 'qa_question_vote_id', 'type' => 'int', 'internal' => 'id'],
'qa_question_vote_score' => ['name' => 'qa_question_vote_score', 'type' => 'int', 'internal' => 'score'], 'qa_question_vote_score' => ['name' => 'qa_question_vote_score', 'type' => 'int', 'internal' => 'score'],
'qa_question_vote_question' => ['name' => 'qa_question_vote_question', 'type' => 'int', 'internal' => 'question', 'readonly' => true], 'qa_question_vote_question' => ['name' => 'qa_question_vote_question', 'type' => 'int', 'internal' => 'question', 'readonly' => true],
'qa_question_vote_created_by' => ['name' => 'qa_question_vote_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], 'qa_question_vote_created_by' => ['name' => 'qa_question_vote_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true],
'qa_question_vote_created_at' => ['name' => 'qa_question_vote_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true], 'qa_question_vote_created_at' => ['name' => 'qa_question_vote_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
]; ];

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

@ -12,8 +12,8 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
use phpOMS\Uri\UriFactory;
use Modules\Media\Models\NullMedia; use Modules\Media\Models\NullMedia;
use phpOMS\Uri\UriFactory;
$questions = $this->getData('questions'); $questions = $this->getData('questions');
echo $this->getData('nav')->render(); ?> echo $this->getData('nav')->render(); ?>

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

@ -12,8 +12,8 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
use phpOMS\Uri\UriFactory;
use Modules\Media\Models\NullMedia; use Modules\Media\Models\NullMedia;
use phpOMS\Uri\UriFactory;
/** \Modules\QA\Models\QAQuestion $question */ /** \Modules\QA\Models\QAQuestion $question */
$question = $this->getData('question'); $question = $this->getData('question');