X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fcomponents%2Fresults%2FItem.js;h=0d73105edd21ac13268223742196ca9bbdfe3daa;hb=eca3f0074e6f9e882b91893e554ce249e25338de;hp=43ea91d09ca73157d299c9fa3a51075a17e145c9;hpb=812a270c7a410461e931394496512d36b34ef7b5;p=alttp.git

diff --git a/resources/js/components/results/Item.js b/resources/js/components/results/Item.js
index 43ea91d..0d73105 100644
--- a/resources/js/components/results/Item.js
+++ b/resources/js/components/results/Item.js
@@ -9,50 +9,74 @@ import { findResult } from '../../helpers/Participant';
 import { maySeeResults } from '../../helpers/permissions';
 import { withUser } from '../../helpers/UserContext';
 
-const getIcon = (result, index) => {
+const getIcon = (result, maySee) => {
 	if (!result || !result.has_finished) {
 		return <Icon.PENDING className="text-muted" size="lg" />;
 	}
-	if (result.forfeit) {
+	if (result.forfeit && maySee) {
 		return <Icon.FORFEIT className="text-danger" size="lg" />;
 	}
-	if (index === 0) {
+	if (result.placement === 1 && maySee) {
 		return <Icon.FIRST_PLACE className="text-gold" size="lg" />;
 	}
-	if (index === 1) {
+	if (result.placement === 2 && maySee) {
 		return <Icon.SECOND_PLACE className="text-silver" size="lg" />;
 	}
-	if (index === 2) {
+	if (result.placement === 3 && maySee) {
 		return <Icon.THIRD_PLACE className="text-bronze" size="lg" />;
 	}
 	return <Icon.FINISHED className="text-success" size="lg" />;
 };
 
+const getTime = (result, maySee) => {
+	if (!result || !maySee) {
+		return null;
+	}
+	if (result.time) {
+		return formatTime(result);
+	}
+	if (result.forfeit) {
+		return 'DNF';
+	}
+	return '?';
+};
+
+const getClassName = result => {
+	const classNames = ['status'];
+	if (result && result.has_finished) {
+		classNames.push('finished');
+		if (result.comment) {
+			classNames.push('has-comment');
+		}
+	} else {
+		classNames.push('pending');
+	}
+	return classNames.join(' ');
+};
+
 const Item = ({
-	index,
 	participant,
 	round,
 	tournament,
 	user,
 }) => {
 	const result = findResult(participant, round);
-	return (
-		<div className="result">
-			<Box user={participant.user} />
-			<div className="status">
-				<span className="time">
-					{result && maySeeResults(user, tournament, round) ?
-						formatTime(result)
-					: null}
-				</span>
-				{getIcon(result, index)}
-			</div>
+	const maySee = maySeeResults(user, tournament, round);
+	return <div className="result">
+		<Box user={participant.user} />
+		<div
+			className={getClassName(result)}
+			title={maySee && result && result.comment ? result.comment : null}
+		>
+			<span className="time">
+				{getTime(result, maySee)}
+			</span>
+			{getIcon(result, maySee)}
 		</div>
-	);
+	</div>;
 };
 
 Item.propTypes = {
-	index: PropTypes.number,
 	participant: PropTypes.shape({
 		user: PropTypes.shape({
 		}),