SAK-44226 Use sort name in new grader (sakaiproject#8609)

https://jira.sakaiproject.org/browse/SAK-44226
chundcm · Sep 22, 2020 · 9e1b553 · 9e1b553
1 parent 38d16a8
commit 9e1b553
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 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
@@ -443,13 +443,15 @@ public SimpleAssignment getAssignment(EntityView view, Map<String, Object> param
     public class GraderUser {
 
         private String displayName;
+        private String sortName;
         private String id;
 
         public GraderUser(User sakaiUser) {
 
             super();
 
             this.displayName = sakaiUser.getDisplayName();
+            this.sortName = sakaiUser.getSortName();
             this.id = sakaiUser.getId();
         }
     }
@@ -1235,6 +1237,7 @@ public class SimpleSubmitter {
 
         private String id;
         private String displayName;
+        private String sortName;
 
         public SimpleSubmitter(AssignmentSubmissionSubmitter ass, boolean anonymousGrading) {
 
@@ -1243,7 +1246,9 @@ public SimpleSubmitter(AssignmentSubmissionSubmitter ass, boolean anonymousGradi
             this.id = ass.getSubmitter();
             try {
                 if (!anonymousGrading) {
-                    this.displayName = userDirectoryService.getUser(this.id).getDisplayName();
+                    User user = userDirectoryService.getUser(this.id);
+                    this.displayName = user.getDisplayName();
+                    this.sortName = user.getSortName();
                 } else {
                     this.displayName = ass.getSubmission().getId() + " " + rb.getString("grading.anonymous.title");
                 }

diff --git a/webcomponents/tool/src/main/frontend/js/grader/submission.js b/webcomponents/tool/src/main/frontend/js/grader/submission.js
@@ -31,7 +31,7 @@ export class Submission {
       this.submitters = init.submitters;
 
       if (init.submitters) {
-        this.firstSubmitterName = init.submitters[0].displayName;
+        this.firstSubmitterName = init.submitters[0].sortName;
         this.firstSubmitterId = init.submitters[0].id;
       }
       this.late = init.late;