From b7a479588a58f3ec6cd9cebd15c12df779a394b1 Mon Sep 17 00:00:00 2001 From: agrabs Date: Fri, 13 Mar 2009 14:35:25 +0000 Subject: [PATCH] MDL-17721 - feedback items now have a label which is printed on analysing and excel export --- mod/feedback/analysis_to_excel.php | 24 +++++++++------- mod/feedback/db/install.xml | 5 ++-- mod/feedback/db/upgrade.php | 12 ++++++++ mod/feedback/edit.php | 3 ++ mod/feedback/item/captcha/captcha_form.php | 2 ++ mod/feedback/item/captcha/lib.php | 11 ++++++-- .../item/feedback_item_form_class.php | 1 + mod/feedback/item/info/info_form.php | 2 ++ mod/feedback/item/info/lib.php | 20 +++++++++---- mod/feedback/item/multichoice/lib.php | 28 ++++++++++++++----- .../item/multichoice/multichoice_form.php | 2 ++ mod/feedback/item/multichoicerated/lib.php | 24 +++++++++++----- .../multichoicerated_form.php | 2 ++ mod/feedback/item/numeric/lib.php | 14 +++++++--- mod/feedback/item/numeric/numeric_form.php | 2 ++ mod/feedback/item/textarea/lib.php | 20 +++++++++---- mod/feedback/item/textarea/textarea_form.php | 2 ++ mod/feedback/item/textfield/lib.php | 20 +++++++++---- .../item/textfield/textfield_form.php | 2 ++ mod/feedback/lib.php | 6 ++++ mod/feedback/version.php | 2 +- 21 files changed, 156 insertions(+), 48 deletions(-) diff --git a/mod/feedback/analysis_to_excel.php b/mod/feedback/analysis_to_excel.php index a50c7cbbea..d9637cd7fa 100644 --- 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(''); - $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(''); $worksheet->write_string($rowOffset, $colOffset, $item->name); + $worksheet->write_string($rowOffset + 1, $colOffset, $item->label); $colOffset++; } $worksheet->setFormat(''); - $worksheet->write_string($rowOffset, $colOffset, $fstring->courseid); + $worksheet->write_string($rowOffset + 1, $colOffset, $fstring->courseid); $colOffset++; $worksheet->setFormat(''); - $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 ff5a190996..89e276eb01 100644 --- a/mod/feedback/db/install.xml +++ b/mod/feedback/db/install.xml @@ -44,8 +44,9 @@ - - + + + diff --git a/mod/feedback/db/upgrade.php b/mod/feedback/db/upgrade.php index e89f0efcab..3aa24f3048 100644 --- 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 f117b66c59..68135a408b 100644 --- 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 2e92b449ca..5f868f9855 100644 --- 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 04b307940f..69071a177c 100644 --- 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)?'':''; ?> valign="top" align=""> - name . $requiredmark, true, false, false);?> + label.') '; + } + echo format_text($item->name . $requiredmark, true, false, false); + ?> <?php echo $this->type;?> @@ -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:' '; + echo $value ? $value : ' '; // 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 ab1fa2a35c..8b6dfe36cc 100644 --- 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 998d7368b4..d792d4fdda 100644 --- 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 3020b00550..74bd0dfce8 100644 --- 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 ''. $itemnr . ' ' . $item->name .''; + echo ''. $itemnr . ' ('. $item->label .') ' . $item->name .''; for($i = 0; $i < sizeof($data); $i++) { echo '-  ' . str_replace("\n", '
', $data[$i]->show) . ''; } @@ -85,15 +87,16 @@ class feedback_item_info extends feedback_item_base { $analysed_item = $this->get_analysed($item, $groupid, $courseid); $worksheet->setFormat(""); - $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(""); - $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(""); - $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)?'':''; ?> - valign="top" align="">name . $requiredmark, true, false, false);?> + valign="top" align=""> + label.') '; + } + echo format_text($item->name . $requiredmark, true, false, false); + ?> + 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 ''. $itemnr . ' ' . $itemname .''; + echo ''. $itemnr . ' ('. $item->label .') ' . $itemname .''; $analysedVals = $analysedItem[2]; $pixnr = 0; foreach($analysedVals as $val) { @@ -175,18 +177,19 @@ class feedback_item_multichoice extends feedback_item_base { $worksheet->setFormat(""); //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(""); - $worksheet->write_string($rowOffset, $i + 1, trim($aData->answertext)); + $worksheet->write_string($rowOffset, $i + 2, trim($aData->answertext)); $worksheet->setFormat(""); - $worksheet->write_number($rowOffset + 1, $i + 1, $aData->answercount); + $worksheet->write_number($rowOffset + 1, $i + 2, $aData->answercount); $worksheet->setFormat(""); - $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)?'':''; - echo ''.format_text($item->name.$requiredmark, true, false, false).''; + echo ''; + if($edit OR $readonly) { + echo '('.$item->label.') '; + } + echo format_text($item->name.$requiredmark, true, false, false).''; echo ''; }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)?'':''; ?> - valign="top" align="">name . $requiredmark, true, false, false);?> + valign="top" align=""> + label.') '; + } + echo format_text($item->name . $requiredmark, true, false, false); + ?> + 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 71f90b3f4e..f7b62fa9dd 100644 --- 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 ''; // $itemnr++; - echo ''; + echo ''; $analysedVals = $analysedItem[2]; $pixnr = 0; $avg = 0.0; @@ -157,27 +159,28 @@ class feedback_item_multichoicerated extends feedback_item_base { $worksheet->setFormat(""); //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(""); - $worksheet->write_string($rowOffset, $i + 1, trim($aData->answertext).' ('.$aData->value.')'); + $worksheet->write_string($rowOffset, $i + 2, trim($aData->answertext).' ('.$aData->value.')'); $worksheet->setFormat(""); - $worksheet->write_number($rowOffset + 1, $i + 1, $aData->answercount); + $worksheet->write_number($rowOffset + 1, $i + 2, $aData->answercount); //$worksheet->setFormat(""); //$worksheet->write_number($rowOffset + 2, $i + 1, $aData->avg); $avg += $aData->avg; } //mittelwert anzeigen $worksheet->setFormat(""); - $worksheet->write_string($rowOffset, sizeof($data) + 1, get_string('average', 'feedback')); + $worksheet->write_string($rowOffset, sizeof($data) + 2, get_string('average', 'feedback')); $worksheet->setFormat(""); - $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 = ''; } ?> - +
'. $itemnr . ' ' . $analysedItem[1] .'
'. $itemnr . ' ('. $item->label .') ' . $analysedItem[1] .'
valign="top" align="">name . $requiredmark, true, false, false);?> valign="top" align=""> + label.') '; + } + echo format_text($item->name . $requiredmark, true, false, false); + ?> + 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 b20214c3cd..353e201da5 100644 --- 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 '';2 // $itemnr++; - echo ''; + echo ''; foreach($values->data as $value) { echo ''; } @@ -108,7 +110,8 @@ class feedback_item_numeric extends feedback_item_base { $analysed_item = $this->get_analysed($item, $groupid, $courseid); $worksheet->setFormat(""); - $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(""); @@ -122,10 +125,10 @@ class feedback_item_numeric extends feedback_item_base { //mittelwert anzeigen $worksheet->setFormat(""); - $worksheet->write_string($rowOffset, 1, get_string('average', 'feedback')); + $worksheet->write_string($rowOffset, 2, get_string('average', 'feedback')); $worksheet->setFormat(""); - $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 { ?>
'. $itemnr . ' ' . $item->name .'
'. $itemnr . ' ('. $item->label .') ' . $item->name .'
-  ' . number_format($value, 2, $this->sep_dec, $this->sep_thous) . '
valign="top" align=""> 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 ac25ea463e..c7366ada22 100644 --- 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 31582ad57d..fee9bb8a6d 100644 --- 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 '';2 // $itemnr++; - echo ''; + echo ''; foreach($values as $value) { echo ''; } @@ -78,17 +80,18 @@ class feedback_item_textarea extends feedback_item_base { $analysed_item = $this->get_analysed($item, $groupid, $courseid); $worksheet->setFormat(""); - $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(""); 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(""); - $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)?'':''; ?> - +
'. $itemnr . ' ' . $item->name .'
'. $itemnr . ' ('. $item->label .') ' . $item->name .'
-  ' . str_replace("\n", '
', $value->value) . '
valign="top" align="">name . $requiredmark, true, false, false);?> valign="top" align=""> + label.') '; + } + echo format_text($item->name . $requiredmark, true, false, false); + ?> + 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 323b5a3ecd..8220a43a31 100644 --- 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 '';2 // $itemnr++; - echo ''; + echo ''; foreach($values as $value) { echo ''; } @@ -77,15 +79,16 @@ class feedback_item_textfield extends feedback_item_base { $analysed_item = $this->get_analysed($item, $groupid, $courseid); $worksheet->setFormat(""); - $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(""); - $worksheet->write_string($rowOffset, 1, $data[0]); + $worksheet->write_string($rowOffset, 2, $data[0]); $rowOffset++; for($i = 1; $i < sizeof($data); $i++) { $worksheet->setFormat(""); - $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)?'':''; ?> - +
'. $itemnr . ' ' . $item->name .'
'. $itemnr . ' ('. $item->label .') ' . $item->name .'
-  ' . str_replace("\n", '
', $value->value) . '
valign="top" align="">name . $requiredmark, true, false, false);?> valign="top" align=""> + label.') '; + } + echo format_text($item->name . $requiredmark, true, false, false); + ?> + 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 d6869902f3..0a2c7be728 100644 --- 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 c406e32a1e..1320f8aee7 100644 --- 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) -- 2.39.5