moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'w19_MDL-32735_m23_feedbackstrict' of git://github.com/skodak/moodle

Browse source
This commit is contained in:
Dan Poltawski 2012-05-07 15:08:21 +08:00
commit c3c70f09d6
7 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
mod/feedback/edit_form.php
View file

@ -31,7 +31,7 @@ require_once($CFG->libdir.'/formslib.php');
class feedback_edit_add_question_form extends moodleform { class feedback_edit_add_question_form extends moodleform {
public function definition() { public function definition() {
$mform =& $this->_form; $mform = $this->_form;
//headline //headline
$mform->addElement('header', 'general', get_string('add_items', 'feedback')); $mform->addElement('header', 'general', get_string('add_items', 'feedback'));
@ -66,6 +66,9 @@ class feedback_edit_use_template_form extends moodleform {
//eg: array('course' => $course) //eg: array('course' => $course)
public function set_feedbackdata($data) { public function set_feedbackdata($data) {
if (is_array($data)) { if (is_array($data)) {
if (!isset($this->feedbackdata)) {
$this->feedbackdata = new stdClass();
}
foreach ($data as $key => $val) { foreach ($data as $key => $val) {
$this->feedbackdata->{$key} = $val; $this->feedbackdata->{$key} = $val;
} }
@ -111,13 +114,13 @@ class feedback_edit_use_template_form extends moodleform {
} }
$attributes = 'onChange="this.form.submit()"'; $attributes = 'onChange="this.form.submit()"';
$elementgroup[] =& $mform->createElement('selectgroups', $elementgroup[] = $mform->createElement('selectgroups',
'templateid', 'templateid',
'', '',
$options, $options,
$attributes); $attributes);
$elementgroup[] =& $mform->createElement('submit', $elementgroup[] = $mform->createElement('submit',
'use_template', 'use_template',
get_string('use_this_template', 'feedback')); get_string('use_this_template', 'feedback'));
} else { } else {
@ -140,6 +143,9 @@ class feedback_edit_create_template_form extends moodleform {
public function set_feedbackdata($data) { public function set_feedbackdata($data) {
if (is_array($data)) { if (is_array($data)) {
if (!isset($this->feedbackdata)) {
$this->feedbackdata = new stdClass();
}
foreach ($data as $key => $val) { foreach ($data as $key => $val) {
$this->feedbackdata->{$key} = $val; $this->feedbackdata->{$key} = $val;
} }
@ -163,24 +169,24 @@ class feedback_edit_create_template_form extends moodleform {
// visible elements // visible elements
$elementgroup = array(); $elementgroup = array();
$elementgroup[] =& $mform->createElement('static', $elementgroup[] = $mform->createElement('static',
'templatenamelabel', 'templatenamelabel',
get_string('name', 'feedback')); get_string('name', 'feedback'));
$elementgroup[] =& $mform->createElement('text', $elementgroup[] = $mform->createElement('text',
'templatename', 'templatename',
get_string('name', 'feedback'), get_string('name', 'feedback'),
array('size'=>'40', 'maxlength'=>'200')); array('size'=>'40', 'maxlength'=>'200'));
if (has_capability('mod/feedback:createpublictemplate', get_system_context())) { if (has_capability('mod/feedback:createpublictemplate', get_system_context())) {
$elementgroup[] =& $mform->createElement('checkbox', $elementgroup[] = $mform->createElement('checkbox',
'ispublic', 'ispublic',
get_string('public', 'feedback'), get_string('public', 'feedback'),
get_string('public', 'feedback')); get_string('public', 'feedback'));
} }
// buttons // buttons
$elementgroup[] =& $mform->createElement('submit', $elementgroup[] = $mform->createElement('submit',
'create_template', 'create_template',
get_string('save_as_new_template', 'feedback')); get_string('save_as_new_template', 'feedback'));

2
mod/feedback/item/info/lib.php
View file

@ -106,7 +106,7 @@ class feedback_item_info extends feedback_item_base {
public function get_analysed($item, $groupid = false, $courseid = false) { public function get_analysed($item, $groupid = false, $courseid = false) {
$presentation = $item->presentation; $presentation = $item->presentation;
$analysed_val = null; $analysed_val = new stdClass();;
$analysed_val->data = null; $analysed_val->data = null;
$analysed_val->name = $item->name; $analysed_val->name = $item->name;
$values = feedback_get_group_values($item, $groupid, $courseid); $values = feedback_get_group_values($item, $groupid, $courseid);

4
mod/feedback/item/multichoice/lib.php
View file

@ -144,7 +144,7 @@ class feedback_item_multichoice extends feedback_item_base {
if ($info->subtype == 'c') { if ($info->subtype == 'c') {
$sizeofanswers = count($answers); $sizeofanswers = count($answers);
for ($i = 1; $i <= $sizeofanswers; $i++) { for ($i = 1; $i <= $sizeofanswers; $i++) {
$ans = null; $ans = new stdClass();
$ans->answertext = $answers[$i-1]; $ans->answertext = $answers[$i-1];
$ans->answercount = 0; $ans->answercount = 0;
foreach ($values as $value) { foreach ($values as $value) {
@ -162,7 +162,7 @@ class feedback_item_multichoice extends feedback_item_base {
} else { } else {
$sizeofanswers = count($answers); $sizeofanswers = count($answers);
for ($i = 1; $i <= $sizeofanswers; $i++) { for ($i = 1; $i <= $sizeofanswers; $i++) {
$ans = null; $ans = new stdClass();
$ans->answertext = $answers[$i-1]; $ans->answertext = $answers[$i-1];
$ans->answercount = 0; $ans->answercount = 0;
foreach ($values as $value) { foreach ($values as $value) {

2
mod/feedback/item/multichoicerated/lib.php
View file

@ -148,7 +148,7 @@ class feedback_item_multichoicerated extends feedback_item_base {
$sizeoflines = count($lines); $sizeoflines = count($lines);
for ($i = 1; $i <= $sizeoflines; $i++) { for ($i = 1; $i <= $sizeoflines; $i++) {
$item_values = explode(FEEDBACK_MULTICHOICERATED_VALUE_SEP, $lines[$i-1]); $item_values = explode(FEEDBACK_MULTICHOICERATED_VALUE_SEP, $lines[$i-1]);
$ans = null; $ans = new stdClass();
$ans->answertext = $item_values[1]; $ans->answertext = $item_values[1];
$avg = 0.0; $avg = 0.0;
$anscount = 0; $anscount = 0;

2
mod/feedback/item/numeric/lib.php
View file

@ -136,7 +136,7 @@ class feedback_item_numeric extends feedback_item_base {
public function get_analysed($item, $groupid = false, $courseid = false) { public function get_analysed($item, $groupid = false, $courseid = false) {
global $DB; global $DB;
$analysed = null; $analysed = new stdClass();
$analysed->data = array(); $analysed->data = array();
$analysed->name = $item->name; $analysed->name = $item->name;
$values = feedback_get_group_values($item, $groupid, $courseid); $values = feedback_get_group_values($item, $groupid, $courseid);

2
mod/feedback/item/textarea/lib.php
View file

@ -123,7 +123,7 @@ class feedback_item_textarea extends feedback_item_base {
public function get_analysed($item, $groupid = false, $courseid = false) { public function get_analysed($item, $groupid = false, $courseid = false) {
global $DB; global $DB;
$analysed_val = null; $analysed_val = new stdClass();
$analysed_val->data = array(); $analysed_val->data = array();
$analysed_val->name = $item->name; $analysed_val->name = $item->name;

2
mod/feedback/item/textfield/lib.php
View file

@ -120,7 +120,7 @@ class feedback_item_textfield extends feedback_item_base {
public function get_analysed($item, $groupid = false, $courseid = false) { public function get_analysed($item, $groupid = false, $courseid = false) {
global $DB; global $DB;
$analysed_val = null; $analysed_val = new stdClass();
$analysed_val->data = null; $analysed_val->data = null;
$analysed_val->name = $item->name; $analysed_val->name = $item->name;