Merge pull request #1475 from RunestoneInteractive/revert-1472-at_show_exception

Revert "Fix: Provide an error report when the assignment table raises an exception"

Author: bnmnetp

modules/questions_report.py

@@ -271,6 +271,15 @@ def _headers_query(
 
     # **user_id headings query**
     ## ---------------------------
+    # The base query for this entire function. It's used to get information about each user_id/div_id combination.
+    query = (
+        # Choose seleted questions.
+        query_questions
+        # Join them to ``useinfo``.
+        & (db.questions.name == db.useinfo.div_id)
+        # Select only questions in the provided course.
+        & (db.useinfo.course_id == course_name)
+    )
     # Get information about each user_id.
     select_args = [db.auth_user.first_name, db.auth_user.last_name, db.auth_user.email]
     select_kwargs = dict(orderby=db.auth_user.last_name | db.auth_user.first_name)
@@ -291,33 +300,13 @@ def _headers_query(
             [row.first_name, row.last_name, row.email]
         )
 
-    # Second, find all students who answered a question in this course or receive a grade on a question in the course. Students can later remove themselves from a course, but their answers will still be in the course, hence this part of the query. Likewise, students who aren't logged in but did answer questions aren't enrolled in the course, but should also be included.
+    # Second, find all students who answered a question in this course. Students can later remove themselves from a course, but their answers will still be in the course, hence this part of the query. Likewise, students who aren't logged in but did answer questions aren't enrolled in the course, but should also be included.
     for row in db(
-        # Choose selected questions.
-        query_questions
-        & (
-            (
-                # Look for all students that answered any of these questions.
-                #
-                # Join these questions to ``useinfo``.
-                (db.questions.name == db.useinfo.div_id)
-                # Select only questions in the provided course.
-                & (db.useinfo.course_id == course_name)
-            )
-            | (
-                # Look for all students that received a grade on any of these questions.
-                (db.questions.name == db.question_grades.div_id)
-                & (db.question_grades.course_name == course_name)
-            )
-        )
+        query
         # Remove any students produced by the previous query.
         & ~db.useinfo.sid.belongs(db(enrolled_students)._select(db.auth_user.username))
-        & ~db.question_grades.sid.belongs(
-            db(enrolled_students)._select(db.auth_user.username)
-        )
     ).select(
         db.useinfo.sid,
-        db.question_grades.sid,
         *select_args,
         # Get the associated ``auth_user`` record if possible.
         left=(db.auth_user.on(db.useinfo.sid == db.auth_user.username),),
@@ -326,23 +315,13 @@ def _headers_query(
         **select_kwargs
     ):
 
-        # Pick whichever user id is present.
-        user_id = row.useinfo.sid or row.question_grades.sid
+        user_id = row.useinfo.sid
         assert user_id not in grades
         grades[user_id] = dict()
         grades[user_id][None] = _UserInfo._make(
             [row.auth_user.first_name, row.auth_user.last_name, row.auth_user.email]
         )
 
-    # Return a query used to get information about each user_id/div_id combination.
-    query = (
-        # Choose selected questions.
-        query_questions
-        # Join them to ``useinfo``.
-        & (db.questions.name == db.useinfo.div_id)
-        # Select only questions in the provided course.
-        & (db.useinfo.course_id == course_name)
-    )
     return grades, query
 
 

static/js/assignment_table.js

@@ -146,12 +146,6 @@ function populateAssignmentTable() {
         report_type: $("#gradingoption1").val(),
         chap_or_assign: $("#chaporassignselector").val(),
     }, (data) => {
-        // Check for errors.
-        if ("errors" in data) {
-            $("#assignment_info_table_loading").html(`Error<br/>Please report this error: ${escapeHTML(data.errors)}`);
-            return;
-        }
-
         // Recreate more helpful data structures from the "flattened" data.
         data.orig_data.forEach(
             (user_id_row, user_id_index) => user_id_row.forEach((div_id_entry, div_id_index) => {

tests/conftest.py

@@ -762,16 +762,6 @@ def hsblog(self, **kwargs):
         # Post to the server.
         return json.loads(self.test_client.validate("ajax/hsblog", data=kwargs))
 
-    def coursechooser(self, course_name):
-        html = self.test_client.validate("default/coursechooser/{}".format(course_name))
-        # Make sure this didn't send us to the user profile page to add a course we aren't registered for.
-        assert "Course IDs for open courses" not in html
-
-    def removecourse(self, course_name):
-        html = self.test_client.validate("default/removecourse/{}".format(course_name))
-        assert "Sorry, you cannot remove" not in html
-        assert "Course Selection" in html
-
 
 # Present ``_TestUser`` as a fixture.
 @pytest.fixture

tests/test_server.py

@@ -828,7 +828,7 @@ def test_grades_1(runestone_db_tools, test_user, tmp_path):
         test_user(
             "test_user_{}".format(index), "x", course, last_name="user_{}".format(index)
         )
-        for index in range(4)
+        for index in range(3)
     ]
 
     def assert_passing(index, *args, **kwargs):
@@ -850,10 +850,10 @@ def assert_passing(index, *args, **kwargs):
     unittest_kwargs = dict(event="unittest", div_id="units2", course=course_name)
 
     # *User 0*: no data supplied
-    ##----------------------------
+    # ----------------------------
 
     # *User 1*: correct answers
-    ##---------------------------
+    # ---------------------------
     # It doesn't matter which user logs out, since all three users share the same client.
     logout = test_user_array[2].test_client.logout
     logout()
@@ -867,7 +867,7 @@ def assert_passing(index, *args, **kwargs):
     assert_passing(1, act="percent:100:passed:2:failed:0", **unittest_kwargs)
 
     # *User 2*: incorrect answers
-    ##----------------------------
+    # ----------------------------
     logout()
     test_user_array[2].login()
     # Add three shortanswer answers, to make sure the number of attempts is correctly recorded.
@@ -880,12 +880,8 @@ def assert_passing(index, *args, **kwargs):
     )
     assert_passing(2, act="percent:50:passed:1:failed:1", **unittest_kwargs)
 
-    # *User 3*: no data supplied, and no longer in course.
-    ##----------------------------------------------------
-    # Wait until the autograder is run to remove the student, so they will have a grade but not have any submissions.
-
     # **Test the grades_report endpoint**
-    ##====================================
+    # ====================================
     tu = test_user_array[2]
 
     def grades_report(assignment, *args, **kwargs):
@@ -938,22 +934,8 @@ def add_to_assignment(question_kwargs, points):
         tu.test_client.validate("assignments/calculate_totals", **assignment_kwargs)
     )["success"]
 
-    # Remove test user 3 from the course. They can't be removed from the current course, so create a new one then add this user to it.
-    logout()
-    tu = test_user_array[3]
-    tu.login()
-    new_course = runestone_db_tools.create_course("random_course_name")
-    tu.update_profile(course_name=new_course.course_name, is_free=True)
-    tu.coursechooser(new_course.course_name)
-    tu.removecourse(course_name)
-
     # **Test this assignment.**
     # ===========================
-    # Log back in as the instructor.
-    logout()
-    tu = test_user_array[2]
-    tu.login()
-    # Now, we can get the report.
     grades = json.loads(grades_report(assignment_name))
 
     # Define a regex string comparison.
@@ -1035,20 +1017,18 @@ def __eq__(self, other):
             ["test_user_0", "user_0", "test", "test_user_0@foo.com", 0.0],
             ["test_user_1", "user_1", "test", "test_user_1@foo.com", 1.0],
             ["test_user_2", "user_2", "test", "test_user_2@foo.com", 0.2],
-            ["test_user_3", "user_3", "test", "test_user_3@foo.com", 0.0],
         ],
         # Correct since the first 3 questions are all on the index page.
         "mergeCells": [{"col": 5, "colspan": 3, "row": 1, "rowspan": 1}],
         "orig_data": [
             # User 0: not submitted.
             [
-                # The format is:
-                # ``[timestamp, score, answer, correct, num_attempts]``.
-                [None, 0.0, None, None, None],  # shortanswer
-                [None, 0.0, None, None, None],  # fillintheblank
-                [None, 0.0, None, None, None],  # mchoice
-                [None, 0.0, {}, None, None],  # lp_build
-                [None, 0.0, "", None, None],  # activecode
+                # The format is: ``[timestamp, score, answer, correct, num_attempts]``.
+                [None, 0.0, None, None, None],
+                [None, 0.0, None, None, None],
+                [None, 0.0, None, None, None],
+                [None, 0.0, {}, None, None],
+                [None, 0.0, "", None, None],
             ],
             # User 1: all correct.
             [
@@ -1089,19 +1069,10 @@ def __eq__(self, other):
                 ],
                 [AlmostNow(), 2.0, "percent:50:passed:1:failed:1", False, 1],
             ],
-            # User 3: not submitted.
-            [
-                # The format is:
-                [None, 0.0, None, None, None],
-                [None, 0.0, None, None, None],
-                [None, 0.0, None, None, None],
-                [None, 0.0, {}, None, None],
-                [None, 0.0, "", None, None],
-            ],
         ],
     }
 
-    # Note: on test failure, pytest will report as incorrect all the ``AlmostNow()`` and ``RegexEquals`` items, even though they may have actually compared as equal.
+    # Note: on test failure, pytest will report as incorrect all the ``AlmostNow()`` and ``RegexEquals`` items, even though they make have actually compared as equal.
     assert grades == expected_grades
 
     logout()