From 9f5834ccc799559ece02f1672faebe4341aa71fc Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Thu, 31 Jul 2014 15:01:03 +0800
Subject: [PATCH] MDL-46548 grades: Update xls grade exporter to support one
 step exports.

---
 grade/export/xls/export.php | 12 ++++--------
 grade/export/xls/index.php  | 21 +++++++--------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/grade/export/xls/export.php b/grade/export/xls/export.php
index 4cbe5bbe55f..35068052c57 100644
--- a/grade/export/xls/export.php
+++ b/grade/export/xls/export.php
@@ -20,13 +20,6 @@ require_once $CFG->dirroot.'/grade/export/lib.php';
 require_once 'grade_export_xls.php';
 
 $id                = required_param('id', PARAM_INT); // course id
-$groupid           = optional_param('groupid', 0, PARAM_INT);
-$itemids           = required_param('itemids', PARAM_RAW);
-$export_feedback   = optional_param('export_feedback', 0, PARAM_BOOL);
-$updatedgradesonly = optional_param('updatedgradesonly', false, PARAM_BOOL);
-$displaytype       = optional_param('displaytype', $CFG->grade_export_displaytype, PARAM_INT);
-$decimalpoints     = optional_param('decimalpoints', $CFG->grade_export_decimalpoints, PARAM_INT);
-$onlyactive        = optional_param('export_onlyactive', 0, PARAM_BOOL);
 
 if (!$course = $DB->get_record('course', array('id'=>$id))) {
     print_error('nocourseid');
@@ -34,6 +27,7 @@ if (!$course = $DB->get_record('course', array('id'=>$id))) {
 
 require_login($course);
 $context = context_course::instance($id);
+$groupid = groups_get_course_group($course, true);
 
 require_capability('moodle/grade:export', $context);
 require_capability('gradeexport/xls:view', $context);
@@ -43,9 +37,11 @@ if (groups_get_course_groupmode($COURSE) == SEPARATEGROUPS and !has_capability('
         print_error('cannotaccessgroup', 'grades');
     }
 }
+$mform = new grade_export_form(null, array('publishing' => true, 'simpleui' => true));
+$formdata = $mform->get_data();
 
 // print all the exported data here
-$export = new grade_export_xls($course, $groupid, $itemids, $export_feedback, $updatedgradesonly, $displaytype, $decimalpoints, $onlyactive, true);
+$export = new grade_export_xls($course, $groupid, $formdata);
 $export->print_grades();
 
 
diff --git a/grade/export/xls/index.php b/grade/export/xls/index.php
index d0f61f8664b..517b95c7711 100644
--- a/grade/export/xls/index.php
+++ b/grade/export/xls/index.php
@@ -40,7 +40,13 @@ if (!empty($CFG->gradepublishing)) {
     $CFG->gradepublishing = has_capability('gradeexport/xls:publish', $context);
 }
 
-$mform = new grade_export_form(null, array('publishing' => true));
+$actionurl = new moodle_url('/grade/export/xls/export.php');
+$formoptions = array(
+    'publishing' => true,
+    'simpleui' => true
+);
+
+$mform = new grade_export_form($actionurl, $formoptions);
 
 $groupmode    = groups_get_course_groupmode($course);   // Groups are being used
 $currentgroup = groups_get_course_group($course, true);
@@ -50,19 +56,6 @@ if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/
     die;
 }
 
-// process post information
-if ($data = $mform->get_data()) {
-    $onlyactive = $data->export_onlyactive || !has_capability('moodle/course:viewsuspendedusers', $context);
-    $export = new grade_export_xls($course, $currentgroup, '', false, false, $data->display, $data->decimals, $onlyactive, true);
-
-    // print the grades on screen for feedbacks
-    $export->process_form($data);
-    $export->print_continue();
-    $export->display_preview();
-    echo $OUTPUT->footer();
-    exit;
-}
-
 groups_print_course_menu($course, 'index.php?id='.$id);
 echo '<div class="clearer"></div>';