SAK-50432 Assignment conditions doesn't work on Spanish language (sak…

…aiproject#12829)
chenxingqiang · Aug 28, 2024 · 3519cec · 3519cec
1 parent f81422d
commit 3519cec
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/assignment/api/src/java/org/sakaiproject/assignment/api/AssignmentService.java b/assignment/api/src/java/org/sakaiproject/assignment/api/AssignmentService.java
@@ -44,6 +44,7 @@
 import org.sakaiproject.site.api.Site;
 import org.sakaiproject.timesheet.api.TimeSheetEntry;
 import org.sakaiproject.user.api.User;
+import org.sakaiproject.util.api.FormattedText;
 
 /**
  * <p>
@@ -888,5 +889,6 @@ public String getDeepLinkWithPermissions(String context, String assignmentId, bo
     public String getAssignmentModifier(String modifier);
 
     public boolean allowAddTags(String context);
-
+
+    public FormattedText getFormattedText();
 }
diff --git a/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java b/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java
@@ -5253,4 +5253,8 @@ public boolean allowAddTags(String context) {
         String resourceString = AssignmentReferenceReckoner.reckoner().context(context).reckon().getReference();
         return permissionCheck(TagService.TAGSERVICE_MANAGE_PERMISSION, resourceString, null);
     }
+
+    public FormattedText getFormattedText() {
+        return formattedText;
+    }
 }
diff --git a/...impl/src/java/org/sakaiproject/condition/impl/evaluator/AssignmentConditionEvaluator.java b/...impl/src/java/org/sakaiproject/condition/impl/evaluator/AssignmentConditionEvaluator.java
@@ -54,7 +54,10 @@ public boolean evaluateCondition(Condition condition, String userId) {
                     // Filter by grades that have been released to the student
                     .filter(AssignmentSubmission::getGradeReleased)
                     // Map to grade
-                    .map(submission -> assignmentService.getGradeForSubmitter(submission, userId))
+                    .map(submission ->  {
+                        String grade = assignmentService.getGradeForSubmitter(submission, userId);
+                        return StringUtils.replace(assignmentService.getGradeDisplay(grade, assignment.getTypeOfGrade(), assignment.getScaleFactor()), assignmentService.getFormattedText().getDecimalSeparator(), ".");
+                    })
                     // Filter by valid values
                     .filter(NumberUtils::isParsable)
                     // Map to double