Best solutions are now distinguished by different icon in the assignment solutions table.

Author: Martin Krulis

src/components/Assignments/Assignment/AssignmentStatusIcon/AssignmentStatusIcon.js

@@ -11,16 +11,27 @@ export const getStatusDesc = (status, lastSubmission) => {
   return status === 'work-in-progress' && !lastSubmission ? 'missing-submission' : status;
 };
 
-const AssignmentStatusIcon = ({ id, status, accepted = false }) => {
+const AssignmentStatusIcon = ({ id, status, accepted = false, isBestSolution = false }) => {
   switch (status) {
     case 'done':
       return (
         <StatusIcon
           id={id}
           accepted={accepted}
-          icon={<Icon icon={['far', 'thumbs-up']} className="text-green" />}
+          icon={<Icon icon={isBestSolution ? 'thumbs-up' : ['far', 'thumbs-up']} className="text-green" />}
           message={
-            <FormattedMessage id="app.assignemntStatusIcon.ok" defaultMessage="Assignment is successfully completed." />
+            <React.Fragment>
+              <FormattedMessage
+                id="app.assignemntStatusIcon.ok"
+                defaultMessage="Assignment is successfully completed."
+              />
+              {isBestSolution && !accepted && (
+                <FormattedMessage
+                  id="app.assignemntStatusIcon.isBestSolution"
+                  defaultMessage="This is the best solution of the author submitted so far."
+                />
+              )}
+            </React.Fragment>
           }
         />
       );
@@ -44,12 +55,20 @@ const AssignmentStatusIcon = ({ id, status, accepted = false }) => {
         <StatusIcon
           id={id}
           accepted={accepted}
-          icon={<Icon icon={['far', 'thumbs-down']} className="text-red" />}
+          icon={<Icon icon={isBestSolution ? 'thumbs-down' : ['far', 'thumbs-down']} className="text-red" />}
           message={
-            <FormattedMessage
-              id="app.assignemntStatusIcon.failed"
-              defaultMessage="No correct solution was submitted yet."
-            />
+            <React.Fragment>
+              <FormattedMessage
+                id="app.assignemntStatusIcon.failed"
+                defaultMessage="No correct solution was submitted yet."
+              />
+              {isBestSolution && !accepted && (
+                <FormattedMessage
+                  id="app.assignemntStatusIcon.isBestSolution"
+                  defaultMessage="This is the best solution of the author submitted so far."
+                />
+              )}
+            </React.Fragment>
           }
         />
       );

src/components/Assignments/SolutionsTable/SolutionsTableRow.js

@@ -29,6 +29,7 @@ const SolutionsTableRow = ({
   actualPoints,
   solution: { createdAt },
   accepted = false,
+  isBestSolution = false,
   runtimeEnvironment = null,
   commentsStats = null,
   permissionHints = null,
@@ -57,7 +58,12 @@ const SolutionsTableRow = ({
             'valign-middle': true,
             'text-nowrap': !compact,
           })}>
-          <AssignmentStatusIcon id={id} status={getStatusDesc(status, lastSubmission)} accepted={accepted} />
+          <AssignmentStatusIcon
+            id={id}
+            status={getStatusDesc(status, lastSubmission)}
+            accepted={accepted}
+            isBestSolution={isBestSolution}
+          />
           <CommentsIcon id={id} commentsStats={commentsStats} gapLeft={!splitOnTwoLines} />
         </td>
 
@@ -149,6 +155,7 @@ SolutionsTableRow.propTypes = {
     createdAt: PropTypes.number.isRequired,
   }),
   accepted: PropTypes.bool,
+  isBestSolution: PropTypes.bool,
   commentsStats: PropTypes.object,
   runtimeEnvironment: PropTypes.object,
   permissionHints: PropTypes.object,

src/locales/cs.json

@@ -40,6 +40,7 @@
   "app.assignemntStatusIcon.evaluationFailed": "Žádné řesení nebylo správně vyhodnoceno.",
   "app.assignemntStatusIcon.failed": "Žádné správné řešení nebylo zatím odevzdáno.",
   "app.assignemntStatusIcon.inProgress": "Řešení úlohy je právě vyhodnocováno.",
+  "app.assignemntStatusIcon.isBestSolution": "Toto je nejlepší řešení, které autor dosud odevzdal.",
   "app.assignemntStatusIcon.none": "Zatím nebyla odevzdána žádná řešení.",
   "app.assignemntStatusIcon.ok": "Úloha byla úspěšně splněna.",
   "app.assignemntStatusIcon.solutionMissingSubmission": "Řešení nebylo odevzdáno k vyhodnocení pravděpodobně díky chybě. Budete ho muset odevzdat znovu.",

src/locales/en.json

@@ -40,6 +40,7 @@
   "app.assignemntStatusIcon.evaluationFailed": "No solution was evaluated correctly by ReCodEx.",
   "app.assignemntStatusIcon.failed": "No correct solution was submitted yet.",
   "app.assignemntStatusIcon.inProgress": "Assignment solution is being evaluated.",
+  "app.assignemntStatusIcon.isBestSolution": "This is the best solution of the author submitted so far.",
   "app.assignemntStatusIcon.none": "No solutions were submmitted so far.",
   "app.assignemntStatusIcon.ok": "Assignment is successfully completed.",
   "app.assignemntStatusIcon.solutionMissingSubmission": "The solution was not submitted for evaluation probably due to an error. You may need to resubmit it.",

src/locales/whitelist_en.json

@@ -40,6 +40,7 @@
   "app.assignemntStatusIcon.evaluationFailed",
   "app.assignemntStatusIcon.failed",
   "app.assignemntStatusIcon.inProgress",
+  "app.assignemntStatusIcon.isBestSolution",
   "app.assignemntStatusIcon.none",
   "app.assignemntStatusIcon.ok",
   "app.assignemntStatusIcon.solutionMissingSubmission",

src/pages/AssignmentStats/AssignmentStats.js

@@ -68,6 +68,7 @@ const prepareTableColumnDescriptors = defaultMemoize((loggedUserId, assignmentId
               info.lastSubmission
             )}
             accepted={info.accepted}
+            isBestSolution={info.isBestSolution}
           />
           <CommentsIcon id={info.id} commentsStats={info.commentsStats} gapLeft />
         </React.Fragment>
@@ -187,6 +188,7 @@ const prepareTableData = defaultMemoize((assigmentSolutions, users, runtimeEnvir
         bonusPoints,
         actualPoints,
         accepted,
+        isBestSolution,
         commentsStats,
         permissionHints,
       }) => {
@@ -195,7 +197,7 @@ const prepareTableData = defaultMemoize((assigmentSolutions, users, runtimeEnvir
           (lastSubmission.evaluationStatus === 'done' || lastSubmission.evaluationStatus === 'failed');
         const userId = solution && solution.userId;
         return {
-          icon: { id, commentsStats, lastSubmission, accepted },
+          icon: { id, commentsStats, lastSubmission, accepted, isBestSolution },
           user: users.find(({ id }) => id === userId),
           date: solution && solution.createdAt,
           validity: statusEvaluated ? safeGet(lastSubmission, ['evaluation', 'score']) : null,