Skip to content

Commit

Permalink
Buttons for normal and debug resubmit
Browse files Browse the repository at this point in the history
  • Loading branch information
SemaiCZE committed Nov 9, 2017
1 parent 47a0896 commit 13382a4
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 14 deletions.
27 changes: 16 additions & 11 deletions src/components/buttons/ResubmitSolution/ResubmitSolution.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,24 @@ import { FormattedMessage } from 'react-intl';
import Icon from 'react-fontawesome';
import Button from '../../widgets/FlatButton';

const ResubmitSolution = ({ resubmit }) => (
<Button bsStyle="success" onClick={resubmit}>
<Icon name="mail-forward" />
{' '}
<FormattedMessage
id="app.resubmitSolution.resubmit"
defaultMessage="Resubmit this solution"
/>
</Button>
);
const ResubmitSolution = ({ resubmit, isDebug }) =>
<Button bsStyle="success" onClick={() => resubmit(isDebug)}>
<Icon name="mail-forward" />{' '}
{isDebug &&
<FormattedMessage
id="app.resubmitSolution.resubmitDebug"
defaultMessage="Resubmit (debug mode)"
/>}
{!isDebug &&
<FormattedMessage
id="app.resubmitSolution.resubmitNondebug"
defaultMessage="Resubmit (normal mode)"
/>}
</Button>;

ResubmitSolution.propTypes = {
resubmit: PropTypes.func.isRequired
resubmit: PropTypes.func.isRequired,
isDebug: PropTypes.bool.isRequired
};

export default ResubmitSolution;
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ const ResubmitSolutionContainer = ({
monitor,
isProcessing,
newSubmissionId,
isDebug = true,
links: { SUBMISSION_DETAIL_URI_FACTORY }
}) => {
return (
<span>
<ResubmitSolution resubmit={resubmit} />
<ResubmitSolution resubmit={resubmit} isDebug={isDebug} />
<EvaluationProgressContainer
isOpen={isProcessing}
monitor={monitor}
Expand All @@ -41,7 +42,8 @@ ResubmitSolutionContainer.propTypes = {
monitor: PropTypes.object,
isProcessing: PropTypes.bool,
newSubmissionId: PropTypes.string,
links: PropTypes.object.isRequired
links: PropTypes.object.isRequired,
isDebug: PropTypes.bool
};

const mapStateToProps = state => ({
Expand All @@ -51,7 +53,7 @@ const mapStateToProps = state => ({
});

const mapDispatchToProps = (dispatch, { id, isPrivate = false }) => ({
resubmit: () => dispatch(resubmitSubmission(id, isPrivate))
resubmit: isDebug => dispatch(resubmitSubmission(id, isPrivate, isDebug))
});

export default withLinks(
Expand Down
6 changes: 6 additions & 0 deletions src/pages/Submission/Submission.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ class Submission extends Component {
<ResubmitSolutionContainer
id={submission.id}
assignmentId={assignment.id}
isDebug={true}
/>
<ResubmitSolutionContainer
id={submission.id}
assignmentId={assignment.id}
isDebug={false}
/>
</p>}
<SubmissionDetail
Expand Down

0 comments on commit 13382a4

Please sign in to comment.