X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;ds=inline;f=resources%2Fjs%2Fcomponents%2Fresults%2FItem.js;h=84395222407e1d50854e283a282a31002b73a328;hb=d32516335ea2534e15256c948e9c38d3de40794b;hp=43ea91d09ca73157d299c9fa3a51075a17e145c9;hpb=812a270c7a410461e931394496512d36b34ef7b5;p=alttp.git
diff --git a/resources/js/components/results/Item.js b/resources/js/components/results/Item.js
index 43ea91d..8439522 100644
--- 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 ;
}
- if (result.forfeit) {
+ if (result.forfeit && maySee) {
return ;
}
- if (index === 0) {
+ if (result.placement === 1) {
return ;
}
- if (index === 1) {
+ if (result.placement === 2) {
return ;
}
- if (index === 2) {
+ if (result.placement === 3) {
return ;
}
return ;
};
+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 (
-
-
-
-
- {result && maySeeResults(user, tournament, round) ?
- formatTime(result)
- : null}
-
- {getIcon(result, index)}
-
+ const maySee = maySeeResults(user, tournament, round);
+ return
+
+
+
+ {getTime(result, maySee)}
+
+ {getIcon(result, maySee)}
- );
+
;
};
Item.propTypes = {
- index: PropTypes.number,
participant: PropTypes.shape({
user: PropTypes.shape({
}),