SAK-41529 Used submission id rather than assignment id ...

... as the evaluated-item-id
K-Class · Mar 25, 2019 · dcd57e4 · dcd57e4
1 parent 4e1f0df
commit dcd57e4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...bookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.java b/...bookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.java
@@ -356,8 +356,9 @@ public boolean isVisible() {
 								String[] bits = assignment.getExternalId().split("/");
 								if (bits != null && bits.length >= 1) {
 									String assignmentId = bits[bits.length-1];
-									sakaiRubricPreview.add(AttributeModifier.append("evaluated-item-id", studentUuid));
-									sakaiRubricPreview.add(AttributeModifier.append("entity-id", assignmentId));//this only works for Assignments atm
+									String submissionId = rubricsService.getRubricEvaluationObjectId(assignmentId, studentUuid, RubricsConstants.RBCS_TOOL_ASSIGNMENT);
+									sakaiRubricPreview.add(AttributeModifier.append("entity-id", assignmentId));
+									sakaiRubricPreview.add(AttributeModifier.append("evaluated-item-id", submissionId));
 								} else {
 									log.warn(assignment.getExternalId() + " is not a valid assignment reference");
 								}

diff --git a/rubrics/tool/src/main/frontend/webcomponents/sakai-rubric-criterion-student.js b/rubrics/tool/src/main/frontend/webcomponents/sakai-rubric-criterion-student.js
@@ -107,6 +107,8 @@ export class SakaiRubricCriterionStudent extends SakaiElement {
             if (r.id == ed.selectedRatingId) {
               r.selected = true;
               selectedRatingItem = r;
+            } else {
+              r.selected = false;
             }
           });