Skip to content

Commit

Permalink
Another isCorrect correction
Browse files Browse the repository at this point in the history
  • Loading branch information
Neloop committed Oct 27, 2017
1 parent ddcd3a5 commit 27f99e0
Showing 1 changed file with 14 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const EvaluationTable = ({
referenceSolutionId,
exerciseId,
links: { REFERENCE_SOLUTION_EVALUATION_URI_FACTORY }
}) => (
}) =>
<Table>
<thead>
<tr>
Expand Down Expand Up @@ -46,7 +46,7 @@ const EvaluationTable = ({
}
return b.evaluation.evaluatedAt - a.evaluation.evaluatedAt;
})
.map(e => (
.map(e =>
<tr key={e.id}>
<td>
<AssignmentStatusIcon
Expand All @@ -55,35 +55,32 @@ const EvaluationTable = ({
accepted={false}
/>
</td>
{e.evaluation && (
{e.evaluation &&
<td>
<FormattedDate value={e.evaluation.evaluatedAt * 1000} />
&nbsp;
<FormattedTime value={e.evaluation.evaluatedAt * 1000} />
</td>
)}
{e.evaluation && (
</td>}
{e.evaluation &&
<td
className={classnames({
'text-danger': !e.evaluation.isCorrect,
'text-success': e.evaluation.isCorrect
'text-danger': !e.isCorrect,
'text-success': e.isCorrect
})}
>
<b>
<FormattedNumber style="percent" value={e.evaluation.score} />
</b>
</td>
)}
{!e.evaluation && (
</td>}
{!e.evaluation &&
<td colSpan="2">
<i>
<FormattedMessage
id="app.evaluationTable.notAvailable"
defaultMessage="Evaluation not available"
/>
</i>
</td>
)}
</td>}
<td className="text-right">
<Link
to={REFERENCE_SOLUTION_EVALUATION_URI_FACTORY(
Expand All @@ -100,21 +97,19 @@ const EvaluationTable = ({
</Link>
</td>
</tr>
))}
)}

{evaluations.length === 0 && (
{evaluations.length === 0 &&
<tr>
<td className="text-center" colSpan={3}>
<FormattedMessage
id="app.evaluationTable.empty"
defaultMessage="There are no evaluations in this list."
/>
</td>
</tr>
)}
</tr>}
</tbody>
</Table>
);
</Table>;

EvaluationTable.propTypes = {
evaluations: PropTypes.array.isRequired,
Expand Down

0 comments on commit 27f99e0

Please sign in to comment.