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 - format code.

Browse Source
1.9.x
Julio Montoya 11 years ago
parent 54964da47e
commit dbbfbb5049
8 changed files with 221 additions and 237 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. 9
      main/admin/settings.lib.php
  2. 26
      main/exercice/matching.class.php
  3. 25
      main/exercice/multiple_answer.class.php
  4. 52
      main/exercice/multiple_answer_combination.class.php
  5. 11
      main/exercice/multiple_answer_combination_true_false.class.php
  6. 168
      main/exercice/multiple_answer_true_false.class.php
  7. 10
      main/exercice/oral_expression.class.php
  8. 157
      main/exercice/unique_answer_no_option.class.php

9
main/admin/settings.lib.php
Unescape View File

@ -497,16 +497,16 @@ function store_regions()
*/
function store_plugins()
{
$plugin_obj = new AppPlugin();
$appPlugin = new AppPlugin();
// Get a list of all current 'Plugins' settings
$plugin_list = $plugin_obj->read_plugins_from_path();
$plugin_list = $appPlugin->read_plugins_from_path();
$installed_plugins = array();
foreach ($plugin_list as $plugin) {
if (isset($_POST['plugin_'.$plugin])) {
$plugin_obj->install($plugin);
$appPlugin->install($plugin);
$installed_plugins[] = $plugin;
}
}
@ -516,8 +516,9 @@ function store_plugins()
} else {
$remove_plugins = $plugin_list;
}
foreach ($remove_plugins as $plugin) {
$plugin_obj->uninstall($plugin);
$appPlugin->uninstall($plugin);
}
}

26
main/exercice/matching.class.php
Unescape View File

@ -12,7 +12,6 @@
/**
* Code
*/
if(!class_exists('Matching')):
/**
* Matching questions type class
* @package chamilo.exercise
@ -101,9 +100,9 @@ class Matching extends Question {
'.get_lang('Weighting').'
</th>
</tr>';
$form -> addElement ('label', get_lang('MakeCorrespond').'<br /> <img src="../img/fill_field.png">', $html);
if ($nb_matches < 1) {
$nb_matches = 1;
Display::display_normal_message(get_lang('YouHaveToCreateAtLeastOneAnswer'));
@ -125,13 +124,13 @@ class Matching extends Question {
$form -> addElement ('html', '</table></div></div>');
$group = array();
if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') {
$group[] = $form->createElement('submit', 'lessMatches', get_lang('DelElem'),'class="btn minus"');
$group[] = $form->createElement('submit', 'moreMatches', get_lang('AddElem'),'class="btn plus"');
} else {
$group[] = $form->createElement('style_submit_button', 'moreMatches', get_lang('AddElem'),'class="btn plus"');
$group[] = $form->createElement('style_submit_button', 'lessMatches', get_lang('DelElem'),'class="btn minus"');
$group[] = $form->createElement('style_submit_button', 'lessMatches', get_lang('DelElem'),'class="btn minus"');
}
$form -> addGroup($group);
@ -171,18 +170,18 @@ class Matching extends Question {
if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') {
// setting the save button here and not in the question class.php
$group[] = $form->createElement('submit','submitQuestion',$text, 'class="'.$class.'"');
$group[] = $form->createElement('submit','submitQuestion',$text, 'class="'.$class.'"');
$group[] = $form->createElement('submit', 'lessOptions', get_lang('DelElem'),'class="minus"');
$group[] = $form->createElement('submit', 'moreOptions',get_lang('AddElem'),'class="plus"');
$group[] = $form->createElement('submit', 'moreOptions',get_lang('AddElem'),'class="plus"');
} else {
// setting the save button here and not in the question class.php
// setting the save button here and not in the question class.php
$group[] = $form->createElement('style_submit_button', 'lessOptions', get_lang('DelElem'),'class="minus"');
$group[] = $form->createElement('style_submit_button', 'moreOptions',get_lang('AddElem'),' class="plus"');
$group[] = $form->createElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
}
$form -> addGroup($group);
if (!empty($this -> id)) {
$form -> setDefaults($defaults);
} else {
@ -190,7 +189,7 @@ class Matching extends Question {
$form -> setDefaults($defaults);
}
}
$form->setConstants(array('nb_matches' => $nb_matches,'nb_options' => $nb_options));
}
@ -227,10 +226,10 @@ class Matching extends Question {
$objAnswer->save();
$this->save();
}
function return_header($feedback_type = null, $counter = null, $score = null) {
$header = parent::return_header($feedback_type, $counter, $score);
$header .= '<table class="'.$this->question_table_class .'">';
$header .= '<table class="'.$this->question_table_class .'">';
$header .= '<tr>
<th>'.get_lang('ElementList').'</th>
<th>'.get_lang('CorrespondsTo').'</th>
@ -238,4 +237,3 @@ class Matching extends Question {
return $header;
}
}
endif;

25
main/exercice/multiple_answer.class.php
Unescape View File

@ -8,8 +8,6 @@
/**
* Code
*/
if(!class_exists('MultipleAnswer')):
/**
CLASS MultipleAnswer
*
@ -103,12 +101,12 @@ class MultipleAnswer extends Question {
$defaults['weighting[2]'] = -5;
}
$renderer = & $form->defaultRenderer();
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'correct['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'counter['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'answer['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'comment['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'weighting['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'correct['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'counter['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'answer['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'comment['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'weighting['.$i.']');
$answer_number=$form->addElement('text', 'counter['.$i.']', null, 'value="'.$i.'"');
$answer_number->freeze();
@ -137,13 +135,13 @@ class MultipleAnswer extends Question {
//ie6 fix
if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') {
$form->addElement('submit', 'lessAnswers', get_lang('LessAnswer'),'class="btn minus"');
$form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'),'class="btn plus"');
$form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'),'class="btn plus"');
$form->addElement('submit','submitQuestion',$text, 'class="'.$class.'"');
} else {
// 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('style_submit_button', 'lessAnswers', get_lang('LessAnswer'),'class="btn minus"');
$form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'),'class="btn plus"');
$form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
$form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
}
}
$renderer->setElementTemplate('{element}&nbsp;','lessAnswers');
@ -200,10 +198,10 @@ class MultipleAnswer extends Question {
$this->updateWeighting($questionWeighting);
$this->save();
}
function return_header($feedback_type = null, $counter = null, $score = null) {
$header = parent::return_header($feedback_type, $counter, $score);
$header .= '<table class="'.$this->question_table_class .'">
$header .= '<table class="'.$this->question_table_class .'">
<tr>
<th>'.get_lang("Choice").'</th>
<th>'. get_lang("ExpectedChoice").'</th>
@ -213,4 +211,3 @@ class MultipleAnswer extends Question {
return $header;
}
}
endif;

52
main/exercice/multiple_answer_combination.class.php
Unescape View File

@ -9,8 +9,6 @@
/**
* Code
*/
if(class_exists('MultipleAnswerCombination')) { return true; }
/**
CLASS MultipleAnswer
*
@ -54,8 +52,8 @@ class MultipleAnswerCombination extends Question {
</th>
<th width="50%">
'.get_lang('Answer').'
</th>';
// show column comment when feedback is enable
</th>';
// show column comment when feedback is enable
$html .='<th>'.get_lang('Comment').'</th>';
$html .= '</tr>';
$form -> addElement ('label', get_lang('Answers').'<br /> <img src="../img/fill_field.png">', $html);
@ -72,11 +70,11 @@ class MultipleAnswerCombination extends Question {
$form -> addElement('hidden', 'nb_answers');
$boxes_names = array();
if ($nb_answers < 1) {
$nb_answers = 1;
Display::display_normal_message(get_lang('YouHaveToCreateAtLeastOneAnswer'));
}
}
for($i = 1 ; $i <= $nb_answers ; ++$i) {
if(is_object($answer)) {
@ -92,15 +90,15 @@ class MultipleAnswerCombination extends Question {
$defaults['answer[2]'] = get_lang('DefaultMultipleAnswer1');
$defaults['comment[2]'] = get_lang('DefaultMultipleComment1');
$defaults['correct[2]'] = false;
$defaults['correct[2]'] = false;
}
$renderer = & $form->defaultRenderer();
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'correct['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'counter['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'answer['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'comment['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'correct['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'counter['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'answer['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'comment['.$i.']');
$answer_number=$form->addElement('text', 'counter['.$i.']', null,'value="'.$i.'"');
$answer_number->freeze();
@ -110,38 +108,38 @@ class MultipleAnswerCombination extends Question {
$form->addElement('html_editor', 'answer['.$i.']',null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
$form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
$form->addElement('html_editor', 'comment['.$i.']',null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
//only 1 answer the all deal ...
//$form->addElement('text', 'weighting['.$i.']',null, 'style="vertical-align:middle;margin-left: 0em;" size="5" value="10"');
$form -> addElement ('html', '</tr>');
}
$form -> addElement ('html', '</table>');
$form -> addElement ('html', '<br />');
$form -> add_multiple_required_rule ($boxes_names , get_lang('ChooseAtLeastOneCheckbox') , 'multiple_required');
$form -> add_multiple_required_rule ($boxes_names , get_lang('ChooseAtLeastOneCheckbox') , 'multiple_required');
//only 1 answer the all deal ...
$form->addElement('text', 'weighting[1]', get_lang('Score'), array('class' => "span1", 'value' => '10'));
$navigator_info = api_get_navigator();
global $text, $class;
//ie6 fix
if ($obj_ex->edit_exercise_in_lp == true) {
if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') {
$form->addElement('submit', 'lessAnswers', get_lang('LessAnswer'),'class="btn minus"');
$form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'),'class="btn plus"');
$form->addElement('submit', 'submitQuestion', $text, 'class="'.$class.'"');
$form->addElement('submit', 'submitQuestion', $text, 'class="'.$class.'"');
} else {
$form->addElement('style_submit_button', 'lessAnswers', get_lang('LessAnswer'),'class="btn minus"');
$form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'),'class="btn plus"');
$form->addElement('style_submit_button', 'submitQuestion',$text, 'class="'.$class.'"');
// setting the save button here and not in the question class.php
}
}
$renderer->setElementTemplate('{element}&nbsp;','lessAnswers');
@ -172,7 +170,7 @@ class MultipleAnswerCombination extends Question {
$objAnswer = new Answer($this->id);
$nb_answers = $form -> getSubmitValue('nb_answers');
for($i=1 ; $i <= $nb_answers ; $i++)
{
$answer = trim($form -> getSubmitValue('answer['.$i.']'));
@ -204,16 +202,16 @@ class MultipleAnswerCombination extends Question {
$this -> updateWeighting($questionWeighting);
$this -> save();
}
function return_header($feedback_type = null, $counter = null, $score = null) {
$header = parent::return_header($feedback_type, $counter, $score);
$header .= '<table class="'.$this->question_table_class .'">
$header .= '<table class="'.$this->question_table_class .'">
<tr>
<th>'.get_lang("Choice").'</th>
<th>'. get_lang("ExpectedChoice").'</th>
<th>'. get_lang("Answer").'</i></th>';
$header .= '<th>'.get_lang("Comment").'</th>';
$header .= '</tr>';
return $header;
return $header;
}
}

11
main/exercice/multiple_answer_combination_true_false.class.php
Unescape View File

@ -9,8 +9,6 @@
/**
* Code
*/
if(class_exists('MultipleAnswerCombinationTrueFalse')) { return true; }
require_once 'multiple_answer_combination.class.php';
/**
CLASS MultipleAnswer
*
@ -20,16 +18,17 @@ require_once 'multiple_answer_combination.class.php';
* @author Eric Marguin
* @package chamilo.exercise
**/
class MultipleAnswerCombinationTrueFalse extends MultipleAnswerCombination {
class MultipleAnswerCombinationTrueFalse extends MultipleAnswerCombination
{
static $typePicture = 'mcmaco.gif';
static $explanationLangVar = 'MultipleAnswerCombinationTrueFalse';
var $options;
var $options;
/**
* Constructor
*/
function MultipleAnswerCombinationTrueFalse(){
function MultipleAnswerCombinationTrueFalse()
{
parent::question();
$this -> type = MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE;
$this -> isContent = $this-> getIsContent();

168
main/exercice/multiple_answer_true_false.class.php
Unescape View File

@ -11,7 +11,6 @@
/**
* Code
*/
if(!class_exists('MultipleAnswerTrueFalse')):
/**
* Class
* @package chamilo.exercise
@ -40,15 +39,15 @@ class MultipleAnswerTrueFalse extends Question {
$nb_answers = isset($_POST['nb_answers']) ? $_POST['nb_answers'] : 4; // The previous default value was 2. See task #1759.
$nb_answers += (isset($_POST['lessAnswers']) ? -1 : (isset($_POST['moreAnswers']) ? 1 : 0));
$course_id = api_get_course_int_id();
$obj_ex = $_SESSION['objExercise'];
$renderer = & $form->defaultRenderer();
$defaults = array();
$html = '<table class="data_table">
<tr style="text-align: center;">
<th>
@ -59,7 +58,7 @@ class MultipleAnswerTrueFalse extends Question {
</th>
<th>
'.get_lang('False').'
</th>
</th>
<th>
'.get_lang('Answer').'
</th>';
@ -69,16 +68,16 @@ class MultipleAnswerTrueFalse extends Question {
}
$html .= '</tr>';
$form -> addElement ('label', get_lang('Answers').'<br /> <img src="../img/fill_field.png">', $html);
$correct = 0;
if (!empty($this -> id)) {
$answer = new Answer($this -> id);
$answer->read();
$answer->read();
if (count($answer->nbrAnswers) > 0 && !$form->isSubmitted()) {
$nb_answers = $answer->nbrAnswers;
}
}
$form -> addElement('hidden', 'nb_answers');
$boxes_names = array();
@ -86,51 +85,51 @@ class MultipleAnswerTrueFalse extends Question {
$nb_answers = 1;
Display::display_normal_message(get_lang('YouHaveToCreateAtLeastOneAnswer'));
}
// Can be more options
// Can be more options
$option_data = Question::readQuestionOption($this->id, $course_id);
for ($i = 1 ; $i <= $nb_answers ; ++$i) {
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'correct['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'counter['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'answer['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'comment['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'correct['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'counter['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'answer['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'comment['.$i.']');
$answer_number=$form->addElement('text', 'counter['.$i.']',null,'value="'.$i.'"');
$answer_number->freeze();
if (is_object($answer)) {
$answer_number->freeze();
if (is_object($answer)) {
$defaults['answer['.$i.']'] = $answer -> answer[$i];
$defaults['comment['.$i.']'] = $answer -> comment[$i];
//$defaults['weighting['.$i.']'] = float_format($answer -> weighting[$i], 1);
$correct = $answer->correct[$i];
$defaults['correct['.$i.']'] = $correct;
$j = 1;
$defaults['correct['.$i.']'] = $correct;
$j = 1;
if (!empty($option_data)) {
foreach ($option_data as $id=>$data) {
foreach ($option_data as $id=>$data) {
$form->addElement('radio', 'correct['.$i.']', null, null, $id);
$j++;
if ($j == 3) {
break;
}
}
}
}
} else {
$form->addElement('radio', 'correct['.$i.']', null, null, 1);
} else {
$form->addElement('radio', 'correct['.$i.']', null, null, 1);
$form->addElement('radio', 'correct['.$i.']', null, null, 2);
$defaults['answer['.$i.']'] = '';
$defaults['comment['.$i.']'] = '';
$defaults['correct['.$i.']'] = '';
}
$defaults['correct['.$i.']'] = '';
}
//$form->addElement('select', 'correct['.$i.']',null, $this->options, array('id'=>$i,'onchange'=>'multiple_answer_true_false_onchange(this)'));
$boxes_names[] = 'correct['.$i.']';
$form->addElement('html_editor', 'answer['.$i.']',null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
@ -142,38 +141,38 @@ class MultipleAnswerTrueFalse extends Question {
}
$form->addElement ('html', '</tr>');
}
$form->addElement('html', '</table>');
$form->addElement('html', '<br />');
$form->addElement('html', '<br />');
$form->addElement('html', '<table><tr><td></td><td>'.get_lang('Correct').'</td><td>'.get_lang('Wrong').'</td><td>'.get_lang('DoubtScore').'</td></tr>');
$renderer->setElementTemplate('<tr><td><span class="form_required">*</span>'.get_lang('Score').'&nbsp;&nbsp;&nbsp;&nbsp;</td><td>{element} &nbsp;&nbsp; <br /><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --></td>', 'option[1]');
$renderer->setElementTemplate('<td>{element} &nbsp;&nbsp;<br /><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --></td>', 'option[2]');
$renderer->setElementTemplate('<td>{element} &nbsp;&nbsp;<br /><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --></td>', 'option[3]');
// 3 scores
$form->addElement('text', 'option[1]', get_lang('Correct'), array('class'=>'span1','value'=>'1'));
$form->addElement('text', 'option[2]', get_lang('Wrong'), array('class'=>'span1','value'=>'-0.5'));
$form->addElement('text', 'option[2]', get_lang('Wrong'), array('class'=>'span1','value'=>'-0.5'));
$form->addElement('text', 'option[3]', get_lang('DoubtScore'),array('class'=>'span1','value'=>'0'));
$form->addRule('option[1]', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('option[2]', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('option[3]', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('option[3]', get_lang('ThisFieldIsRequired'), 'required');
$form -> addElement ('html', '</tr><table>');
$form -> addElement('hidden', 'options_count', 3);
$form -> addElement ('html', '</table><br /><br />');
$form -> addElement('hidden', 'options_count', 3);
$form -> addElement ('html', '</table><br /><br />');
//Extra values True, false, Dont known
if (!empty($this->extra)) {
$scores = explode(':',$this->extra);
$scores = explode(':',$this->extra);
if (!empty($scores)) {
for ($i = 1; $i <=3; $i++) {
$defaults['option['.$i.']'] = $scores[$i-1];
}
}
}
$defaults['option['.$i.']'] = $scores[$i-1];
}
}
}
//$form -> add_multiple_required_rule ($boxes_names , get_lang('ChooseAtLeastOneCheckbox') , 'multiple_required');
@ -183,16 +182,16 @@ class MultipleAnswerTrueFalse extends Question {
if ($obj_ex->edit_exercise_in_lp == true) {
//ie6 fix
if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') {
$form->addElement('submit', 'lessAnswers', get_lang('LessAnswer'),'class="btn minus"');
$form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'),'class="btn plus"');
$form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'),'class="btn plus"');
$form->addElement('submit', 'submitQuestion',$text, 'class="'.$class.'"');
} else {
// setting the save button here and not in the question class.php
$form->addElement('style_submit_button', 'lessAnswers', get_lang('LessAnswer'),'class="btn minus"');
$form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'),'class="btn plus"');
$form->addElement('style_submit_button', 'submitQuestion',$text, 'class="'.$class.'"');
$form->addElement('style_submit_button', 'submitQuestion',$text, 'class="'.$class.'"');
}
}
$renderer->setElementTemplate('{element}&nbsp;','lessAnswers');
@ -223,75 +222,74 @@ class MultipleAnswerTrueFalse extends Question {
$nb_answers = $form->getSubmitValue('nb_answers');
$options_count = $form->getSubmitValue('options_count');
$course_id = api_get_course_int_id();
$correct = array();
$options = Question::readQuestionOption($this->id, $course_id);
if (!empty($options)) {
foreach ($options as $option_data) {
$id = $option_data['id'];
unset($option_data['id']);
Question::updateQuestionOption($id, $option_data, $course_id);
}
} else {
for ($i=1 ; $i <= 3 ; $i++) {
} else {
for ($i=1 ; $i <= 3 ; $i++) {
$last_id = Question::saveQuestionOption($this->id, $this->options[$i], $course_id, $i);
$correct[$i] = $last_id;
}
}
}
//Getting quiz_question_options (true, false, doubt) because it's possible that there are more options in the future
$new_options = Question::readQuestionOption($this->id, $course_id);
$sorted_by_position = array();
foreach($new_options as $item) {
$sorted_by_position[$item['position']] = $item;
}
//Saving quiz_question.extra values that has the correct scores of the true, false, doubt options registered in this format XX:YY:ZZZ where XX is a float score value
}
//Saving quiz_question.extra values that has the correct scores of the true, false, doubt options registered in this format XX:YY:ZZZ where XX is a float score value
$extra_values = array();
for ($i=1 ; $i <= 3 ; $i++) {
$score = trim($form -> getSubmitValue('option['.$i.']'));
$extra_values[]= $score;
}
$this->setExtra(implode(':',$extra_values));
}
$this->setExtra(implode(':',$extra_values));
for ($i=1 ; $i <= $nb_answers ; $i++) {
$answer = trim($form -> getSubmitValue('answer['.$i.']'));
$comment = trim($form -> getSubmitValue('comment['.$i.']'));
$goodAnswer = trim($form -> getSubmitValue('correct['.$i.']'));
$goodAnswer = trim($form -> getSubmitValue('correct['.$i.']'));
if (empty($options)) {
//If this is the first time that the question is created when change the default values from the form 1 and 2 by the correct "option id" registered
//If this is the first time that the question is created when change the default values from the form 1 and 2 by the correct "option id" registered
$goodAnswer = $sorted_by_position[$goodAnswer]['id'];
}
}
$questionWeighting += $extra_values[0]; //By default 0 has the correct answers
$objAnswer->createAnswer($answer, $goodAnswer, $comment,'',$i);
}
$objAnswer->createAnswer($answer, $goodAnswer, $comment,'',$i);
}
// saves the answers into the data base
$objAnswer -> save();
// sets the total weighting of the question
$this -> updateWeighting($questionWeighting);
$this -> save();
}
function return_header($feedback_type = null, $counter = null, $score = null) {
$header = parent::return_header($feedback_type, $counter, $score);
$header .= '<table class="'.$this->question_table_class .'">
function return_header($feedback_type = null, $counter = null, $score = null) {
$header = parent::return_header($feedback_type, $counter, $score);
$header .= '<table class="'.$this->question_table_class .'">
<tr>
<th>'.get_lang("Choice").'</th>
<th>'. get_lang("ExpectedChoice").'</th>
<th>'. get_lang("Answer").'</th>';
if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
$header .= '<th>'.get_lang("Comment").'</th>';
} else {
} else {
$header .= '<th>&nbsp;</th>';
}
$header .= '</tr>';
return $header;
return $header;
}
}
endif;

10
main/exercice/oral_expression.class.php
Unescape View File

@ -11,7 +11,6 @@
/**
* Code
*/
if(!class_exists('OralExpression')):
/**
* @package chamilo.exercise
*/
@ -55,7 +54,7 @@ class OralExpression extends Question {
$this->weighting = $form -> getSubmitValue('weighting');
$this->save();
}
function return_header($feedback_type = null, $counter = null, $score = null) {
$header = parent::return_header($feedback_type, $counter, $score);
$header .= '<table class="'.$this->question_table_class.'">
@ -67,8 +66,7 @@ class OralExpression extends Question {
</tr>
<tr>
<th>&nbsp;</th>
</tr>';
return $header;
}
</tr>';
return $header;
}
}
endif;

157
main/exercice/unique_answer_no_option.class.php
Unescape View File

@ -11,8 +11,6 @@
* Code
*/
if(!class_exists('UniqueAnswerNoOption')):
/**
CLASS UNIQUE_ANSWER
*
@ -24,8 +22,8 @@ if(!class_exists('UniqueAnswerNoOption')):
* @package chamilo.exercise
**/
class UniqueAnswerNoOption extends Question {
class UniqueAnswerNoOption extends Question
{
static $typePicture = 'mcuao.gif';
static $explanationLangVar = 'UniqueAnswerNoOption';
@ -52,7 +50,7 @@ class UniqueAnswerNoOption extends Question {
//this line define how many question by default appear when creating a choice question
$nb_answers = isset($_POST['nb_answers']) ? (int) $_POST['nb_answers'] : 3; // The previous default value was 2. See task #1759.
$nb_answers += (isset($_POST['lessAnswers']) ? -1 : (isset($_POST['moreAnswers']) ? 1 : 0));
$nb_answers += (isset($_POST['lessAnswers']) ? -1 : (isset($_POST['moreAnswers']) ? 1 : 0));
/*
Types of Feedback
@ -89,32 +87,32 @@ class UniqueAnswerNoOption extends Question {
'.$feedback_title.'
<th width="60px">
'.get_lang('Weighting').'
</th>
</th>
</tr>';
$form -> addElement ('label', get_lang('Answers').'<br /> <img src="../img/fill_field.png">', $html);
$defaults = array();
$correct = 0;
if (!empty($this -> id)) {
$answer = new Answer($this -> id);
$answer -> read();
if (count($answer->nbrAnswers)>0 && !$form->isSubmitted()) {
$nb_answers = $answer->nbrAnswers;
$nb_answers = $answer->nbrAnswers;
}
}
$temp_scenario = array();
if ($nb_answers < 1) {
$nb_answers = 1;
Display::display_normal_message(get_lang('YouHaveToCreateAtLeastOneAnswer'));
}
}
if ($_GET['editQuestion']) {
//fixing $nb_answers
$new_list = array();
$count = 1;
$count = 1;
if (isset($_POST['lessAnswers'])) {
if (!isset($_SESSION['less_answer'])) {
$_SESSION['less_answer'] = $this -> id;
@ -122,106 +120,106 @@ class UniqueAnswerNoOption extends Question {
}
}
for ($k = 1 ; $k <= $nb_answers; ++$k) {
if ($answer->position[$k] != '666') {
if ($answer->position[$k] != '666') {
$new_list[$count] = $count;
$count++;
}
}
}
} else {
for ($k = 1 ; $k <= $nb_answers; ++$k) {
$new_list[$k] = $k;
}
for ($k = 1 ; $k <= $nb_answers; ++$k) {
$new_list[$k] = $k;
}
}
$i = 1;
//for ($k = 1 ; $k <= $real_nb_answers; $k++) {
//for ($k = 1 ; $k <= $real_nb_answers; $k++) {
foreach ($new_list as $key) {
$i = $key;
$form -> addElement ('html', '<tr>');
$i = $key;
$form -> addElement ('html', '<tr>');
if (is_object($answer)) {
if($answer->position[$i] == 666) {
//we set nothing
} else {
//we set nothing
} else {
if ($answer->correct[$i]) {
$correct = $i;
}
$answer_result = $answer->answer[$i];
$answer_result = $answer->answer[$i];
$weight_result = float_format($answer->weighting[$i], 1);
if ($nb_answers == $i) {
$weight_result = '0';
}
$defaults['answer['.$i.']'] = $answer_result;
$defaults['comment['.$i.']'] = $answer->comment[$i];
$defaults['weighting['.$i.']'] = $weight_result;
$item_list=explode('@@',$answer -> destination[$i]);
$try = $item_list[0];
$lp = $item_list[1];
$list_dest = $item_list[2];
$url = $item_list[3];
if ($try==0)
$try_result=0;
else
$try_result=1;
if ($url==0)
$url_result='';
else
$url_result=$url;
$temp_scenario['url'.$i] = $url_result;
$temp_scenario['try'.$i] = $try_result;
$temp_scenario['lp'.$i] = $lp;
$temp_scenario['destination'.$i]= $list_dest;
}
}
$defaults['scenario']=$temp_scenario;
$renderer = & $form->defaultRenderer();
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'correct');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'counter['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'answer['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'comment['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'weighting['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'correct');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'counter['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'answer['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'comment['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'weighting['.$i.']');
$answer_number=$form->addElement('text', 'counter['.$i.']', null,'value="'.$i.'"');
$answer_number->freeze();
$form->addElement('radio', 'correct', null, null, $i, 'class="checkbox" style="margin-left: 0em;"');
$form->addElement('html_editor', 'answer['.$i.']', null, 'style="vertical-align:middle"', $editor_config);
$form->addElement('html_editor', 'comment['.$i.']', null, 'style="vertical-align:middle"', $editor_config);
$form->addElement('text', 'weighting['.$i.']', null, array('class' => "span1", 'value' => '0'));
$form->addElement('html', '</tr>');
$i++;
}
$i++;
}
if (empty($this -> id)) {
$form->addElement('hidden', 'new_question', 1);
}
//Adding the "I don't know" question answer
//if (empty($this -> id)) {
$i = 666;
$form -> addElement ('html', '<tr>');
$i = 666;
$form -> addElement ('html', '<tr>');
$defaults['answer['.$i.']'] = get_lang('DontKnow');
$defaults['weighting['.$i.']'] = 0;
$defaults['scenario']=$temp_scenario;
$renderer = & $form->defaultRenderer();
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'correct');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'counter['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'answer['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'comment['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'weighting['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'correct');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'counter['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'answer['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'comment['.$i.']');
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'weighting['.$i.']');
$answer_number=$form->addElement('text', 'counter['.$i.']',null,'value="-"');
$answer_number->freeze();
@ -241,9 +239,7 @@ class UniqueAnswerNoOption extends Question {
$form->addElement('text', 'weighting['.$i.']', null, array('class' => "span1", 'value' => '0', 'readonly' =>'readonly'));
$form->addElement ('html', '</tr>');
//}
$form -> addElement ('html', '</table>');
$form -> addElement ('html', '<br />');
$navigator_info = api_get_navigator();
@ -251,15 +247,15 @@ class UniqueAnswerNoOption extends Question {
global $text, $class;
//ie6 fix
if ($obj_ex->edit_exercise_in_lp == true) {
if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') {
$form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'),'class="btn plus"');
if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') {
$form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'),'class="btn plus"');
$form->addElement('submit', 'lessAnswers', get_lang('LessAnswer'),'class="btn minus"');
$form->addElement('submit','submitQuestion',$text, 'class="'.$class.'"');
} else {
//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('style_submit_button', 'lessAnswers', get_lang('LessAnswer'),'class="btn minus"');
$form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'),'class="btn plus"');
$form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
$form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
}
}
$renderer->setElementTemplate('{element}&nbsp;','submitQuestion');
@ -278,13 +274,13 @@ class UniqueAnswerNoOption extends Question {
$form -> setDefaults($defaults);
} else {
$form -> setDefaults($defaults);
}
}
$form->addElement('hidden', 'nb_answers');
$form->setConstants(array('nb_answers' => $nb_answers));
}
@ -301,19 +297,19 @@ class UniqueAnswerNoOption extends Question {
$nb_answers = $form -> getSubmitValue('nb_answers');
$minus = 1;
if ($form -> getSubmitValue('new_question')) {
$minus = 0;
}
$minus = 0;
}
for ($i=1 ; $i <= $nb_answers - $minus; $i++) {
$position = trim($form -> getSubmitValue('position['.$i.']'));
$answer = trim($form -> getSubmitValue('answer['.$i.']'));
$comment = trim($form -> getSubmitValue('comment['.$i.']'));
$weighting = trim($form -> getSubmitValue('weighting['.$i.']'));
$scenario = $form -> getSubmitValue('scenario');
//
//$list_destination = $form -> getSubmitValue('destination'.$i);
//$destination_str = $form -> getSubmitValue('destination'.$i);
@ -362,7 +358,7 @@ class UniqueAnswerNoOption extends Question {
if (empty($destination)) {
$destination=0;
}
if ($url=='') {
$url=0;
}
@ -371,17 +367,17 @@ class UniqueAnswerNoOption extends Question {
$dest= $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
$objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
}
//Create 666 answer
$i = 666;
$answer = trim($form -> getSubmitValue('answer['.$i.']'));
$comment = trim($form -> getSubmitValue('comment['.$i.']'));
$weighting = trim($form -> getSubmitValue('weighting['.$i.']'));
$goodAnswer= ($correct == $i) ? true : false;
$dest = '';
$dest = '';
$objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
// saves the answers into the data base
$objAnswer -> save();
@ -389,17 +385,16 @@ class UniqueAnswerNoOption extends Question {
$this -> updateWeighting($questionWeighting);
$this -> save();
}
function return_header($feedback_type = null, $counter = null, $score = null) {
$header = parent::return_header($feedback_type, $counter, $score);
$header .= '<table class="'.$this->question_table_class .'">
$header .= '<table class="'.$this->question_table_class .'">
<tr>
<th>'.get_lang("Choice").'</th>
<th>'. get_lang("ExpectedChoice").'</th>
<th>'. get_lang("Answer").'</th>';
$header .= '<th>'.get_lang("Comment").'</th>';
$header .= '</tr>';
return $header;
return $header;
}
}
endif;

Write Preview
Loading…
Cancel
Save