MDL-11715, merged fix, export form should follow sort order

diff --git a/grade/export/grade_export_form.php b/grade/export/grade_export_form.php
index 210b695c5f48feca8edd3ebc233baca33c030ded..4710df4d515f24aabf624177604cc37b9c9647f5 100755 (executable)
--- a/grade/export/grade_export_form.php
+++ b/grade/export/grade_export_form.php
@@ -114,7 +114,20 @@ class grade_export_form extends moodleform {
 
         $mform->addElement('header', 'gradeitems', get_string('gradeitemsinc', 'grades'));
 
-        if ($grade_items = grade_item::fetch_all(array('courseid'=>$COURSE->id))) {
+        if ($all_grade_items = grade_item::fetch_all(array('courseid'=>$COURSE->id))) {
+            // follow proper sort order, MDL-11715
+            $grade_items = array();
+            foreach ($all_grade_items as $item) {
+                $grade_items[$item->sortorder] = $item;
+            }
+            unset($all_grade_items);
+            ksort($grade_items);
+
+            // Put course total at the end
+            $total = $grade_items[1];
+            unset($grade_items[1]);
+            $grade_items[] = $total;          
+            
             foreach ($grade_items as $grade_item) {
                 if (!empty($features['idnumberrequired']) and empty($grade_item->idnumber)) {
                     $mform->addElement('advcheckbox', 'itemids['.$grade_item->id.']', $grade_item->get_name(), get_string('noidnumber', 'grades'));