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

Fix matching draggable when answer the question again see #2095

Browse Source
pull/2487/head
jmontoyaa 8 years ago
parent 1263050044
commit c0fd8fca98
1 changed files with 15 additions and 31 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. 44
      main/inc/lib/exercise.lib.php

44
main/inc/lib/exercise.lib.php
Unescape View File

@ -37,7 +37,7 @@ class ExerciseLib
$current_item = '', $current_item = '',
$show_title = true, $show_title = true,
$freeze = false, $freeze = false,
$user_choice = array(), $user_choice = [],
$show_comment = false, $show_comment = false,
$show_answers = false $show_answers = false
) { ) {
@ -109,7 +109,7 @@ class ExerciseLib
// because the match between the suggestions and the answers cannot be // because the match between the suggestions and the answers cannot be
// done easily (suggestions and answers are in the same table), so we // done easily (suggestions and answers are in the same table), so we
// have to go through answers first (elems with "correct" value to 0). // have to go through answers first (elems with "correct" value to 0).
$select_items = array(); $select_items = [];
//This will contain the number of answers on the left side. We call them //This will contain the number of answers on the left side. We call them
// suggestions here, for the sake of comprehensions, while the ones // suggestions here, for the sake of comprehensions, while the ones
// on the right side are called answers // on the right side are called answers
@ -188,7 +188,7 @@ class ExerciseLib
// Add nanog // Add nanog
if (api_get_setting('enable_record_audio') == 'true') { if (api_get_setting('enable_record_audio') == 'true') {
//@todo pass this as a parameter //@todo pass this as a parameter
global $exercise_stat_info, $exerciseId, $exe_id; global $exercise_stat_info, $exerciseId;
if (!empty($exercise_stat_info)) { if (!empty($exercise_stat_info)) {
$objQuestionTmp->initFile( $objQuestionTmp->initFile(
@ -212,7 +212,6 @@ class ExerciseLib
$form = new FormValidator('free_choice_'.$questionId); $form = new FormValidator('free_choice_'.$questionId);
$config = ['ToolbarSet' => 'TestFreeAnswer']; $config = ['ToolbarSet' => 'TestFreeAnswer'];
//$form->addButtonAdvancedSettings('hide_description_'.$questionId, get_lang('AddDescription'));
$form->addHtml('<div id="'.'hide_description_'.$questionId.'_options" style="display: none;">'); $form->addHtml('<div id="'.'hide_description_'.$questionId.'_options" style="display: none;">');
$form->addHtmlEditor( $form->addHtmlEditor(
"choice[".$questionId."]", "choice[".$questionId."]",
@ -540,8 +539,7 @@ class ExerciseLib
break; break;
case MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE: case MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE:
$s .= '<input type="hidden" name="choice2['.$questionId.']" value="0" />'; $s .= '<input type="hidden" name="choice2['.$questionId.']" value="0" />';
$my_choice = [];
$my_choice = array();
if (!empty($user_choice_array)) { if (!empty($user_choice_array)) {
foreach ($user_choice_array as $item) { foreach ($user_choice_array as $item) {
$item = explode(':', $item); $item = explode(':', $item);
@ -874,15 +872,10 @@ class ExerciseLib
break; break;
case DRAGGABLE: case DRAGGABLE:
if ($answerCorrect) { if ($answerCorrect) {
$parsed_answer = $answer;
/*$lines_count = '';
$data = $objAnswerTmp->getAnswerByAutoId($numAnswer);
$data = $objAnswerTmp->getAnswerByAutoId($data['correct']);
$lines_count = $data['answer'];*/
$windowId = $questionId.'_'.$lines_count; $windowId = $questionId.'_'.$lines_count;
$s .= '<li class="touch-items" id="'.$windowId.'">'; $s .= '<li class="touch-items" id="'.$windowId.'">';
$s .= Display::div( $s .= Display::div(
$parsed_answer, $answer,
[ [
'id' => "window_$windowId", 'id' => "window_$windowId",
'class' => "window{$questionId}_question_draggable exercise-draggable-answer-option" 'class' => "window{$questionId}_question_draggable exercise-draggable-answer-option"
@ -963,7 +956,6 @@ class ExerciseLib
} }
$matching_correct_answer++; $matching_correct_answer++;
$s .= '</li>'; $s .= '</li>';
} }
break; break;
@ -971,16 +963,14 @@ class ExerciseLib
if ($answerId == 1) { if ($answerId == 1) {
echo $objAnswerTmp->getJs(); echo $objAnswerTmp->getJs();
} }
if ($answerCorrect != 0) { if ($answerCorrect != 0) {
$parsed_answer = $answer;
$windowId = "{$questionId}_{$lines_count}"; $windowId = "{$questionId}_{$lines_count}";
$s .= <<<HTML $s .= <<<HTML
<tr> <tr>
<td width="45%"> <td width="45%">
<div id="window_{$windowId}" class="window window_left_question window{$questionId}_question"> <div id="window_{$windowId}" class="window window_left_question window{$questionId}_question">
<strong>$lines_count.</strong> $parsed_answer <strong>$lines_count.</strong>
$answer
</div> </div>
</td> </td>
<td width="10%"> <td width="10%">
@ -992,17 +982,18 @@ HTML;
if ($user_choice) { if ($user_choice) {
foreach ($user_choice as $chosen) { foreach ($user_choice as $chosen) {
if ($answerCorrect != $chosen['answer']) { if ($numAnswer == $chosen['position']) {
continue;
}
$selectedValue = $chosen['answer']; $selectedValue = $chosen['answer'];
break;
}
} }
} }
foreach ($select_items as $key => $select_item) { foreach ($select_items as $key => $selectItem) {
$draggableSelectOptions[$select_item['id']] = $select_item['letter']; $draggableSelectOptions[$selectItem['id']] = $selectItem['letter'];
} }
foreach ($draggableSelectOptions as $value => $text) { foreach ($draggableSelectOptions as $value => $text) {
if ($value == $selectedValue) { if ($value == $selectedValue) {
break; break;
@ -1046,11 +1037,7 @@ HTML;
} }
} }
$s .= <<<HTML $s .= '</td><td width="45%">';
</td>
<td width="45%">
HTML;
if (isset($select_items[$lines_count])) { if (isset($select_items[$lines_count])) {
$s .= <<<HTML $s .= <<<HTML
<div id="window_{$windowId}_answer" class="window window_right_question"> <div id="window_{$windowId}_answer" class="window window_right_question">
@ -1105,7 +1092,6 @@ HTML;
$s .= "</div>"; //clearfix $s .= "</div>"; //clearfix
$counterAnswer = 1; $counterAnswer = 1;
$s .= $isVertical ? '' : '<div class="row">'; $s .= $isVertical ? '' : '<div class="row">';
for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++) { for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++) {
$answerCorrect = $objAnswerTmp->isCorrect($answerId); $answerCorrect = $objAnswerTmp->isCorrect($answerId);
$windowId = $questionId.'_'.$counterAnswer; $windowId = $questionId.'_'.$counterAnswer;
@ -1117,7 +1103,6 @@ HTML;
</div> </div>
'; ';
$s .= $isVertical ? '</div>' : ''; $s .= $isVertical ? '</div>' : '';
$counterAnswer++; $counterAnswer++;
} }
} }
@ -1141,7 +1126,6 @@ HTML;
if ($origin == 'export') { if ($origin == 'export') {
return $s; return $s;
} }
echo $s; echo $s;
} elseif ($answerType == HOT_SPOT || $answerType == HOT_SPOT_DELINEATION) { } elseif ($answerType == HOT_SPOT || $answerType == HOT_SPOT_DELINEATION) {
global $exerciseId, $exe_id; global $exerciseId, $exe_id;

Write Preview
Loading…
Cancel
Save