X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fcomponents%2Fresults%2FItem.js;h=2a1fc8c07f4cbb404be0f030b0315e274720dc33;hb=8078d2d7e3363679874caaa571a1c138438c95e2;hp=993a3823fd2cfd5a1058b749d67ac1ec81fa4ba8;hpb=edd0e97bfdc544114f30bf4c13a929631c44a555;p=alttp.git

diff --git a/resources/js/components/results/Item.js b/resources/js/components/results/Item.js
index 993a382..2a1fc8c 100644
--- a/resources/js/components/results/Item.js
+++ b/resources/js/components/results/Item.js
@@ -2,29 +2,67 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { withTranslation } from 'react-i18next';
 
+import Icon from '../common/Icon';
 import Box from '../users/Box';
 import { formatTime } from '../../helpers/Result';
 import { findResult } from '../../helpers/Participant';
-import i18n from '../../i18n';
+import { maySeeResults } from '../../helpers/permissions';
+import { withUser } from '../../helpers/UserContext';
+
+const getIcon = (result, index, maySee) => {
+	if (!result || !result.has_finished) {
+		return <Icon.PENDING className="text-muted" size="lg" />;
+	}
+	if (result.forfeit && maySee) {
+		return <Icon.FORFEIT className="text-danger" size="lg" />;
+	}
+	if (index === 0) {
+		return <Icon.FIRST_PLACE className="text-gold" size="lg" />;
+	}
+	if (index === 1) {
+		return <Icon.SECOND_PLACE className="text-silver" size="lg" />;
+	}
+	if (index === 2) {
+		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 Item = ({
+	index,
 	participant,
 	round,
+	tournament,
+	user,
 }) => {
 	const result = findResult(participant, round);
-	return (
-		<div className="result">
-			<Box user={participant.user} />
-			{result ?
-				<div>
-					{i18n.t('results.time', { time: formatTime(result) })}
-				</div>
-			: null}
+	const maySee = maySeeResults(user, tournament, round);
+	return <div className="result">
+		<Box user={participant.user} />
+		<div className="status">
+			<span className="time">
+				{getTime(result, maySee)}
+			</span>
+			{getIcon(result, index, maySee)}
 		</div>
-	);
+	</div>;
 };
 
 Item.propTypes = {
+	index: PropTypes.number,
 	participant: PropTypes.shape({
 		user: PropTypes.shape({
 		}),
@@ -33,6 +71,8 @@ Item.propTypes = {
 	}),
 	tournament: PropTypes.shape({
 	}),
+	user: PropTypes.shape({
+	}),
 };
 
-export default withTranslation()(Item);
+export default withTranslation()(withUser(Item));