SAK-49894 SakaiGrader distorts group assignment scores with overrides (…

…sakaiproject#12469)
chenxingqiang · Aug 16, 2024 · e4d1d6e · e4d1d6e
1 parent a874497
commit e4d1d6e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/...t/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java b/...t/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java
@@ -710,10 +710,6 @@ private Map<String, Object> submissionToMap(Set<String> activeSubmitters, Assign
                 submission.put("grade", assignmentService.getGradeDisplay(as.getGrade(), assignment.getTypeOfGrade(), assignment.getScaleFactor()));
             }
 
-            if (StringUtils.isNotBlank(as.getGrade())) {
-                submission.put("grade", as.getGrade());
-            }
-
             boolean draft = assignmentToolUtils.isDraftSubmission(as);
             if (draft) {
                 submission.put("draft", draft);
@@ -932,9 +928,6 @@ private Map<String, Object> submissionToMap(Set<String> activeSubmitters, Assign
 
             if (!feedbackAttachments.isEmpty()) submission.put("feedbackAttachments", feedbackAttachments);
 
-            String grade = assignmentService.getGradeForSubmitter(as, as.getSubmitters().isEmpty() ? null : as.getSubmitters().stream().findAny().get().getSubmitter());
-            if (StringUtils.isNotBlank(grade)) submission.put("grade", grade);
-
             String status = assignmentService.getSubmissionStatus(as.getId(), true);
             if (StringUtils.isNotBlank(status)) submission.put("status", status);
 

diff --git a/...mponents/tool/src/main/frontend/packages/sakai-grader/src/sakai-grader-rendering-mixin.js b/...mponents/tool/src/main/frontend/packages/sakai-grader/src/sakai-grader-rendering-mixin.js
@@ -262,12 +262,12 @@ export const graderRenderingMixin = Base => class extends Base {
         ${this._renderFailed()}
       ` : nothing }
       ${this.gradeScale === SCORE_GRADE_TYPE ? html`
-        <input id="score-grade-input" aria-label="${this.i18n.number_grade_label}"
+        <input id=${ifDefined(submitter ? undefined : "score-grade-input")} aria-label="${this.i18n.number_grade_label}"
           @keydown=${this._validateGradeInput}
           @keyup=${submitter ? undefined : this._gradeSelected}
           data-user-id="${ifDefined(submitter ? submitter.id : undefined)}"
           type="text"
-          class="points-input ${ifDefined(submitter ? "grader-grade-override" : undefined)}"
+          class="points-input ${ifDefined(submitter ? "grader-grade-override" : "")}"
           .value=${submitter ? submitter.overridden ? submitter.grade : "" : this._submission.grade} />
         ${this._renderSaved()}
         ${this._renderFailed()}