X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=resources%2Fjs%2Fcomponents%2Fresults%2FItem.js;h=4b243b34bc4a9a673a55c233d4c4c62481745851;hb=c5b15dc5518c627daa4f02f653ff900e4fe13db7;hp=d99d93f75eea34eca456b0d668127f28038ef85b;hpb=80befc9403845a0f41f5f7e766938b0bbf607d7e;p=alttp.git
diff --git a/resources/js/components/results/Item.js b/resources/js/components/results/Item.js
index d99d93f..4b243b3 100644
--- a/resources/js/components/results/Item.js
+++ b/resources/js/components/results/Item.js
@@ -1,71 +1,60 @@
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 { findResult } from '../../helpers/Participant';
+import { getIcon, getTime } from '../../helpers/Result';
import { maySeeResults } from '../../helpers/permissions';
+import { findResult } from '../../helpers/User';
import { withUser } from '../../helpers/UserContext';
-const getIcon = (result, index, maySee) => {
- if (!result || !result.has_finished) {
- 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');
}
- if (result.forfeit && maySee) {
- return ;
- }
- if (index === 0) {
- return ;
- }
- if (index === 1) {
- return ;
- }
- if (index === 2) {
- return ;
- }
- return ;
-};
-
-const getTime = (result, maySee) => {
- if (!result || !maySee) {
- return null;
- }
- if (result.time) {
- return formatTime(result);
- }
- if (result.forfeit) {
- return 'DNF';
- }
- return '?';
+ return classNames.join(' ');
};
const Item = ({
- index,
- participant,
+ authUser,
round,
tournament,
user,
}) => {
- const result = findResult(participant, round);
- const maySee = maySeeResults(user, tournament, round);
+ const [showDialog, setShowDialog] = useState(false);
+ const result = findResult(user, round);
+ const maySee = maySeeResults(authUser, tournament, round);
return
-
-
+
+
+ {getIcon(result, maySee)}
+
+
setShowDialog(false)}
+ round={round}
+ show={showDialog}
+ tournament={tournament}
+ user={user}
+ />
;
};
Item.propTypes = {
- index: PropTypes.number,
- participant: PropTypes.shape({
- user: PropTypes.shape({
- }),
+ authUser: PropTypes.shape({
}),
round: PropTypes.shape({
}),
@@ -75,4 +64,4 @@ Item.propTypes = {
}),
};
-export default withTranslation()(withUser(Item));
+export default withUser(Item, 'authUser');