Better overview of autograde

Author: runestonetest

controllers/assignments.py

@@ -123,6 +123,32 @@ def calculate_totals():
     return json.dumps(_calculate_totals(sid=sid, assignment_name=assignment_name))
 
 
+@auth.requires(
+    lambda: verifyInstructorStatus(auth.user.course_name, auth.user),
+    requires_login=True,
+)
+def get_summary():
+    assignment_name = request.vars.assignment
+    assignment = (
+        db(
+            (db.assignments.name == assignment_name)
+            & (db.assignments.course == auth.user.course_id)
+        )
+        .select()
+        .first()
+    )
+    res = db.executesql(
+        f"""
+    select name, min(score), max(score), to_char(avg(score), '00.999') as mean, count(score) from assignment_questions join questions on question_id = questions.id join question_grades on name = div_id
+where assignment_id = {assignment.id} and course_name = '{auth.user.course_name}'
+group by name
+    """,
+        as_dict=True,
+    )
+
+    return json.dumps(res)
+
+
 def _autograde(
     sid=None,
     student_rownum=None,
@@ -223,16 +249,20 @@ def autograde():
     enforce_deadline = request.vars.get("enforceDeadline", None)
     assignment_name = request.vars.assignment
     timezoneoffset = session.timezoneoffset if "timezoneoffset" in session else None
-
-    return json.dumps(
-        _autograde(
-            sid=sid,
-            question_name=question_name,
-            enforce_deadline=enforce_deadline,
-            assignment_name=assignment_name,
-            timezoneoffset=timezoneoffset,
-        )
+    res = _autograde(
+        sid=sid,
+        question_name=question_name,
+        enforce_deadline=enforce_deadline,
+        assignment_name=assignment_name,
+        timezoneoffset=timezoneoffset,
     )
+    tres = _calculate_totals(sid=sid, assignment_name=assignment_name)
+    if "computed_score" in tres:
+        res["total_mess"] = tres["computed_score"]
+    else:
+        res["total_mess"] = tres["message"]
+
+    return json.dumps(res)
 
 
 @auth.requires(
@@ -304,7 +334,7 @@ def record_grade():
                     & (db.question_grades.div_id == request.vars["acid"])
                     & (db.question_grades.course_name == auth.user.course_name)
                 ),
-                **updates
+                **updates,
             )
         except IntegrityError:
             logger.error(

static/js/admin.js

@@ -157,24 +157,36 @@ function autoGrade() {
         (async function (students, ajax_params) {
             // Grade each student provided.
             let student_array = Object.keys(students);
+            let total = 0;
+            $("#gradingprogresstitle").html("<h3>Grading Progress</h3>");
+            $("#autogradingprogress").html("");
             for (let index = 0; index < student_array.length; ++index) {
                 let student = student_array[index];
                 ajax_params.data.sid = student;
                 res = await jQuery.ajax(ajax_params);
-                $("#autogradingprogress").html(
-                    `Student ${index + 1} of ${student_array.length}: ${
+                $("#autogradingprogress").append(
+                    `${index + 1} of ${student_array.length}: ${student} ${
                         res.message
-                    } for ${student}`
+                    } Score: ${res.total_mess} <br>`
                 );
+                total = total + res.total_mess;
+                $("#autogradingprogress").animate({
+                    scrollTop: $("#autogradingprogress").height(),
+                });
             }
-            // Clear the graing progress.
-            $("#autogradingprogress").html("");
-            calculateTotals();
+            $("#autogradingprogress").append(
+                `Average Score: ${total / student_array.length}`
+            );
+            $("#autogradingprogress").animate({
+                scrollTop: $("#autogradingprogress").height(),
+            });
+
+            gradingSummary("autogradingsummary");
             $("#autogradesubmit").prop("disabled", false);
         })(students, params);
     } else {
         jQuery.ajax(params).always(function () {
-            calculateTotals();
+            gradingSummary("autogradingsummary");
             $("#autogradesubmit").prop("disabled", false);
         });
     }
@@ -213,6 +225,28 @@ function calculateTotals(sid) {
     });
 }
 
+function gradingSummary(container) {
+    let assignment = getSelectedItem("assignment");
+    jQuery.ajax({
+        url: `${eBookConfig.app}/assignments/get_summary`,
+        dataType: "JSON",
+        data: {
+            assignment: assignment,
+        },
+        success: function (retdata) {
+            // retdata is array of rows in dictionary form.
+            $("#gradingsummarytitle").html("<h3>Grading Summary</h3>");
+            container = document.getElementById(container);
+            $(container).html("");
+            var hot = new Handsontable(container, {
+                data: retdata,
+                colHeaders: Object.keys(retdata[0]),
+                licenseKey: "non-commercial-and-evaluation",
+            });
+        },
+    });
+}
+
 function saveManualTotal() {
     var assignment = getSelectedItem("assignment");
     var studentID = getSelectedItem("student");

views/_sphinx_static_files.html

@@ -22,6 +22,9 @@
 <script type="text/javascript" src="{{=base_static_url}}/jquery.tablesorter.js"></script>
 <script type="text/javascript" src="{{=base_static_url}}/jquery-ui-1.10.3.custom.min.js"></script>
 
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/handsontable.full.js"></script>
+<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/handsontable.full.min.css" rel="stylesheet" media="screen">
+
 <link rel="stylesheet" type="text/css" href="{{=URL('static', 'jquery.datetimepicker.min.css')}}" />
 <link href="{{=base_static_url}}/jquery-ui-1.10.3.custom.min.css" rel="stylesheet" type="text/css"/>
 <link rel="stylesheet" href="{{=base_static_url}}/pygments.css" type="text/css"/>

views/admin/grading.html

@@ -61,9 +61,12 @@ <h3>Students</h3>
     <strong>Warning</strong> Autograde does not support multiple selections yet.
   </div>
 
-  <div id="autogradingprogress">
+  <div>
+    <div id="gradingprogresstitle"></div>
+    <div id="autogradingprogress" style="max-height: 100px; overflow: auto;"></div>
+    <div id="gradingsummarytitle"></div>
+    <div id="autogradingsummary"></div>
   </div>
-
   <div id="assignmentTotalform" style="text-align: center; visibility: hidden; background-color: rgba(219,103,14,.71); margin: 10px; padding: 5px; border-radius: 10px;">
     <strong>Override student score for whole assignment.</strong>
     <form>