show progress and summary

Author: runestonetest

controllers/assignments.py

@@ -139,13 +139,19 @@ def get_summary():
     )
     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
+    select chapter, 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
+group by chapter, name
     """,
         as_dict=True,
     )
 
+    for row in res:
+        if row["count"] > 0:
+            row[
+                "name"
+            ] = f"""<a href="/runestone/dashboard/exercisemetrics?id={row['name']}&chapter={row['chapter']}">{row['name']}</a>"""
+
     return json.dumps(res)
 
 

controllers/dashboard.py

@@ -554,16 +554,15 @@ def questiongrades():
 
     # make sure points total is up to date
     assignment_id = request.vars.assignment_id
+
+    if assignment_id.isnumeric():
+        assignmatch = db.assignments.id == request.vars.assignment_id
+    else:
+        assignmatch = db.assignments.name == request.vars.assignment_id
+    assignment = db(assignmatch & (db.assignments.course == course.id)).select().first()
+    assignment_id = assignment.id
     update_total_points(assignment_id)
 
-    assignment = (
-        db(
-            (db.assignments.id == request.vars.assignment_id)
-            & (db.assignments.course == course.id)
-        )
-        .select()
-        .first()
-    )
     sid = request.vars.sid
     student = db(db.auth_user.username == sid).select(
         db.auth_user.first_name, db.auth_user.last_name, db.auth_user.username

static/js/admin.js

@@ -160,14 +160,16 @@ function autoGrade() {
             let total = 0;
             $("#gradingprogresstitle").html("<h3>Grading Progress</h3>");
             $("#autogradingprogress").html("");
+            $("#autogradingprogress").css("border", "1px solid");
             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").append(
-                    `${index + 1} of ${student_array.length}: ${student} ${
-                        res.message
-                    } Score: ${res.total_mess} <br>`
+                    `${index + 1} of ${student_array.length}:
+                        <a href="/runestone/dashboard/questiongrades?sid=${student}&assignment_id=${assignment}">${student}</a>
+                        ${res.message}
+                        Score: ${res.total_mess} <br>`
                 );
                 total = total + res.total_mess;
                 $("#autogradingprogress").animate({
@@ -238,10 +240,15 @@ function gradingSummary(container) {
             $("#gradingsummarytitle").html("<h3>Grading Summary</h3>");
             container = document.getElementById(container);
             $(container).html("");
+            let columns = [];
+            for (let k of Object.keys(retdata[0])) {
+                columns.push({ data: k, renderer: "html" });
+            }
             var hot = new Handsontable(container, {
                 data: retdata,
                 colHeaders: Object.keys(retdata[0]),
                 licenseKey: "non-commercial-and-evaluation",
+                columns: columns,
             });
         },
     });
@@ -630,6 +637,7 @@ function updateQuestionList() {
         } else {
             $("#releasestate").text("");
         }
+        gradingSummary("autogradingsummary");
     }
     if (chapAssign == "assignment") {
         populateQuestions(questionSelector, assignmentinfo[col1val]);

views/admin/grading.html

@@ -13,7 +13,7 @@
   eBookConfig.get_assignment_release_statesURL = '{{=get_assignment_release_statesURL}}';
   eBookConfig.course = '{{=course_id}}';
   // load the students dictionary once the page loads
-  $(getCourseStudents)
+  $(document).ready(getCourseStudents);
 </script>
 
 <div class="col-md-5" style="margin-top: 50px; margin-bottom: 10px;">
@@ -63,7 +63,7 @@ <h3>Students</h3>
 
   <div>
     <div id="gradingprogresstitle"></div>
-    <div id="autogradingprogress" style="max-height: 100px; overflow: auto;"></div>
+    <div id="autogradingprogress" style="max-height: 100px; overflow: auto; "></div>
     <div id="gradingsummarytitle"></div>
     <div id="autogradingsummary"></div>
   </div>