server calculated scoring

[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 43ea91d09ca73157d299c9fa3a51075a17e145c9..84395222407e1d50854e283a282a31002b73a328 100644 (file)
--- a/resources/js/components/results/Item.js
+++ b/resources/js/components/results/Item.js
@@ -9,50 +9,58 @@ 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) {
                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" />;
 };
 
+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} />
-                       <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={`status ${result && result.has_finished ? 'finished' : 'pending'}`}>
+                       <span className="time">
+                               {getTime(result, maySee)}
+                       </span>
+                       {getIcon(result, maySee)}
                </div>
-       );
+       </div>;
 };
 
 Item.propTypes = {
-       index: PropTypes.number,
        participant: PropTypes.shape({
                user: PropTypes.shape({
                }),