result comments

[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 2a1fc8c07f4cbb404be0f030b0315e274720dc33..0781ccaaa5b062b1f3993993349041d80d91ef9b 100644 (file)
--- a/resources/js/components/results/Item.js
+++ b/resources/js/components/results/Item.js
@@ -9,20 +9,20 @@ import { findResult } from '../../helpers/Participant';
 import { maySeeResults } from '../../helpers/permissions';
 import { withUser } from '../../helpers/UserContext';
 
-const getIcon = (result, index, maySee) => {
+const getIcon = (result, 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) {
+       if (result.placement === 1) {
                return <Icon.FIRST_PLACE className="text-gold" size="lg" />;
        }
-       if (index === 1) {
+       if (result.placement === 2) {
                return <Icon.SECOND_PLACE className="text-silver" size="lg" />;
        }
-       if (index === 2) {
+       if (result.placement === 3) {
                return <Icon.THIRD_PLACE className="text-bronze" size="lg" />;
        }
        return <Icon.FINISHED className="text-success" size="lg" />;
@@ -41,8 +41,20 @@ const getTime = (result, maySee) => {
        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,
@@ -52,17 +64,19 @@ const Item = ({
        const maySee = maySeeResults(user, tournament, round);
        return <div className="result">
                <Box user={participant.user} />
-               <div className="status">
+               <div
+                       className={getClassName(result)}
+                       title={maySee && result && result.comment ? result.comment : null}
+               >
                        <span className="time">
                                {getTime(result, maySee)}
                        </span>
-                       {getIcon(result, index, maySee)}
+                       {getIcon(result, maySee)}
                </div>
        </div>;
 };
 
 Item.propTypes = {
-       index: PropTypes.number,
        participant: PropTypes.shape({
                user: PropTypes.shape({
                }),