chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor fix for fill in blanks see #5257

Browse Source
skala
Julio Montoya 14 years ago
parent 001d37e7bd
commit bfd2c5137e
2 changed files with 57 additions and 36 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 33
      main/exercice/exercise.class.php
  2. 60
      main/exercice/stats.php

33
main/exercice/exercise.class.php
Unescape View File

@ -3611,24 +3611,29 @@ class Exercise {
}
}
}
public function fill_in_blank_answer_to_array($answer) {
api_preg_match_all('/\[[^]]+\]/', $answer, $teacher_answer_list);
$teacher_answer_list = $teacher_answer_list[0];
return $teacher_answer_list;
}
public function fill_in_blank_answer_to_string($answer) {
api_preg_match_all('/\[[^]]+\]/', $answer, $teacher_answer_list);
$teacher_answer_list = $this->fill_in_blank_answer_to_array($answer);
$result = '';
if (!empty($teacher_answer_list)) {
$teacher_answer_list = $teacher_answer_list[0];
if (!empty($teacher_answer_list)) {
$i = 0;
foreach($teacher_answer_list as $teacher_item) {
$value = null;
//Cleaning student answer list
$value = strip_tags($teacher_item);
$value = api_substr($value,1, api_strlen($value)-2);
$value = explode('/', $value);
if (!empty($value[0])) {
$value = trim($value[0]);
$value = str_replace(' ', '', $value);
$result .= $value;
}
foreach ($teacher_answer_list as $teacher_item) {
$value = null;
//Cleaning student answer list
$value = strip_tags($teacher_item);
$value = api_substr($value,1, api_strlen($value)-2);
$value = explode('/', $value);
if (!empty($value[0])) {
$value = trim($value[0]);
$value = str_replace(' ', '', $value);
$result .= $value;
}
}
}
return $result;

60
main/exercice/stats.php
Unescape View File

@ -103,29 +103,45 @@ if (!empty($question_list)) {
$answer = new Answer($question_id);
$answer_count = $answer->selectNbrAnswers();
for ($answer_id = 1; $answer_id <= $answer_count; $answer_id++) {
$answer_info = $answer->selectAnswer($answer_id);
if ($answer_id == 1) {
$data[$id]['name'] = cut($question_obj->question, 100);
} else {
$data[$id]['name'] = '-';
}
if ($question_obj->type == FILL_IN_BLANKS) {
$answer_info = substr($answer_info, 0, strpos($answer_info, '::'));
}
$data[$id]['answer'] = $answer_info;
$is_correct = $answer->isCorrect($answer_id);
$data[$id]['correct'] = $is_correct == 1 ? get_lang('Yes') : get_lang('No');
$real_answer_id = $answer->selectAutoId($answer_id);
$count = get_number_students_answer_count($real_answer_id, $question_id, $exercise_id, api_get_course_id(), api_get_session_id());
//$data[$id]['attempts'] = $count.'/'.$count_students;
$percentange = $count/$count_students*100;
$data[$id]['attempts'] = Display::bar_progress($percentange, false, $count .' / '.$count_students);
for ($answer_id = 1; $answer_id <= $answer_count; $answer_id++) {
$answer_info = $answer->selectAnswer($answer_id);
$is_correct = $answer->isCorrect($answer_id);
$correct_answer = $is_correct == 1 ? get_lang('Yes') : get_lang('No');
//$data[$id]['name'] .=$answer_count;
//Overwriting values depending of the question
switch($question_obj->type) {
case FILL_IN_BLANKS :
$answer_info = substr($answer_info, 0, strpos($answer_info, '::'));
$correct_answer = $is_correct;
$answers = $objExercise->fill_in_blank_answer_to_array($answer_info);
$counter = 0;
foreach ($answers as $answer_item) {
if ($counter == 0) {
$data[$id]['name'] = cut($question_obj->question, 100);
} else {
$data[$id]['name'] = '-';
}
$data[$id]['answer'] = $answer_item;
$data[$id]['correct'] = get_lang('Yes');
$data[$id]['attempts'] = '-';
$id++;
$counter++;
}
break;
default:
if ($answer_id == 1) {
$data[$id]['name'] = cut($question_obj->question, 100);
} else {
$data[$id]['name'] = '-';
}
$data[$id]['answer'] = $answer_info;
$data[$id]['correct'] = $correct_answer;
$real_answer_id = $answer->selectAutoId($answer_id);
$count = get_number_students_answer_count($real_answer_id, $question_id, $exercise_id, api_get_course_id(), api_get_session_id());
$percentange = $count/$count_students*100;
$data[$id]['attempts'] = Display::bar_progress($percentange, false, $count .' / '.$count_students);
}
$id++;
}

Write Preview
Loading…
Cancel
Save