add filters, update api, update api docs
This commit is contained in:
@@ -45,21 +45,15 @@ class AnswerHelper
|
||||
$class = 'label label-warning';
|
||||
$content = 'Не проверен';
|
||||
|
||||
if ($answer_flag > 0)
|
||||
{
|
||||
if ($answer_flag > 0) {
|
||||
$class = 'label label-success';
|
||||
$answer_flag < 1 ? $content = $answer_flag *100 . '%' : $content = 'Верен';
|
||||
}
|
||||
else if ($answer_flag === 0.0)
|
||||
{
|
||||
else if ($answer_flag === 0.0) {
|
||||
$class = 'label label-danger';
|
||||
$content = 'Не верен';
|
||||
}
|
||||
|
||||
return Html::tag('span', $content,
|
||||
[
|
||||
'class' => $class,
|
||||
]
|
||||
);
|
||||
return Html::tag('span', $content, ['class' => $class,]);
|
||||
}
|
||||
}
|
@@ -13,21 +13,17 @@ class ScoreCalculatorHelper
|
||||
{
|
||||
$responses = $user_questionnaire->getUserResponses()->all();
|
||||
|
||||
foreach ($responses as $response)
|
||||
{
|
||||
foreach ($responses as $response) {
|
||||
self::rateOneResponse($response);
|
||||
}
|
||||
}
|
||||
|
||||
public static function rateOneResponse(UserResponse $response)
|
||||
{
|
||||
if ($response->answer_flag === null && $response->getQuestionTypeValue() != 1) // not open question
|
||||
{
|
||||
if ($response->getQuestionTypeValue() != 1) { // not open question
|
||||
$correct_answers = $response->getCorrectAnswers();
|
||||
foreach ($correct_answers as $correct_answer)
|
||||
{
|
||||
if ($response->response_body === $correct_answer['answer_body'])
|
||||
{
|
||||
foreach ($correct_answers as $correct_answer) {
|
||||
if ($response->response_body === $correct_answer['answer_body']) {
|
||||
$response->answer_flag = 1;
|
||||
$response->save();
|
||||
return;
|
||||
@@ -41,8 +37,7 @@ class ScoreCalculatorHelper
|
||||
public static function checkAnswerFlagsForNull(UserQuestionnaire $userQuestionnaire): bool
|
||||
{
|
||||
$responses = $userQuestionnaire->getUserResponses()->AsArray()->all();
|
||||
foreach ($responses as $response)
|
||||
{
|
||||
foreach ($responses as $response) {
|
||||
if (ArrayHelper::isIn(null, $response))
|
||||
return false;
|
||||
}
|
||||
@@ -56,13 +51,10 @@ class ScoreCalculatorHelper
|
||||
|
||||
$score = null;
|
||||
$user_correct_answers_num = null;
|
||||
foreach ($responses_questions as $response_question)
|
||||
{
|
||||
if(self::isCorrect($response_question['answer_flag']))
|
||||
{
|
||||
foreach ($responses_questions as $response_question) {
|
||||
if(self::isCorrect($response_question['answer_flag'])) {
|
||||
$user_correct_answers_num += 1;
|
||||
switch ($response_question['question']['question_type_id'])
|
||||
{
|
||||
switch ($response_question['question']['question_type_id']) {
|
||||
case '1': // open question
|
||||
$score += $response_question['answer_flag'] * $response_question['question']['score'];
|
||||
break;
|
||||
|
@@ -10,8 +10,7 @@ class TimeHelper
|
||||
{
|
||||
public static function limitTime($time_limit)
|
||||
{
|
||||
if ($time_limit === null)
|
||||
{
|
||||
if ($time_limit === null) {
|
||||
return 'Не ограничено';
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user