prefer nickname sorting participants

diff --git a/resources/js/helpers/Participant.js b/resources/js/helpers/Participant.js
index 7a689960ea831945428edb9aed1aa43cb3f889a4..d7bdd7c4a41055a8f7d067c2f44c1f02ffc1a5b2 100644 (file)
--- a/resources/js/helpers/Participant.js
+++ b/resources/js/helpers/Participant.js
@@ -1,3 +1,5 @@
+import User from './User';
+
 export const compareFinished = round => (a, b) => {
        const a_result = findResult(a, round);
        const b_result = findResult(b, round);
@@ -41,8 +43,8 @@ export const compareResult = round => (a, b) => {
 };
 
 export const compareUsername = (a, b) => {
-       const a_name = a && a.user && a.user.username ? a.user.username : '';
-       const b_name = b && b.user && b.user.username ? b.user.username : '';
+       const a_name = a && a.user ? User.getUserName(a.user) : '';
+       const b_name = b && b.user ? User.getUserName(b.user) : '';
        return a_name.localeCompare(b_name);
 };
 

diff --git a/resources/js/helpers/User.js b/resources/js/helpers/User.js
index 222e0f6af392681756aaf1a46a222318aec34c01..f13e11977f652529284872d447c9454b2a7e53c8 100644 (file)
--- a/resources/js/helpers/User.js
+++ b/resources/js/helpers/User.js
@@ -18,5 +18,6 @@ export const hasFinishedRound = (user, round) => {
 export default {
        findResult,
        getAvatarUrl,
+       getUserName,
        hasFinishedRound,
 };