From b96c4044bc1937935bbae9027eaab35a2aa4026f Mon Sep 17 00:00:00 2001 From: Martin Krulis Date: Fri, 21 Apr 2023 00:49:49 +0200 Subject: [PATCH] Fixing bugs, appearance improvements. --- .../PlagiarismCodeBoxWithSelector.js | 5 ++++- .../SolutionPlagiarisms/SolutionPlagiarisms.js | 17 +++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/components/Solutions/PlagiarismCodeBoxWithSelector/PlagiarismCodeBoxWithSelector.js b/src/components/Solutions/PlagiarismCodeBoxWithSelector/PlagiarismCodeBoxWithSelector.js index cee772ed8..0f3b79a2d 100644 --- a/src/components/Solutions/PlagiarismCodeBoxWithSelector/PlagiarismCodeBoxWithSelector.js +++ b/src/components/Solutions/PlagiarismCodeBoxWithSelector/PlagiarismCodeBoxWithSelector.js @@ -8,7 +8,7 @@ import SourceCodeBox from '../SourceCodeBox'; import DateTime from '../../widgets/DateTime'; import Button from '../../widgets/TheButton'; import GroupsNameContainer from '../../../containers/GroupsNameContainer'; -import { CloseIcon } from '../../icons'; +import { CloseIcon, CodeFileIcon } from '../../icons'; class PlagiarismCodeBoxWithSelector extends Component { state = { selectedFile: 0, dialogOpen: false }; @@ -62,6 +62,9 @@ class PlagiarismCodeBoxWithSelector extends Component { key={file.id} className={this.state.selectedFile === idx ? 'table-primary' : 'clickable'} onClick={this.state.selectedFile !== idx ? () => this.selectFile(idx) : null}> + + + {file.solutionFile.name} diff --git a/src/pages/SolutionPlagiarisms/SolutionPlagiarisms.js b/src/pages/SolutionPlagiarisms/SolutionPlagiarisms.js index ccc14af0b..a9fac1323 100644 --- a/src/pages/SolutionPlagiarisms/SolutionPlagiarisms.js +++ b/src/pages/SolutionPlagiarisms/SolutionPlagiarisms.js @@ -13,7 +13,7 @@ import Callout from '../../components/widgets/Callout'; import { AssignmentSolutionNavigation } from '../../components/layout/Navigation'; import ResourceRenderer from '../../components/helpers/ResourceRenderer'; import PlagiarismCodeBoxWithSelector from '../../components/Solutions/PlagiarismCodeBoxWithSelector'; -import { BanIcon, PlagiarismIcon, UserIcon } from '../../components/icons'; +import Icon, { BanIcon, PlagiarismIcon, UserIcon } from '../../components/icons'; import UsersNameContainer from '../../containers/UsersNameContainer'; import { fetchRuntimeEnvironments } from '../../redux/modules/runtimeEnvironments'; @@ -227,9 +227,14 @@ class SolutionPlagiarisms extends Component { className={'clickable' + (plagiarismSource === selectedSource ? ' table-primary' : '')} onClick={() => this.selectPlagiarismSource(plagiarismSource)}> - + + + + + + {plagiarisms[plagiarismSource].length === 0 ? ( - + {plagiarisms[plagiarismSource][0].similarity * 100} % ) : ( <> - + - : {Math.max(plagiarisms[plagiarismSource].map(p => p.similarity)) * 100} % + : {Math.max(...plagiarisms[plagiarismSource].map(p => p.similarity)) * 100} % - +