MDL-11051 grade export - do not use quickforms elements directly

diff --git a/grade/export/grade_export_form.php b/grade/export/grade_export_form.php
index eea55bd678e45498445fa959a20e8828e9cde419..03dff89485432608a995b573a692642db02ca860 100755 (executable)
--- a/grade/export/grade_export_form.php
+++ b/grade/export/grade_export_form.php
@@ -2,7 +2,7 @@
 require_once $CFG->libdir.'/formslib.php';
 
 class grade_export_form extends moodleform {
-    function definition (){
+    function definition() {
         global $CFG, $COURSE, $USER;
 
         $mform =& $this->_form;
@@ -45,26 +45,21 @@ class grade_export_form extends moodleform {
         $mform->addElement('header', 'general', get_string('gradeitemsinc', 'grades')); // TODO: localize
 
         $mform->addElement('hidden', 'id', $COURSE->id);
+
         if ($grade_items = grade_item::fetch_all(array('courseid'=>$COURSE->id))) {
-            $noidnumber = false;
             foreach ($grade_items as $grade_item) {
-
                 if ($plugin != 'xmlexport' || $grade_item->idnumber) {
-                    $element = new HTML_QuickForm_advcheckbox('itemids['.$grade_item->id.']', null, $grade_item->get_name(), array('selected'=>'selected'), array(0, $grade_item->id));
-                    $element->setChecked(1);
+                    $mform->addElement('advcheckbox', 'itemids['.$grade_item->id.']', $grade_item->get_name());
+                    $mform->setDefault('itemids['.$grade_item->id.']', 1);
+
                 } else {
+                    $mform->addElement('advcheckbox', 'itemids['.$grade_item->id.']', $grade_item->get_name(), get_string('noidnumber'));
+                    $mform->hardFreeze('itemids['.$grade_item->id.']');
                     $noidnumber = true;
-                    $element = new HTML_QuickForm_advcheckbox('itemids['.$grade_item->id.']', null, $grade_item->get_name(), array('disabled'=>'disabled'), array(0, $grade_item->id));
                 }
-
-                $mform->addElement($element);
             }
         }
 
-        if ($noidnumber) {
-            $mform->addElement('static', 'noidnumber',  '', get_string('noidnumber'));
-        }
-
         $options = array('10'=>10, '20'=>20, '100'=>100, '1000'=>1000, '100000'=>100000);
         $mform->addElement('select', 'previewrows', 'Preview rows', $options); // TODO: localize
         $mform->setType('previewrows', PARAM_INT);

diff --git a/grade/export/ods/index.php b/grade/export/ods/index.php
index 935f15aa75478789c2af10fdf254b8a6edba37ce..21e5c523fb75800206a3a96f78ef7e473f35fac4 100755 (executable)
--- a/grade/export/ods/index.php
+++ b/grade/export/ods/index.php
@@ -53,7 +53,13 @@ $mform = new grade_export_form();
 // process post information
 if ($data = $mform->get_data()) {
     if ($data->itemids) {
-        $itemidsurl = implode(",",$data->itemids);
+        $items = array();
+        foreach ($data->itemids as $itemid=>$selected) {
+            if ($selected) {
+                $items[] = $itemid;
+            }
+        }
+        $itemidsurl = implode(",", $items);
     } else {
         //error?
         $itemidsurl = '';

diff --git a/grade/export/txt/grade_export_txt_form.php b/grade/export/txt/grade_export_txt_form.php
index a035ac639d1eb6841e2f50a527d0735ef5839ea9..c4795560e46c8d186cb18b9ec578f656d7af54e7 100755 (executable)
--- a/grade/export/txt/grade_export_txt_form.php
+++ b/grade/export/txt/grade_export_txt_form.php
@@ -5,7 +5,6 @@ class grade_export_txt_form extends moodleform {
     function definition (){
         global $CFG, $COURSE;
 
-        include_once($CFG->libdir.'/pear/HTML/QuickForm/advcheckbox.php');
         $mform =& $this->_form;
 
         $mform->addElement('advcheckbox', 'export_letters', get_string('exportletters', 'grades'));
@@ -17,15 +16,13 @@ class grade_export_txt_form extends moodleform {
         $mform->addElement('hidden', 'id', $COURSE->id);
         if ($grade_items = grade_item::fetch_all(array('courseid'=>$COURSE->id))) {
             foreach ($grade_items as $grade_item) {
-                $element = new HTML_QuickForm_advcheckbox('itemids['.$grade_item->id.']', null, $grade_item->get_name(), array('selected'=>'selected'), array(0, $grade_item->id));
-                $element->setChecked(1);
-                $mform->addElement($element);
+                $mform->addElement('advcheckbox', 'itemids['.$grade_item->id.']', $grade_item->get_name());
+                $mform->setDefault('itemids['.$grade_item->id.']', 1);
             }
         }
         $options = array('10'=>10, '20'=>20, '100'=>100, '1000'=>1000, '100000'=>100000);
         $mform->addElement('select', 'previewrows', 'Preview rows', $options); // TODO: localize
         $mform->setType('previewrows', PARAM_INT);
-        include_once($CFG->libdir.'/pear/HTML/QuickForm/radio.php');
         $radio = array();
         $radio[] = &MoodleQuickForm::createElement('radio', 'separator', null, get_string('septab', 'grades'), 'tab');
         $radio[] = &MoodleQuickForm::createElement('radio', 'separator', null, get_string('sepcomma', 'grades'), 'comma');

diff --git a/grade/export/txt/index.php b/grade/export/txt/index.php
index 84603cb56e4575e571406707b8e346f595d03f55..f65ff7694d47579ad172cfce0c865667054ef372 100755 (executable)
--- a/grade/export/txt/index.php
+++ b/grade/export/txt/index.php
@@ -54,7 +54,13 @@ $mform = new grade_export_txt_form();
 // process post information
 if ($data = $mform->get_data()) {
     if ($data->itemids) {
-        $itemidsurl = implode(",",$data->itemids);
+        $items = array();
+        foreach ($data->itemids as $itemid=>$selected) {
+            if ($selected) {
+                $items[] = $itemid;
+            }
+        }
+        $itemidsurl = implode(",", $items);
     } else {
         //error?
         $itemidsurl = '';

diff --git a/grade/export/xls/index.php b/grade/export/xls/index.php
index ccad791facb0820a393128db4064c799be5081a7..49562007a722b29adf7a36aa6a015fdec8d2deaf 100755 (executable)
--- a/grade/export/xls/index.php
+++ b/grade/export/xls/index.php
@@ -53,7 +53,13 @@ $mform = new grade_export_form();
 // process post information
 if ($data = $mform->get_data()) {
     if ($data->itemids) {
-        $itemidsurl = implode(",",$data->itemids);
+        $items = array();
+        foreach ($data->itemids as $itemid=>$selected) {
+            if ($selected) {
+                $items[] = $itemid;
+            }
+        }
+        $itemidsurl = implode(",", $items);
     } else {
         //error?
         $itemidsurl = '';

diff --git a/grade/export/xml/index.php b/grade/export/xml/index.php
index a1313b9e58d0aef5d4ab6b11ed3c68be68902e6c..d4bdcdd7376eb985c18e59c766e28c0f0cc4b549 100755 (executable)
--- a/grade/export/xml/index.php
+++ b/grade/export/xml/index.php
@@ -53,7 +53,13 @@ $mform = new grade_export_form(null, array('plugin'=>'xmlexport'));
 // process post information
 if ($data = $mform->get_data()) {
     if ($data->itemids) {
-        $itemidsurl = implode(",",$data->itemids);
+        $items = array();
+        foreach ($data->itemids as $itemid=>$selected) {
+            if ($selected) {
+                $items[] = $itemid;
+            }
+        }
+        $itemidsurl = implode(",", $items);
     } else {
         //error?
         $itemidsurl = '';