X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fcomponents%2Fresults%2FItem.js;h=d99d93f75eea34eca456b0d668127f28038ef85b;hb=2b3d5b3d98705cda41a7218d7133234b227e87b6;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..d99d93f 100644 --- a/resources/js/components/results/Item.js +++ b/resources/js/components/results/Item.js @@ -9,11 +9,11 @@ import { findResult } from '../../helpers/Participant'; import { maySeeResults } from '../../helpers/permissions'; import { withUser } from '../../helpers/UserContext'; -const getIcon = (result, index) => { +const getIcon = (result, index, maySee) => { if (!result || !result.has_finished) { return ; } - if (result.forfeit) { + if (result.forfeit && maySee) { return ; } if (index === 0) { @@ -28,6 +28,19 @@ const getIcon = (result, index) => { 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, @@ -36,19 +49,16 @@ const Item = ({ 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, index, maySee)}
- ); +
; }; Item.propTypes = {