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

Merge branch 'ilosada-7212c' into 1.9.x

Browse Source
1.9.x
Yannick Warnier 11 years ago
parent c0b01d79bc 71504f8d31
commit 82e0a4f126
5 changed files with 154 additions and 46 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. 136
      main/exercice/calculated_answer.class.php
  2. 38
      main/exercice/evalmathnotation.php
  3. 22
      main/exercice/question_list_admin.inc.php
  4. 2
      main/lang/english/trad4all.inc.php
  5. 2
      main/lang/spanish/trad4all.inc.php

136
main/exercice/calculated_answer.class.php
Unescape View File

@ -133,7 +133,23 @@ class CalculatedAnswer extends Question
$form->addElement('label', null, get_lang('IfYouWantOnlyIntegerValuesWriteBothLimitsWithoutDecimals'));
$form->addElement('html', '<div id="blanks_weighting"></div>');
$form->addElement('label', null, get_lang('FormulaExample').': &radic;<span style="text-decoration:overline;">&nbsp;x &divide y&nbsp;</span> &times e <sup>(ln(pi))</sup> = sqrt([x]/[y])*(e^(ln(pi)))');
$notationListButton = Display::url(
get_lang('NotationList'),
api_get_path(WEB_PATH).'main/exercice/evalmathnotation.php',
array(
'class' => 'btn ajax',
'_target' => '_blank'
)
);
$form->addElement(
'html',
'<div class="control-group">
<label class="control-label"></label>
<div class="controls">'.$notationListButton.'</div>
</div>');
$form->addElement('label', null, get_lang('FormulaExample'));
$form->addElement('text', 'formula', get_lang('Formula'), array('id' => 'formula', 'class' => 'span4'));
$form->addRule('formula', get_lang('GiveFormula'), 'required');
@ -163,50 +179,62 @@ class CalculatedAnswer extends Question
*/
function processAnswersCreation($form)
{
global $charset;
$answer = $form->getSubmitValue('answer');
$formula = $form->getSubmitValue('formula');
$lowestValues = $form->getSubmitValue('lowestValue');
$highestValues = $form->getSubmitValue('highestValue');
$answerVariations = $form->getSubmitValue('answerVariations');
$this->weighting = $form->getSubmitValue('weighting');
//Remove previous answers
Database::delete("c_quiz_answer", array('question_id = ?' => $this->id));
// Create as many answers as $answerVariations
for ($j=0 ; $j < $answerVariations; $j++) {
$auxAnswer = $answer;
$auxFormula = $formula;
$nb = preg_match_all('/\[[^\]]*\]/', $auxAnswer, $blanks);
if ($nb > 0) {
for ($i=0 ; $i < $nb; ++$i) {
$blankItem = $blanks[0][$i];
$replace = array("[", "]");
$newBlankItem = str_replace($replace, "", $blankItem);
$newBlankItem = "[".trim($newBlankItem)."]";
$randomValue = mt_rand($lowestValues[$i],$highestValues[$i]);
//$randomValue = mt_rand($lowestValues[$i]*100,$highestValues[$i]*100)/100;
$auxAnswer = str_replace($blankItem, $randomValue, $auxAnswer);
$auxFormula = str_replace($blankItem, $randomValue, $auxFormula);
}
require_once(api_get_path(LIBRARY_PATH).'evalmath.class.php');
$math = new EvalMath();
$result = $math->evaluate($auxFormula);
$result = number_format($result, 2, ".", "");
// Remove decimal trailing zeros
$result = rtrim($result, "0");
// If it is an integer (ends in .00) remove the decimal point
if (mb_substr($result, -1) === ".") {
$result = str_replace(".", "", $result);
if (!self::isAnswered()) {
$table = Database::get_course_table(TABLE_QUIZ_ANSWER);
Database::delete(
$table,
array(
'c_id = ? AND question_id = ?' => array(
$this->course['real_id'],
$this->id
)
)
);
$answer = $form->getSubmitValue('answer');
$formula = $form->getSubmitValue('formula');
$lowestValues = $form->getSubmitValue('lowestValue');
$highestValues = $form->getSubmitValue('highestValue');
$answerVariations = $form->getSubmitValue('answerVariations');
$this->weighting = $form->getSubmitValue('weighting');
// Create as many answers as $answerVariations
for ($j=0 ; $j < $answerVariations; $j++) {
$auxAnswer = $answer;
$auxFormula = $formula;
$nb = preg_match_all('/\[[^\]]*\]/', $auxAnswer, $blanks);
if ($nb > 0) {
for ($i=0 ; $i < $nb; ++$i) {
$blankItem = $blanks[0][$i];
$replace = array("[", "]");
$newBlankItem = str_replace($replace, "", $blankItem);
$newBlankItem = "[".trim($newBlankItem)."]";
// take random float values when one or both edge values have a decimal point
$randomValue =
(strpos($lowestValues[$i],'.') !== false ||
strpos($highestValues[$i],'.') !== false) ?
mt_rand($lowestValues[$i]*100,$highestValues[$i]*100)/100 :
mt_rand($lowestValues[$i],$highestValues[$i]);
$auxAnswer = str_replace($blankItem, $randomValue, $auxAnswer);
$auxFormula = str_replace($blankItem, $randomValue, $auxFormula);
}
require_once(api_get_path(LIBRARY_PATH).'evalmath.class.php');
$math = new EvalMath();
$result = $math->evaluate($auxFormula);
$result = number_format($result, 2, ".", "");
// Remove decimal trailing zeros
$result = rtrim($result, "0");
// If it is an integer (ends in .00) remove the decimal point
if (mb_substr($result, -1) === ".") {
$result = str_replace(".", "", $result);
}
// Attach formula
$auxAnswer .= " [".$result."]@@".$formula;
}
// Attach formula
$auxAnswer .= " [".$result."]@@".$formula;
$this->save();
$objAnswer = new answer($this->id);
$objAnswer->createAnswer($auxAnswer, 1, '', $this->weighting, null);
$objAnswer->position = array();
$objAnswer->save();
}
$this->save();
$objAnswer = new answer($this->id);
$objAnswer->createAnswer($auxAnswer, 1, '', $this->weighting, array());
$objAnswer->position = array();
$objAnswer->save();
}
}
@ -225,4 +253,26 @@ class CalculatedAnswer extends Question
</tr>';
return $header;
}
/**
* Returns true if the current question has been attempted to be answered
* @return boolean
*/
public function isAnswered()
{
$table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
$result = Database::select(
'question_id',
$table,
array(
'where' => array(
'question_id = ? AND course_code = ?' => array(
$this->id,
$this->course['code']
)
)
)
);
return empty($result) ? false : true;
}
}

38
main/exercice/evalmathnotation.php
Unescape View File

@ -0,0 +1,38 @@
<?php
/* For licensing terms, see /license.txt */
require_once "../inc/global.inc.php";
echo "<pre>".
get_lang('SummationPlus')."\n".
get_lang('SubstractionMinus')."\n".
get_lang('MultiplicationStar')."\n".
get_lang('DivisionSlash')."\n".
get_lang('ExponentiationCircumflex')."\n".
"\n".
get_lang('SquareRootSqrt')."\n".
get_lang('AbsoluteValueAbs')."\n".
get_lang('NaturalLogarithmLn')."\n".
get_lang('LogarithmLog')."\n".
get_lang('ENumberE')."\n".
get_lang('PiNumberPi')."\n".
"\n".
get_lang('SineSin')."\n".
get_lang('HyperbolicSineSinh')."\n".
get_lang('ArcsineArcsin')."\n".
get_lang('InverseSineAsin')."\n".
get_lang('HyperbolicArcsineArcsinh')."\n".
get_lang('InverseHyperbolicSineAsinh')."\n".
"\n".
get_lang('CosineCos')."\n".
get_lang('HyperbolicCosineCosh')."\n".
get_lang('ArccosineArccos')."\n".
get_lang('InverseCosineAcos')."\n".
get_lang('HyperbolicArccosineArccosh')."\n".
get_lang('InverseHyperbolicCosineAcosh')."\n".
"\n".
get_lang('TangentTan')."\n".
get_lang('HyperbolicTangentTanh')."\n".
get_lang('ArctangentArctan')."\n".
get_lang('InverseTangentAtan')."\n".
get_lang('HyperbolicArctangentArctanh')."\n".
get_lang('InverseHyperbolicTangentAtanh').
"</pre>";

22
main/exercice/question_list_admin.inc.php
Unescape View File

@ -170,7 +170,27 @@ if (!$inATest) {
$question_class = get_class($objQuestionTmp);
$clone_link = '<a href="'.api_get_self().'?'.api_get_cidreq().'&clone_question='.$id.'">'.Display::return_icon('cd.gif',get_lang('Copy'), array(), ICON_SIZE_SMALL).'</a>';
$edit_link = '<a href="'.api_get_self().'?'.api_get_cidreq().'&type='.$objQuestionTmp->selectType().'&myid=1&editQuestion='.$id.'">'.Display::return_icon('edit.png',get_lang('Modify'), array(), ICON_SIZE_SMALL).'</a>';
/*$edit_link = '<a href="'.api_get_self().'?'.api_get_cidreq().'&type='.$objQuestionTmp->selectType().'&myid=1&editQuestion='.$id.'">'.Display::return_icon('edit.png',get_lang('Modify'), array(), ICON_SIZE_SMALL).'</a>';
if ($objQuestionTmp->type == CALCULATED_ANSWER && $objQuestionTmp->isAnswered()) {
$edit_link = '<a>'.Display::return_icon('edit_na.png',get_lang('Modify'), array(), ICON_SIZE_SMALL).'</a>';
}*/
$edit_link = ($objQuestionTmp->type == CALCULATED_ANSWER && $objQuestionTmp->isAnswered()) ?
'<a>'.Display::return_icon(
'edit_na.png',
get_lang('QuestionEditionNotAvailableBecauseItIsAlreadyAnsweredHoweverYouCanCopyItAndModifyTheCopy'),
array(),
ICON_SIZE_SMALL
).'</a>' :
'<a href="'.api_get_self().'?'.api_get_cidreq().'&type='.
$objQuestionTmp->selectType().'&myid=1&editQuestion='.$id.'">'.
Display::return_icon(
'edit.png',
get_lang('Modify'),
array(),
ICON_SIZE_SMALL
).'</a>';
if ($objExercise->edit_exercise_in_lp == true) {
$delete_link = '<a id="delete_'.$id.'" class="opener" href="'.api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId.'&deleteQuestion='.$id.'" >'.Display::return_icon('delete.png',get_lang('RemoveFromTest'), array(), ICON_SIZE_SMALL).'</a>';

2
main/lang/english/trad4all.inc.php
Unescape View File

@ -1675,4 +1675,4 @@ $DataTableSearch = "Search";
$HideColumn = "Hide column";
$DisplayColumn = "Show column";
$LegalAgreementAccepted = "Legal agreement accepted";
?>
?>

2
main/lang/spanish/trad4all.inc.php
Unescape View File

@ -1680,4 +1680,4 @@ $DataTableSearch = "Buscar";
$HideColumn = "Ocultar columna";
$DisplayColumn = "Mostrar columna";
$LegalAgreementAccepted = "Condiciones legales aceptadas";
?>
?>

Write Preview
Loading…
Cancel
Save