From 2c4a3f7525c00a3768f9311d276347a675eebd63 Mon Sep 17 00:00:00 2001 From: Alfonso Roman Date: Sun, 13 Jul 2014 20:29:28 -0700 Subject: [PATCH] MDL-47045 gradereport_grader: Improve Grader report user interface This issue is a part of the MDL-46658 Task. This issue is a part of the MDL-25544 Epic. --- grade/report/grader/index.php | 12 +- grade/report/grader/lib.php | 2 +- grade/report/grader/module.js | 3 +- grade/report/grader/pix/corner-fold.png | Bin 0 -> 320 bytes grade/report/grader/styles.css | 574 +++++++++++------- ...adereport_grader-gradereporttable-debug.js | 397 ++++++++++++ ...gradereport_grader-gradereporttable-min.js | 1 + ...dle-gradereport_grader-gradereporttable.js | 392 ++++++++++++ .../yui/src/gradereporttable/build.json | 10 + .../gradereporttable/js/gradereporttable.js | 392 ++++++++++++ .../meta/gradereporttable.json | 9 + 11 files changed, 1585 insertions(+), 207 deletions(-) create mode 100644 grade/report/grader/pix/corner-fold.png create mode 100644 grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-debug.js create mode 100644 grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-min.js create mode 100644 grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable.js create mode 100644 grade/report/grader/yui/src/gradereporttable/build.json create mode 100644 grade/report/grader/yui/src/gradereporttable/js/gradereporttable.js create mode 100644 grade/report/grader/yui/src/gradereporttable/meta/gradereporttable.json diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php index 66b944772c7..85e6776b9de 100644 --- a/grade/report/grader/index.php +++ b/grade/report/grader/index.php @@ -52,7 +52,8 @@ if (isset($graderreportsilast)) { } $PAGE->set_url(new moodle_url('/grade/report/grader/index.php', array('id'=>$courseid))); -$PAGE->requires->yui_module('moodle-gradereport_grader-scrollview', 'M.gradereport_grader.scrollview.init'); +//$PAGE->requires->yui_module('moodle-gradereport_grader-scrollview', 'M.gradereport_grader.scrollview.init'); +$PAGE->requires->yui_module('moodle-gradereport_grader-gradereporttable', 'M.gradereport_grader.gradereporttable.init', array()); // basic access checks if (!$course = $DB->get_record('course', array('id' => $courseid))) { @@ -193,6 +194,15 @@ if ($USER->gradeediting[$course->id] && ($report->get_pref('showquickfeedback') echo $reporthtml; } +// Render a loading screen. +$loading = html_writer::div( + html_writer::div( + '', 'gradebook-loading' + ), 'gradebook-loading-screen', array('aria-hidden' => 'true') + ); + +echo $loading; + // prints paging bar at bottom for large pages if (!empty($studentsperpage) && $studentsperpage >= 20) { echo $OUTPUT->paging_bar($numusers, $report->page, $studentsperpage, $report->pbarurl); diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php index cf02a6ee5db..2ad04b3a118 100644 --- a/grade/report/grader/lib.php +++ b/grade/report/grader/lib.php @@ -1137,7 +1137,7 @@ class grade_report_grader extends grade_report { $html .= $OUTPUT->container(html_writer::table($righttable), 'right_scroller'); } else { $fulltable = new html_table(); - $fulltable->attributes['class'] = 'gradestable flexible boxaligncenter generaltable'; + $fulltable->attributes['class'] = 'table table-bordered table-striped table-condensed'; $fulltable->id = 'user-grades'; // Extract rows from each side (left and right) and collate them into one row each diff --git a/grade/report/grader/module.js b/grade/report/grader/module.js index 6263883d05d..e760ce9fc56 100644 --- a/grade/report/grader/module.js +++ b/grade/report/grader/module.js @@ -56,7 +56,8 @@ M.gradereport_grader = { return; } - var content = '