From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Sun, 13 Mar 2022 20:41:22 +0000 (+0100)
Subject: sort results by time
X-Git-Url: https://git.localhorst.tv/?a=commitdiff_plain;ds=inline;h=14bee4bbb112ddab53914fa777be6004debeb5c4;p=alttp.git

sort results by time
---

diff --git a/resources/js/components/results/List.js b/resources/js/components/results/List.js
index 11eb9a8..448736a 100644
--- a/resources/js/components/results/List.js
+++ b/resources/js/components/results/List.js
@@ -2,9 +2,10 @@ import PropTypes from 'prop-types';
 import React from 'react';
 
 import Item from './Item';
+import { sortByResult } from '../../helpers/Participant';
 
 const List = ({ round, tournament }) => <div className="results d-flex">
-	{tournament.participants.map(participant =>
+	{sortByResult(tournament.participants, round).map(participant =>
 		<Item
 			key={participant.id}
 			participant={participant}
diff --git a/resources/js/helpers/Participant.js b/resources/js/helpers/Participant.js
index 8ae225c..e5a135f 100644
--- a/resources/js/helpers/Participant.js
+++ b/resources/js/helpers/Participant.js
@@ -1,3 +1,22 @@
+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;
+	if (a_time) {
+		if (b_time) {
+			if (a_time < b_time) return -1;
+			if (b_time < a_time) return 1;
+			return 0;
+		}
+		return -1;
+	}
+	if (b_time) {
+		return 1;
+	}
+	return 0;
+};
+
 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 : '';
@@ -10,7 +29,15 @@ export const findResult = (participant, round) => {
 	return round.results.find(result => result.user_id === participant.user_id);
 };
 
+export const sortByResult = (participants, round) => {
+	if (!participants || !participants.length) return participants;
+	if (!round || !round.results || !round.results.length) return participants;
+	return participants.sort(compareResult(round));
+};
+
 export default {
+	compareResult,
 	compareUsername,
 	findResult,
+	sortByResult,
 };