fix: remove unused code

openedx · Nov 6, 2023 · fae1c97 · fae1c97
1 parent 6f8f5c1
commit fae1c97
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 100 deletions.
diff --git a/openassessment/xblock/ui_mixins/mfe/mixin.py b/openassessment/xblock/ui_mixins/mfe/mixin.py
@@ -86,16 +86,9 @@ def get_learner_data(self, data, suffix=""):  # pylint: disable=unused-argument
                 raise JsonHandlerError(400, f"Cannot jump to step: {jump_step}")
 
         # Determine which mode we are viewing in, since data comes from different sources
+        # View submission, submitted or draft
         if workflow_step == "submission" or jump_step == "submission":
-
-            # View our submitted response
-            if self.submission_data.has_submitted:
-                serializer_context.update({"view": "submission"})
-
-            # View our draft response
-            else:
-                serializer_context.update({"view": "draft"})
-
+            serializer_context.update({"view": "submission"})
         # View the current assessment step
         else:
             serializer_context.update({"view": "assessment"})

diff --git a/openassessment/xblock/ui_mixins/mfe/page_context_serializer.py b/openassessment/xblock/ui_mixins/mfe/page_context_serializer.py
@@ -34,43 +34,6 @@ class AssessmentScoreSerializer(Serializer):
     possible = IntegerField(source="points_possible", required=False)
 
 
-class ReceivedGradesSerializer(Serializer):
-    """
-    Received grades for each of the applicable graded steps
-    Returns:
-    {
-        self: (Assessment score object)
-        peer: (Assessment score object)
-        staff: (Assessment score object)
-    }
-    """
-
-    self = AssessmentScoreSerializer(source="grades.self_score")
-    peer = AssessmentScoreSerializer(source="grades.peer_score")
-    staff = AssessmentScoreSerializer(source="grades.staff_score")
-
-    def to_representation(self, instance):
-        """
-        Hook output to remove steps that are not part of the assignment.
-
-        Grades are not released for steps until all steps are completed.
-        """
-        step_names = ["self", "peer", "staff"]
-
-        # NOTE - cache this so we don't update the workflow
-        configured_steps = instance.status_details.keys()
-        is_done = instance.is_done
-
-        for step in step_names:
-            if step not in configured_steps:
-                self.fields.pop(step)
-
-        if not is_done:
-            return {field: {} for field in self.fields}
-
-        return super().to_representation(instance)
-
-
 class ClosedInfoSerializer(Serializer):
     """Serialize closed info from a given assessment step API"""
 
@@ -273,16 +236,11 @@ class ProgressSerializer(Serializer):
     {
         // What step are we on? An index to the configuration from ORA config call.
         activeStepName: (String) one of ["submission", "studentTraining", "peer", "self", "staff", "done]
-
-        hasReceivedFinalGrade: (Bool) // In effect, is the ORA complete?
-        receivedGrades: (Object) Staff grade data, when there is a completed staff grade.
         activeStepInfo: (Object) Specific info for the active step
     }
     """
 
     activeStepName = SerializerMethodField()
-    hasReceivedFinalGrade = BooleanField(source="workflow_data.is_done")
-    receivedGrades = ReceivedGradesSerializer(source="workflow_data")
     stepInfo = StepInfoSerializer(source="*")
 
     def get_activeStepName(self, instance):

diff --git a/openassessment/xblock/ui_mixins/mfe/test_mfe_mixin.py b/openassessment/xblock/ui_mixins/mfe/test_mfe_mixin.py
@@ -224,7 +224,7 @@ def test_start_submission(self, xblock, mock_serializer):
         # Then I get submission
         expected_context = {
             "step": "submission",
-            "view": "draft",
+            "view": "submission",
         }
         mock_serializer.assert_called_once_with(xblock, context={**expected_context})
 

diff --git a/openassessment/xblock/ui_mixins/mfe/test_page_context_serializer.py b/openassessment/xblock/ui_mixins/mfe/test_page_context_serializer.py
@@ -304,8 +304,6 @@ def test_submission(self, xblock):
         # Then I get the expected shapes
         expected_data = {
             "activeStepName": "submission",
-            "hasReceivedFinalGrade": False,
-            "receivedGrades": {},
             "stepInfo": {
                 "submission": {
                     "closed": False,
@@ -335,11 +333,6 @@ def test_student_training(self, xblock):
         # Then I get the expected shapes
         expected_data = {
             "activeStepName": "studentTraining",
-            "hasReceivedFinalGrade": False,
-            "receivedGrades": {
-                "peer": {},
-                "staff": {},
-            },
             "stepInfo": {
                 "submission": {
                     "closed": False,
@@ -380,11 +373,6 @@ def test_student_training_due(self, xblock):
         # Then I get the expected shapes
         expected_data = {
             "activeStepName": "studentTraining",
-            "hasReceivedFinalGrade": False,
-            "receivedGrades": {
-                "peer": {},
-                "staff": {},
-            },
             "stepInfo": {
                 "submission": {
                     "closed": True,
@@ -425,11 +413,6 @@ def test_student_training_not_yet_available(self, xblock):
         # Then I get the expected shapes
         expected_data = {
             "activeStepName": "studentTraining",
-            "hasReceivedFinalGrade": False,
-            "receivedGrades": {
-                "peer": {},
-                "staff": {},
-            },
             "stepInfo": {
                 "submission": {
                     "closed": False,
@@ -470,11 +453,6 @@ def test_peer_assessment(self, xblock):
         # Then I get the expected shapes
         expected_data = {
             "activeStepName": "peer",
-            "hasReceivedFinalGrade": False,
-            "receivedGrades": {
-                "peer": {},
-                "staff": {},
-            },
             "stepInfo": {
                 "submission": {
                     "closed": False,
@@ -517,11 +495,6 @@ def test_peer_assessment__cancelled(self, xblock):
         # Then I get the expected shapes
         expected_data = {
             "activeStepName": "submission",
-            "hasReceivedFinalGrade": False,
-            "receivedGrades": {
-                "peer": {},
-                "staff": {},
-            },
             "stepInfo": {
                 "submission": {
                     "closed": False,
@@ -550,11 +523,6 @@ def test_self_assessment(self, xblock):
         # Then I get the expected shapes
         expected_data = {
             "activeStepName": "self",
-            "hasReceivedFinalGrade": False,
-            "receivedGrades": {
-                "self": {},
-                "staff": {},
-            },
             "stepInfo": {
                 "submission": {
                     "closed": False,
@@ -586,12 +554,6 @@ def test_self_assessment_closed(self, xblock):
         # Then I get the expected shapes
         expected_data = {
             "activeStepName": "self",
-            "hasReceivedFinalGrade": False,
-            "receivedGrades": {
-                "self": {},
-                "peer": {},
-                "staff": {},
-            },
             "stepInfo": {
                 "submission": {
                     "closed": True,
@@ -624,12 +586,6 @@ def test_self_assessment_not_available(self, xblock):
         # Then I get the expected shapes
         expected_data = {
             "activeStepName": "self",
-            "hasReceivedFinalGrade": False,
-            "receivedGrades": {
-                "self": {},
-                "peer": {},
-                "staff": {},
-            },
             "stepInfo": {
                 "submission": {
                     "closed": False,
@@ -673,10 +629,6 @@ def test_team_assignment(self, xblock):
         # Then I get the expected shapes
         expected_data = {
             "activeStepName": "staff",
-            "hasReceivedFinalGrade": False,
-            "receivedGrades": {
-                # NOTE - Teams actually have a different step type that should go here
-            },
             "stepInfo": {
                 "submission": {
                     "closed": False,