clickable results

[alttp.git] / resources / js / components / results / Item.js

diff --git a/resources/js/components/results/Item.js b/resources/js/components/results/Item.js
index 0d0d34e81a11553f7535be8a883d1fabb7df378d..a2ee8e392b82a392b76236b8bab92e4e7806d6f7 100644 (file)
--- a/resources/js/components/results/Item.js
+++ b/resources/js/components/results/Item.js
@@ -1,67 +1,59 @@
 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 { getIcon, getTime } from '../../helpers/Result';
 import { findResult } from '../../helpers/Participant';
 import { maySeeResults } from '../../helpers/permissions';
 import { withUser } from '../../helpers/UserContext';
 
-const getIcon = (result, index) => {
-       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) {
-               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 = (user, tournament, round, result) => {
-       if (!result || !maySeeResults(user, tournament, round)) {
-               return null;
-       }
-       if (result.time) {
-               return formatTime(result);
-       }
-       if (result.forfeit) {
-               return 'DNF';
-       }
-       return '?';
+       return classNames.join(' ');
 };
 
 const Item = ({
-       index,
        participant,
        round,
        tournament,
        user,
 }) => {
+       const [showDialog, setShowDialog] = useState(false);
        const result = findResult(participant, round);
+       const maySee = maySeeResults(user, tournament, round);
        return <div className="result">
                <Box user={participant.user} />
-               <div className="status">
+               <Button
+                       className={getClassName(result)}
+                       onClick={() => setShowDialog(true)}
+                       title={maySee && result && result.comment ? result.comment : null}
+               >
                        <span className="time">
-                               {getTime(user, tournament, round, result)}
+                               {getTime(result, maySee)}
                        </span>
-                       {getIcon(result, index)}
-               </div>
+                       {getIcon(result, maySee)}
+               </Button>
+               <DetailDialog
+                       onHide={() => setShowDialog(false)}
+                       participant={participant}
+                       round={round}
+                       show={showDialog}
+                       tournament={tournament}
+               />
        </div>;
 };
 
 Item.propTypes = {
-       index: PropTypes.number,
        participant: PropTypes.shape({
                user: PropTypes.shape({
                }),
@@ -74,4 +66,4 @@ Item.propTypes = {
        }),
 };
 
-export default withTranslation()(withUser(Item));
+export default withUser(Item);