From 1306b27b0524596ab60f87cd5e48c9204fd2fa00 Mon Sep 17 00:00:00 2001 From: Fernando Date: Fri, 20 Oct 2023 14:34:12 -0400 Subject: [PATCH] fix: style and functions rename --- lms/djangoapps/ora_staff_grader/ora_api.py | 4 +- .../ora_staff_grader/serializers.py | 50 +++++++++---------- lms/djangoapps/ora_staff_grader/urls.py | 4 +- lms/djangoapps/ora_staff_grader/views.py | 13 +++-- 4 files changed, 35 insertions(+), 36 deletions(-) diff --git a/lms/djangoapps/ora_staff_grader/ora_api.py b/lms/djangoapps/ora_staff_grader/ora_api.py index fdf033b2522f..1e54e9ccc728 100644 --- a/lms/djangoapps/ora_staff_grader/ora_api.py +++ b/lms/djangoapps/ora_staff_grader/ora_api.py @@ -33,11 +33,11 @@ def get_submissions(request, usage_id): return json.loads(response.content) -def get_assessments_grades(request, usage_id, submission_uuid, assessment_type): +def get_assessments(request, usage_id, submission_uuid, assessment_type): """ Get a list of assessments from the ORA's 'list_assessments_grades' XBlock.json_handler """ - handler_name = "list_assessments_grades" + handler_name = "list_assessments" body = {"item_id": usage_id, "submission_uuid": submission_uuid, "assessment_type": assessment_type} response = call_xblock_json_handler(request, usage_id, handler_name, body) diff --git a/lms/djangoapps/ora_staff_grader/serializers.py b/lms/djangoapps/ora_staff_grader/serializers.py index d2c5482f357a..fcb41eecf4c6 100644 --- a/lms/djangoapps/ora_staff_grader/serializers.py +++ b/lms/djangoapps/ora_staff_grader/serializers.py @@ -133,7 +133,7 @@ class ScoreSerializer(serializers.Serializer): class SubmissionMetadataSerializer(serializers.Serializer): """ - Submission metadata for displaying submissions table in ESG + Submission metadata for displaying submissions table in Enhanced Staff Grader (ESG) """ submissionUUID = serializers.CharField(source="submissionUuid") @@ -165,45 +165,45 @@ class Meta: read_only_fields = fields -class AssessmentScoresMetadataSerializer(serializers.Serializer): +class AssessmentScoresSerializer(serializers.Serializer): """ - Assessment Score metadata for displaying assessment table in ESG + Assessment Score for displaying assessment table in Enhanced Staff Grader (ESG) """ - type = serializers.CharField() - score = serializers.IntegerField() + criterion_name = serializers.CharField() + score_earned = serializers.IntegerField() score_type = serializers.CharField() class Meta: fields = [ - "type", - "score", + "criterion_name", + "score_earned", "score_type", ] read_only_fields = fields -class AssessmentMetadataSerializer(serializers.Serializer): +class AssessmentSerializer(serializers.Serializer): """ - Assessment metadata for displaying assessment table in ESG + Assessment metadata for displaying assessment table in Enhanced Staff Grader (ESG) """ - idAssessment = serializers.CharField() - grader_name = serializers.CharField(allow_null=True) - grader_username = serializers.CharField(allow_null=True) - grader_email = serializers.CharField(allow_null=True) - assesmentDate = serializers.DateTimeField() - assesmentScores = serializers.ListField(child=AssessmentScoresMetadataSerializer()) - problemStep = serializers.CharField(allow_null=True) + id_assessment = serializers.CharField() + scorer_name = serializers.CharField(allow_null=True) + scorer_username = serializers.CharField(allow_null=True) + scorer_email = serializers.CharField(allow_null=True) + assesment_date = serializers.DateTimeField() + assesment_scores = serializers.ListField(child=AssessmentScoresSerializer()) + problem_step = serializers.CharField(allow_null=True) feedback = serializers.CharField(allow_null=True) class Meta: fields = [ - "idAssessment", - "grader_name", - "grader_username", - "grader_email", - "assesmentDate", - "assesmentScores", - "problemStep", + "id_assessment", + "scorer_name", + "scorer_username", + "scorer_email", + "assesment_date", + "assesment_scores", + "problem_step", "feedback", ] read_only_fields = fields @@ -234,12 +234,12 @@ def get_isEnabled(self, obj): """ return obj['isEnabled'] and not obj['oraMetadata'].teams_enabled -class FeedbackSerializer(serializers.Serializer): +class AssessmentFeedbackSerializer(serializers.Serializer): """ Serialize info for the initialize call. Packages ORA, course, submission, and rubric data. """ - assessments = serializers.ListField(child=AssessmentMetadataSerializer()) + assessments = serializers.ListField(child=AssessmentSerializer()) class Meta: fields = ["assessments",] diff --git a/lms/djangoapps/ora_staff_grader/urls.py b/lms/djangoapps/ora_staff_grader/urls.py index 8edb03a4b20b..fd21bd2e42b6 100644 --- a/lms/djangoapps/ora_staff_grader/urls.py +++ b/lms/djangoapps/ora_staff_grader/urls.py @@ -13,7 +13,7 @@ SubmissionLockView, SubmissionStatusFetchView, UpdateGradeView, - FeedbackListView, + AssessmentFeedbackView, ) @@ -23,7 +23,7 @@ urlpatterns += [ path("mock/", include("lms.djangoapps.ora_staff_grader.mock.urls")), path("initialize", InitializeView.as_view(), name="initialize"), - path("feedbacklist", FeedbackListView.as_view(), name="feedbacklist"), + path("assessments/feedback", AssessmentFeedbackView.as_view(), name="assessment-feedback"), path("submission/batch/unlock", SubmissionBatchUnlockView.as_view(), name="batch-unlock"), path("submission/files", SubmissionFilesFetchView.as_view(), name="fetch-files"), path( diff --git a/lms/djangoapps/ora_staff_grader/views.py b/lms/djangoapps/ora_staff_grader/views.py index f006db30a3ba..e826cacd327f 100644 --- a/lms/djangoapps/ora_staff_grader/views.py +++ b/lms/djangoapps/ora_staff_grader/views.py @@ -44,13 +44,13 @@ get_assessment_info, get_submission_info, get_submissions, - get_assessments_grades, + get_assessments, submit_grade, ) from lms.djangoapps.ora_staff_grader.serializers import ( FileListSerializer, InitializeSerializer, - FeedbackSerializer, + AssessmentFeedbackSerializer, LockStatusSerializer, StaffAssessSerializer, SubmissionFetchSerializer, @@ -150,7 +150,7 @@ def get(self, request, ora_location, *args, **kwargs): return UnknownErrorResponse() -class FeedbackListView(StaffGraderBaseView): +class AssessmentFeedbackView(StaffGraderBaseView): """ GET course metadata @@ -172,13 +172,12 @@ class FeedbackListView(StaffGraderBaseView): def get(self, request, ora_location, submission_uuid, assessment_type=None, *args, **kwargs): try: - init_data = {} + assessments_data = {} # Get list of submissions for this ORA - init_data["assessments"] = get_assessments_grades(request, ora_location, submission_uuid, assessment_type) - #init_data["assessments"] = TEST + assessments_data["assessments"] = get_assessments(request, ora_location, submission_uuid, assessment_type) - response_data = FeedbackSerializer(init_data).data + response_data = AssessmentFeedbackSerializer(assessments_data).data log.info(response_data) return Response(response_data)