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 fill in blanks js errors see BT#11317

Browse Source
pull/2487/head
jmontoyaa 8 years ago
parent a6c42c55b5
commit c44799f24e
1 changed files with 164 additions and 105 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. 269
      main/exercise/fill_blanks.class.php

269
main/exercise/fill_blanks.class.php
Unescape View File

@ -33,161 +33,220 @@ class FillBlanks extends Question
*/ */
public function createAnswersForm($form) public function createAnswersForm($form)
{ {
$fillBlanksAllowedSeparator = self::getAllowedSeparator(); //$fillBlanksAllowedSeparator = self::getAllowedSeparator();
$defaults = array(); $defaults = array();
if (!empty($this->id)) { if (!empty($this->id)) {
$objectAnswer = new Answer($this->id); $objectAnswer = new Answer($this->id);
$answer = $objectAnswer->selectAnswer(1); $answer = $objectAnswer->selectAnswer(1);
$listAnswersInfo = FillBlanks::getAnswerInfo($answer); $listAnswersInfo = FillBlanks::getAnswerInfo($answer);
if ($listAnswersInfo['switchable']) {
if ($listAnswersInfo["switchable"]) {
$defaults['multiple_answer'] = 1; $defaults['multiple_answer'] = 1;
} else { } else {
$defaults['multiple_answer'] = 0; $defaults['multiple_answer'] = 0;
} }
//take the complete string except after the last '::' //take the complete string except after the last '::'
$defaults['answer'] = $listAnswersInfo["text"]; $defaults['answer'] = $listAnswersInfo['text'];
$defaults['select_separator'] = $listAnswersInfo["blankseparatornumber"]; $defaults['select_separator'] = $listAnswersInfo['blankseparatornumber'];
$blanksepartornumber = $listAnswersInfo["blankseparatornumber"]; $blankSeparatorNumber = $listAnswersInfo['blankseparatornumber'];
} else { } else {
$defaults['answer'] = get_lang('DefaultTextInBlanks'); $defaults['answer'] = get_lang('DefaultTextInBlanks');
$defaults['select_separator'] = 0; $defaults['select_separator'] = 0;
$blanksepartornumber = 0; $blankSeparatorNumber = 0;
} }
$blankSeparatorStart = self::getStartSeparator($blanksepartornumber); $blankSeparatorStart = self::getStartSeparator($blankSeparatorNumber);
$blankSeparatorEnd = self::getEndSeparator($blanksepartornumber); $blankSeparatorEnd = self::getEndSeparator($blankSeparatorNumber);
$setValues = null; $setWeightAndSize = '';
if (isset($listAnswersInfo) && count($listAnswersInfo['tabweighting']) > 0) {
if (isset($a_weightings) && count($a_weightings) > 0) { foreach ($listAnswersInfo['tabweighting'] as $i => $weighting) {
foreach ($a_weightings as $i => $weighting) { $setWeightAndSize .= 'document.getElementById("weighting['.$i.']").value = "'.$weighting.'";';
$setValues .= 'document.getElementById("weighting['.$i.']").value = "'.$weighting.'";'; }
foreach ($listAnswersInfo['tabinputsize'] as $i => $sizeOfInput) {
//var_dump($listAnswersInfo['tabwords']);
$setWeightAndSize .= 'document.getElementById("sizeofinput['.$i.']").value = "'.$sizeOfInput.'";';
$setWeightAndSize .= 'document.getElementById("samplesize['.$i.']").style.width = "'.$sizeOfInput.'px";';
} }
} }
// javascript
echo '<script>
var blankSeparatortStart = "'.$blankSeparatorStart.'";
var blankSeparatortEnd = "'.$blankSeparatorEnd.'";
var blankSeparatortStartRegexp = getBlankSeparatorRegexp(blankSeparatortStart);
var blankSeparatortEndRegexp = getBlankSeparatorRegexp(blankSeparatortEnd);
echo '<script>
var firstTime = true;
var originalOrder = new Array();
var blankSeparatorStart = "'.$blankSeparatorStart.'";
var blankSeparatorEnd = "'.$blankSeparatorEnd.'";
var blankSeparatorStartRegexp = getBlankSeparatorRegexp(blankSeparatorStart);
var blankSeparatorEndRegexp = getBlankSeparatorRegexp(blankSeparatorEnd);
var blanksRegexp = "/"+blankSeparatorStartRegexp+"[^"+blankSeparatorStartRegexp+"]*"+blankSeparatorEndRegexp+"/g";
CKEDITOR.on("instanceCreated", function(e) { CKEDITOR.on("instanceCreated", function(e) {
if (e.editor.name === "answer") { if (e.editor.name === "answer") {
e.editor.on("change", updateBlanks); //e.editor.on("change", updateBlanks);
e.editor.on("change", function(){
updateBlanks();
});
} }
}); });
var firstTime = true;
function updateBlanks() function updateBlanks()
{ {
var answer;
if (firstTime) { if (firstTime) {
var field = document.getElementById("answer"); var field = document.getElementById("answer");
var answer = field.value; answer = field.value;
} else { } else {
var answer = CKEDITOR.instances["answer"].getData(); answer = CKEDITOR.instances["answer"].getData();
} }
// disable the save button, if not blanks have been created // disable the save button, if not blanks have been created
$("button").attr("disabled", "disabled"); $("button").attr("disabled", "disabled");
$("#defineoneblank").show(); $("#defineoneblank").show();
var blanks = answer.match(eval(blanksRegexp));
var blanksRegexp = "/"+blankSeparatortStartRegexp+"[^"+blankSeparatortStartRegexp+"]*"+blankSeparatortEndRegexp+"/g"; var fields = "<div class=\"form-group \">";
var blanks = answer.match(eval(blanksRegexp));
var fields = "<div class=\"form-group \">";
fields += "<label class=\"col-sm-2 control-label\">'.get_lang('Weighting').'</label>"; fields += "<label class=\"col-sm-2 control-label\">'.get_lang('Weighting').'</label>";
fields += "<div class=\"col-sm-8\">"; fields += "<div class=\"col-sm-8\">";
fields += "<table>"; fields += "<table>";
fields += "<tr><th style=\"padding:0 20px\">'.get_lang("WordTofind").'</th><th style=\"padding:0 20px\">'.get_lang("QuestionWeighting").'</th><th style=\"padding:0 20px\">'.get_lang("BlankInputSize").'</th></tr>"; fields += "<tr><th style=\"padding:0 20px\">'.get_lang("WordTofind").'</th><th style=\"padding:0 20px\">'.get_lang("QuestionWeighting").'</th><th style=\"padding:0 20px\">'.get_lang("BlankInputSize").'</th></tr>";
if (blanks != null) { if (blanks != null) {
for (var i=0 ; i < blanks.length ; i++){ for (var i=0; i < blanks.length; i++) {
// remove forbidden characters that causes bugs // remove forbidden characters that causes bugs
blanks[i] = removeForbiddenChars(blanks[i]); blanks[i] = removeForbiddenChars(blanks[i]);
// trim blanks between brackets // trim blanks between brackets
blanks[i] = trimBlanksBetweenSeparator(blanks[i], blankSeparatortStart, blankSeparatortEnd); blanks[i] = trimBlanksBetweenSeparator(blanks[i], blankSeparatorStart, blankSeparatorEnd);
// if the word is empty [] // if the word is empty []
if (blanks[i] == blankSeparatortStartRegexp+blankSeparatortEndRegexp) { if (blanks[i] == blankSeparatorStartRegexp+blankSeparatorEndRegexp) {
break; break;
} }
// get input size // get input size
var lainputsize = 200; var inputSize = 200;
var lainputsizetrue = 200; var textValue = blanks[i].substr(1, blanks[i].length - 2);
if ($("#samplesize\\\["+i+"\\\]").width()) { var btoaValue = textValue.hashCode();
// this is a weird patch to avoid to reduce the size of input blank when you are writing in the ckeditor.
lainputsize = $("#samplesize\\\["+i+"\\\]").width(); if (firstTime == false) {
lainputsizetrue = $("#samplesize\\\["+i+"\\\]").width() + 15; var element = document.getElementById("samplesize["+i+"]");
} if (element) {
inputSize = document.getElementById("sizeofinput["+i+"]").value;
}
}
if (document.getElementById("weighting["+i+"]")) { if (document.getElementById("weighting["+i+"]")) {
var value = document.getElementById("weighting["+i+"]").value; var value = document.getElementById("weighting["+i+"]").value;
} else { } else {
var value = "10"; var value = "10";
} }
fields += "<tr>"; fields += "<tr>";
fields += "<td>"+blanks[i]+"</td>"; fields += "<td>"+blanks[i]+"</td>";
fields += "<td><input style=\"width:35px\" value=\""+value+"\" type=\"text\" id=\"weighting["+i+"]\" name=\"weighting["+i+"]\" /></td>"; fields += "<td><input style=\"width:35px\" value=\""+value+"\" type=\"text\" id=\"weighting["+i+"]\" name=\"weighting["+i+"]\" /></td>";
fields += "<td>"; fields += "<td>";
fields += "<input type=\"button\" value=\"-\" onclick=\"changeInputSize(-1, "+i+")\">"; fields += "<input class=\"btn btn-default\" type=\"button\" value=\"-\" onclick=\"changeInputSize(-1, "+i+")\">&nbsp;";
fields += "<input type=\"button\" value=\"+\" onclick=\"changeInputSize(1, "+i+")\">"; fields += "<input class=\"btn btn-default\" type=\"button\" value=\"+\" onclick=\"changeInputSize(1, "+i+")\">&nbsp;";
fields += "<input value=\""+blanks[i].substr(1, blanks[i].length - 2)+"\" style=\"width:"+lainputsizetrue+"px\" disabled=disabled id=\"samplesize["+i+"]\"/>"; fields += "<input class=\"sample\" id=\"samplesize["+i+"]\" data-btoa=\""+btoaValue+"\" type=\"text\" value=\""+textValue+"\" style=\"width:"+inputSize+"px\" disabled=disabled />";
fields += "<input type=\"hidden\" id=\"sizeofinput["+i+"]\" name=\"sizeofinput["+i+"]\" value=\""+lainputsize+"\" \"/>"; fields += "<input id=\"sizeofinput["+i+"]\" type=\"hidden\" value=\""+inputSize+"\" name=\"sizeofinput["+i+"]\" />";
fields += "</td>"; fields += "</td>";
fields += "</tr>"; fields += "</tr>";
// enable the save button // enable the save button
$("button").removeAttr("disabled"); $("button").removeAttr("disabled");
$("#defineoneblank").hide(); $("#defineoneblank").hide();
} }
} }
document.getElementById("blanks_weighting").innerHTML = fields + "</table></div></div>";
document.getElementById("blanks_weighting").innerHTML = fields + "</table></div></div>";
$(originalOrder).each(function(i, data) {
if (firstTime == false) {
value = data.value;
console.log(value);
var d = $("input.sample[data-btoa=\'"+value+"\']");
var id = d.attr("id");
if (id) {
var sizeInputId = id.replace("samplesize", "sizeofinput");
var sizeInputId = sizeInputId.replace("[", "\\\[");
var sizeInputId = sizeInputId.replace("]", "\\\]");
$("#"+sizeInputId).val(data.width);
d.outerWidth(data.width+"px");
}
}
});
updateOrder(blanks);
if (firstTime) { if (firstTime) {
firstTime = false; firstTime = false;
'; '.$setWeightAndSize.'
}
if (isset($listAnswersInfo) && count($listAnswersInfo["tabweighting"]) > 0) {
foreach ($listAnswersInfo["tabweighting"] as $i => $weighting) {
echo 'document.getElementById("weighting['.$i.']").value = "'.$weighting.'";';
}
foreach ($listAnswersInfo["tabinputsize"] as $i => $sizeOfInput) {
echo 'document.getElementById("sizeofinput['.$i.']").value = "'.$sizeOfInput.'";';
echo '$("#samplesize\\\['.$i.'\\\]").width('.$sizeOfInput.');';
} }
}
echo '}
}
window.onload = updateBlanks; window.onload = updateBlanks;
function getInputSize() { String.prototype.hashCode = function() {
var outTabSize = new Array(); var hash = 0, i, chr, len;
$("input").each(function() { if (this.length === 0) return hash;
if ($(this).attr("id") && $(this).attr("id").match(/samplesize/)) { for (i = 0, len = this.length; i < len; i++) {
var tabidnum = $(this).attr("id").match(/\d+/); chr = this.charCodeAt(i);
var idnum = tabidnum[0]; hash = ((hash << 5) - hash) + chr;
var thewidth = $(this).next().attr("value"); hash |= 0; // Convert to 32bit integer
tabInputSize[idnum] = thewidth; }
return hash;
};
function updateOrder(blanks)
{
originalOrder = new Array();
if (blanks != null) {
for (var i=0; i < blanks.length; i++) {
// remove forbidden characters that causes bugs
blanks[i] = removeForbiddenChars(blanks[i]);
// trim blanks between brackets
blanks[i] = trimBlanksBetweenSeparator(blanks[i], blankSeparatorStart, blankSeparatorEnd);
// if the word is empty []
if (blanks[i] == blankSeparatorStartRegexp+blankSeparatorEndRegexp) {
break;
}
var textValue = blanks[i].substr(1, blanks[i].length - 2);
var btoaValue = textValue.hashCode();
if (firstTime == false) {
var element = document.getElementById("samplesize["+i+"]");
if (element) {
inputSize = document.getElementById("sizeofinput["+i+"]").value;
originalOrder.push({ "width" : inputSize, "value": btoaValue });
}
}
} }
}); }
} }
function changeInputSize(inCoef, inIdNum) function changeInputSize(coef, inIdNum)
{ {
if (firstTime) {
var field = document.getElementById("answer");
answer = field.value;
} else {
answer = CKEDITOR.instances["answer"].getData();
}
var blanks = answer.match(eval(blanksRegexp));
var currentWidth = $("#samplesize\\\["+inIdNum+"\\\]").width(); var currentWidth = $("#samplesize\\\["+inIdNum+"\\\]").width();
var newWidth = currentWidth + inCoef * 20; var newWidth = currentWidth + coef * 20;
newWidth = Math.max(20, newWidth); newWidth = Math.max(20, newWidth);
newWidth = Math.min(newWidth, 600); newWidth = Math.min(newWidth, 600);
$("#samplesize\\\["+inIdNum+"\\\]").width(newWidth); $("#samplesize\\\["+inIdNum+"\\\]").outerWidth(newWidth);
$("#sizeofinput\\\["+inIdNum+"\\\]").attr("value", newWidth); $("#sizeofinput\\\["+inIdNum+"\\\]").attr("value", newWidth);
updateOrder(blanks);
} }
function removeForbiddenChars(inTxt) { function removeForbiddenChars(inTxt)
{
outTxt = inTxt; outTxt = inTxt;
outTxt = outTxt.replace(/&quot;/g, ""); // remove the char outTxt = outTxt.replace(/&quot;/g, ""); // remove the char
outTxt = outTxt.replace(/\x22/g, ""); // remove the char outTxt = outTxt.replace(/\x22/g, ""); // remove the char
outTxt = outTxt.replace(/"/g, ""); // remove the char outTxt = outTxt.replace(/"/g, ""); // remove the char
@ -199,13 +258,14 @@ class FillBlanks extends Question
} }
function changeBlankSeparator() function changeBlankSeparator()
{ {console.log("dd");
var separatorNumber = $("#select_separator").val(); var separatorNumber = $("#select_separator").val();
var tabSeparator = getSeparatorFromNumber(separatorNumber); var tabSeparator = getSeparatorFromNumber(separatorNumber);
blankSeparatortStart = tabSeparator[0]; blankSeparatorStart = tabSeparator[0];
blankSeparatortEnd = tabSeparator[1]; blankSeparatorEnd = tabSeparator[1];
blankSeparatortStartRegexp = getBlankSeparatorRegexp(blankSeparatortStart); blankSeparatorStartRegexp = getBlankSeparatorRegexp(blankSeparatorStart);
blankSeparatortEndRegexp = getBlankSeparatorRegexp(blankSeparatortEnd); blankSeparatorEndRegexp = getBlankSeparatorRegexp(blankSeparatorEnd);
blanksRegexp = "/"+blankSeparatorStartRegexp+"[^"+blankSeparatorStartRegexp+"]*"+blankSeparatorEndRegexp+"/g";
updateBlanks(); updateBlanks();
} }
@ -240,8 +300,6 @@ class FillBlanks extends Question
function trimBlanksBetweenSeparator(inTxt, inSeparatorStart, inSeparatorEnd) function trimBlanksBetweenSeparator(inTxt, inSeparatorStart, inSeparatorEnd)
{ {
// blankSeparatortStartRegexp
// blankSeparatortEndRegexp
var result = inTxt var result = inTxt
result = result.replace(inSeparatorStart, ""); result = result.replace(inSeparatorStart, "");
result = result.replace(inSeparatorEnd, ""); result = result.replace(inSeparatorEnd, "");
@ -251,35 +309,37 @@ class FillBlanks extends Question
</script>'; </script>';
// answer // answer
$form->addElement('label', null, '<br /><br />'.get_lang('TypeTextBelow').', '.get_lang('And').' '.get_lang('UseTagForBlank')); $form->addLabel(
null,
'<br /><br />'.get_lang('TypeTextBelow').', '.get_lang('And').' '.get_lang('UseTagForBlank')
);
$form->addElement( $form->addElement(
'html_editor', 'html_editor',
'answer', 'answer',
Display::return_icon('fill_field.png'), Display::return_icon('fill_field.png'),
['id' => 'answer', 'onkeyup' => "javascript: updateBlanks(this);"], ['id' => 'answer'],
array('ToolbarSet' => 'TestQuestionDescription') array('ToolbarSet' => 'TestQuestionDescription')
); );
$form->addRule('answer',get_lang('GiveText'),'required'); $form->addRule('answer', get_lang('GiveText'), 'required');
//added multiple answers //added multiple answers
$form->addElement('checkbox','multiple_answer','', get_lang('FillInBlankSwitchable')); $form->addElement('checkbox', 'multiple_answer', '', get_lang('FillInBlankSwitchable'));
$form->addElement( $form->addElement(
'select', 'select',
'select_separator', 'select_separator',
get_lang("SelectFillTheBlankSeparator"), get_lang("SelectFillTheBlankSeparator"),
self::getAllowedSeparatorForSelect(), self::getAllowedSeparatorForSelect(),
' id="select_separator" style="width:150px" onchange="changeBlankSeparator()" ' ' id="select_separator" style="width:150px" onchange="changeBlankSeparator()" '
); );
$form->addElement( $form->addLabel(
'label',
null, null,
'<input type="button" onclick="updateBlanks()" value="'.get_lang('RefreshBlanks').'" class="btn btn-default" />' '<input type="button" onclick="updateBlanks()" value="'.get_lang('RefreshBlanks').'" class="btn btn-default" />'
); );
$form->addElement('html','<div id="blanks_weighting"></div>'); $form->addHtml('<div id="blanks_weighting"></div>');
global $text; global $text;
// setting the save button here and not in the question class.php // setting the save button here and not in the question class.php
$form->addElement('html','<div id="defineoneblank" style="color:#D04A66; margin-left:160px">'.get_lang('DefineBlanks').'</div>'); $form->addHtml('<div id="defineoneblank" style="color:#D04A66; margin-left:160px">'.get_lang('DefineBlanks').'</div>');
$form->addButtonSave($text, 'submitQuestion'); $form->addButtonSave($text, 'submitQuestion');
if (!empty($this->id)) { if (!empty($this->id)) {
@ -603,13 +663,13 @@ class FillBlanks extends Question
public static function getAnswerInfo($userAnswer = "", $isStudentAnswer = false) public static function getAnswerInfo($userAnswer = "", $isStudentAnswer = false)
{ {
$listAnswerResults = array(); $listAnswerResults = array();
$listAnswerResults['text'] = ""; $listAnswerResults['text'] = '';
$listAnswerResults['wordsCount'] = 0; $listAnswerResults['wordsCount'] = 0;
$listAnswerResults['tabwordsbracket'] = array(); $listAnswerResults['tabwordsbracket'] = array();
$listAnswerResults['tabwords'] = array(); $listAnswerResults['tabwords'] = array();
$listAnswerResults['tabweighting'] = array(); $listAnswerResults['tabweighting'] = array();
$listAnswerResults['tabinputsize'] = array(); $listAnswerResults['tabinputsize'] = array();
$listAnswerResults['switchable'] = ""; $listAnswerResults['switchable'] = '';
$listAnswerResults['studentanswer'] = array(); $listAnswerResults['studentanswer'] = array();
$listAnswerResults['studentscore'] = array(); $listAnswerResults['studentscore'] = array();
$listAnswerResults['blankseparatornumber'] = 0; $listAnswerResults['blankseparatornumber'] = 0;
@ -631,7 +691,7 @@ class FillBlanks extends Question
$listArobaseSplit = explode('@', $listDoubleColon[1]); $listArobaseSplit = explode('@', $listDoubleColon[1]);
if (count($listArobaseSplit) < 2) { if (count($listArobaseSplit) < 2) {
$listArobaseSplit[1] = ""; $listArobaseSplit[1] = '';
} }
// take the complete string except after the last '::' // take the complete string except after the last '::'
@ -770,8 +830,7 @@ class FillBlanks extends Question
LEFT JOIN '.$tblTrackEExercise.' tee LEFT JOIN '.$tblTrackEExercise.' tee
ON tee.exe_id = tea.exe_id ON tee.exe_id = tea.exe_id
AND tea.c_id = '.$courseId.' AND tea.c_id = '.$courseId.'
AND exe_exo_id = '.$testId.' AND exe_exo_id = '.$testId.'
WHERE WHERE
tee.c_id = '.$courseId.' AND tee.c_id = '.$courseId.' AND
question_id = '.$questionId.' AND question_id = '.$questionId.' AND

Write Preview
Loading…
Cancel
Save