From 3f91f58429f060ac3bd92bc9c3f87c3e708351d2 Mon Sep 17 00:00:00 2001 From: Cristian Fasanando Date: Thu, 7 Jan 2010 12:03:49 -0500 Subject: [PATCH 1/2] hidden comments when no feedback is enable in test - partial CT#462 --- main/exercice/exercise_result.php | 28 +++++++++++- main/exercice/exercise_show.php | 59 ++++++++++++++++++------- main/exercice/hotspot_admin.inc.php | 40 ++++++++++++----- main/exercice/matching.class.php | 4 +- main/exercice/multiple_answer.class.php | 27 +++++++---- main/exercice/unique_answer.class.php | 11 ++--- 6 files changed, 128 insertions(+), 41 deletions(-) diff --git a/main/exercice/exercise_result.php b/main/exercice/exercise_result.php index 1c9e5d3355..09385aefa0 100755 --- a/main/exercice/exercise_result.php +++ b/main/exercice/exercise_result.php @@ -332,6 +332,7 @@ FUNCTIONS function display_unique_or_multiple_answer($answerType, $studentChoice, $answer, $answerComment, $answerCorrect) { + global $feedback_type; ?> @@ -348,6 +349,7 @@ function display_unique_or_multiple_answer($answerType, $studentChoice, $answer, echo $answer; ?> + + +   + + + +   + + '; ?> + +   + + + +   + + + +   +

+

+ +   + @@ -267,6 +268,8 @@ function display_unique_or_multiple_answer($answerType, $studentChoice, $answer, echo $answer; ?> + + + +   + - + + + + + - - + + + - + + + + + + +   + + + + +   +   @@ -606,7 +631,11 @@ if ($show_results) { + + +   +   @@ -1008,7 +1037,7 @@ if ($show_results) { } echo ''; echo '
'; - if ($questionScore==-1) { + if ($questionScore==-1 ) { $questionScore=0; echo '
'.get_lang('notCorrectedYet'); } diff --git a/main/exercice/hotspot_admin.inc.php b/main/exercice/hotspot_admin.inc.php index 50cec7e944..c01f3fe30d 100755 --- a/main/exercice/hotspot_admin.inc.php +++ b/main/exercice/hotspot_admin.inc.php @@ -172,7 +172,9 @@ if($modifyAnswers) for($i=1;$i <= $nbrAnswers;$i++) { $reponse[$i]=$objAnswer->selectAnswer($i); - $comment[$i]=$objAnswer->selectComment($i); + if ($objExercise->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) { + $comment[$i]=$objAnswer->selectComment($i); + } $weighting[$i]=$objAnswer->selectWeighting($i); $hotspot_coordinates[$i]=$objAnswer->selectHotspotCoordinates($i); $hotspot_type[$i]=$objAnswer->selectHotspotType($i); @@ -183,7 +185,9 @@ if($modifyAnswers) $_SESSION['tmp_answers'] = array(); $_SESSION['tmp_answers']['answer'] = $reponse; - $_SESSION['tmp_answers']['comment'] = $comment; + if ($objExercise->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) { + $_SESSION['tmp_answers']['comment'] = $comment; + } $_SESSION['tmp_answers']['weighting'] = $weighting; $_SESSION['tmp_answers']['hotspot_coordinates'] = $hotspot_coordinates; $_SESSION['tmp_answers']['hotspot_type'] = $hotspot_type; @@ -195,7 +199,9 @@ if($modifyAnswers) $nbrAnswers--; // Remove the last answer $tmp = array_pop($_SESSION['tmp_answers']['answer']); - $tmp = array_pop($_SESSION['tmp_answers']['comment']); + if ($objExercise->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) { + $tmp = array_pop($_SESSION['tmp_answers']['comment']); + } $tmp = array_pop($_SESSION['tmp_answers']['weighting']); $tmp = array_pop($_SESSION['tmp_answers']['hotspot_coordinates']); $tmp = array_pop($_SESSION['tmp_answers']['hotspot_type']); @@ -212,7 +218,9 @@ if($modifyAnswers) // Add a new answer $_SESSION['tmp_answers']['answer'][]=''; - $_SESSION['tmp_answers']['comment'][]=''; + if ($objExercise->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) { + $_SESSION['tmp_answers']['comment'][]=''; + } $_SESSION['tmp_answers']['weighting'][]='1'; $_SESSION['tmp_answers']['hotspot_coordinates'][]='0;0|0|0'; $_SESSION['tmp_answers']['hotspot_type'][]='square'; @@ -293,9 +301,16 @@ if($modifyAnswers) --> -   - * - +   + + + selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) { ?> + * + + + * + + * @@ -303,8 +318,9 @@ if($modifyAnswers) for($i=1;$i <= $nbrAnswers;$i++) { ?> -
- +
+ selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) { ?> + CreateHtml(); /**/ ?> - + + + + + diff --git a/main/exercice/matching.class.php b/main/exercice/matching.class.php index 9b7053e6a9..2797ea7bda 100755 --- a/main/exercice/matching.class.php +++ b/main/exercice/matching.class.php @@ -142,7 +142,7 @@ class Matching extends Question { if ($nb_matches < 1) { $nb_matches = 1; - Display::display_normal_message(get_lang('YouHaveToCreateAlLeastOneAnswer')); + Display::display_normal_message(get_lang('YouHaveToCreateAtLeastOneAnswer')); } for($i = 1 ; $i <= $nb_matches ; ++$i) { @@ -195,7 +195,7 @@ class Matching extends Question { if ($nb_options < 1) { $nb_options = 1; - Display::display_normal_message(get_lang('YouHaveToCreateAlLeastOneAnswer')); + Display::display_normal_message(get_lang('YouHaveToCreateAtLeastOneAnswer')); } for($i = 1 ; $i <= $nb_options ; ++$i) { diff --git a/main/exercice/multiple_answer.class.php b/main/exercice/multiple_answer.class.php index d726b9ecd9..1a7ca2541d 100755 --- a/main/exercice/multiple_answer.class.php +++ b/main/exercice/multiple_answer.class.php @@ -66,6 +66,8 @@ class MultipleAnswer extends Question { $nb_answers = isset($_POST['nb_answers']) ? $_POST['nb_answers'] : 2; $nb_answers += (isset($_POST['lessAnswers']) ? -1 : (isset($_POST['moreAnswers']) ? 1 : 0)); + $obj_ex = $_SESSION['objExercise']; + $html='
@@ -82,11 +84,15 @@ class MultipleAnswer extends Question { '.get_lang('Answer').' - - + '; + // show column comment when feedback is enable + if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM ) { + $html .=' '.get_lang('Comment').' - - + '; + } + + $html .= ' '.get_lang('Weighting').' '; @@ -107,7 +113,7 @@ class MultipleAnswer extends Question { if ($nb_answers < 1) { $nb_answers = 1; - Display::display_normal_message(get_lang('YouHaveToCreateAlLeastOneAnswer')); + Display::display_normal_message(get_lang('YouHaveToCreateAtLeastOneAnswer')); } for($i = 1 ; $i <= $nb_answers ; ++$i) { @@ -135,10 +141,15 @@ class MultipleAnswer extends Question { $form->addElement('checkbox', 'correct['.$i.']', null, null, 'class="checkbox" style="margin-left: 0em;"'); $boxes_names[] = 'correct['.$i.']'; - - $form->addElement('html_editor', 'answer['.$i.']',null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100')); + + $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')); + + // show comment when feedback is enable + if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) { + $form->addElement('html_editor', 'comment['.$i.']',null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100')); + } + $form->addElement('text', 'weighting['.$i.']',null, 'style="vertical-align:middle;margin-left: 0em;" size="5" value="10"'); $form -> addElement ('html', ''); } diff --git a/main/exercice/unique_answer.class.php b/main/exercice/unique_answer.class.php index ecd3d16e94..1e0487fbab 100755 --- a/main/exercice/unique_answer.class.php +++ b/main/exercice/unique_answer.class.php @@ -159,7 +159,7 @@ class UniqueAnswer extends Question { if ($nb_answers < 1) { $nb_answers = 1; - Display::display_normal_message(get_lang('YouHaveToCreateAlLeastOneAnswer')); + Display::display_normal_message(get_lang('YouHaveToCreateAtLeastOneAnswer')); } for($i = 1 ; $i <= $nb_answers ; ++$i) @@ -230,11 +230,12 @@ class UniqueAnswer extends Question { $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->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required'); - - if ($obj_ex->selectFeedbackType()==0) // feedback + + if ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_END) { + // feedback $form->addElement('html_editor', 'comment['.$i.']', null, 'style="vertical-align:middle"', $editor_config); - elseif ($obj_ex->selectFeedbackType()==1) // direct feedback - { + } elseif ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) { + // direct feedback $form->addElement('html_editor', 'comment['.$i.']', null, 'style="vertical-align:middle"', $editor_config); //Adding extra feedback fields $group = array(); From 0b2271e560ecf003e58dcf547a788c82abf62801 Mon Sep 17 00:00:00 2001 From: Arthur Portugal Date: Thu, 7 Jan 2010 12:38:10 -0500 Subject: [PATCH 2/2] Added the validation for the document tests CT#451 --- tests/procedures/spanish/tests.xls | Bin 47104 -> 49664 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/procedures/spanish/tests.xls b/tests/procedures/spanish/tests.xls index 288b2daa29ece36d130534481108a35c2e43edf5..4c3e173d50831715827d8a8c8dbd6a4d95a2398e 100644 GIT binary patch delta 6463 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 aF>!`=<=h1mUk;%Qn@s6vwQnyBPxu$~mu)=& delta 4916 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