- Added a test

- Splitted a function
- Changed some logics of the assessment

Author: orronai

lms/lmsdb/models.py

@@ -375,10 +375,9 @@ def open_for_new_solutions(self) -> bool:
     def get_highest_number(cls, course: Course):
         return (
             cls
-            .select(cls.number)
+            .select(fn.MAX(cls.number))
             .where(cls.course == course)
-            .order_by(cls.number.desc())
-            .limit(1)
+            .group_by(cls.course)
             .scalar()
         )
 
@@ -437,7 +436,6 @@ def __str__(self):
 @pre_save(sender=Exercise)
 def exercise_number_save_handler(model_class, instance, created):
     """Change the exercise number to the highest consecutive number."""
-
     if model_class.is_number_exists(instance.course, instance.number):
         instance.number = model_class.get_highest_number(instance.course) + 1
 
@@ -746,11 +744,12 @@ def mark_as_checked(
         assessment_id: Optional[int] = None,
         by: Optional[Union[User, int]] = None,
     ) -> bool:
+        assessment = SolutionAssessment.get_or_none(
+            SolutionAssessment.id == assessment_id,
+        )
         return self.set_state(
             Solution.STATES.DONE,
-            SolutionAssessment.get_or_none(
-                SolutionAssessment.id == assessment_id,
-            ),
+            assessment=assessment,
             checker=by,
         )
 

lms/static/checker.js

@@ -26,18 +26,22 @@ function trackFinished(exerciseId, solutionId, element) {
   });
 }
 
+function changeAssessmentsAttributes(assessmentGroup, item) {
+  if (item.value == assessmentGroup.dataset.checkedid) {
+    item.removeAttribute('checked');
+    item.checked = false;
+    assessmentGroup.dataset.checkedid = 'None';
+  } else {
+    assessmentGroup.dataset.checkedid = item.value;
+  }
+}
+
 function trackAssessmentButtons() {
   const assessmentGroup = document.getElementById('solution-assessment');
   const assessmentElements = document.querySelectorAll('input[name="assessment"]');
   Array.from(assessmentElements).forEach((item) => {
     item.addEventListener('click', () => {
-      if (item.value == assessmentGroup.dataset.checkedid) {
-        item.removeAttribute('checked');
-        item.checked = false;
-        assessmentGroup.dataset.checkedid = 'None';
-      } else {
-        assessmentGroup.dataset.checkedid = item.value;
-      }
+      changeAssessmentsAttributes(assessmentGroup, item);
     }, true);
   });
 }

tests/test_solutions.py

@@ -128,6 +128,7 @@ def test_mark_as_checked(
         student_user: User,
         staff_user: User,
         solution: Solution,
+        _assessments,
     ):
         # Basic functionality
         assert solution.state == Solution.STATES.CREATED.name
@@ -155,6 +156,7 @@ def test_get_next_unchecked(
         student_user: User,
         exercise: Exercise,
         staff_user: User,
+        _assessments,
     ):
         student_user2 = conftest.create_student_user(index=1)
         exercise2 = conftest.create_exercise(course, 2, index=3)
@@ -627,3 +629,21 @@ def test_solution_assessment_on_save(course: Course, _assessments):
         assert (
             assessment.active_color == DEFAULT_ASSESSMENT_BUTTON_ACTIVE_COLOR,
         )
+
+    @staticmethod
+    def test_solutions_of_user(
+        staff_user: User, student_user: User, course: Course,
+        solution: Solution, _assessments,
+    ):
+        conftest.create_usercourse(student_user, course)
+        solutions.mark_as_checked(solution.id, staff_user.id, 2)
+        solution = Solution.get_by_id(solution.id)
+
+        exercise2 = conftest.create_exercise(course, 2)
+        solution2 = conftest.create_solution(exercise2, student_user)
+        solutions.mark_as_checked(solution2.id, staff_user.id)
+        solution2 = Solution.get_by_id(solution2.id)
+        
+        exercises = solution.of_user(student_user.id, from_all_courses=True)
+        assert exercises[0].get('assessment') == 'Nice'
+        assert exercises[1].get('assessment') is None