import LargeCheck from '../common/LargeCheck';
import laravelErrorsToFormik from '../../helpers/laravelErrorsToFormik';
-import { findResult } from '../../helpers/Participant';
+import { findResult } from '../../helpers/User';
import { formatTime, parseTime } from '../../helpers/Result';
import i18n from '../../i18n';
import yup from '../../schema/yup';
handleChange,
handleSubmit,
onCancel,
+ round,
touched,
values,
}) =>
<Form noValidate onSubmit={handleSubmit}>
<Modal.Body>
+ {!round.locked ?
+ <Row>
+ <Form.Group as={Col} sm={9} controlId="report.time">
+ <Form.Label>{i18n.t('results.reportTime')}</Form.Label>
+ <Form.Control
+ isInvalid={!!(touched.time && errors.time)}
+ name="time"
+ onBlur={handleBlur}
+ onChange={handleChange}
+ placeholder={values.forfeit ? 'DNF' : '1:22:59'}
+ type="text"
+ value={values.time || ''}
+ />
+ {touched.time && errors.time ?
+ <Form.Control.Feedback type="invalid">
+ {i18n.t(errors.time)}
+ </Form.Control.Feedback>
+ :
+ <Form.Text muted>
+ {parseTime(values.time) ?
+ i18n.t(
+ 'results.reportPreview',
+ { time: formatTime({ time: parseTime(values.time) })},
+ )
+ : null}
+ </Form.Text>
+ }
+ </Form.Group>
+ <Form.Group as={Col} sm={3} controlId="report.forfeit">
+ <Form.Label>{i18n.t('results.forfeit')}</Form.Label>
+ <Form.Control
+ as={LargeCheck}
+ isInvalid={!!(touched.forfeit && errors.forfeit)}
+ name="forfeit"
+ onBlur={handleBlur}
+ onChange={handleChange}
+ value={!!values.forfeit}
+ />
+ </Form.Group>
+ </Row>
+ : null}
<Row>
- <Form.Group as={Col} sm={9} controlId="report.time">
- <Form.Label>{i18n.t('results.reportTime')}</Form.Label>
+ <Form.Group as={Col} sm={12} controlId="report.comment">
+ <Form.Label>{i18n.t('results.comment')}</Form.Label>
<Form.Control
- isInvalid={!!(touched.time && errors.time)}
- name="time"
+ as="textarea"
+ isInvalid={!!(touched.comment && errors.comment)}
+ name="comment"
onBlur={handleBlur}
onChange={handleChange}
- placeholder={values.forfeit ? 'DNF' : '1:22:59'}
- type="text"
- value={values.time || ''}
- />
- {touched.time && errors.time ?
- <Form.Control.Feedback type="invalid">
- {i18n.t(errors.time)}
- </Form.Control.Feedback>
- :
- <Form.Text muted>
- {parseTime(values.time) ?
- i18n.t(
- 'results.reportPreview',
- { time: formatTime({ time: parseTime(values.time) })},
- )
- : null}
- </Form.Text>
- }
- </Form.Group>
- <Form.Group as={Col} sm={3} controlId="report.forfeit">
- <Form.Label>{i18n.t('results.forfeit')}</Form.Label>
- <Form.Control
- as={LargeCheck}
- isInvalid={!!(touched.forfeit && errors.forfeit)}
- name="forfeit"
- onBlur={handleBlur}
- onChange={handleChange}
- value={!!values.forfeit}
+ value={values.comment || ''}
/>
</Form.Group>
</Row>
ReportForm.propTypes = {
errors: PropTypes.shape({
+ comment: PropTypes.string,
forfeit: PropTypes.string,
time: PropTypes.string,
}),
handleChange: PropTypes.func,
handleSubmit: PropTypes.func,
onCancel: PropTypes.func,
+ round: PropTypes.shape({
+ locked: PropTypes.bool,
+ }),
touched: PropTypes.shape({
+ comment: PropTypes.bool,
forfeit: PropTypes.bool,
time: PropTypes.bool,
}),
values: PropTypes.shape({
+ comment: PropTypes.string,
forfeit: PropTypes.bool,
time: PropTypes.string,
}),
displayName: 'ReportForm',
enableReinitialize: true,
handleSubmit: async (values, actions) => {
- const { forfeit, participant_id, round_id, time } = values;
+ const { comment, forfeit, round_id, time, user_id } = values;
const { setErrors } = actions;
const { onCancel } = actions.props;
try {
await axios.post('/api/results', {
+ comment,
forfeit,
- participant_id,
round_id,
time: parseTime(time) || 0,
+ user_id,
});
toastr.success(i18n.t('results.reportSuccess'));
if (onCancel) {
}
}
},
- mapPropsToValues: ({ participant, round }) => {
- const result = findResult(participant, round);
- console.log(result);
+ mapPropsToValues: ({ round, user }) => {
+ const result = findResult(user, round);
return {
+ comment: result && result.comment ? result.comment : '',
forfeit: result ? !!result.forfeit : false,
- participant_id: participant.id,
round_id: round.id,
time: result && result.time ? formatTime(result) : '',
+ user_id: user.id,
};
},
validationSchema: yup.object().shape({
+ comment: yup.string(),
forfeit: yup.boolean().required(),
time: yup.string().time().when('forfeit', {
is: false,