Adding info about plagiarism checks (for assignment solutions) even when no similar solutions were detected.

Author: krulis-martin

recodex-web.spec

@@ -2,7 +2,7 @@
 %define short_name web-app
 %define version 2.15.2
 %define unmangled_version ebc78182eb1009c8c0198e703eace2fc2a7052a9
-%define release 1
+%define release 2
 
 Summary: ReCodEx web-app component
 Name: %{name}

src/components/icons/index.js

@@ -92,6 +92,7 @@ export const OutputIcon = props => <Icon {...props} icon="sign-out-alt" />;
 export const PastDeadlineIcon = props => <Icon {...props} icon="skull" />;
 export const PipelineIcon = props => <Icon {...props} icon="random" />;
 export const PipelineStructureIcon = props => <Icon {...props} icon="sitemap" />;
+export const PlagiarismCheckedIcon = props => <Icon icon="person-circle-check" {...props} />;
 export const PlagiarismIcon = props => <Icon icon="person-circle-exclamation" {...props} />;
 export const PointsIcon = props => <Icon icon="comment-dollar" {...props} />;
 export const PointsDecreasedIcon = props => <Icon icon="level-down-alt" className="text-body-secondary" {...props} />;

src/components/widgets/DateTime/DateTime.js

@@ -31,6 +31,7 @@ const dateTime = ({
   showSeconds = false,
   showRelative = isDeadline,
   noWrap = true,
+  compact = false,
 }) => {
   const { dateFormatOverride = null } = useContext(UserUIDataContext);
 
@@ -58,17 +59,14 @@ const dateTime = ({
             <FormattedDate value={unixts * 1000} />
           )}
 
-          {(showTime || showRelative) && <span className="px-1"> </span>}
+          {(showTime || showRelative) && <span className={compact ? '' : 'px-1'}> </span>}
         </span>
       )}
 
       {showTime && (
-        <span
-          className={classnames({
-            'text-nowrap': true,
-          })}>
+        <span className="text-nowrap">
           <FormattedTime value={unixts * 1000} format={showSeconds ? '24hourWithSeconds' : '24hour'} />
-          {showRelative && <span className="px-1"> </span>}
+          {showRelative && <span className={compact ? '' : 'px-1'}> </span>}
         </span>
       )}
 
@@ -143,6 +141,7 @@ dateTime.propTypes = {
   deadlineDangerTime: PropTypes.number,
   deadlineAlertTime: PropTypes.number,
   noWrap: PropTypes.bool,
+  compact: PropTypes.bool,
 };
 
 DateTime.propTypes = {

src/locales/cs.json

@@ -168,8 +168,10 @@
   "app.assignmentSolutions.assignmentSolutions": "Řešení zadané úlohy",
   "app.assignmentSolutions.noSolutions": "Momentálně zde nejsou žádná odevzdaná řešení.",
   "app.assignmentSolutions.pendingReviews": "V tuto chvíli {count, plural, one {je otevřena} =2 {jsou otevřeny} =3 {jsou otevřeny} =4 {jsou otevřeny} other {je otevřeno}} {count} {count, plural, one {revize} =2 {revize} =3 {revize} =4 {revize} other {revizí}} ze všech řešení vybrané úlohy. Nezapomeňte, že autoři úloh vidí vaše komentáře zdrojových kódů až poté, co jsou příslušné revize uzavřeny.",
+  "app.assignmentSolutions.plagiarismsChecked": "Tato řešení byla zkontrolována na plagiáty {date}. Žádné podobnosti nebyly nalezeny.",
   "app.assignmentSolutions.plagiarismsDetected.assignments": "V seznamu {count, plural, one {je zobrazeno} =2 {jsou zobrazena} =3 {jsou zobrazena} =4 {jsou zobrazena} other {je zobrazeno}} {count} řešení ({assignments, plural, =2 {ze} =3 {ze} =4 {ze} other {z}} {assignments} {assignments, plural, one {úlohy} other {úloh}}), {count, plural, one {ke kterému} other {ke kterým}} byla nalezena podobná řešení. V takových případech se může jednat o plagiáty.",
   "app.assignmentSolutions.plagiarismsDetected.authors": "V seznamu {count, plural, one {je zobrazeno} =2 {jsou zobrazena} =3 {jsou zobrazena} =4 {jsou zobrazena} other {je zobrazeno}} {count} řešení (od {authors} {authors, plural, one {autora} other {různých autorů}}), {count, plural, one {ke kterému} other {ke kterým}} byla nalezena podobná řešení. V takových případech se může jednat o plagiáty.",
+  "app.assignmentSolutions.plagiarismsDetected.time": "Poslední kontrola na plagiáty proběhla {date}.",
   "app.assignmentSolutions.title": "Všechna řešení zadané úlohy",
   "app.assignmentSolutions.viewModes.accepted": "Pouze akceptovaná řešení",
   "app.assignmentSolutions.viewModes.best": "Pouze nejlepší řešení",
@@ -2197,4 +2199,4 @@
   "recodex-judge-shuffle-all": "Sudí neuspořádaných tokenů a řádků",
   "recodex-judge-shuffle-newline": "Sudí neuspořádaných tokenů (ignorující konce řádků)",
   "recodex-judge-shuffle-rows": "Sudí neuspořádaných řádků"
-}
+}

src/locales/en.json

@@ -168,8 +168,10 @@
   "app.assignmentSolutions.assignmentSolutions": "Assignment Solutions",
   "app.assignmentSolutions.noSolutions": "There are currently no submitted solutions.",
   "app.assignmentSolutions.pendingReviews": "There {count, plural, one {is} other {are}} {count} pending {count, plural, one {review} other {reviews}} among the solutions of the selected assignment. Remember that the review comments are visible to the author after a review is closed.",
+  "app.assignmentSolutions.plagiarismsChecked": "These assignment solutions were checked for plagiarisms at {date}. No similarities found.",
   "app.assignmentSolutions.plagiarismsDetected.assignments": "There {count, plural, one {is} other {are}} {count} {count, plural, one {solution} other {solutions}} (of {assignments} {assignments, plural, one {assignment} other {assignments}}) with detected similarities. Such solutions may be plagiarisms.",
   "app.assignmentSolutions.plagiarismsDetected.authors": "There {count, plural, one {is} other {are}} {count} {count, plural, one {solution} other {solutions}} (from {authors} {authors, plural, one {author} other {unique authors}}) with detected similarities. Such solutions may be plagiarisms.",
+  "app.assignmentSolutions.plagiarismsDetected.time": "The latest plagiarism check ended at {date}.",
   "app.assignmentSolutions.title": "All Submissions of The Assignment",
   "app.assignmentSolutions.viewModes.accepted": "Accepted solutions only",
   "app.assignmentSolutions.viewModes.best": "Best solutions only",
@@ -2197,4 +2199,4 @@
   "recodex-judge-shuffle-all": "Unordered-tokens-and-rows judge",
   "recodex-judge-shuffle-newline": "Unordered-tokens judge (ignoring ends of lines)",
   "recodex-judge-shuffle-rows": "Unordered-rows judge"
-}
+}

src/pages/AssignmentSolutions/AssignmentSolutions.js

@@ -20,6 +20,7 @@ import Icon, {
   DetailIcon,
   CodeFileIcon,
   LoadingIcon,
+  PlagiarismCheckedIcon,
   PlagiarismIcon,
   ResultsIcon,
   UserIcon,
@@ -460,14 +461,38 @@ class AssignmentSolutions extends Component {
                     linkFactory={links.GROUP_EDIT_URI_FACTORY}
                   />
 
-                  {plagiarisms && plagiarisms.length > 0 && (
+                  {plagiarisms && plagiarisms.length > 0 ? (
                     <Callout variant="danger" icon={<PlagiarismIcon />}>
                       <FormattedMessage
                         id="app.assignmentSolutions.plagiarismsDetected.authors"
                         defaultMessage="There {count, plural, one {is} other {are}} {count} {count, plural, one {solution} other {solutions}} (from {authors} {authors, plural, one {author} other {unique authors}}) with detected similarities. Such solutions may be plagiarisms."
                         values={{ count: plagiarisms.length, authors: getPlagiarismUniqueAuthors(plagiarisms).length }}
                       />
+                      {assignment.plagiarismCheckedAt && (
+                        <>
+                          <br />
+                          <FormattedMessage
+                            id="app.assignmentSolutions.plagiarismsDetected.time"
+                            defaultMessage="The latest plagiarism check ended at {date}."
+                            values={{
+                              date: <DateTime unixts={assignment.plagiarismCheckedAt} compact />,
+                            }}
+                          />
+                        </>
+                      )}
                     </Callout>
+                  ) : (
+                    assignment.plagiarismCheckedAt && (
+                      <Callout variant="success" icon={<PlagiarismCheckedIcon />}>
+                        <FormattedMessage
+                          id="app.assignmentSolutions.plagiarismsChecked"
+                          defaultMessage="These assignment solutions were checked for plagiarisms at {date}. No similarities found."
+                          values={{
+                            date: <DateTime unixts={assignment.plagiarismCheckedAt} compact />,
+                          }}
+                        />
+                      </Callout>
+                    )
                   )}
 
                   {pendingReviews && pendingReviews.length > 0 && !group.archived && (