Skip to content

Commit b96c404

Browse files
committed
Fixing bugs, appearance improvements.
1 parent 2889228 commit b96c404

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

src/components/Solutions/PlagiarismCodeBoxWithSelector/PlagiarismCodeBoxWithSelector.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import SourceCodeBox from '../SourceCodeBox';
88
import DateTime from '../../widgets/DateTime';
99
import Button from '../../widgets/TheButton';
1010
import GroupsNameContainer from '../../../containers/GroupsNameContainer';
11-
import { CloseIcon } from '../../icons';
11+
import { CloseIcon, CodeFileIcon } from '../../icons';
1212

1313
class PlagiarismCodeBoxWithSelector extends Component {
1414
state = { selectedFile: 0, dialogOpen: false };
@@ -62,6 +62,9 @@ class PlagiarismCodeBoxWithSelector extends Component {
6262
key={file.id}
6363
className={this.state.selectedFile === idx ? 'table-primary' : 'clickable'}
6464
onClick={this.state.selectedFile !== idx ? () => this.selectFile(idx) : null}>
65+
<td className="text-nowrap shrink-col">
66+
<CodeFileIcon className="text-muted" gapLeft gapRight />
67+
</td>
6568
<td>
6669
<code>
6770
{file.solutionFile.name}

src/pages/SolutionPlagiarisms/SolutionPlagiarisms.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import Callout from '../../components/widgets/Callout';
1313
import { AssignmentSolutionNavigation } from '../../components/layout/Navigation';
1414
import ResourceRenderer from '../../components/helpers/ResourceRenderer';
1515
import PlagiarismCodeBoxWithSelector from '../../components/Solutions/PlagiarismCodeBoxWithSelector';
16-
import { BanIcon, PlagiarismIcon, UserIcon } from '../../components/icons';
16+
import Icon, { BanIcon, PlagiarismIcon, UserIcon } from '../../components/icons';
1717
import UsersNameContainer from '../../containers/UsersNameContainer';
1818

1919
import { fetchRuntimeEnvironments } from '../../redux/modules/runtimeEnvironments';
@@ -227,9 +227,14 @@ class SolutionPlagiarisms extends Component {
227227
className={'clickable' + (plagiarismSource === selectedSource ? ' table-primary' : '')}
228228
onClick={() => this.selectPlagiarismSource(plagiarismSource)}>
229229
<td className="text-nowrap">
230-
<UsersNameContainer userId={plagiarismSource} noAvatar noAutoload />
230+
<Icon icon="person-dots-from-line" className="text-muted" />
231231
</td>
232232
<td className="text-nowrap">
233+
<strong>
234+
<UsersNameContainer userId={plagiarismSource} noAvatar noAutoload />
235+
</strong>
236+
</td>
237+
<td className="text-nowrap text-muted small">
233238
<FormattedMessage
234239
id="app.solutionPlagiarisms.selectSourceTable.files"
235240
defaultMessage="{count} {count, plural, one {file} other {files}}"
@@ -238,19 +243,19 @@ class SolutionPlagiarisms extends Component {
238243
</td>
239244

240245
{plagiarisms[plagiarismSource].length === 0 ? (
241-
<td colSpan={2} className="text-nowrap">
246+
<td colSpan={2} className="text-nowrap text-muted small">
242247
{plagiarisms[plagiarismSource][0].similarity * 100} %
243248
</td>
244249
) : (
245250
<>
246-
<td className="text-nowrap">
251+
<td className="text-nowrap text-muted small">
247252
<FormattedMessage
248253
id="app.solutionPlagiarisms.selectSourceTable.max"
249254
defaultMessage="max"
250255
/>
251-
: {Math.max(plagiarisms[plagiarismSource].map(p => p.similarity)) * 100} %
256+
: {Math.max(...plagiarisms[plagiarismSource].map(p => p.similarity)) * 100} %
252257
</td>
253-
<td className="text-nowrap">
258+
<td className="text-nowrap text-muted small">
254259
<FormattedMessage
255260
id="app.solutionPlagiarisms.selectSourceTable.avg"
256261
defaultMessage="average"

0 commit comments

Comments
 (0)