Adapt to new submission data format

src/components/Assignments/Assignment/AssignmentDetails/AssignmentDetails.js

@@ -27,7 +27,8 @@ const AssignmentDetails = ({
   isBonus,
   runtimeEnvironments,
   canSubmit,
-  pointsPercentualThreshold
+  pointsPercentualThreshold,
+  alreadySubmitted
 }) =>
   <Box
     title={
@@ -112,7 +113,7 @@ const AssignmentDetails = ({
         </tr>
         <tr>
           <td className="text-center">
-            <Icon name="cloud-upload" />
+            <Icon name="ban" />
           </td>
           <td>
             <FormattedMessage
@@ -124,6 +125,20 @@ const AssignmentDetails = ({
             {submissionsCountLimit === null ? '-' : submissionsCountLimit}
           </td>
         </tr>
+        <tr>
+          <td className="text-center">
+            <Icon name="coffee" />
+          </td>
+          <td>
+            <FormattedMessage
+              id="app.assignment.alreadySubmitted"
+              defaultMessage="Already submitted:"
+            />
+          </td>
+          <td>
+            {alreadySubmitted}
+          </td>
+        </tr>
         <tr>
           <td className="text-center">
             <Icon name="unlock-alt" />
@@ -204,7 +219,8 @@ AssignmentDetails.propTypes = {
   isBonus: PropTypes.bool,
   runtimeEnvironments: PropTypes.array,
   canSubmit: ImmutablePropTypes.map,
-  pointsPercentualThreshold: PropTypes.number
+  pointsPercentualThreshold: PropTypes.number,
+  alreadySubmitted: PropTypes.number.isRequired
 };
 
 export default AssignmentDetails;

src/components/Assignments/SubmissionsTable/EvaluationFailedTableRow.js

@@ -4,23 +4,21 @@ import { FormattedDate, FormattedTime, FormattedMessage } from 'react-intl';
 import { Link } from 'react-router';
 import AssignmentStatusIcon from '../Assignment/AssignmentStatusIcon';
 
-const EvaluationFailedTableRow = ({ link, note, submittedAt }) => (
+const EvaluationFailedTableRow = ({ link, note, solution: { createdAt } }) =>
   <tr>
-    <td><AssignmentStatusIcon id={link} status="evaluation-failed" /></td>
     <td>
-      <FormattedDate value={submittedAt * 1000} />
+      <AssignmentStatusIcon id={link} status="evaluation-failed" />
+    </td>
+    <td>
+      <FormattedDate value={createdAt * 1000} />
       &nbsp;
-      <FormattedTime value={submittedAt * 1000} />
+      <FormattedTime value={createdAt * 1000} />
     </td>
     <td className="text-center">
-      <span className="text-danger">
-        -
-      </span>
+      <span className="text-danger">-</span>
     </td>
     <td className="text-center">
-      <span className="text-danger">
-        -
-      </span>
+      <span className="text-danger">-</span>
     </td>
     <td>
       {note}
@@ -33,13 +31,14 @@ const EvaluationFailedTableRow = ({ link, note, submittedAt }) => (
         />
       </Link>
     </td>
-  </tr>
-);
+  </tr>;
 
 EvaluationFailedTableRow.propTypes = {
   link: PropTypes.string.isRequired,
-  submittedAt: PropTypes.number.isRequired,
-  note: PropTypes.string.isRequired
+  note: PropTypes.string.isRequired,
+  solution: PropTypes.shape({
+    createdAt: PropTypes.number.isRequired
+  }).isRequired
 };
 
 export default EvaluationFailedTableRow;

src/components/Assignments/SubmissionsTable/FailedSubmissionTableRow.js

@@ -13,19 +13,20 @@ import Points from './Points';
 const FailedSubmissionTableRow = ({
   link,
   note,
-  submittedAt,
+  lastSubmission: { evaluation: { score, points } },
   maxPoints,
-  evaluation: { score, points, bonusPoints },
+  bonusPoints,
+  solution: { createdAt },
   accepted
 }) =>
   <tr>
     <td>
       <AssignmentStatusIcon id={link} status="failed" accepted={accepted} />
     </td>
     <td>
-      <FormattedDate value={submittedAt * 1000} />
+      <FormattedDate value={createdAt * 1000} />
       &nbsp;
-      <FormattedTime value={submittedAt * 1000} />
+      <FormattedTime value={createdAt * 1000} />
     </td>
     <td className="text-center">
       <span className="text-danger">
@@ -56,12 +57,17 @@ const FailedSubmissionTableRow = ({
 
 FailedSubmissionTableRow.propTypes = {
   link: PropTypes.string.isRequired,
-  submittedAt: PropTypes.number.isRequired,
   note: PropTypes.string.isRequired,
   maxPoints: PropTypes.number.isRequired,
-  evaluation: PropTypes.shape({
-    score: PropTypes.number.isRequired,
-    points: PropTypes.number.isRequired
+  bonusPoints: PropTypes.number.isRequired,
+  lastSubmission: PropTypes.shape({
+    evaluation: PropTypes.shape({
+      score: PropTypes.number.isRequired,
+      points: PropTypes.number.isRequired
+    })
+  }).isRequired,
+  solution: PropTypes.shape({
+    createdAt: PropTypes.number.isRequired
   }).isRequired,
   accepted: PropTypes.bool
 };

src/components/Assignments/SubmissionsTable/NotEvaluatedSubmissionTableRow.js

@@ -4,13 +4,19 @@ import { FormattedDate, FormattedTime, FormattedMessage } from 'react-intl';
 import { Link } from 'react-router';
 import AssignmentStatusIcon from '../Assignment/AssignmentStatusIcon';
 
-const NotEvaluatedSubmissionTableRow = ({ link, note, submittedAt }) => (
+const NotEvaluatedSubmissionTableRow = ({
+  link,
+  note,
+  solution: { createdAt }
+}) =>
   <tr>
-    <td><AssignmentStatusIcon id={link} status="work-in-progress" /></td>
     <td>
-      <FormattedDate value={submittedAt * 1000} />
+      <AssignmentStatusIcon id={link} status="work-in-progress" />
+    </td>
+    <td>
+      <FormattedDate value={createdAt * 1000} />
       &nbsp;
-      <FormattedTime value={submittedAt * 1000} />
+      <FormattedTime value={createdAt * 1000} />
     </td>
     <td className="text-center">-</td>
     <td className="text-center">- / -</td>
@@ -25,13 +31,14 @@ const NotEvaluatedSubmissionTableRow = ({ link, note, submittedAt }) => (
         />
       </Link>
     </td>
-  </tr>
-);
+  </tr>;
 
 NotEvaluatedSubmissionTableRow.propTypes = {
   link: PropTypes.string.isRequired,
-  submittedAt: PropTypes.number.isRequired,
-  note: PropTypes.string.isRequired
+  note: PropTypes.string.isRequired,
+  solution: PropTypes.shape({
+    createdAt: PropTypes.number.isRequired
+  }).isRequired
 };
 
 export default NotEvaluatedSubmissionTableRow;

src/components/Assignments/SubmissionsTable/SubmissionsTable.js

@@ -66,7 +66,7 @@ const SubmissionsTable = ({
               const id = data.id;
               const link = SUBMISSION_DETAIL_URI_FACTORY(assignmentId, id);
 
-              switch (data.evaluationStatus) {
+              switch (data.lastSubmission.evaluationStatus) {
                 case 'done':
                   return (
                     <SuccessfulSubmissionTableRow

src/components/Assignments/SubmissionsTable/SuccessfulSubmissionTableRow.js

@@ -14,19 +14,20 @@ import Points from './Points';
 const SuccessfulSubmissionTableRow = ({
   link,
   note,
-  submittedAt,
+  lastSubmission: { evaluation: { score, points } },
   maxPoints,
-  evaluation: { score, bonusPoints, points },
+  bonusPoints,
+  solution: { createdAt },
   accepted
-}) => (
+}) =>
   <tr>
     <td>
       <AssignmentStatusIcon id={link} status="done" accepted={accepted} />
     </td>
     <td>
-      <FormattedDate value={submittedAt * 1000} />
+      <FormattedDate value={createdAt * 1000} />
       &nbsp;
-      <FormattedTime value={submittedAt * 1000} />
+      <FormattedTime value={createdAt * 1000} />
     </td>
     <td className="text-center">
       <strong className="text-success">
@@ -53,17 +54,21 @@ const SuccessfulSubmissionTableRow = ({
         />
       </Link>
     </td>
-  </tr>
-);
+  </tr>;
 
 SuccessfulSubmissionTableRow.propTypes = {
   link: PropTypes.string.isRequired,
-  submittedAt: PropTypes.number.isRequired,
   note: PropTypes.string.isRequired,
   maxPoints: PropTypes.number.isRequired,
-  evaluation: PropTypes.shape({
-    score: PropTypes.number.isRequired,
-    points: PropTypes.number.isRequired
+  bonusPoints: PropTypes.number.isRequired,
+  lastSubmission: PropTypes.shape({
+    evaluation: PropTypes.shape({
+      score: PropTypes.number.isRequired,
+      points: PropTypes.number.isRequired
+    })
+  }).isRequired,
+  solution: PropTypes.shape({
+    createdAt: PropTypes.number.isRequired
   }).isRequired,
   accepted: PropTypes.bool
 };

src/components/Exercises/ReferenceSolutionsList/ReferenceSolutionsList.js

@@ -36,10 +36,9 @@ const ReferenceSolutionsList = ({
         .map(
           ({
             id,
-            uploadedAt,
             description,
             permissionHints,
-            solution: { userId }
+            solution: { userId, createdAt }
           }) =>
             <tr key={id}>
               <td className="text-center">
@@ -49,8 +48,8 @@ const ReferenceSolutionsList = ({
                 {description}
               </td>
               <td>
-                <FormattedDate value={new Date(uploadedAt * 1000)} /> &nbsp;{' '}
-                <FormattedTime value={new Date(uploadedAt * 1000)} />
+                <FormattedDate value={new Date(createdAt * 1000)} /> &nbsp;{' '}
+                <FormattedTime value={new Date(createdAt * 1000)} />
               </td>
               <td>
                 <UsersNameContainer userId={userId} />

src/components/Groups/ResultsTable/ResultsTableRow.js

@@ -16,17 +16,12 @@ const ResultsTableRow = ({ userId, assignmentsIds, submissions }) => {
         const points =
           submission &&
           submission !== null &&
-          submission.evaluation &&
-          submission.evaluation !== null
-            ? submission.evaluation.points
+          submission.lastSubmission.evaluation &&
+          submission.lastSubmission.evaluation.points
+            ? submission.lastSubmission.evaluation.points
             : '-';
         const bonusPoints =
-          submission &&
-          submission !== null &&
-          submission.evaluation &&
-          submission.evaluation !== null
-            ? submission.evaluation.bonusPoints
-            : 0;
+          submission && submission !== null ? submission.bonusPoints : 0;
         totalPoints += points !== '-' ? points : 0;
         totalPoints += bonusPoints;
         return (

src/components/ReferenceSolutions/EvaluationTable/EvaluationTable.css

@@ -0,0 +1,3 @@
+.activeRow {
+  background-color: #eee;
+}

src/components/ReferenceSolutions/EvaluationTable/EvaluationTable.js

@@ -7,18 +7,11 @@ import {
   FormattedNumber
 } from 'react-intl';
 import { Table } from 'react-bootstrap';
-import { Link } from 'react-router';
 import classnames from 'classnames';
-
-import withLinks from '../../../hoc/withLinks';
 import AssignmentStatusIcon from '../../Assignments/Assignment/AssignmentStatusIcon';
+import './EvaluationTable.css';
 
-const EvaluationTable = ({
-  evaluations,
-  referenceSolutionId,
-  exerciseId,
-  links: { REFERENCE_SOLUTION_EVALUATION_URI_FACTORY }
-}) =>
+const EvaluationTable = ({ evaluations, renderButtons, selectedRowId = '' }) =>
   <Table>
     <thead>
       <tr>
@@ -47,7 +40,7 @@ const EvaluationTable = ({
           return b.evaluation.evaluatedAt - a.evaluation.evaluatedAt;
         })
         .map(e =>
-          <tr key={e.id}>
+          <tr key={e.id} className={selectedRowId === e.id ? 'activeRow' : ''}>
             <td>
               <AssignmentStatusIcon
                 id={e.id}
@@ -81,21 +74,7 @@ const EvaluationTable = ({
                   />
                 </i>
               </td>}
-            <td className="text-right">
-              <Link
-                to={REFERENCE_SOLUTION_EVALUATION_URI_FACTORY(
-                  exerciseId,
-                  referenceSolutionId,
-                  e.id
-                )}
-                className="btn btn-flat btn-default btn-xs"
-              >
-                <FormattedMessage
-                  id="app.evaluationTable.showDetails"
-                  defaultMessage="Show details"
-                />
-              </Link>
-            </td>
+            {renderButtons && renderButtons(e.id)}
           </tr>
         )}
 
@@ -113,9 +92,8 @@ const EvaluationTable = ({
 
 EvaluationTable.propTypes = {
   evaluations: PropTypes.array.isRequired,
-  referenceSolutionId: PropTypes.string.isRequired,
-  exerciseId: PropTypes.string.isRequired,
-  links: PropTypes.object
+  renderButtons: PropTypes.func,
+  selectedRowId: PropTypes.string
 };
 
-export default withLinks(EvaluationTable);
+export default EvaluationTable;