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

diff --git a/resources/js/components/results/Item.js b/resources/js/components/results/Item.js
index 2a1fc8c..4b243b3 100644
--- a/resources/js/components/results/Item.js
+++ b/resources/js/components/results/Item.js
@@ -1,71 +1,60 @@
 import PropTypes from 'prop-types';
-import React from 'react';
-import { withTranslation } from 'react-i18next';
+import React, { useState } from 'react';
+import { Button } from 'react-bootstrap';
 
-import Icon from '../common/Icon';
+import DetailDialog from './DetailDialog';
 import Box from '../users/Box';
-import { formatTime } from '../../helpers/Result';
-import { findResult } from '../../helpers/Participant';
+import { getIcon, getTime } from '../../helpers/Result';
 import { maySeeResults } from '../../helpers/permissions';
+import { findResult } from '../../helpers/User';
 import { withUser } from '../../helpers/UserContext';
 
-const getIcon = (result, index, maySee) => {
-	if (!result || !result.has_finished) {
-		return <Icon.PENDING className="text-muted" size="lg" />;
+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');
 	}
-	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 '?';
+	return classNames.join(' ');
 };
 
 const Item = ({
-	index,
-	participant,
+	authUser,
 	round,
 	tournament,
 	user,
 }) => {
-	const result = findResult(participant, round);
-	const maySee = maySeeResults(user, tournament, round);
+	const [showDialog, setShowDialog] = useState(false);
+	const result = findResult(user, round);
+	const maySee = maySeeResults(authUser, tournament, round);
 	return <div className="result">
-		<Box user={participant.user} />
-		<div className="status">
+		<Box user={user} />
+		<Button
+			className={getClassName(result)}
+			onClick={() => setShowDialog(true)}
+			title={maySee && result && result.comment ? result.comment : null}
+		>
 			<span className="time">
 				{getTime(result, maySee)}
 			</span>
-			{getIcon(result, index, maySee)}
-		</div>
+			{getIcon(result, maySee)}
+		</Button>
+		<DetailDialog
+			onHide={() => setShowDialog(false)}
+			round={round}
+			show={showDialog}
+			tournament={tournament}
+			user={user}
+		/>
 	</div>;
 };
 
 Item.propTypes = {
-	index: PropTypes.number,
-	participant: PropTypes.shape({
-		user: PropTypes.shape({
-		}),
+	authUser: PropTypes.shape({
 	}),
 	round: PropTypes.shape({
 	}),
@@ -75,4 +64,4 @@ Item.propTypes = {
 	}),
 };
 
-export default withTranslation()(withUser(Item));
+export default withUser(Item, 'authUser');