|
@@ -30,42 +30,40 @@ class Matching extends Question
|
|
|
* function which redefines Question::createAnswersForm
|
|
|
* @param FormValidator $form
|
|
|
*/
|
|
|
- public function createAnswersForm ($form)
|
|
|
+ public function createAnswersForm($form)
|
|
|
{
|
|
|
$defaults = array();
|
|
|
$navigator_info = api_get_navigator();
|
|
|
|
|
|
$nb_matches = $nb_options = 2;
|
|
|
- if ($form -> isSubmitted()) {
|
|
|
- $nb_matches = $form -> getSubmitValue('nb_matches');
|
|
|
- $nb_options = $form -> getSubmitValue('nb_options');
|
|
|
- if(isset($_POST['lessMatches']))
|
|
|
+ if ($form->isSubmitted()) {
|
|
|
+ $nb_matches = $form->getSubmitValue('nb_matches');
|
|
|
+ $nb_options = $form->getSubmitValue('nb_options');
|
|
|
+ if (isset($_POST['lessMatches']))
|
|
|
$nb_matches--;
|
|
|
- if(isset($_POST['moreMatches']))
|
|
|
+ if (isset($_POST['moreMatches']))
|
|
|
$nb_matches++;
|
|
|
- if(isset($_POST['lessOptions']))
|
|
|
+ if (isset($_POST['lessOptions']))
|
|
|
$nb_options--;
|
|
|
- if(isset($_POST['moreOptions']))
|
|
|
+ if (isset($_POST['moreOptions']))
|
|
|
$nb_options++;
|
|
|
-
|
|
|
- } else if(!empty($this -> id)) {
|
|
|
- $answer = new Answer($this -> id);
|
|
|
- $answer -> read();
|
|
|
- if(count($answer->nbrAnswers)>0) {
|
|
|
+ } else if (!empty($this->id)) {
|
|
|
+ $answer = new Answer($this->id);
|
|
|
+ $answer->read();
|
|
|
+ if (count($answer->nbrAnswers) > 0) {
|
|
|
$a_matches = $a_options = array();
|
|
|
$nb_matches = $nb_options = 0;
|
|
|
- for($i=1 ; $i<=$answer->nbrAnswers ; $i++){
|
|
|
- if ($answer -> isCorrect($i)) {
|
|
|
+ for ($i = 1; $i <= $answer->nbrAnswers; $i++) {
|
|
|
+ if ($answer->isCorrect($i)) {
|
|
|
$nb_matches++;
|
|
|
- $defaults['answer['.$nb_matches.']'] = $answer -> selectAnswer($i);
|
|
|
- $defaults['weighting['.$nb_matches.']'] = float_format($answer -> selectWeighting($i),1);
|
|
|
- $defaults['matches['.$nb_matches.']'] = $answer -> correct[$i];
|
|
|
+ $defaults['answer[' . $nb_matches . ']'] = $answer->selectAnswer($i);
|
|
|
+ $defaults['weighting[' . $nb_matches . ']'] = float_format($answer->selectWeighting($i), 1);
|
|
|
+ $defaults['matches[' . $nb_matches . ']'] = $answer->correct[$i];
|
|
|
} else {
|
|
|
$nb_options++;
|
|
|
- $defaults['option['.$nb_options.']'] = $answer -> selectAnswer($i);
|
|
|
+ $defaults['option[' . $nb_options . ']'] = $answer->selectAnswer($i);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
} else {
|
|
|
$defaults['answer[1]'] = get_lang('DefaultMakeCorrespond1');
|
|
@@ -75,120 +73,135 @@ class Matching extends Question
|
|
|
$defaults['option[2]'] = get_lang('DefaultMatchingOptB');
|
|
|
}
|
|
|
$a_matches = array();
|
|
|
- for($i=1 ; $i<=$nb_options ; ++$i) {
|
|
|
- $a_matches[$i] = chr(64+$i); // fill the array with A, B, C.....
|
|
|
+ for ($i = 1; $i <= $nb_options; ++$i) {
|
|
|
+ $a_matches[$i] = chr(64 + $i); // fill the array with A, B, C.....
|
|
|
}
|
|
|
|
|
|
- $form -> addElement('hidden', 'nb_matches', $nb_matches);
|
|
|
- $form -> addElement('hidden', 'nb_options', $nb_options);
|
|
|
+ $form->addElement('hidden', 'nb_matches', $nb_matches);
|
|
|
+ $form->addElement('hidden', 'nb_options', $nb_options);
|
|
|
|
|
|
// DISPLAY MATCHES
|
|
|
- $html='<table class="data_table">
|
|
|
- <tr>
|
|
|
- <th width="10px">
|
|
|
- '.get_lang('Number').'
|
|
|
- </th>
|
|
|
- <th width="40%">
|
|
|
- '.get_lang('Answer').'
|
|
|
- </th>
|
|
|
- <th width="40%">
|
|
|
- '.get_lang('MatchesTo').'
|
|
|
- </th>
|
|
|
- <th width="50px">
|
|
|
- '.get_lang('Weighting').'
|
|
|
- </th>
|
|
|
- </tr>';
|
|
|
-
|
|
|
- $form -> addElement ('label', get_lang('MakeCorrespond').'<br /> <img src="../img/fill_field.png">', $html);
|
|
|
+ $html = '<table class="table table-striped table-hover">
|
|
|
+ <thead>
|
|
|
+ <tr>
|
|
|
+ <th width="10">' . get_lang('Number') . '</th>
|
|
|
+ <th width="85%">' . get_lang('Answer') . '</th>
|
|
|
+ <th width="15%">' . get_lang('MatchesTo') . '</th>
|
|
|
+ <th width="10">' . get_lang('Weighting') . '</th>
|
|
|
+ </tr>
|
|
|
+ </thead>
|
|
|
+ <tbody>';
|
|
|
+
|
|
|
+ $form->addHeader(get_lang('MakeCorrespond'));
|
|
|
+ $form->addHtml($html);
|
|
|
|
|
|
if ($nb_matches < 1) {
|
|
|
$nb_matches = 1;
|
|
|
Display::display_normal_message(get_lang('YouHaveToCreateAtLeastOneAnswer'));
|
|
|
}
|
|
|
|
|
|
- for($i = 1 ; $i <= $nb_matches ; ++$i) {
|
|
|
- $form -> addElement ('html', '<tr><td>');
|
|
|
- $group = array();
|
|
|
- $puce = $form->createElement('text', null,null,'value="'.$i.'"');
|
|
|
- $puce->freeze();
|
|
|
- $group[] = $puce;
|
|
|
-
|
|
|
- $group[] = $form->createElement('text', 'answer['.$i.']',null);
|
|
|
- $group[] = $form->createElement('select', 'matches['.$i.']',null,$a_matches);
|
|
|
- $group[] = $form->createElement('text', 'weighting['.$i.']',null, array('class' => 'span1', 'value' => 10));
|
|
|
- $form -> addGroup($group, null, null, '</td><td>');
|
|
|
- $form -> addElement ('html', '</td></tr>');
|
|
|
+ for ($i = 1; $i <= $nb_matches; ++$i) {
|
|
|
+ $renderer = &$form->defaultRenderer();
|
|
|
+
|
|
|
+ $renderer->setElementTemplate(
|
|
|
+ '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->{element}</td>',
|
|
|
+ "answer[$i]"
|
|
|
+ );
|
|
|
+ $renderer->setElementTemplate(
|
|
|
+ '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->{element}</td>',
|
|
|
+ "matches[$i]"
|
|
|
+ );
|
|
|
+ $renderer->setElementTemplate(
|
|
|
+ '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->{element}</td>',
|
|
|
+ "weighting[$i]"
|
|
|
+ );
|
|
|
+
|
|
|
+ $form->addHtml('<tr>');
|
|
|
+
|
|
|
+ $form->addHtml("<td>$i</td>");
|
|
|
+ $form->addText("answer[$i]", null);
|
|
|
+ $form->addSelect("matches[$i]", null, $a_matches);
|
|
|
+ $form->addText("weighting[$i]", null, true, ['value' => 10]);
|
|
|
+
|
|
|
+ $form->addHtml('</tr>');
|
|
|
}
|
|
|
|
|
|
- $form -> addElement ('html', '</table></div></div>');
|
|
|
+ $form->addHtml('</tbody></table>');
|
|
|
$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"');
|
|
|
+ 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"');
|
|
|
+ $renderer->setElementTemplate('<div class="form-group"><div class="col-sm-offset-2">{element}', 'lessMatches');
|
|
|
+ $renderer->setElementTemplate('{element}</div></div>', 'moreMatches');
|
|
|
+
|
|
|
+ $group[] = $form->addButtonDelete(get_lang('DelElem'), 'lessMatches', true);
|
|
|
+ $group[] = $form->addButtonCreate(get_lang('AddElem'), 'moreMatches', true);
|
|
|
}
|
|
|
|
|
|
- $form -> addGroup($group);
|
|
|
+ $form->addGroup($group);
|
|
|
|
|
|
// DISPLAY OPTIONS
|
|
|
- $html='<table class="data_table">
|
|
|
- <tr style="text-align: center;">
|
|
|
- <th width="10px">
|
|
|
- '.get_lang('Number').'
|
|
|
- </th>
|
|
|
- <th width="90%"
|
|
|
- '.get_lang('Answer').'
|
|
|
- </th>
|
|
|
- </tr>';
|
|
|
- //$form -> addElement ('html', $html);
|
|
|
- $form -> addElement ('label', null, $html);
|
|
|
+ $html = '<table class="table table-striped table-hover">
|
|
|
+ <thead>
|
|
|
+ <tr>
|
|
|
+ <th width="15%">' . get_lang('Number') . '</th>
|
|
|
+ <th width="85%">' . get_lang('Answer') . '</th>
|
|
|
+ </tr>
|
|
|
+ </thead>
|
|
|
+ <tbody>';
|
|
|
+
|
|
|
+ $form->addHtml($html);
|
|
|
|
|
|
if ($nb_options < 1) {
|
|
|
$nb_options = 1;
|
|
|
Display::display_normal_message(get_lang('YouHaveToCreateAtLeastOneAnswer'));
|
|
|
}
|
|
|
|
|
|
- for($i = 1 ; $i <= $nb_options ; ++$i) {
|
|
|
- $form -> addElement ('html', '<tr><td>');
|
|
|
- $group = array();
|
|
|
- $puce = $form->createElement('text', null,null,'value="'.chr(64+$i).'"');
|
|
|
- $puce->freeze();
|
|
|
- $group[] = $puce;
|
|
|
- $group[] = $form->createElement('text', 'option['.$i.']',null, array('class' =>'span6'));
|
|
|
- $form -> addGroup($group, null, null, '</td><td>');
|
|
|
- $form -> addElement ('html', '</td></tr>');
|
|
|
+ for ($i = 1; $i <= $nb_options; ++$i) {
|
|
|
+ $renderer = &$form->defaultRenderer();
|
|
|
+
|
|
|
+ $renderer->setElementTemplate(
|
|
|
+ '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->{element}</td>',
|
|
|
+ "option[$i]"
|
|
|
+ );
|
|
|
+
|
|
|
+ $form->addHtml('<tr>');
|
|
|
+
|
|
|
+ $form->addHtml('<td>' . chr(64 + $i) . '</td>');
|
|
|
+ $form->addText("option[$i]", null);
|
|
|
+
|
|
|
+ $form->addHtml('</tr>');
|
|
|
}
|
|
|
|
|
|
- $form -> addElement ('html', '</table></div></div>');
|
|
|
+ $form->addHtml('</table>');
|
|
|
$group = array();
|
|
|
global $text, $class;
|
|
|
|
|
|
- if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') {
|
|
|
+ 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', 'lessOptions', get_lang('DelElem'),'class="minus"');
|
|
|
- $group[] = $form->createElement('submit', 'moreOptions',get_lang('AddElem'),'class="plus"');
|
|
|
+ $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"');
|
|
|
} else {
|
|
|
// 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.'"');
|
|
|
+ $group[] = $form->addButtonDelete(get_lang('DelElem'), 'lessOptions', true);
|
|
|
+ $group[] = $form->addButtonCreate(get_lang('AddElem'), 'moreOptions', true);
|
|
|
+ $group[] = $form->addButtonSave($text, 'submitQuestion', true);
|
|
|
}
|
|
|
|
|
|
- $form -> addGroup($group);
|
|
|
+ $form->addGroup($group);
|
|
|
|
|
|
- if (!empty($this -> id)) {
|
|
|
- $form -> setDefaults($defaults);
|
|
|
+ if (!empty($this->id)) {
|
|
|
+ $form->setDefaults($defaults);
|
|
|
} else {
|
|
|
- if ($this -> isContent == 1) {
|
|
|
- $form -> setDefaults($defaults);
|
|
|
+ if ($this->isContent == 1) {
|
|
|
+ $form->setDefaults($defaults);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- $form->setConstants(array('nb_matches' => $nb_matches,'nb_options' => $nb_options));
|
|
|
+ $form->setConstants(array('nb_matches' => $nb_matches, 'nb_options' => $nb_options));
|
|
|
}
|
|
|
|
|
|
|