match front-end

Author: rockstarr-programmerr

classroom/business/all/student_report.py

@@ -6,11 +6,14 @@ def __init__(self, classroom, student):
         self.classroom = classroom
         self.student = student
 
-    def make(self):
+    def make(self, exercise_pk=None, detail=True):
         reports = []
         exercises = self.get_exercises()
 
         for exercise in exercises:
+            if exercise_pk and exercise_pk != exercise.pk:
+                continue
+
             report = self.new_report(exercise)
             submission = self.get_submission(exercise)
 
@@ -34,6 +37,11 @@ def make(self):
                 )
                 report['band_score'] = self.calculate_band(report['total'])
 
+            if not detail:
+                del report['passage_1_detail']
+                del report['passage_2_detail']
+                del report['passage_3_detail']
+
             reports.append(report)
 
         return reports

classroom/serializers/classroom.py

@@ -61,13 +61,6 @@ class RemoveReadingExerciseSerializer(serializers.Serializer):
     pk = serializers.IntegerField()
 
 
-class _PassageDetailSerializer(serializers.Serializer):
-    question_number = serializers.IntegerField()
-    submitted_answer = serializers.CharField()
-    possible_answers = serializers.ListField(child=serializers.CharField())
-    is_correct = serializers.BooleanField()
-
-
 class _ExerciseSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = ReadingExercise
@@ -77,8 +70,18 @@ class Meta:
         }
 
 
+class _PassageDetailSerializer(serializers.Serializer):
+    question_number = serializers.IntegerField()
+    submitted_answer = serializers.CharField()
+    possible_answers = serializers.ListField(child=serializers.CharField())
+    is_correct = serializers.BooleanField()
+
+
 class StudentReadingReportSerializer(serializers.Serializer):
-    student = serializers.IntegerField(write_only=True)
+    student_pk = serializers.IntegerField(write_only=True)
+    exercise_pk = serializers.IntegerField(write_only=True, required=False)
+    show_detail = serializers.BooleanField(write_only=True, default=True)
+
     exercise = _ExerciseSerializer(read_only=True)
     passage_1_total = serializers.IntegerField(read_only=True)
     passage_2_total = serializers.IntegerField(read_only=True)

classroom/views/classroom.py

@@ -99,9 +99,15 @@ def remove_reading_exercises(self, request, pk):
     def student_reading_report(self, request, pk):
         serializer = self.get_serializer(data=request.query_params)
         serializer.is_valid(raise_exception=True)
+
+        student_pk = serializer.validated_data['student_pk']
+        exercise_pk = serializer.validated_data.get('exercise_pk')
+        show_detail = serializer.validated_data['show_detail']
+
         classroom = self.get_object()
-        student = get_object_or_404(User.students.all(), pk=serializer.validated_data['student'])
+        student = get_object_or_404(User.students.all(), pk=student_pk)
         report_maker = ReadingReportMaker(classroom, student)
-        report = report_maker.make()
+        report = report_maker.make(exercise_pk=exercise_pk, detail=show_detail)
+
         serializer = self.get_serializer(instance=report, many=True)
         return Response(serializer.data)