Making revisions more eye-catching and easily accessible for students.

Author: krulis-martin

src/components/Solutions/SolutionReviewIcon/SolutionReviewIcon.js

@@ -31,7 +31,7 @@ const SolutionReviewIcon = ({ id, review, isReviewer = false, placement = 'botto
               <>
                 <FormattedMessage
                   id="app.solutionReviewIcon.tooltip.closedAt"
-                  defaultMessage="The review was closed at {closed}, the comments are available at source codes page."
+                  defaultMessage="The review was closed at {closed}, the comments are available on the submitted files page."
                   values={{ closed: <DateTime unixts={review.closedAt} /> }}
                 />{' '}
                 {review.issues > 0 ? (

src/components/Solutions/SolutionStatus/SolutionStatus.js

@@ -100,7 +100,7 @@ class SolutionStatus extends Component {
       editNote = null,
       assignmentSolversLoading,
       assignmentSolverSelector,
-      links: { SOLUTION_DETAIL_URI_FACTORY },
+      links: { SOLUTION_DETAIL_URI_FACTORY, SOLUTION_SOURCE_CODES_URI_FACTORY },
     } = this.props;
 
     const important = getImportantSolutions(otherSolutions, id);
@@ -366,7 +366,7 @@ class SolutionStatus extends Component {
                   )}
 
                   {review && review.issues > 0 && (
-                    <small className="text-muted">
+                    <small className="text-muted ml-3">
                       (
                       <FormattedMessage
                         id="app.solution.reviewIssuesCount"
@@ -377,6 +377,16 @@ class SolutionStatus extends Component {
                     </small>
                   )}
 
+                  {review.closedAt && (
+                    <Link to={SOLUTION_SOURCE_CODES_URI_FACTORY(assignmentId, id)}>
+                      <ReviewIcon
+                        review={review}
+                        gapLeft
+                        className={review.issues > 0 ? 'text-warning' : 'text-success'}
+                      />
+                    </Link>
+                  )}
+
                   {important.lastReviewed && (
                     <span className="small float-right mx-2">
                       <Link to={SOLUTION_DETAIL_URI_FACTORY(assignmentId, important.lastReviewed.id)}>

src/locales/cs.json

@@ -1661,6 +1661,7 @@
   "app.solution.pointsExplainDialog.epsilonExplain": "Epsilon (1e-6) je přičteno, aby kompenzovalo zaokrouhlovací chyby.",
   "app.solution.pointsExplainDialog.overriddenPoints": "Vedoucí ručně přepsal hodnocení úlohy na <strong>{overriddenPoints}</strong> {overriddenPoints, plural, one {bod} =2 {body} =3 {body} =4 {body} other {bodů}} (a {bonusPoints} {bonusPoints, plural, one {bonusový bod} =2 {bonusové body} =3 {bonusové body} =4 {bonusové body} other {bonusových bodů}}).",
   "app.solution.pointsExplainDialog.title": "Vysvětlení hodnotícího procesu",
+  "app.solution.reviewAvailableCallout": "K tomuto řešení byla vytvořena revize, která se vám zobrazí na stránce s odevzdanými soubory.",
   "app.solution.reviewClosedAt": "Revidováno v",
   "app.solution.reviewIssuesCount": "{issues} {count, plural, one {připomínka} =2 {připomínky} =3 {připomínky} =4 {připomínky} other {připomínek}} k vyřešení",
   "app.solution.reviewNotStartedYet": "dosud nezahájeno",

src/locales/en.json

@@ -1661,6 +1661,7 @@
   "app.solution.pointsExplainDialog.epsilonExplain": "The epsilon (1e-6) is added to compensate for rounding errors.",
   "app.solution.pointsExplainDialog.overriddenPoints": "A supervisor has manually overridden the points to <strong>{overriddenPoints}</strong> (and {bonusPoints} {bonusPoints, plural, one {point} other {points}}).",
   "app.solution.pointsExplainDialog.title": "Explanation of the scoring process",
+  "app.solution.reviewAvailableCallout": "A review of this solution is available on the submitted files page.",
   "app.solution.reviewClosedAt": "Reviewed at",
   "app.solution.reviewIssuesCount": "{issues} {issues, plural, one {issue} other {issues}} to resolve",
   "app.solution.reviewNotStartedYet": "not started yet",
@@ -1697,7 +1698,7 @@
   "app.solutionPlagiarisms.suspectedSourcesAvailable": "of {count} available",
   "app.solutionPlagiarisms.title": "Similarities Detected — Suspected Plagiarism",
   "app.solutionPlagiarisms.unableCompareMalformed": "Malformed files cannot be visualized in comparison mode.",
-  "app.solutionReviewIcon.tooltip.closedAt": "The review was closed at {closed}, the comments are available at source codes page.",
+  "app.solutionReviewIcon.tooltip.closedAt": "The review was closed at {closed}, the comments are available on the submitted files page.",
   "app.solutionReviewIcon.tooltip.issues": "The reviewer created {issues} {issues, plural, one {issue} other {issues}}, please, fix {issues, plural, one {it} other {them}} in the next solution.",
   "app.solutionReviewIcon.tooltip.noIssues": "No issues were created.",
   "app.solutionReviewIcon.tooltip.startedAt": "The review was started at {started} and has not been closed yet.",

src/pages/Solution/Solution.js

@@ -4,6 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { Row, Col } from 'react-bootstrap';
 import { connect } from 'react-redux';
 import { FormattedMessage, injectIntl } from 'react-intl';
+import { Link } from 'react-router-dom';
 import { defaultMemoize } from 'reselect';
 
 import Page from '../../components/layout/Page';
@@ -41,10 +42,13 @@ import {
 } from '../../redux/selectors/assignments';
 import { evaluationsForSubmissionSelector, fetchManyStatus } from '../../redux/selectors/submissionEvaluations';
 import { assignmentSubmissionScoreConfigSelector } from '../../redux/selectors/exerciseScoreConfig';
+import { isLoggedAsStudent } from '../../redux/selectors/users';
 
 import { registerSolutionVisit } from '../../components/Solutions/RecentlyVisited/functions';
 import { hasPermissions } from '../../helpers/common';
-import { PlagiarismIcon, SolutionResultsIcon, WarningIcon } from '../../components/icons';
+import { LinkIcon, PlagiarismIcon, SolutionResultsIcon, WarningIcon } from '../../components/icons';
+
+import withLinks from '../../helpers/withLinks';
 
 const assignmentHasRuntime = defaultMemoize(
   (assignment, runtimeId) =>
@@ -98,7 +102,9 @@ class Solution extends Component {
       fetchScoreConfigIfNeeded,
       assignmentSolversLoading,
       assignmentSolverSelector,
+      isStudent = false,
       intl: { locale },
+      links: { SOLUTION_SOURCE_CODES_URI_FACTORY },
     } = this.props;
 
     return (
@@ -195,6 +201,29 @@ class Solution extends Component {
                   </Callout>
                 )}
 
+              {isStudent && hasPermissions(solution, 'viewReview') && solution.review && solution.review.closedAt && (
+                <Callout variant={solution.review.issues > 0 ? 'warning' : 'success'}>
+                  <FormattedMessage
+                    id="app.solution.reviewAvailableCallout"
+                    defaultMessage="A review of this solution is available on the submitted files page."
+                  />
+                  {solution.review.issues > 0 && (
+                    <>
+                      {' ('}
+                      <FormattedMessage
+                        id="app.solution.reviewIssuesCount"
+                        defaultMessage="{issues} {issues, plural, one {issue} other {issues}} to resolve"
+                        values={{ issues: solution.review.issues }}
+                      />
+                      {')'}
+                    </>
+                  )}
+                  <Link to={SOLUTION_SOURCE_CODES_URI_FACTORY(assignmentId, solution.id)}>
+                    <LinkIcon largeGapLeft className="text-primary" />
+                  </Link>
+                </Callout>
+              )}
+
               <ResourceRenderer resource={runtimeEnvironments} returnAsArray>
                 {runtimes => (
                   <FetchManyResourceRenderer fetchManyStatus={fetchStatus}>
@@ -248,11 +277,13 @@ Solution.propTypes = {
   scoreConfigSelector: PropTypes.func,
   assignmentSolversLoading: PropTypes.bool,
   assignmentSolverSelector: PropTypes.func.isRequired,
+  isStudent: PropTypes.bool,
   editNote: PropTypes.func.isRequired,
   deleteEvaluation: PropTypes.func.isRequired,
   refreshSolutionEvaluations: PropTypes.func.isRequired,
   download: PropTypes.func.isRequired,
   intl: PropTypes.object,
+  links: PropTypes.object.isRequired,
 };
 
 export default connect(
@@ -274,6 +305,7 @@ export default connect(
     scoreConfigSelector: assignmentSubmissionScoreConfigSelector(state),
     assignmentSolversLoading: isAssignmentSolversLoading(state),
     assignmentSolverSelector: getAssignmentSolverSelector(state),
+    isStudent: isLoggedAsStudent(state),
   }),
   (dispatch, { match: { params } }) => ({
     loadAsync: () => Solution.loadAsync(params, dispatch),
@@ -290,4 +322,4 @@ export default connect(
       ),
     download: (id, entry = null) => dispatch(download(id, entry)),
   })
-)(injectIntl(Solution));
+)(injectIntl(withLinks(Solution)));

src/redux/selectors/users.js

@@ -78,6 +78,10 @@ export const isLoggedAsSuperAdmin = createSelector(getLoggedInUserEffectiveRole,
   isSuperadminRole(effectiveRole)
 );
 
+export const isLoggedAsStudent = createSelector(getLoggedInUserEffectiveRole, effectiveRole =>
+  isStudentRole(effectiveRole)
+);
+
 export const memberOfInstancesIdsSelector = userId =>
   createSelector(getUser(userId), user =>
     user && isReady(user) ? user.getIn(['data', 'privateData', 'instancesIds'], EMPTY_LIST) : EMPTY_LIST