diff --git a/mod/feedback/analysis.php b/mod/feedback/analysis.php index 67192edd12a..7ce9cd9cd9e 100644 --- a/mod/feedback/analysis.php +++ b/mod/feedback/analysis.php @@ -146,7 +146,14 @@ $itemclass = 'feedback_item_'.$item->typ; //get the instance of the item-class $itemobj = new $itemclass(); - $itemnr = $itemobj->print_analysed($item, $itemnr, $mygroupid); + $itemnr++; + if($feedback->autonumbering) { + $printnr = $itemnr.'.'; + } else { + $printnr = ''; + } + $itemobj->print_analysed($item, $printnr, $mygroupid); + // $itemnr = $itemobj->print_analysed($item, $itemnr, $mygroupid); echo ''; } }else { diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php index 2088aadb62c..a78cbda8bf2 100644 --- a/mod/feedback/analysis_course.php +++ b/mod/feedback/analysis_course.php @@ -169,7 +169,13 @@ $itemclass = 'feedback_item_'.$item->typ; //get the instance of the item-class $itemobj = new $itemclass(); - $itemnr = $itemobj->print_analysed($item, $itemnr, $mygroupid, $coursefilter); + $itemnr++; + if($feedback->autonumbering) { + $printnr = $itemnr.'.'; + } else { + $printnr = ''; + } + $itemobj->print_analysed($item, $printnr, $mygroupid, $coursefilter); if (eregi('rated$', $item->typ)) { echo ''. get_string('sort_by_course', 'feedback').''; diff --git a/mod/feedback/backuplib.php b/mod/feedback/backuplib.php index f66ace3c322..e9fc46ab95c 100644 --- a/mod/feedback/backuplib.php +++ b/mod/feedback/backuplib.php @@ -62,6 +62,7 @@ fwrite ($bf,full_tag("ANONYMOUS",4,false,$feedback->anonymous)); fwrite ($bf,full_tag("EMAILNOTIFICATION",4,false,$feedback->email_notification)); fwrite ($bf,full_tag("MULTIPLESUBMIT",4,false,$feedback->multiple_submit)); + fwrite ($bf,full_tag("AUTONUMBERING",4,false,$feedback->autonumbering)); fwrite ($bf,full_tag("PAGEAFTERSUB",4,false,$feedback->page_after_submit)); fwrite ($bf,full_tag("PUBLISHSTATS",4,false,$feedback->publish_stats)); fwrite ($bf,full_tag("TIMEOPEN",4,false,$feedback->timeopen)); diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php index 062ec413eff..0fc3919b735 100644 --- a/mod/feedback/complete.php +++ b/mod/feedback/complete.php @@ -325,9 +325,9 @@ } } echo ''; - if($feedbackitem->hasvalue == 1) { + if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) { $itemnr++; - echo '' . $itemnr . '.) '; + echo '' . $itemnr . '. '; } else { echo ' '; } diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php index 1ececf702af..aa29e8e7cd6 100644 --- a/mod/feedback/complete_guest.php +++ b/mod/feedback/complete_guest.php @@ -300,9 +300,9 @@ } } echo ''; - if($feedbackitem->hasvalue == 1) { + if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) { $itemnr++; - echo '' . $itemnr . '.) '; + echo '' . $itemnr . '. '; } else { echo ' '; } diff --git a/mod/feedback/db/install.xml b/mod/feedback/db/install.xml index d04f07b73fd..8db4df76783 100644 --- a/mod/feedback/db/install.xml +++ b/mod/feedback/db/install.xml @@ -9,7 +9,8 @@ - + + diff --git a/mod/feedback/db/upgrade.php b/mod/feedback/db/upgrade.php index b37dc83c26b..9da23720ce1 100644 --- a/mod/feedback/db/upgrade.php +++ b/mod/feedback/db/upgrade.php @@ -199,15 +199,14 @@ function xmldb_feedback_upgrade($oldversion=0) { $result = $result && insert_record('log_display', $new_log_display); } -/// And upgrade begins here. For each one, you'll need one -/// block of code similar to the next one. Please, delete -/// this comment lines once this file start handling proper -/// upgrade code. - -/// if ($result && $oldversion < YYYYMMDD00) { //New version in version.php -/// $result = result of "/lib/ddllib.php" function calls -/// } - + if ($result && $oldversion < 2008042900) { + /// Define field autonumbering to be added to feedback + $table = new XMLDBTable('feedback'); + $field = new XMLDBField('autonumbering'); + $field->setAttributes(XMLDB_TYPE_INTEGER, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '1', 'multiple_submit'); + /// Launch add field2 + $result = $result && add_field($table, $field); + } return $result; } diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php index 33e1c660aae..13a7d5599f6 100644 --- a/mod/feedback/edit.php +++ b/mod/feedback/edit.php @@ -248,9 +248,9 @@ } echo ''; //items without value only are labels - if($feedbackitem->hasvalue == 1) { + if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) { $itemnr++; - echo '' . $itemnr . '.) '; + echo '' . $itemnr . '. '; } else { echo ' '; } diff --git a/mod/feedback/item/captcha/lib.php b/mod/feedback/item/captcha/lib.php index ab1ff6718dd..b94735d5ff4 100644 --- a/mod/feedback/item/captcha/lib.php +++ b/mod/feedback/item/captcha/lib.php @@ -38,7 +38,7 @@ class feedback_item_captcha extends feedback_item_base { return ''; } - function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) { + function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) { return $itemnr; } diff --git a/mod/feedback/item/feedback_item_class.php b/mod/feedback/item/feedback_item_class.php index 1047fa7cbbd..33d64d6d538 100644 --- a/mod/feedback/item/feedback_item_class.php +++ b/mod/feedback/item/feedback_item_class.php @@ -51,12 +51,12 @@ class feedback_item_base { /** * @param $item the db-object from feedback_item - * @param integer $itemnr + * @param string $itemnr * @param integer $groupid * @param integer $courseid * @return integer the new itemnr */ - function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) { + function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) { return 0; } diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php index b342a0d24ec..43e7f709d62 100644 --- a/mod/feedback/item/multichoice/lib.php +++ b/mod/feedback/item/multichoice/lib.php @@ -133,7 +133,7 @@ class feedback_item_multichoice extends feedback_item_base { return $printval; } - function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) { + function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) { $sep_dec = get_string('separator_decimal', 'feedback'); if(substr($sep_dec, 0, 2) == '[['){ $sep_dec = FEEDBACK_DECIMAL; @@ -146,9 +146,9 @@ class feedback_item_multichoice extends feedback_item_base { $analysedItem = $this->get_analysed($item, $groupid, $courseid); if($analysedItem) { - $itemnr++; + // $itemnr++; $itemname = stripslashes($analysedItem[1]); - echo ''. $itemnr . '.) ' . $itemname .''; + echo ''. $itemnr . ' ' . $itemname .''; $analysedVals = $analysedItem[2]; $pixnr = 0; foreach($analysedVals as $val) { @@ -164,7 +164,7 @@ class feedback_item_multichoice extends feedback_item_base { echo '-  ' . trim($val->answertext) . ':'.$intvalue.' ' . $val->answercount . (($val->quotient > 0)?' ('. $quotient . ' %)':'').''; } } - return $itemnr; + // return $itemnr; } function excelprint_item(&$worksheet, $rowOffset, $item, $groupid, $courseid = false) { diff --git a/mod/feedback/item/multichoicerated/lib.php b/mod/feedback/item/multichoicerated/lib.php index f896956d2de..e861281b60f 100644 --- a/mod/feedback/item/multichoicerated/lib.php +++ b/mod/feedback/item/multichoicerated/lib.php @@ -109,7 +109,7 @@ class feedback_item_multichoicerated extends feedback_item_base { return $printval; } - function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) { + function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) { $sep_dec = get_string('separator_decimal', 'feedback'); if(substr($sep_dec, 0, 2) == '[['){ $sep_dec = FEEDBACK_DECIMAL; @@ -123,8 +123,8 @@ class feedback_item_multichoicerated extends feedback_item_base { $analysedItem = $this->get_analysed($item, $groupid, $courseid); if($analysedItem) { //echo ''; - $itemnr++; - echo ''; + // $itemnr++; + echo ''; $analysedVals = $analysedItem[2]; $pixnr = 0; $avg = 0.0; @@ -146,7 +146,7 @@ class feedback_item_multichoicerated extends feedback_item_base { echo ''; //echo '
'. $itemnr . '.) ' . stripslashes($analysedItem[1]) .'
'. $itemnr . ' ' . stripslashes($analysedItem[1]) .'
'.get_string('average', 'feedback').': '.$avg.'
'; } - return $itemnr; + // return $itemnr; } function excelprint_item(&$worksheet, $rowOffset, $item, $groupid, $courseid = false) { diff --git a/mod/feedback/item/numeric/lib.php b/mod/feedback/item/numeric/lib.php index 28a97319494..8acc3aff29c 100644 --- a/mod/feedback/item/numeric/lib.php +++ b/mod/feedback/item/numeric/lib.php @@ -68,7 +68,7 @@ class feedback_item_numeric extends feedback_item_base { return $value->value; } - function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) { + function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) { $sep_dec = get_string('separator_decimal', 'feedback'); if(substr($sep_dec, 0, 2) == '[['){ $sep_dec = FEEDBACK_DECIMAL; @@ -84,16 +84,20 @@ class feedback_item_numeric extends feedback_item_base { if(isset($values->data) AND is_array($values->data)) { //echo '';2 - $itemnr++; - echo ''; + // $itemnr++; + echo ''; foreach($values->data as $value) { echo ''; } //echo '
'. $itemnr . '.) ' . stripslashes($item->name) .'
'. $itemnr . ' ' . stripslashes($item->name) .'
-  ' . $value . '
'; - $avg = number_format($values->avg, 2, $sep_dec, $sep_thous); + if(isset($values->avg)) { + $avg = number_format($values->avg, 2, $sep_dec, $sep_thous); + } else { + $avg = number_format(0, 2, $sep_dec, $sep_thous); + } echo ''.get_string('average', 'feedback').': '.$avg.''; } - return $itemnr; + // return $itemnr; } function excelprint_item(&$worksheet, $rowOffset, $item, $groupid, $courseid = false) { diff --git a/mod/feedback/item/textarea/lib.php b/mod/feedback/item/textarea/lib.php index e70995eadc0..bbe9fbe4417 100644 --- a/mod/feedback/item/textarea/lib.php +++ b/mod/feedback/item/textarea/lib.php @@ -58,18 +58,18 @@ class feedback_item_textarea extends feedback_item_base { return $value->value; } - function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) { + function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) { $values = feedback_get_group_values($item, $groupid, $courseid); if($values) { //echo '';2 - $itemnr++; - echo ''; + // $itemnr++; + echo ''; foreach($values as $value) { echo ''; } //echo '
'. $itemnr . '.) ' . stripslashes_safe($item->name) .'
'. $itemnr . ' ' . stripslashes_safe($item->name) .'
-  ' . str_replace("\n", '
', $value->value) . '
'; } - return $itemnr; + // return $itemnr; } function excelprint_item(&$worksheet, $rowOffset, $item, $groupid, $courseid = false) { diff --git a/mod/feedback/item/textfield/lib.php b/mod/feedback/item/textfield/lib.php index 0e3ce601478..998f477160a 100644 --- a/mod/feedback/item/textfield/lib.php +++ b/mod/feedback/item/textfield/lib.php @@ -57,18 +57,18 @@ class feedback_item_textfield extends feedback_item_base { return $value->value; } - function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) { + function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) { $values = feedback_get_group_values($item, $groupid, $courseid); if($values) { //echo '';2 - $itemnr++; - echo ''; + // $itemnr++; + echo ''; foreach($values as $value) { echo ''; } //echo '
'. $itemnr . '.) ' . stripslashes_safe($item->name) .'
'. $itemnr . ' ' . stripslashes_safe($item->name) .'
-  ' . str_replace("\n", '
', $value->value) . '
'; } - return $itemnr; + // return $itemnr; } function excelprint_item(&$worksheet, $rowOffset, $item, $groupid, $courseid = false) { diff --git a/mod/feedback/mod_form.php b/mod/feedback/mod_form.php index b503a321dbd..6076a9f24fd 100644 --- a/mod/feedback/mod_form.php +++ b/mod/feedback/mod_form.php @@ -69,10 +69,13 @@ class mod_feedback_mod_form extends moodleform_mod { $multiple_submit_value = $feedback->multiple_submit ? get_string('yes') : get_string('no'); $mform->addElement('text', 'multiple_submit_static', get_string('multiple_submit', 'feedback'), array('size'=>'4','disabled'=>'disabled', 'value'=>$multiple_submit_value)); $mform->addElement('hidden', 'multiple_submit', ''); + $mform->setHelpButton('multiple_submit_static', array('multiplesubmit', get_string('multiple_submit', 'feedback'), 'feedback')); }else { $mform->addElement('selectyesno', 'multiple_submit', get_string('multiple_submit', 'feedback')); + $mform->setHelpButton('multiple_submit', array('multiplesubmit', get_string('multiple_submit', 'feedback'), 'feedback')); } - $mform->setHelpButton('multiple_submit', array('multiplesubmit', get_string('multiple_submit', 'feedback'), 'feedback')); + $mform->addElement('selectyesno', 'autonumbering', get_string('autonumbering', 'feedback')); + $mform->setHelpButton('autonumbering', array('autonumbering', get_string('autonumbering', 'feedback'), 'feedback')); //------------------------------------------------------------------------------- $mform->addElement('header', 'aftersubmithdr', get_string('after_submit', 'feedback')); diff --git a/mod/feedback/print.php b/mod/feedback/print.php index dd5f2af27c8..7a452c4ef00 100644 --- a/mod/feedback/print.php +++ b/mod/feedback/print.php @@ -72,9 +72,9 @@ $itempos++; echo ''; //Items without value only are labels - if($feedbackitem->hasvalue == 1) { + if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) { $itemnr++; - echo '' . $itemnr . '.) '; + echo '' . $itemnr . '. '; } else { echo ' '; } diff --git a/mod/feedback/restorelib.php b/mod/feedback/restorelib.php index abe1d063808..884f78866b9 100644 --- a/mod/feedback/restorelib.php +++ b/mod/feedback/restorelib.php @@ -54,6 +54,7 @@ $feedback->anonymous = backup_todb($info['MOD']['#']['ANONYMOUS']['0']['#']); $feedback->email_notification = backup_todb($info['MOD']['#']['EMAILNOTIFICATION']['0']['#']); $feedback->multiple_submit = backup_todb($info['MOD']['#']['MULTIPLESUBMIT']['0']['#']); + $feedback->autonumbering = backup_todb($info['MOD']['#']['AUTONUMBERING']['0']['#']); $feedback->page_after_submit = backup_todb($info['MOD']['#']['PAGEAFTERSUB']['0']['#']); $feedback->publish_stats = backup_todb($info['MOD']['#']['PUBLISHSTATS']['0']['#']); $feedback->timeopen = backup_todb($info['MOD']['#']['TIMEOPEN']['0']['#']); diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php index 07bcf2b1f10..d81078ce5e0 100644 --- a/mod/feedback/show_entries.php +++ b/mod/feedback/show_entries.php @@ -266,9 +266,9 @@ //get the values $value = get_record_select('feedback_value','completed ='.$feedbackcompleted->id.' AND item='.$feedbackitem->id); echo ''; - if($feedbackitem->hasvalue == 1) { + if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) { $itemnr++; - echo '' . $itemnr . '.) '; + echo '' . $itemnr . '. '; } else { echo ' '; } diff --git a/mod/feedback/show_entries_anonym.php b/mod/feedback/show_entries_anonym.php index 44918f30781..74f3e4e602f 100644 --- a/mod/feedback/show_entries_anonym.php +++ b/mod/feedback/show_entries_anonym.php @@ -149,9 +149,9 @@ //get the values $value = get_record_select('feedback_value','completed ='.$feedbackcompleted->id.' AND item='.$feedbackitem->id); echo ''; - if($feedbackitem->hasvalue == 1) { + if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) { $itemnr++; - echo '' . $itemnr . '.) '; + echo '' . $itemnr . '. '; } else { echo ' '; } diff --git a/mod/feedback/use_templ.php b/mod/feedback/use_templ.php index d46223cb6ae..39053ac13c0 100644 --- a/mod/feedback/use_templ.php +++ b/mod/feedback/use_templ.php @@ -101,9 +101,9 @@ echo '
'; foreach($templateitems as $templateitem){ echo ''; - if($templateitem->hasvalue == 1) { + if($templateitem->hasvalue == 1 AND $feedback->autonumbering) { $itemnr++; - echo ''; + echo ''; } else { echo ''; } diff --git a/mod/feedback/version.php b/mod/feedback/version.php index ed9207426b7..d7af244cd08 100644 --- a/mod/feedback/version.php +++ b/mod/feedback/version.php @@ -10,7 +10,7 @@ */ - $module->version = 2008042802; // The current module version (Date: YYYYMMDDXX) + $module->version = 2008042900; // The current module version (Date: YYYYMMDDXX) $module->requires = 2007101503; // 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)
' . $itemnr . '.) ' . $itemnr . '.