Skip to content
Snippets Groups Projects
Commit e8b6db9f authored by Bereczki Sandor's avatar Bereczki Sandor
Browse files

Description fix, Nickname change to Full Name

Fixed the issue with no File but with description. Now you will see the description with solutions sent with no file. The admins will see the full names at the solution details panel instead of the nicknames too.
parent 2aa542cd
No related branches found
No related tags found
No related merge requests found
...@@ -13,7 +13,7 @@ class CorrectSolutionForm extends Component { ...@@ -13,7 +13,7 @@ class CorrectSolutionForm extends Component {
render() { render() {
const { const {
studentName, studentFullName, studentId, taskTitle, taskSolutions, studentFullName, studentId, taskTitle, taskSolutions,
} = this.props; } = this.props;
const taskSolutionsProfile = const taskSolutionsProfile =
taskSolutions.filter(solution => solution.created_by === studentId); taskSolutions.filter(solution => solution.created_by === studentId);
...@@ -42,16 +42,19 @@ class CorrectSolutionForm extends Component { ...@@ -42,16 +42,19 @@ class CorrectSolutionForm extends Component {
style={{ marginRight: '1.5em', marginTop: '1.5em' }} style={{ marginRight: '1.5em', marginTop: '1.5em' }}
onClick={() => { this.setState({ showModal: true }); }} onClick={() => { this.setState({ showModal: true }); }}
> >
{studentName} {studentFullName}
</Button> </Button>
} }
> >
<Modal.Header> <Modal.Header>
A(z) {taskTitle} nevű feladat {studentName} által beadott megoldásának kijavítása: A(z) {taskTitle} nevű feladat {studentFullName} által beadott megoldásának kijavítása:
</Modal.Header> </Modal.Header>
<Modal.Content> <Modal.Content>
<Header as='h5'>A megoldás leírása:</Header> <Header as='h5'>A megoldás leírása:</Header>
{fileLink === null ? 'Nincs leírás.' : relevantDocument.description.split('\n')} {(relevantDocument === undefined || relevantDocument === null)
&& fileLink != null
? 'Nincs leírás.'
: relevantDocument.description.split('\n')}
<Header as='h5'>A beadott dokumentum:</Header> <Header as='h5'>A beadott dokumentum:</Header>
{fileLink === null ? {fileLink === null ?
<p>Nincs fájl.</p> : <p>Nincs fájl.</p> :
......
...@@ -57,7 +57,7 @@ class SolutionDetailsForm extends Component { ...@@ -57,7 +57,7 @@ class SolutionDetailsForm extends Component {
{noSubmitStudents.length === 0 ? {noSubmitStudents.length === 0 ?
emptyMessage(emptyStudentText) : emptyMessage(emptyStudentText) :
noSubmitStudents.map(student => ( noSubmitStudents.map(student => (
<Button color='blue' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.nick}</Button> <Button color='blue' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.full_name}</Button>
)) ))
} }
<Header as='h3'>Javításra vár (A névre kattintva kijavítható a megoldás):</Header> <Header as='h3'>Javításra vár (A névre kattintva kijavítható a megoldás):</Header>
...@@ -77,14 +77,14 @@ class SolutionDetailsForm extends Component { ...@@ -77,14 +77,14 @@ class SolutionDetailsForm extends Component {
{noAcceptStudents.length === 0 ? {noAcceptStudents.length === 0 ?
emptyMessage(emptyStudentText) : emptyMessage(emptyStudentText) :
noAcceptStudents.map(student => ( noAcceptStudents.map(student => (
<Button color='red' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.nick}</Button> <Button color='red' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.full_name}</Button>
)) ))
} }
<Header as='h3'>Elfogadva:</Header> <Header as='h3'>Elfogadva:</Header>
{acceptedStudents.length === 0 ? {acceptedStudents.length === 0 ?
emptyMessage(emptyStudentText) : emptyMessage(emptyStudentText) :
acceptedStudents.map(student => ( acceptedStudents.map(student => (
<Button color='green' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.nick}</Button> <Button color='green' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.full_name}</Button>
)) ))
} }
</Modal.Content> </Modal.Content>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment