diff --git a/src/components/ReferenceSolutions/EvaluationDetail/EvaluationDetail.js b/src/components/ReferenceSolutions/EvaluationDetail/EvaluationDetail.js
index a6d03e145..2d7cba726 100644
--- a/src/components/ReferenceSolutions/EvaluationDetail/EvaluationDetail.js
+++ b/src/components/ReferenceSolutions/EvaluationDetail/EvaluationDetail.js
@@ -12,7 +12,7 @@ import { Table } from 'react-bootstrap';
import Box from '../../widgets/Box';
import { MaybeSucceededIcon } from '../../icons';
-const EvaluationDetail = ({ evaluation, note = '' }) => (
+const EvaluationDetail = ({ evaluation, isCorrect }) =>
(
-
-
-
- |
-
-
- |
-
-
(
@@ -85,12 +73,11 @@ const EvaluationDetail = ({ evaluation, note = '' }) => (
| |
-
-);
+ ;
EvaluationDetail.propTypes = {
evaluation: PropTypes.object.isRequired,
- note: PropTypes.string
+ isCorrect: PropTypes.bool.isRequired
};
export default EvaluationDetail;
diff --git a/src/components/ReferenceSolutions/ReferenceSolutionEvaluationDetail/ReferenceSolutionEvaluationDetail.js b/src/components/ReferenceSolutions/ReferenceSolutionEvaluationDetail/ReferenceSolutionEvaluationDetail.js
index 7827949e7..effa86b60 100644
--- a/src/components/ReferenceSolutions/ReferenceSolutionEvaluationDetail/ReferenceSolutionEvaluationDetail.js
+++ b/src/components/ReferenceSolutions/ReferenceSolutionEvaluationDetail/ReferenceSolutionEvaluationDetail.js
@@ -33,7 +33,7 @@ class ReferenceSolutionEvaluationDetail extends Component {
exerciseId={exerciseId}
/>
- {referenceSolution.solution.files.map(file => (
+ {referenceSolution.solution.files.map(file =>
- ))}
+ )}
- {solutionEvaluation.evaluation && (
+ {solutionEvaluation.evaluation &&
- )}
+ />}
- {solutionEvaluation.evaluation && (
+ {solutionEvaluation.evaluation &&
-
+
-
- )}
+ }
(
+}) =>
- {submittedAt < firstDeadline ? (
-
- ) : (
-
- )}
+ {submittedAt < firstDeadline
+ ?
+ : }
|
{submittedAt >= firstDeadline &&
- allowSecondDeadline === true && (
-
-
-
- |
-
-
- |
-
- )}
-
-
-
-
- |
-
-
- |
-
+ allowSecondDeadline === true &&
+
+
+
+ |
+
+
+ |
+
}
@@ -113,8 +98,8 @@ const EvaluationDetail = ({
|
@@ -142,7 +127,7 @@ const EvaluationDetail = ({
{evaluation.points}/{maxPoints}
|
- {evaluation.bonusPoints !== 0 && (
+ {evaluation.bonusPoints !== 0 &&
- |
- )}
- {evaluation.bonusPoints !== 0 && (
+ }
+ {evaluation.bonusPoints !== 0 &&
- |
- )}
+ }
-
-);
+ ;
EvaluationDetail.propTypes = {
assignment: PropTypes.shape({
@@ -191,7 +173,7 @@ EvaluationDetail.propTypes = {
allowSecondDeadline: PropTypes.bool.isRequired,
secondDeadline: PropTypes.number
}).isRequired,
- note: PropTypes.string,
+ isCorrect: PropTypes.bool.isRequired,
submittedAt: PropTypes.number.isRequired,
evaluation: PropTypes.object,
maxPoints: PropTypes.number.isRequired
diff --git a/src/components/Submissions/SubmissionDetail/SubmissionDetail.js b/src/components/Submissions/SubmissionDetail/SubmissionDetail.js
index c6335b5e5..ea01ac235 100644
--- a/src/components/Submissions/SubmissionDetail/SubmissionDetail.js
+++ b/src/components/Submissions/SubmissionDetail/SubmissionDetail.js
@@ -32,7 +32,8 @@ class SubmissionDetail extends Component {
evaluation,
accepted,
originalSubmissionId,
- runtimeEnvironmentId
+ runtimeEnvironmentId,
+ isCorrect
},
assignment,
isSupervisor
@@ -54,7 +55,7 @@ class SubmissionDetail extends Component {
assignmentId={assignment.id}
/>
- {files.map(file => (
+ {files.map(file =>
- ))}
+ )}
- {evaluation && (
+ {evaluation &&
- )}
+ />}
- {evaluation && (
+ {evaluation &&
- {isSupervisor && (
+ {isSupervisor &&
- )}
+ />}
- {isSupervisor && (
+ {isSupervisor &&
-
- )}
-
- )}
+ }
+ }