QuestionOptionsEvaluation: Fix evaluation formulas - refs BT#15265

pull/2864/head
Angel Fernando Quiroz Campos 7 years ago
parent 39be652524
commit 29bf4c5bb1
  1. 25
      main/exercise/exercise_report.php
  2. 98
      main/exercise/recalculate.php
  3. 11
      main/inc/lib/exercise.lib.php
  4. 170
      plugin/questionoptionsevaluation/QuestionOptionsEvaluationPlugin.php
  5. 129
      plugin/questionoptionsevaluation/evaluation.php
  6. 3
      plugin/questionoptionsevaluation/lang/english.php
  7. 5
      plugin/questionoptionsevaluation/lang/spanish.php

@ -233,13 +233,28 @@ if (isset($_REQUEST['comments']) &&
Database::insert($TBL_TRACK_ATTEMPT_RECORDING, $params);
}
$qry = 'SELECT DISTINCT question_id, marks
$useEvaluationPlugin = false;
$pluginEvaluation = QuestionOptionsEvaluationPlugin::create();
if ('true' === $pluginEvaluation->get(QuestionOptionsEvaluationPlugin::SETTING_ENABLE)) {
$formula = $pluginEvaluation->getFormulaForExercise($exerciseId);
if (!empty($formula)) {
$useEvaluationPlugin = true;
}
}
if (!$useEvaluationPlugin) {
$qry = 'SELECT DISTINCT question_id, marks
FROM '.$TBL_TRACK_ATTEMPT.' WHERE exe_id = '.$id.'
GROUP BY question_id';
$res = Database::query($qry);
$tot = 0;
while ($row = Database :: fetch_array($res, 'ASSOC')) {
$tot += $row['marks'];
$res = Database::query($qry);
$tot = 0;
while ($row = Database :: fetch_array($res, 'ASSOC')) {
$tot += $row['marks'];
}
} else {
$tot = $pluginEvaluation->getResultWithFormula($id, $formula);
}
$sql = "UPDATE $TBL_TRACK_EXERCISES

@ -49,50 +49,66 @@ $exercise->read($exerciseId);
$totalScore = 0;
$totalWeight = 0;
foreach ($questionList as $questionId) {
$question = Question::read($questionId, $courseId);
$totalWeight += $question->selectWeighting();
// We're inside *one* question. Go through each possible answer for this question
if ($question->type === MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY) {
$result = $exercise->manage_answer(
$exeId,
$questionId,
[],
'exercise_result',
[],
false,
true,
false,
$exercise->selectPropagateNeg(),
[],
[],
true
);
} else {
$result = $exercise->manage_answer(
$exeId,
$questionId,
[],
'exercise_result',
[],
false,
true,
false,
$exercise->selectPropagateNeg(),
[],
[],
true
);
}
$useEvaluationPlugin = false;
$pluginEvaluation = QuestionOptionsEvaluationPlugin::create();
if ('true' === $pluginEvaluation->get(QuestionOptionsEvaluationPlugin::SETTING_ENABLE)) {
$formula = $pluginEvaluation->getFormulaForExercise($exerciseId);
// Adding the new score.
$totalScore += $result['score'];
if (!empty($formula)) {
$useEvaluationPlugin = true;
}
}
$remindList = $trackedExercise->getQuestionsToCheck();
if (!empty($remindList)) {
$remindList = explode(',', $remindList);
if (!$useEvaluationPlugin) {
foreach ($questionList as $questionId) {
$question = Question::read($questionId, $courseId);
$totalWeight += $question->selectWeighting();
// We're inside *one* question. Go through each possible answer for this question
if ($question->type === MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY) {
$result = $exercise->manage_answer(
$exeId,
$questionId,
[],
'exercise_result',
[],
false,
true,
false,
$exercise->selectPropagateNeg(),
[],
[],
true
);
} else {
$result = $exercise->manage_answer(
$exeId,
$questionId,
[],
'exercise_result',
[],
false,
true,
false,
$exercise->selectPropagateNeg(),
[],
[],
true
);
}
// Adding the new score.
$totalScore += $result['score'];
}
$remindList = $trackedExercise->getQuestionsToCheck();
if (!empty($remindList)) {
$remindList = explode(',', $remindList);
}
} else {
$totalScore = $pluginEvaluation->getResultWithFormula($exeId, $formula);
$totalWeight = $pluginEvaluation->getMaxScore();
}
$table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);

@ -4805,6 +4805,17 @@ EOT;
$learnpath_item_view_id = $exercise_stat_info['orig_lp_item_view_id'];
if (api_is_allowed_to_session_edit()) {
$plugin = QuestionOptionsEvaluationPlugin::create();
if ('true' === $plugin->get(QuestionOptionsEvaluationPlugin::SETTING_ENABLE)) {
$formula = $plugin->getFormulaForExercise($exercise_stat_info['exe_exo_id']);
if (!empty($formula)) {
$total_score = $plugin->getResultWithFormula($exercise_stat_info['exe_id'], $formula);
$total_weight = $plugin->getMaxScore();
}
}
Event::updateEventExercise(
$exercise_stat_info['exe_id'],
$objExercise->selectId(),

@ -1,12 +1,17 @@
<?php
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\TrackEAttempt;
/**
* Class QuestionOptionsEvaluationPlugin.
*/
class QuestionOptionsEvaluationPlugin extends Plugin
{
const EXTRAFIELD_FORMULA = 'question_valuation_formula';
const SETTING_ENABLE = 'enable';
const SETTING_MAX_SCORE = 'exercise_max_score';
const EXTRAFIELD_FORMULA = 'quiz_evaluation_formula';
/**
* QuestionValuationPlugin constructor.
@ -16,7 +21,14 @@ class QuestionOptionsEvaluationPlugin extends Plugin
$version = '1.0';
$author = 'Angel Fernando Quiroz Campos';
parent::__construct($version, $author, ['enable' => 'boolean']);
parent::__construct(
$version,
$author,
[
self::SETTING_ENABLE => 'boolean',
self::SETTING_MAX_SCORE => 'text'
]
);
}
/**
@ -79,7 +91,7 @@ class QuestionOptionsEvaluationPlugin extends Plugin
*/
private function createExtraField()
{
$extraField = new ExtraField('question');
$extraField = new ExtraField('quiz');
if (false === $extraField->get_handler_field_info_by_field_variable(self::EXTRAFIELD_FORMULA)) {
$extraField
@ -100,11 +112,161 @@ class QuestionOptionsEvaluationPlugin extends Plugin
*/
private function removeExtraField()
{
$extraField = new ExtraField('question');
$extraField = new ExtraField('quiz');
$value = $extraField->get_handler_field_info_by_field_variable(self::EXTRAFIELD_FORMULA);
if (false !== $value) {
$extraField->delete($value['id']);
}
}
/**
* @param Exercise $exercise
*/
public function recalculateQuestionScore(Exercise $exercise)
{
foreach ($exercise->questionList as $questionId) {
$question = Question::read($questionId);
if (!in_array($question->selectType(), [UNIQUE_ANSWER, MULTIPLE_ANSWER])) {
continue;
}
$questionAnswers = new Answer($questionId, 0, $exercise);
$counts = array_count_values($questionAnswers->correct);
$weighting = [];
foreach ($questionAnswers->correct as $i => $correct) {
$weighting[$i] = 1 == $correct ? 1 / $counts[1] : -1 / $counts[0];
}
$questionAnswers->new_nbrAnswers = $questionAnswers->nbrAnswers;
$questionAnswers->new_answer = $questionAnswers->answer;
$questionAnswers->new_comment = $questionAnswers->comment;
$questionAnswers->new_correct = $questionAnswers->correct;
$questionAnswers->new_weighting = $weighting;
$questionAnswers->new_position = $questionAnswers->position;
$questionAnswers->new_destination = $questionAnswers->destination;
$questionAnswers->new_hotspot_coordinates = $questionAnswers->hotspot_coordinates;
$questionAnswers->new_hotspot_type = $questionAnswers->hotspot_type;
$allowedWeights = array_filter(
$weighting,
function ($weight) {
return $weight > 0;
}
);
$questionAnswers->save();
$question->updateWeighting(array_sum($allowedWeights));
$question->save($exercise);
}
}
/**
* @param int $formula
* @param Exercise $exercise
*/
public function saveFormulaForExercise($formula, Exercise $exercise)
{
$extraFieldValue = new ExtraFieldValue('quiz');
$extraFieldValue->save(
[
'item_id' => $exercise->iId,
'variable' => self::EXTRAFIELD_FORMULA,
'value' => $formula,
]
);
}
/**
* @param int $exerciseId
*
* @return int
*/
public function getFormulaForExercise($exerciseId)
{
$extraFieldValue = new ExtraFieldValue('quiz');
$value = $extraFieldValue->get_values_by_handler_and_field_variable(
$exerciseId,
self::EXTRAFIELD_FORMULA
);
if (empty($value)) {
return 0;
}
return (int) $value['value'];
}
/**
* @return int
*/
public function getMaxScore()
{
$max = $this->get(self::SETTING_MAX_SCORE);
if (!empty($max)) {
return (int) $max;
}
return 10;
}
/**
* @param int $trackId
* @param int $formula
*
* @throws \Doctrine\ORM\ORMException
* @throws \Doctrine\ORM\OptimisticLockException
* @throws \Doctrine\ORM\TransactionRequiredException
*
* @return float|int
*/
public function getResultWithFormula($trackId, $formula)
{
$em = Database::getManager();
$eTrack = $em->find('ChamiloCoreBundle:TrackEExercises', $trackId);
$qTracks = $em
->createQuery(
'SELECT a FROM ChamiloCoreBundle:TrackEAttempt a
WHERE a.exeId = :id AND a.userId = :user AND a.cId = :course AND a.sessionId = :session'
)
->setParameters(
[
'id' => $eTrack->getExeId(),
'course' => $eTrack->getCId(),
'session' => $eTrack->getSessionId(),
'user' => $eTrack->getExeUserId(),
]
)
->getResult();
$counts = ['correct' => 0, 'incorrect' => 0];
/** @var TrackEAttempt $qTrack */
foreach ($qTracks as $qTrack) {
if ($qTrack->getMarks() > 0) {
$counts['correct']++;
} else {
$counts['incorrect']++;
}
}
switch ($formula) {
case 1:
$result = $counts['correct'] - $counts['incorrect'];
break;
case 2:
$result = $counts['correct'] - $counts['incorrect'] / 2;
break;
case 3:
$result = $counts['correct'] - $counts['incorrect'] / 3;
break;
}
return ($result / count($qTracks)) * 10;
}
}

@ -30,94 +30,47 @@ if ($plugin->get('enable') !== 'true') {
exit;
}
$form = new FormValidator('evaluation');
$form->addRadio(
'formula',
$plugin->get_lang('EvaluationFormula'),
[
$plugin->get_lang('NoFormula'),
$plugin->get_lang('Formula1'),
$plugin->get_lang('Formula2'),
$plugin->get_lang('Formula3'),
]
)->setColumnsSize([4, 7, 1]);
$form->addButtonSave(get_lang('Save'))->setColumnsSize([4, 7, 1]);
$form->addHidden('exercise', $exerciseId);
if ($form->validate()) {
$values = $form->exportValues();
$formRecalculate = new FormValidator('recalculate');
$formRecalculate->addHidden('exercise', $exerciseId);
$formRecalculate->addButtonUpdate($plugin->get_lang('RecalculateQuestionScores'));
if ($formRecalculate->validate()) {
$plugin->recalculateQuestionScore($exercise);
Display::addFlash(
Display::return_message($plugin->get_lang('QuestionsEvaluated'), 'success')
);
header(
'Location: '.api_get_path(WEB_CODE_PATH).'exercise/exercise.php?'.api_get_cidreq()."&exerciseId=$exerciseId"
);
exit;
}
$formEvaluation = new FormValidator('evaluation');
$formEvaluation
->addRadio(
'formula',
$plugin->get_lang('EvaluationFormula'),
[
$plugin->get_lang('NoFormula'),
$plugin->get_lang('Formula1'),
$plugin->get_lang('Formula2'),
$plugin->get_lang('Formula3'),
]
)
->setColumnsSize([4, 7, 1]);
$formEvaluation->addButtonSave(get_lang('Save'))->setColumnsSize([4, 7, 1]);
$formEvaluation->addHidden('exercise', $exerciseId);
if ($formEvaluation->validate()) {
$values = $formEvaluation->exportValues();
$formula = isset($values['formula']) ? (int) $values['formula'] : 0;
$nbrQuestions = count($exercise->get_validated_question_list());
foreach ($exercise->questionList as $questionId) {
$question = Question::read($questionId);
if (!in_array($question->selectType(), [UNIQUE_ANSWER, MULTIPLE_ANSWER])) {
continue;
}
$questionAnswers = new Answer($questionId, 0, $exercise);
$counts = array_count_values($questionAnswers->correct);
$weighting = [];
foreach ($questionAnswers->correct as $i => $correct) {
// Success
if (1 == $correct) {
$weighting[$i] = 10 / $counts[1] / $nbrQuestions;
continue;
}
// failures
switch ($formula) {
case 0:
default:
$weighting[$i] = isset($questionAnswers->weighting[$i]) ? $questionAnswers->weighting[$i] : 0;
break;
case 1:
$weighting[$i] = (-10 / $counts[0]) / $nbrQuestions;
break;
case 2:
$weighting[$i] = (-10 / $counts[0]) / 2 / $nbrQuestions;
break;
case 3:
$weighting[$i] = (-10 / $counts[0]) / 3 / $nbrQuestions;
break;
}
}
$weighting = array_map(
function ($weight) {
return float_format($weight);
},
$weighting
);
$questionAnswers->new_nbrAnswers = $questionAnswers->nbrAnswers;
$questionAnswers->new_answer = $questionAnswers->answer;
$questionAnswers->new_comment = $questionAnswers->comment;
$questionAnswers->new_correct = $questionAnswers->correct;
$questionAnswers->new_weighting = $weighting;
$questionAnswers->new_position = $questionAnswers->position;
$questionAnswers->new_destination = $questionAnswers->destination;
$questionAnswers->new_hotspot_coordinates = $questionAnswers->hotspot_coordinates;
$questionAnswers->new_hotspot_type = $questionAnswers->hotspot_type;
$allowedWeights = array_filter(
$weighting,
function ($weight) {
return $weight > 0;
}
);
$questionAnswers->save();
$question->updateWeighting(array_sum($allowedWeights));
$question->save($exercise);
}
$plugin->saveFormulaForExercise($formula, $exercise);
Display::addFlash(
Display::return_message($plugin->get_lang('QuestionsEvaluated'))
Display::return_message($plugin->get_lang('FormulaSaved'), 'success')
);
header(
@ -126,9 +79,13 @@ if ($form->validate()) {
exit;
}
$formEvaluation->setDefaults(['formula' => $plugin->getFormulaForExercise($exercise->iId)]);
echo Display::return_message(
$plugin->get_lang('QuizQuestionsScoreRulesTitleConfirm'),
'warning'
);
$form->display();
echo '<hr>';
$formRecalculate->display();
echo '<hr>';
$formEvaluation->display();

@ -5,6 +5,8 @@ $strings['plugin_title'] = 'Question options evaluation';
$strings['plugin_comment'] = 'Allow recalulate the options score in questions';
$strings['enable'] = 'Enable';
$strings['exercise_max_score'] = 'Max score in exercises';
$strings['exercise_max_score_help'] = 'Default is 10.';
$strings['QuizQuestionsScoreRulesTitleConfirm'] = 'Changing the evaluation formula generates changes for each question in the exercise and prevents undoing this change below. Are you sure you want to proceed?';
$strings['EvaluationFormula'] = 'Evaluation formula';
@ -13,3 +15,4 @@ $strings['Formula1'] = 'Successes - Failures';
$strings['Formula2'] = 'Successes - Failures / 2';
$strings['Formula3'] = 'Successes - Failures / 3';
$strings['QuestionsEvaluated'] = 'Questions evaluated';
$strings['RecalculateQuestionScores'] = 'Recalculate question scores';

@ -5,6 +5,8 @@ $strings['plugin_title'] = 'Evaluación para opciones de pregunta';
$strings['plugin_comment'] = 'Permite recalcular los puntajes de opciones en preguntas';
$strings['enable'] = 'Habilitar';
$strings['exercise_max_score'] = 'Puntuación máxima por ejercicio';
$strings['exercise_max_score_help'] = 'Por defecto es 10.';
$strings['QuizQuestionsScoreRulesTitleConfirm'] = 'Cambiar la fórmula de evaluación genera cambios para cada pregunta del ejercicio e impide deshacer este cambio a continuación. ¿Está seguro que desea proceder?';
$strings['EvaluationFormula'] = 'Fórmula de evaluación';
@ -12,4 +14,5 @@ $strings['NoFormula'] = 'Sin formula';
$strings['Formula1'] = 'Aciertos - Fallos';
$strings['Formula2'] = 'Aciertos - Fallos / 2';
$strings['Formula3'] = 'Aciertos - Fallos / 3';
$strings['QuestionsEvaluated'] = 'Preguntas evaluados';
$strings['QuestionsEvaluated'] = 'Preguntas evaluadas';
$strings['RecalculateQuestionScores'] = 'Recalcular puntuaciones de preguntas';

Loading…
Cancel
Save