X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fhelpers%2FParticipant.js;h=d79349bca8776a65ae853943df671f8ffb8f114f;hb=d1f28ea443b090c7593791eba9631796ccaeafe1;hp=e5a135f1b14c47f09182898f0d92aa8aaf5cfa13;hpb=14bee4bbb112ddab53914fa777be6004debeb5c4;p=alttp.git diff --git a/resources/js/helpers/Participant.js b/resources/js/helpers/Participant.js index e5a135f..d79349b 100644 --- a/resources/js/helpers/Participant.js +++ b/resources/js/helpers/Participant.js @@ -1,8 +1,8 @@ export const compareResult = round => (a, b) => { const a_result = findResult(a, round); const b_result = findResult(b, round); - const a_time = a_result ? a_result.time : 0; - const b_time = b_result ? b_result.time : 0; + const a_time = a_result && !a_result.forfeit ? a_result.time : 0; + const b_time = b_result && !b_result.forfeit ? b_result.time : 0; if (a_time) { if (b_time) { if (a_time < b_time) return -1; @@ -14,7 +14,18 @@ export const compareResult = round => (a, b) => { if (b_time) { return 1; } - return 0; + const a_forfeit = a_result && a_result.forfeit; + const b_forfeit = b_result && b_result.forfeit; + if (a_forfeit) { + if (b_forfeit) { + return 0; + } + return -1; + } + if (b_forfeit) { + return 1; + } + return compareUsername(a, b); }; export const compareUsername = (a, b) => { @@ -29,6 +40,24 @@ export const findResult = (participant, round) => { return round.results.find(result => result.user_id === participant.user_id); }; +export const isRunner = participant => + participant && participant.roles && participant.roles.includes('runner'); + +export const isTournamentAdmin = participant => + participant && participant.roles && participant.roles.includes('admin'); + +export const patchUser = (participant, user) => { + if (!participant || !user) return participant; + if (participant.user_id != user.id) return participant; + return { + ...participant, + user: { + ...participant.user, + ...user, + }, + }; +}; + export const sortByResult = (participants, round) => { if (!participants || !participants.length) return participants; if (!round || !round.results || !round.results.length) return participants; @@ -39,5 +68,8 @@ export default { compareResult, compareUsername, findResult, + isRunner, + isTournamentAdmin, + patchUser, sortByResult, };