X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=resources%2Fjs%2Fhelpers%2FTournament.js;h=7dbcb9b5b294386c8d4a725eeeacdcbb64b854da;hb=a748d5724c8acff6e3bb3fe6c20aa5968b65d58a;hp=31414de957fffab192fd073b1f8cae067cdff306;hpb=eebc6384e56336b66ec250fc2aea3be6171d53ff;p=alttp.git

diff --git a/resources/js/helpers/Tournament.js b/resources/js/helpers/Tournament.js
index 31414de..7dbcb9b 100644
--- a/resources/js/helpers/Tournament.js
+++ b/resources/js/helpers/Tournament.js
@@ -1,44 +1,12 @@
 import Participant from './Participant';
 import Round from './Round';
 
-export const calculateScores = tournament => {
-	const scores = getRunners(tournament).map(participant => ({ participant, score: 0 }));
-	if (!tournament.rounds || !tournament.rounds.length) return scores;
-	tournament.rounds.forEach(round => {
-		const filtered = Participant
-			.sortByResult(tournament.participants, round)
-			.map(p => ({ participant: p, result: Participant.findResult(p, round) }))
-			.filter(r => r.result && (r.result.time || r.result.forfeit))
-			.reverse();
-		let running = 0;
-		let bonus = 1;
-		let lastResult = null;
-		for (let i = 0; i < filtered.length; ++i) {
-			const score = scores.find(s => s.participant.id === filtered[i].participant.id);
-			if (!score) return;
-			const result = filtered[i].result;
-			const betterThanLast = lastResult === null || result.time < lastResult;
-			if (!result.forfeit && betterThanLast) {
-				running += bonus;
-				lastResult = result.time;
-				bonus = 1;
-			} else {
-				++bonus;
-			}
-			if (!result.forfeit) {
-				score.score += running;
-			}
-		}
-	});
-	return scores.sort(compareScore).reverse();
-};
-
 export const compareScore = (a, b) => {
 	const a_score = a && a.score ? a.score : 0;
 	const b_score = b && b.score ? b.score : 0;
 	if (a_score < b_score) return -1;
 	if (b_score < a_score) return 1;
-	return Participant.compareUsername(a.participant, b.participant);
+	return Participant.compareUsername(a.participant, b.participant) * -1;
 };
 
 export const findParticipant = (tournament, user) => {
@@ -61,6 +29,20 @@ export const getTournamentAdmins = tournament => {
 		.sort(Participant.compareUsername);
 };
 
+export const getTournamentCrew = tournament => {
+	if (!tournament || !tournament.participants || !tournament.participants.length) return [];
+	return tournament.participants
+		.filter(Participant.isTournamentCrew)
+		.sort(Participant.compareUsername);
+};
+
+export const getTournamentMonitors = tournament => {
+	if (!tournament || !tournament.participants || !tournament.participants.length) return [];
+	return tournament.participants
+		.filter(Participant.isTournamentMonitor)
+		.sort(Participant.compareUsername);
+};
+
 export const hasRunners = tournament => {
 	return getRunners(tournament).length > 0;
 };
@@ -69,6 +51,36 @@ export const hasTournamentAdmins = tournament => {
 	return getTournamentAdmins(tournament).length > 0;
 };
 
+export const hasTournamentCrew = tournament => {
+	return getTournamentCrew(tournament).length > 0;
+};
+
+export const hasTournamentMonitors = tournament => {
+	return getTournamentMonitors(tournament).length > 0;
+};
+
+export const patchParticipant = (tournament, participant) => {
+	if (!tournament) return tournament;
+	if (!tournament.participants || !tournament.participants.length) {
+		return {
+			...tournament,
+			participants: [participant],
+		};
+	}
+	if (!tournament.participants.find(p => p.id === participant.id)) {
+		return {
+			...tournament,
+			participants: [...tournament.participants, participant],
+		};
+	}
+	return {
+		...tournament,
+		participants: tournament.participants.map(
+			p => p.id === participant.id ? participant : p,
+		),
+	};
+};
+
 export const patchResult = (tournament, result) => {
 	if (!tournament || !tournament.rounds) return tournament;
 	return {
@@ -109,9 +121,16 @@ export const sortParticipants = tournament => {
 };
 
 export default {
-	calculateScores,
 	compareScore,
 	findParticipant,
+	getRunners,
+	getTournamentAdmins,
+	getTournamentCrew,
+	getTournamentMonitors,
+	hasRunners,
+	hasTournamentAdmins,
+	hasTournamentCrew,
+	hasTournamentMonitors,
 	patchResult,
 	patchRound,
 	patchUser,