MDL-13722, MDL-12909 - idnumber required in xml grade export, if not present do not...

diff --git a/grade/export/lib.php b/grade/export/lib.php
index 66680472ab81f359bd65f9cb34ae7cc20d11f89d..bd04f508d303f6144071f16db27755363258dcab 100755 (executable)
--- a/grade/export/lib.php
+++ b/grade/export/lib.php
@@ -192,8 +192,9 @@ abstract class grade_export {
 
     /**
      * Prints preview of exported grades on screen as a feedback mechanism
+     * @param bool $require_user_idnumber true means skip users without idnumber
      */
-    public function display_preview() {
+    public function display_preview($require_user_idnumber=false) {
 
         print_heading(get_string('previewrows', 'grades'));
 
@@ -225,9 +226,10 @@ abstract class grade_export {
                 break;
             }
             $user = $userdata->user;
-            // if (empty($user->idnumber)) {   // Not sure why this was here, ccommented out for MDL-13722
-            //     continue;
-            // }
+            if ($require_user_idnumber and empty($user->idnumber)) {
+                // some exports require user idnumber
+                continue;
+            }
 
             $gradeupdated = false; // if no grade is update at all for this user, do not display this row
             $rowstr = '';

diff --git a/grade/export/xml/index.php b/grade/export/xml/index.php
index 764784c64cc8bdd2b1637659b93b53ad0c85b315..3047a7eb8dc8c21a918729e62aa20fc18cf4b45d 100755 (executable)
--- a/grade/export/xml/index.php
+++ b/grade/export/xml/index.php
@@ -54,7 +54,7 @@ if ($data = $mform->get_data()) {
     // print the grades on screen for feedbacks
     $export->process_form($data);
     $export->print_continue();
-    $export->display_preview();
+    $export->display_preview(true);
     print_footer($course);
     exit;
 }