MDL-17721 - feedback items now have a label which is printed on analysing and excel

 export

diff --git a/mod/feedback/analysis_to_excel.php b/mod/feedback/analysis_to_excel.php
index a50c7cbbeac04a5cadeed6531c278d62f052715f..d9637cd7fa29e451591ac5254dddb30c17e94f22 100644 (file)
--- a/mod/feedback/analysis_to_excel.php
+++ b/mod/feedback/analysis_to_excel.php
@@ -47,6 +47,7 @@
     $fstring->of = get_string('of', 'feedback');
     $fstring->modulenameplural = get_string('modulenameplural', 'feedback');
     $fstring->questions = get_string('questions', 'feedback');
+    $fstring->itemlabel = get_string('item_label', 'feedback');
     $fstring->question = get_string('question', 'feedback');
     $fstring->responses = get_string('responses', 'feedback');
     $fstring->idnumber = get_string('idnumber');
@@ -88,8 +89,9 @@
     $worksheet1->hideGridlines();
     $worksheet1->setHeader("&\"Arial," . $fstring->bold . "\"&14".$feedback->name);
     $worksheet1->setFooter($fstring->page." &P " . $fstring->of . " &N");
-    $worksheet1->setColumn(0, 0, 30);
-    $worksheet1->setColumn(1, 20, 15);
+    $worksheet1->setColumn(0, 0, 10);
+    $worksheet1->setColumn(1, 1, 30);
+    $worksheet1->setColumn(2, 20, 15);
     $worksheet1->setMargins_LR(0.10);
 
     $worksheet2->setLandscape();
@@ -118,8 +120,9 @@
     }
     
     $rowOffset1 += 2;
-    $worksheet1->write_string($rowOffset1, 0, $fstring->question);
-    $worksheet1->write_string($rowOffset1, 1, $fstring->responses);
+    $worksheet1->write_string($rowOffset1, 0, $fstring->itemlabel);
+    $worksheet1->write_string($rowOffset1, 1, $fstring->question);
+    $worksheet1->write_string($rowOffset1, 2, $fstring->responses);
     $rowOffset1++ ;
 
     if (empty($items)) {
@@ -171,30 +174,31 @@
         
         $worksheet->setFormat('<l><f><ru2>');
 
-        $worksheet->write_string($rowOffset, $colOffset, $fstring->idnumber);
+        $worksheet->write_string($rowOffset + 1, $colOffset, $fstring->idnumber);
         $colOffset++;
 
-        $worksheet->write_string($rowOffset, $colOffset, $fstring->username);
+        $worksheet->write_string($rowOffset + 1, $colOffset, $fstring->username);
         $colOffset++;
 
-        $worksheet->write_string($rowOffset, $colOffset, $fstring->fullname);
+        $worksheet->write_string($rowOffset + 1, $colOffset, $fstring->fullname);
         $colOffset++;
         
         foreach($items as $item) {
             $worksheet->setFormat('<l><f><ru2>');
             $worksheet->write_string($rowOffset, $colOffset, $item->name);
+            $worksheet->write_string($rowOffset + 1, $colOffset, $item->label);
             $colOffset++;
         }
 
         $worksheet->setFormat('<l><f><ru2>');
-        $worksheet->write_string($rowOffset, $colOffset, $fstring->courseid);
+        $worksheet->write_string($rowOffset + 1, $colOffset, $fstring->courseid);
         $colOffset++;
 
         $worksheet->setFormat('<l><f><ru2>');
-        $worksheet->write_string($rowOffset, $colOffset, $fstring->course);
+        $worksheet->write_string($rowOffset + 1, $colOffset, $fstring->course);
         $colOffset++;
 
-        return $rowOffset + 1;
+        return $rowOffset + 2;
     }
     
     function feedback_excelprint_detailed_items(&$worksheet, $completed, $items, $rowOffset) {

diff --git a/mod/feedback/db/install.xml b/mod/feedback/db/install.xml
index ff5a190996aab0fb04a6f301e423f5d92f82e501..89e276eb0147e591b159cbbee07ce8f55afb08a1 100644 (file)
--- a/mod/feedback/db/install.xml
+++ b/mod/feedback/db/install.xml
@@ -44,8 +44,9 @@
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" ENUM="false" NEXT="feedback"/>
         <FIELD NAME="feedback" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="id" NEXT="template"/>
         <FIELD NAME="template" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="feedback" NEXT="name"/>
-        <FIELD NAME="name" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="template" NEXT="presentation"/>
-        <FIELD NAME="presentation" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="name" NEXT="typ"/>
+        <FIELD NAME="name" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="template" NEXT="label"/>
+        <FIELD NAME="label" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="name" NEXT="presentation"/>
+        <FIELD NAME="presentation" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="label" NEXT="typ"/>
         <FIELD NAME="typ" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="presentation" NEXT="hasvalue"/>
         <FIELD NAME="hasvalue" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="typ" NEXT="position"/>
         <FIELD NAME="position" TYPE="int" LENGTH="3" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="hasvalue" NEXT="required"/>

diff --git a/mod/feedback/db/upgrade.php b/mod/feedback/db/upgrade.php
index e89f0efcabcac58126fa3a68c333872ab102b8de..3aa24f3048d4ba8cc2980a949e968a399886451e 100644 (file)
--- a/mod/feedback/db/upgrade.php
+++ b/mod/feedback/db/upgrade.php
@@ -237,6 +237,18 @@ function xmldb_feedback_upgrade($oldversion) {
     if ($result && $oldversion < 2008073002) {
         $update_sql = "UPDATE {feedback_item} SET presentation = '-|-' WHERE presentation = '0|0' AND typ = 'numeric'";
         $result = $result && $DB->execute($update_sql);
+        
+        upgrade_mod_savepoint($result, 2008073002, 'feedback');
+    }
+    
+    if ($result && $oldversion < 2009031301) {
+        /// Define field label to be added to feedback_item
+        $table = new xmldb_table('feedback_item');
+        $field = new xmldb_field('label', XMLDB_TYPE_CHAR, '255', null, null, false, null, null, '', 'name');
+        /// Launch add field2
+        $dbman->add_field($table, $field);
+
+        upgrade_mod_savepoint($result, 2009031301, 'feedback');
     }
     
     return $result;

diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php
index f117b66c59b17f9705886eb1d8305c8a09c4f0f6..68135a408b49caa7e7896757e6ce290b3e2206cc 100644 (file)
--- a/mod/feedback/edit.php
+++ b/mod/feedback/edit.php
@@ -24,6 +24,8 @@
     $moveitem = optional_param('moveitem', false, PARAM_INT);
     $movehere = optional_param('movehere', false, PARAM_INT);
     $switchitemrequired = optional_param('switchitemrequired', false, PARAM_INT);
+
+    $ME = strip_querystring($FULLME);//sometimes it is not correct set
     
     // $SESSION->feedback->current_tab = $do_show;
     $current_tab = $do_show;
@@ -63,6 +65,7 @@
     if($movehere && isset($SESSION->feedback->moving->movingitem)){
         $item = $DB->get_record('feedback_item', array('id'=>$SESSION->feedback->moving->movingitem));
         feedback_move_item($item, intval($movehere));
+        $moveitem = false;
     }
     if($moveitem){
         $item = $DB->get_record('feedback_item', array('id'=>$moveitem));

diff --git a/mod/feedback/item/captcha/captcha_form.php b/mod/feedback/item/captcha/captcha_form.php
index 2e92b449ca53527d4174459da8e99b245829b437..5f868f9855a1ba37c32933808900230bac0a8764 100644 (file)
--- a/mod/feedback/item/captcha/captcha_form.php
+++ b/mod/feedback/item/captcha/captcha_form.php
@@ -6,6 +6,7 @@ class feedback_captcha_form extends feedback_item_form {
     var $type = "captcha";
     var $requiredcheck;
     var $itemname;
+    var $itemlabel;
     var $select;
     
     function definition() {
@@ -15,6 +16,7 @@ class feedback_captcha_form extends feedback_item_form {
         $this->requiredcheck = $mform->addElement('checkbox', 'required', get_string('required', 'feedback'));
         
         $this->itemname = $mform->addElement('text', 'itemname', get_string('item_name', 'feedback'), array('size="'.FEEDBACK_ITEM_NAME_TEXTBOX_SIZE.'"','maxlength="255"'));
+        $this->itemlabel = $mform->addElement('text', 'itemlabel', get_string('item_label', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
         
         $this->select = $mform->addElement('select',
                                             'count_of_nums', 

diff --git a/mod/feedback/item/captcha/lib.php b/mod/feedback/item/captcha/lib.php
index 04b307940fc9e2ad956c339a946e15f46b50118a..69071a177c5964bcdae9330969d77fe369c2d512 100644 (file)
--- a/mod/feedback/item/captcha/lib.php
+++ b/mod/feedback/item/captcha/lib.php
@@ -17,6 +17,7 @@ class feedback_item_captcha extends feedback_item_base {
 
         $item->presentation = empty($item->presentation) ? 3 : $item->presentation;
         $item->name = empty($item->name) ? '' : $item->name;
+        $item->label = empty($item->label) ? '' : $item->label;
         
         $item->required = isset($item->required) ? $item->required : 1;
         if($item->required) {
@@ -24,6 +25,7 @@ class feedback_item_captcha extends feedback_item_base {
         }
 
         $item_form->itemname->setValue($item->name);
+        $item_form->itemlabel->setValue($item->label);
         
         $item_form->select->setValue($item->presentation);
         return $item_form;
@@ -87,7 +89,12 @@ class feedback_item_captcha extends feedback_item_base {
         $requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
     ?>
         <td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>">
-            <?php echo format_text($item->name . $requiredmark, true, false, false);?>
+        <?php
+            if($edit OR $readonly) {
+                echo '('.$item->label.') ';
+            }
+            echo format_text($item->name . $requiredmark, true, false, false);
+        ?>
             <img alt="<?php echo $this->type;?>" src="<?php echo $CFG->wwwroot.htmlspecialchars('/mod/feedback/item/captcha/print_captcha.php?id='.$cmid);?>" />
         </td>
         <td valign="top" align="<?php echo $align;?>">
@@ -95,7 +102,7 @@ class feedback_item_captcha extends feedback_item_base {
         if($readonly){
             // print_simple_box_start($align);
             print_box_start('generalbox boxalign'.$align);
-            echo $value?$value:'&nbsp;';
+            echo $value ? $value : '&nbsp;';
             // print_simple_box_end();
             print_box_end();
         }else {

diff --git a/mod/feedback/item/feedback_item_form_class.php b/mod/feedback/item/feedback_item_form_class.php
index ab1fa2a35ceda42c7cc982a3c3b38f1dda34ad58..8b6dfe36ccc58c0214d283c4883ffe10902609c6 100644 (file)
--- a/mod/feedback/item/feedback_item_form_class.php
+++ b/mod/feedback/item/feedback_item_form_class.php
@@ -3,6 +3,7 @@
 require_once $CFG->libdir.'/formslib.php';
 
 define('FEEDBACK_ITEM_NAME_TEXTBOX_SIZE', 80);
+define('FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE', 20);
 class feedback_item_form extends moodleform {
     
     function get_item_form() {

diff --git a/mod/feedback/item/info/info_form.php b/mod/feedback/item/info/info_form.php
index 998d7368b470d693dbea3138b66993abbfd1d85f..d792d4fdda17fb8bba385544e1178edb224d0b9a 100644 (file)
--- a/mod/feedback/item/info/info_form.php
+++ b/mod/feedback/item/info/info_form.php
@@ -6,6 +6,7 @@ class feedback_info_form extends feedback_item_form {
     var $type = "info";
     var $requiredcheck;
     var $itemname;
+    var $itemlabel;
     var $infotype;
     
     function definition() {
@@ -15,6 +16,7 @@ class feedback_info_form extends feedback_item_form {
         $this->requiredcheck = &$mform->addElement('hidden', 'required');
         
         $this->itemname = &$mform->addElement('text', 'itemname', get_string('item_name', 'feedback'), array('size="'.FEEDBACK_ITEM_NAME_TEXTBOX_SIZE.'"','maxlength="255"'));
+        $this->itemlabel = $mform->addElement('text', 'itemlabel', get_string('item_label', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
         
         $options=array();
         $options[1]  = get_string('responsetime', 'feedback');

diff --git a/mod/feedback/item/info/lib.php b/mod/feedback/item/info/lib.php
index 3020b00550acac534dff2871536a5fd51f2b85fd..74bd0dfce868ea7d4854e9ea854c62006c9c2419 100644 (file)
--- a/mod/feedback/item/info/lib.php
+++ b/mod/feedback/item/info/lib.php
@@ -17,10 +17,12 @@ class feedback_item_info extends feedback_item_base {
         
         $item->presentation = empty($item->presentation) ? '' : $item->presentation;
         $item->name = empty($item->name) ? '' : htmlspecialchars($item->name);
+        $item->label = empty($item->label) ? '' : $item->label;
         
         $item_form->requiredcheck->setValue(false);
 
         $item_form->itemname->setValue($item->name);
+        $item_form->itemlabel->setValue($item->label);
 
         $item_form->infotype->setValue($item->presentation);
         
@@ -73,7 +75,7 @@ class feedback_item_info extends feedback_item_base {
         $analysed_item = $this->get_analysed($item, $groupid, $courseid);
         $data = $analysed_item->data;
         if(is_array($data)) {
-            echo '<tr><th colspan="2" align="left">'. $itemnr . '&nbsp;' . $item->name .'</th></tr>';
+            echo '<tr><th colspan="2" align="left">'. $itemnr . '&nbsp;('. $item->label .') ' . $item->name .'</th></tr>';
             for($i = 0; $i < sizeof($data); $i++) {
                 echo '<tr><td colspan="2" valign="top" align="left">-&nbsp;&nbsp;' . str_replace("\n", '<br />', $data[$i]->show) . '</td></tr>';
             }
@@ -85,15 +87,16 @@ class feedback_item_info extends feedback_item_base {
         $analysed_item = $this->get_analysed($item, $groupid, $courseid);
 
         $worksheet->setFormat("<l><f><ro2><vo><c:green>");
-        $worksheet->write_string($rowOffset, 0, $item->name);
+        $worksheet->write_string($rowOffset, 0, $item->label);
+        $worksheet->write_string($rowOffset, 1, $item->name);
         $data = $analysed_item->data;
         if(is_array($data)) {
             $worksheet->setFormat("<l><ro2><vo>");
-            $worksheet->write_string($rowOffset, 1, $data[0]->show);
+            $worksheet->write_string($rowOffset, 2, $data[0]->show);
             $rowOffset++;
             for($i = 1; $i < sizeof($data); $i++) {
                 $worksheet->setFormat("<l><vo>");
-                $worksheet->write_string($rowOffset, 1, $data[$i]->show);
+                $worksheet->write_string($rowOffset, 2, $data[$i]->show);
                 $rowOffset++;
             }
         }
@@ -113,7 +116,14 @@ class feedback_item_info extends feedback_item_base {
         }
         $requiredmark =  ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
     ?>
-        <td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>"><?php echo format_text($item->name . $requiredmark, true, false, false);?></td>
+        <td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>">
+        <?php
+            if($edit OR $readonly) {
+                echo '('.$item->label.') ';
+            }
+            echo format_text($item->name . $requiredmark, true, false, false);
+        ?>
+        </td>
         <td valign="top" align="<?php echo $align;?>">
     <?php
         if($readonly){

diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php
index 0a6c8839596e6191de99da57d8c5a08496fecb6f..999111e2079d612c8112c9942eeda199a1133c1a 100644 (file)
--- a/mod/feedback/item/multichoice/lib.php
+++ b/mod/feedback/item/multichoice/lib.php
@@ -21,6 +21,7 @@ class feedback_item_multichoice extends feedback_item_base {
         
         $item->presentation = empty($item->presentation) ? '' : $item->presentation;
         $item->name = empty($item->name) ? '' : $item->name;
+        $item->label = empty($item->label) ? '' : $item->label;
 
         $info = $this->get_info($item);
 
@@ -30,6 +31,7 @@ class feedback_item_multichoice extends feedback_item_base {
         }
         
         $item_form->itemname->setValue($item->name);
+        $item_form->itemlabel->setValue($item->label);
         
         $item_form->selectadjust->setValue($info->horizontal);
         
@@ -148,7 +150,7 @@ class feedback_item_multichoice extends feedback_item_base {
         if($analysedItem) {
             // $itemnr++;
             $itemname = $analysedItem[1];
-            echo '<tr><th colspan="2" align="left">'. $itemnr . '&nbsp;' . $itemname .'</th></tr>';
+            echo '<tr><th colspan="2" align="left">'. $itemnr . '&nbsp;('. $item->label .') ' . $itemname .'</th></tr>';
             $analysedVals = $analysedItem[2];
             $pixnr = 0;
             foreach($analysedVals as $val) {
@@ -175,18 +177,19 @@ class feedback_item_multichoice extends feedback_item_base {
 
         $worksheet->setFormat("<l><f><ro2><vo><c:green>");
         //frage schreiben
-        $worksheet->write_string($rowOffset, 0, $analysed_item[1]);
+        $worksheet->write_string($rowOffset, 0, $item->label);
+        $worksheet->write_string($rowOffset, 1, $analysed_item[1]);
         if(is_array($data)) {
             for($i = 0; $i < sizeof($data); $i++) {
                 $aData = $data[$i];
                 
                 $worksheet->setFormat("<l><f><ro2><vo><c:blue>");
-                $worksheet->write_string($rowOffset, $i + 1, trim($aData->answertext));
+                $worksheet->write_string($rowOffset, $i + 2, trim($aData->answertext));
                 
                 $worksheet->setFormat("<l><vo>");
-                $worksheet->write_number($rowOffset + 1, $i + 1, $aData->answercount);
+                $worksheet->write_number($rowOffset + 1, $i + 2, $aData->answercount);
                 $worksheet->setFormat("<l><f><vo><pr>");
-                $worksheet->write_number($rowOffset + 2, $i + 1, $aData->quotient);
+                $worksheet->write_number($rowOffset + 2, $i + 2, $aData->quotient);
             }
         }
         $rowOffset +=3 ;
@@ -215,7 +218,11 @@ class feedback_item_multichoice extends feedback_item_base {
             }
             $requiredmark =  ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
             
-            echo '<td '.$highlight.' valign="top" align="'.$align.'">'.format_text($item->name.$requiredmark, true, false, false).'</td>';
+            echo '<td '.$highlight.' valign="top" align="'.$align.'">';
+            if($edit OR $readonly) {
+                echo '('.$item->label.') ';
+            }            
+            echo format_text($item->name.$requiredmark, true, false, false).'</td>';
             echo '<td valign="top" align="'.$align.'">';
         }else {
             if($highlightrequire AND $item->required AND intval($value) <= 0) {
@@ -225,7 +232,14 @@ class feedback_item_multichoice extends feedback_item_base {
             }
             $requiredmark =  ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
             ?>
-                <td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>"><?php echo format_text($item->name . $requiredmark, true, false, false);?></td>
+                <td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>">
+                <?php 
+                if($edit OR $readonly) {
+                    echo '('.$item->label.') ';
+                }
+                echo format_text($item->name . $requiredmark, true, false, false);
+                ?>
+                </td>
                 <td valign="top" align="<?php echo $align;?>">
             <?php
         }

diff --git a/mod/feedback/item/multichoice/multichoice_form.php b/mod/feedback/item/multichoice/multichoice_form.php
index abf2f8ab871e9959f2890488533498193a2030db..b2cad9b0def4ede58b8f00169a94cadbe50366bf 100644 (file)
--- a/mod/feedback/item/multichoice/multichoice_form.php
+++ b/mod/feedback/item/multichoice/multichoice_form.php
@@ -6,6 +6,7 @@ class feedback_multichoice_form extends feedback_item_form {
     var $type = "multichoice";
     var $requiredcheck;
     var $itemname;
+    var $itemlabel;
     var $selectadjust;
     var $selecttype;
     var $values;
@@ -18,6 +19,7 @@ class feedback_multichoice_form extends feedback_item_form {
         $this->requiredcheck = $mform->addElement('checkbox', 'required', get_string('required', 'feedback'));
         
         $this->itemname = $mform->addElement('text', 'itemname', get_string('item_name', 'feedback'), array('size="'.FEEDBACK_ITEM_NAME_TEXTBOX_SIZE.'"','maxlength="255"'));
+        $this->itemlabel = $mform->addElement('text', 'itemlabel', get_string('item_label', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
 
         $this->selectadjust = $mform->addElement('select',
                                             'horizontal', 

diff --git a/mod/feedback/item/multichoicerated/lib.php b/mod/feedback/item/multichoicerated/lib.php
index 71f90b3f4e996f36cdd84f0de1d7e7fbaca73ffc..f7b62fa9dd585fdf3a1310b7ab653573ec535b9d 100644 (file)
--- a/mod/feedback/item/multichoicerated/lib.php
+++ b/mod/feedback/item/multichoicerated/lib.php
@@ -26,6 +26,7 @@ class feedback_item_multichoicerated extends feedback_item_base {
         
         $item->presentation = empty($item->presentation) ? '' : $item->presentation;
         $item->name = empty($item->name) ? '' : $item->name;
+        $item->label = empty($item->label) ? '' : $item->label;
 
         $info = $this->get_info($item);
 
@@ -35,6 +36,7 @@ class feedback_item_multichoicerated extends feedback_item_base {
         }
         
         $item_form->itemname->setValue($item->name);
+        $item_form->itemlabel->setValue($item->label);
         
         $item_form->selectadjust->setValue($info->horizontal);
         
@@ -124,7 +126,7 @@ class feedback_item_multichoicerated extends feedback_item_base {
         if($analysedItem) {
             //echo '<table>';
             // $itemnr++;
-            echo '<tr><th colspan="2" align="left">'. $itemnr . '&nbsp;' . $analysedItem[1] .'</th></tr>';
+            echo '<tr><th colspan="2" align="left">'. $itemnr . '&nbsp;('. $item->label .') ' . $analysedItem[1] .'</th></tr>';
             $analysedVals = $analysedItem[2];
             $pixnr = 0;
             $avg = 0.0;
@@ -157,27 +159,28 @@ class feedback_item_multichoicerated extends feedback_item_base {
 
         $worksheet->setFormat("<l><f><ro2><vo><c:green>");
         //frage schreiben
-        $worksheet->write_string($rowOffset, 0, $analysed_item[1]);
+        $worksheet->write_string($rowOffset, 0, $item->label);
+        $worksheet->write_string($rowOffset, 1, $analysed_item[1]);
         if(is_array($data)) {
             $avg = 0.0;
             for($i = 0; $i < sizeof($data); $i++) {
                 $aData = $data[$i];
                 
                 $worksheet->setFormat("<l><f><ro2><vo><c:blue>");
-                $worksheet->write_string($rowOffset, $i + 1, trim($aData->answertext).' ('.$aData->value.')');
+                $worksheet->write_string($rowOffset, $i + 2, trim($aData->answertext).' ('.$aData->value.')');
                 
                 $worksheet->setFormat("<l><vo>");
-                $worksheet->write_number($rowOffset + 1, $i + 1, $aData->answercount);
+                $worksheet->write_number($rowOffset + 1, $i + 2, $aData->answercount);
                 //$worksheet->setFormat("<l><f><vo>");
                 //$worksheet->write_number($rowOffset + 2, $i + 1, $aData->avg);
                 $avg += $aData->avg;
             }
             //mittelwert anzeigen
             $worksheet->setFormat("<l><f><ro2><vo><c:red>");
-            $worksheet->write_string($rowOffset, sizeof($data) + 1, get_string('average', 'feedback'));
+            $worksheet->write_string($rowOffset, sizeof($data) + 2, get_string('average', 'feedback'));
             
             $worksheet->setFormat("<l><f><vo>");
-            $worksheet->write_number($rowOffset + 1, sizeof($data) + 1, $avg);
+            $worksheet->write_number($rowOffset + 1, sizeof($data) + 2, $avg);
         }
         $rowOffset +=2 ;
         return $rowOffset;
@@ -195,7 +198,14 @@ class feedback_item_multichoicerated extends feedback_item_base {
             $highlight = '';
         }
     ?>
-        <td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>"><?php echo format_text($item->name . $requiredmark, true, false, false);?></td>
+        <td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>">
+        <?php
+            if($edit OR $readonly) {
+                echo '('.$item->label.') ';
+            }
+            echo format_text($item->name . $requiredmark, true, false, false);
+        ?>
+        </td>
         <td valign="top" align="<?php echo $align;?>">
     <?php
         $index = 1;

diff --git a/mod/feedback/item/multichoicerated/multichoicerated_form.php b/mod/feedback/item/multichoicerated/multichoicerated_form.php
index c771ec864846271114634392e47ddb7b80efcbd1..5d9b0a498cb92b178187c3114cf8b9e58a33dac1 100644 (file)
--- a/mod/feedback/item/multichoicerated/multichoicerated_form.php
+++ b/mod/feedback/item/multichoicerated/multichoicerated_form.php
@@ -6,6 +6,7 @@ class feedback_multichoicerated_form extends feedback_item_form {
     var $type = "multichoicerated";
     var $requiredcheck;
     var $itemname;
+    var $itemlabel;
     var $selectadjust;
     var $selecttype;
     var $values;
@@ -18,6 +19,7 @@ class feedback_multichoicerated_form extends feedback_item_form {
         $this->requiredcheck = $mform->addElement('checkbox', 'required', get_string('required', 'feedback'));
         
         $this->itemname = $mform->addElement('text', 'itemname', get_string('item_name', 'feedback'), array('size="'.FEEDBACK_ITEM_NAME_TEXTBOX_SIZE.'"','maxlength="255"'));
+        $this->itemlabel = $mform->addElement('text', 'itemlabel', get_string('item_label', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
 
         $this->selectadjust = $mform->addElement('select',
                                             'horizontal', 

diff --git a/mod/feedback/item/numeric/lib.php b/mod/feedback/item/numeric/lib.php
index b20214c3cda3376caee7eac8b9e44d198815cab4..353e201da58601c92d977d72bbd3767b05b4d3aa 100644 (file)
--- a/mod/feedback/item/numeric/lib.php
+++ b/mod/feedback/item/numeric/lib.php
@@ -27,6 +27,7 @@ class feedback_item_numeric extends feedback_item_base {
 
         $item->presentation = empty($item->presentation) ? '' : $item->presentation;
         $item->name = empty($item->name) ? '' : $item->name;
+        $item->label = empty($item->label) ? '' : $item->label;
         
         $item->required = isset($item->required) ? $item->required : 0;
         if($item->required) {
@@ -34,6 +35,7 @@ class feedback_item_numeric extends feedback_item_base {
         }
 
         $item_form->itemname->setValue($item->name);
+        $item_form->itemlabel->setValue($item->label);
         
         $range_from_to = explode('|',$item->presentation);
         
@@ -89,7 +91,7 @@ class feedback_item_numeric extends feedback_item_base {
         if(isset($values->data) AND is_array($values->data)) {
             //echo '<table>';2
             // $itemnr++;
-            echo '<tr><th colspan="2" align="left">'. $itemnr . '&nbsp;' . $item->name .'</th></tr>';
+            echo '<tr><th colspan="2" align="left">'. $itemnr . '&nbsp;('. $item->label .') ' . $item->name .'</th></tr>';
             foreach($values->data as $value) {
                 echo '<tr><td colspan="2" valign="top" align="left">-&nbsp;&nbsp;' . number_format($value, 2, $this->sep_dec, $this->sep_thous) . '</td></tr>';
             }
@@ -108,7 +110,8 @@ class feedback_item_numeric extends feedback_item_base {
         $analysed_item = $this->get_analysed($item, $groupid, $courseid);
 
         $worksheet->setFormat("<l><f><ro2><vo><c:green>");
-        $worksheet->write_string($rowOffset, 0, $item->name);
+        $worksheet->write_string($rowOffset, 0, $item->label);
+        $worksheet->write_string($rowOffset, 1, $item->name);
         $data = $analysed_item->data;
         if(is_array($data)) {
             // $worksheet->setFormat("<l><ro2><vo>");
@@ -122,10 +125,10 @@ class feedback_item_numeric extends feedback_item_base {
         
             //mittelwert anzeigen
             $worksheet->setFormat("<l><f><ro2><vo><c:red>");
-            $worksheet->write_string($rowOffset, 1, get_string('average', 'feedback'));
+            $worksheet->write_string($rowOffset, 2, get_string('average', 'feedback'));
             
             $worksheet->setFormat("<l><f><vo>");
-            $worksheet->write_number($rowOffset + 1, 1, $analysed_item->avg);
+            $worksheet->write_number($rowOffset + 1, 2, $analysed_item->avg);
             $rowOffset++;
         }
         $rowOffset++;
@@ -150,6 +153,9 @@ class feedback_item_numeric extends feedback_item_base {
     ?>
         <td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>">
             <?php 
+                if($edit OR $readonly) {
+                    echo '('.$item->label.') ';
+                }
                 echo format_text($item->name . $requiredmark, true, false, false);
                 switch(true) {
                     case ($range_from === '-' AND is_numeric($range_to)):

diff --git a/mod/feedback/item/numeric/numeric_form.php b/mod/feedback/item/numeric/numeric_form.php
index ac25ea463e1e086263963486fc3de9bc6903d906..c7366ada22cada75dc54b073b14c86a37cf53b80 100644 (file)
--- a/mod/feedback/item/numeric/numeric_form.php
+++ b/mod/feedback/item/numeric/numeric_form.php
@@ -6,6 +6,7 @@ class feedback_numeric_form extends feedback_item_form {
     var $type = "numeric";
     var $requiredcheck;
     var $itemname;
+    var $itemlabel;
     var $selectfrom;
     var $selectto;
     
@@ -16,6 +17,7 @@ class feedback_numeric_form extends feedback_item_form {
         $this->requiredcheck = $mform->addElement('checkbox', 'required', get_string('required', 'feedback'));
         
         $this->itemname = $mform->addElement('text', 'itemname', get_string('item_name', 'feedback'), array('size="'.FEEDBACK_ITEM_NAME_TEXTBOX_SIZE.'"','maxlength="255"'));
+        $this->itemlabel = $mform->addElement('text', 'itemlabel', get_string('item_label', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
         
         $this->selectfrom = $mform->addElement('text', 'numericrangefrom', get_string('numeric_range_from', 'feedback'), array('size="10"','maxlength="10"'));
         

diff --git a/mod/feedback/item/textarea/lib.php b/mod/feedback/item/textarea/lib.php
index 31582ad57df2a27e59b8c0acc96e7c416ed3a3a9..fee9bb8a6dce9b015cf1f5dc75d5ce07565b24a1 100644 (file)
--- a/mod/feedback/item/textarea/lib.php
+++ b/mod/feedback/item/textarea/lib.php
@@ -17,6 +17,7 @@ class feedback_item_textarea extends feedback_item_base {
 
         $item->presentation = empty($item->presentation) ? '' : $item->presentation;
         $item->name = empty($item->name) ? '' : $item->name;
+        $item->label = empty($item->label) ? '' : $item->label;
               
         $item->required = isset($item->required) ? $item->required : 0;
         if($item->required) {
@@ -24,6 +25,7 @@ class feedback_item_textarea extends feedback_item_base {
         }
 
         $item_form->itemname->setValue($item->name);
+        $item_form->itemlabel->setValue($item->label);
 
         $widthAndHeight = explode('|',$item->presentation);
         $itemwidth = isset($widthAndHeight[0]) ? $widthAndHeight[0] : 30;
@@ -65,7 +67,7 @@ class feedback_item_textarea extends feedback_item_base {
         if($values) {
             //echo '<table>';2
             // $itemnr++;
-            echo '<tr><th colspan="2" align="left">'. $itemnr . '&nbsp;' . $item->name .'</th></tr>';
+            echo '<tr><th colspan="2" align="left">'. $itemnr . '&nbsp;('. $item->label .') ' . $item->name .'</th></tr>';
             foreach($values as $value) {
                 echo '<tr><td valign="top" align="left">-&nbsp;&nbsp;</td><td align="left" valign="top">' . str_replace("\n", '<br />', $value->value) . '</td></tr>';
             }
@@ -78,17 +80,18 @@ class feedback_item_textarea extends feedback_item_base {
         $analysed_item = $this->get_analysed($item, $groupid, $courseid);
 
         $worksheet->setFormat("<l><f><ro2><vo><c:green>");
-        $worksheet->write_string($rowOffset, 0, $item->name);
+        $worksheet->write_string($rowOffset, 0, $item->label);
+        $worksheet->write_string($rowOffset, 1, $item->name);
         $data = $analysed_item->data;
         if(is_array($data)) {
             $worksheet->setFormat("<l><ro2><vo>");
             if(isset($data[0])) {
-                $worksheet->write_string($rowOffset, 1, $data[0]);
+                $worksheet->write_string($rowOffset, 2, $data[0]);
             }
             $rowOffset++;
             for($i = 1; $i < sizeof($data); $i++) {
                 $worksheet->setFormat("<l><vo>");
-                $worksheet->write_string($rowOffset, 1, $data[$i]);
+                $worksheet->write_string($rowOffset, 2, $data[$i]);
                 $rowOffset++;
             }
         }
@@ -107,7 +110,14 @@ class feedback_item_textarea extends feedback_item_base {
         }
         $requiredmark =  ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
     ?>
-        <td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>"><?php echo format_text($item->name . $requiredmark, true, false, false);?></td>
+        <td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>">
+        <?php
+            if($edit OR $readonly) {
+                echo '('.$item->label.') ';
+            }
+            echo format_text($item->name . $requiredmark, true, false, false);
+        ?>
+        </td>
         <td valign="top" align="<?php echo $align;?>">
     <?php
         if($readonly){

diff --git a/mod/feedback/item/textarea/textarea_form.php b/mod/feedback/item/textarea/textarea_form.php
index 8579cf40024f881bdb9bacfbfeae371ce57558fa..f40acd9b8309e3c06d0f103f5c130fe592028599 100644 (file)
--- a/mod/feedback/item/textarea/textarea_form.php
+++ b/mod/feedback/item/textarea/textarea_form.php
@@ -6,6 +6,7 @@ class feedback_textarea_form extends feedback_item_form {
     var $type = "textarea";
     var $requiredcheck;
     var $itemname;
+    var $itemlabel;
     var $selectwith;
     var $selectheight;
     
@@ -16,6 +17,7 @@ class feedback_textarea_form extends feedback_item_form {
         $this->requiredcheck = $mform->addElement('checkbox', 'required', get_string('required', 'feedback'));
         
         $this->itemname = $mform->addElement('text', 'itemname', get_string('item_name', 'feedback'), array('size="'.FEEDBACK_ITEM_NAME_TEXTBOX_SIZE.'"','maxlength="255"'));
+        $this->itemlabel = $mform->addElement('text', 'itemlabel', get_string('item_label', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
         
         $this->selectwith = $mform->addElement('select',
                                             'itemwidth', 

diff --git a/mod/feedback/item/textfield/lib.php b/mod/feedback/item/textfield/lib.php
index 323b5a3ecda88f83b49a21af1e568ddd576b0fa0..8220a43a3114a24836aa38c4b78554a97d12f4d7 100644 (file)
--- a/mod/feedback/item/textfield/lib.php
+++ b/mod/feedback/item/textfield/lib.php
@@ -17,6 +17,7 @@ class feedback_item_textfield extends feedback_item_base {
         
         $item->presentation = empty($item->presentation) ? '' : $item->presentation;
         $item->name = empty($item->name) ? '' : $item->name;
+        $item->label = empty($item->label) ? '' : $item->label;
         
         $item->required = isset($item->required) ? $item->required : 0;
         if($item->required) {
@@ -24,6 +25,7 @@ class feedback_item_textfield extends feedback_item_base {
         }
 
         $item_form->itemname->setValue($item->name);
+        $item_form->itemlabel->setValue($item->label);
 
         $sizeAndLength = explode('|',$item->presentation);
         $itemsize = isset($sizeAndLength[0]) ? $sizeAndLength[0] : 30;
@@ -64,7 +66,7 @@ class feedback_item_textfield extends feedback_item_base {
         if($values) {
             //echo '<table>';2
             // $itemnr++;
-            echo '<tr><th colspan="2" align="left">'. $itemnr . '&nbsp;' . $item->name .'</th></tr>';
+            echo '<tr><th colspan="2" align="left">'. $itemnr . '&nbsp;('. $item->label .') ' . $item->name .'</th></tr>';
             foreach($values as $value) {
                 echo '<tr><td colspan="2" valign="top" align="left">-&nbsp;&nbsp;' . str_replace("\n", '<br />', $value->value) . '</td></tr>';
             }
@@ -77,15 +79,16 @@ class feedback_item_textfield extends feedback_item_base {
         $analysed_item = $this->get_analysed($item, $groupid, $courseid);
 
         $worksheet->setFormat("<l><f><ro2><vo><c:green>");
-        $worksheet->write_string($rowOffset, 0, $item->name);
+        $worksheet->write_string($rowOffset, 0, $item->label);
+        $worksheet->write_string($rowOffset, 1, $item->name);
         $data = $analysed_item->data;
         if(is_array($data)) {
             $worksheet->setFormat("<l><ro2><vo>");
-            $worksheet->write_string($rowOffset, 1, $data[0]);
+            $worksheet->write_string($rowOffset, 2, $data[0]);
             $rowOffset++;
             for($i = 1; $i < sizeof($data); $i++) {
                 $worksheet->setFormat("<l><vo>");
-                $worksheet->write_string($rowOffset, 1, $data[$i]);
+                $worksheet->write_string($rowOffset, 2, $data[$i]);
                 $rowOffset++;
             }
         }
@@ -104,7 +107,14 @@ class feedback_item_textfield extends feedback_item_base {
         }
         $requiredmark =  ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
     ?>
-        <td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>"><?php echo format_text($item->name . $requiredmark, true, false, false);?></td>
+        <td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>">
+        <?php
+            if($edit OR $readonly) {
+                echo '('.$item->label.') ';
+            }
+            echo format_text($item->name . $requiredmark, true, false, false);
+        ?>
+        </td>
         <td valign="top" align="<?php echo $align;?>">
     <?php
         if($readonly){

diff --git a/mod/feedback/item/textfield/textfield_form.php b/mod/feedback/item/textfield/textfield_form.php
index 16b47aa65c8d6965e6185bcfa0667ff7cb54a6fa..d468958a75b773a9a50fa96e98c879dc999618ca 100644 (file)
--- a/mod/feedback/item/textfield/textfield_form.php
+++ b/mod/feedback/item/textfield/textfield_form.php
@@ -6,6 +6,7 @@ class feedback_textfield_form extends feedback_item_form {
     var $type = "textfield";
     var $requiredcheck;
     var $itemname;
+    var $itemlabel;
     var $selectwith;
     var $selectheight;
     
@@ -16,6 +17,7 @@ class feedback_textfield_form extends feedback_item_form {
         $this->requiredcheck = $mform->addElement('checkbox', 'required', get_string('required', 'feedback'));
         
         $this->itemname = $mform->addElement('text', 'itemname', get_string('item_name', 'feedback'), array('size="'.FEEDBACK_ITEM_NAME_TEXTBOX_SIZE.'"','maxlength="255"'));
+        $this->itemlabel = $mform->addElement('text', 'itemlabel', get_string('item_label', 'feedback'), array('size="'.FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE.'"','maxlength="255"'));
         
         $this->selectwith = $mform->addElement('select',
                                             'itemsize', 

diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php
index d6869902f334ff3afce52408a4caf6fba8b6d8ce..0a2c7be728f0cba3bc155f321a07fee69bcc61ed 100644 (file)
--- a/mod/feedback/lib.php
+++ b/mod/feedback/lib.php
@@ -849,6 +849,9 @@ function feedback_create_item($data) {
     $itemname = trim($data->itemname);
     $item->name = ($itemname ? $data->itemname : get_string('no_itemname', 'feedback'));
 
+    $itemlabel = trim($data->itemlabel);
+    $item->label = ($itemlabel ? $data->itemlabel : get_string('no_itemlabel', 'feedback'));
+
     //get the used class from item-typ
     $itemclass = 'feedback_item_'.$data->typ;
     //get the instance of the item class
@@ -881,6 +884,9 @@ function feedback_update_item($item, $data = null){
         $itemname = trim($data->itemname);
         $item->name = ($itemname ? $data->itemname : get_string('no_itemname', 'feedback'));
 
+        $itemlabel = trim($data->itemlabel);
+        $item->label = ($itemlabel ? $data->itemlabel : get_string('no_itemlabel', 'feedback'));
+
         //get the used class from item-typ
         $itemclass = 'feedback_item_'.$data->typ;
         //get the instance of the item class

diff --git a/mod/feedback/version.php b/mod/feedback/version.php
index c406e32a1e011e3a50a790915d49c22dd56cb803..1320f8aee70187003245d2e6959f9600560c2369 100644 (file)
--- a/mod/feedback/version.php
+++ b/mod/feedback/version.php
@@ -10,7 +10,7 @@
 */
 
    
-    $module->version = 2009031201; // The current module version (Date: YYYYMMDDXX)
+    $module->version = 2009031301; // The current module version (Date: YYYYMMDDXX)
     $module->requires = 2008072401;  // Requires this Moodle version
     $feedback_version_intern = 1; //this version is used for restore older backups
     $module->cron = 0; // Period for cron to check this module (secs)