apuc/guild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix answerFlagLabel method in AnswerHelper, fix setPercentCorrectAnswers method in ScoreCalculatorService

Browse Source
This commit is contained in:
iironside
2022-03-16 12:55:44 +03:00
parent 97e79f6c94
commit 86853f2a59
8 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/models/UserQuestionnaire.php
View File

@ -150,8 +150,8 @@ class UserQuestionnaire extends ActiveRecord
*/
public function numCorrectAnswersWithoutOpenQuestions()
{
return $this->hasMany(Answer::className(), ['question_id' => 'question_id'])
->viaTable('user_response', ['user_questionnaire_uuid' => 'uuid'])
return $this->hasMany(Answer::className(), ['question_id' => 'id'])
->viaTable('question', ['questionnaire_id' => 'questionnaire_id'])
->where(['answer_flag' => '1'])
->andWhere(['status' => '1'])
->count();
@ -162,9 +162,10 @@ class UserQuestionnaire extends ActiveRecord
*/
public function numOpenQuestionsAnswers()
{
return $this->hasMany(Question::className(), ['id' => 'question_id'])
->viaTable('user_response', ['user_questionnaire_uuid' => 'uuid'])
return $this->hasMany(Question::className(), ['questionnaire_id' => 'id'])
->viaTable('questionnaire', ['id' => 'questionnaire_id'])
->where(['question_type_id' => '1'])
->andWhere(['status' => '1'])
->count();
}