Minor - format code.

1.9.x
Julio Montoya 11 years ago
parent da239fdb30
commit 074c81b67b
  1. 1
      main/exercice/exercise_result.php
  2. 32
      main/exercice/matching.class.php
  3. 1
      main/exercice/overview.php

@ -49,7 +49,6 @@ if ($debug) {
error_log('Entering exercise_result.php: '.print_r($_POST, 1)); error_log('Entering exercise_result.php: '.print_r($_POST, 1));
} }
// general parameters passed via POST/GET
// general parameters passed via POST/GET // general parameters passed via POST/GET
if (empty($origin)) { if (empty($origin)) {
$origin = Security::remove_XSS($_REQUEST['origin']); $origin = Security::remove_XSS($_REQUEST['origin']);

@ -1,8 +1,6 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
/**
* Code
*/
/** /**
* *
* Class Matching * Class Matching
@ -14,24 +12,27 @@
* @author Eric Marguin * @author Eric Marguin
* @package chamilo.exercise * @package chamilo.exercise
*/ */
class Matching extends Question { class Matching extends Question
{
static $typePicture = 'matching.gif'; static $typePicture = 'matching.gif';
static $explanationLangVar = 'Matching'; static $explanationLangVar = 'Matching';
/** /**
* Constructor * Constructor
*/ */
function Matching(){ public function Matching()
{
parent::question(); parent::question();
$this->type = MATCHING; $this->type = MATCHING;
$this->isContent = $this-> getIsContent(); $this->isContent = $this-> getIsContent();
} }
/** /**
* function which redifines Question::createAnswersForm * function which redefines Question::createAnswersForm
* @param the formvalidator instance * @param FormValidator $form
*/ */
function createAnswersForm ($form) { public function createAnswersForm ($form)
{
$defaults = array(); $defaults = array();
$navigator_info = api_get_navigator(); $navigator_info = api_get_navigator();
@ -194,10 +195,10 @@ class Matching extends Question {
/** /**
* abstract function which creates the form to create / edit the answers of the question * abstract function which creates the form to create / edit the answers of the question
* @param the formvalidator instance * @param FormValidator $form
*/ */
function processAnswersCreation($form) { public function processAnswersCreation($form)
{
$nb_matches = $form -> getSubmitValue('nb_matches'); $nb_matches = $form -> getSubmitValue('nb_matches');
$nb_options = $form -> getSubmitValue('nb_options'); $nb_options = $form -> getSubmitValue('nb_options');
$this -> weighting = 0; $this -> weighting = 0;
@ -225,7 +226,14 @@ class Matching extends Question {
$this->save(); $this->save();
} }
function return_header($feedback_type = null, $counter = null, $score = null) { /**
* @param null $feedback_type
* @param null $counter
* @param null $score
* @return string
*/
public function return_header($feedback_type = null, $counter = null, $score = null)
{
$header = parent::return_header($feedback_type, $counter, $score); $header = parent::return_header($feedback_type, $counter, $score);
$header .= '<table class="'.$this->question_table_class .'">'; $header .= '<table class="'.$this->question_table_class .'">';
$header .= '<tr> $header .= '<tr>

@ -98,7 +98,6 @@ if (isset($exercise_stat_info['exe_id'])) {
} }
//1. Check if this is a new attempt or a previous //1. Check if this is a new attempt or a previous
//$countNotFinished = isset($exercise_stat_info['num_exe']) ? $exercise_stat_info['num_exe'] : null;
$label = get_lang('StartTest'); $label = get_lang('StartTest');
if ($time_control && !empty($clock_expired_time) || !empty($attempt_list)) { if ($time_control && !empty($clock_expired_time) || !empty($attempt_list)) {
$label = get_lang('ContinueTest'); $label = get_lang('ContinueTest');

Loading…
Cancel
Save