From e8b6db9ffa3121a6bcd13099deb8131f28f044cc Mon Sep 17 00:00:00 2001
From: Bereczki Sandor <bsandor453@gmail.com>
Date: Wed, 30 Jan 2019 17:00:38 +0100
Subject: [PATCH] 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.
---
 src/components/forms/CorrectSolutionForm.js | 11 +++++++----
 src/components/forms/SolutionDetailsForm.js |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/components/forms/CorrectSolutionForm.js b/src/components/forms/CorrectSolutionForm.js
index d933300..341c4a3 100644
--- a/src/components/forms/CorrectSolutionForm.js
+++ b/src/components/forms/CorrectSolutionForm.js
@@ -13,7 +13,7 @@ class CorrectSolutionForm extends Component {
 
   render() {
     const {
-      studentName, studentFullName, studentId, taskTitle, taskSolutions,
+      studentFullName, studentId, taskTitle, taskSolutions,
     } = this.props;
     const taskSolutionsProfile =
     taskSolutions.filter(solution => solution.created_by === studentId);
@@ -42,16 +42,19 @@ class CorrectSolutionForm extends Component {
             style={{ marginRight: '1.5em', marginTop: '1.5em' }}
             onClick={() => { this.setState({ showModal: true }); }}
           >
-            {studentName}
+            {studentFullName}
           </Button>
         }
       >
         <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.Content>
           <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>
           {fileLink === null ?
             <p>Nincs fĂĄjl.</p> :
diff --git a/src/components/forms/SolutionDetailsForm.js b/src/components/forms/SolutionDetailsForm.js
index f56dc4d..e78054f 100644
--- a/src/components/forms/SolutionDetailsForm.js
+++ b/src/components/forms/SolutionDetailsForm.js
@@ -57,7 +57,7 @@ class SolutionDetailsForm extends Component {
           {noSubmitStudents.length === 0 ?
               emptyMessage(emptyStudentText) :
               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>
@@ -77,14 +77,14 @@ class SolutionDetailsForm extends Component {
           {noAcceptStudents.length === 0 ?
             emptyMessage(emptyStudentText) :
             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>
           {acceptedStudents.length === 0 ?
             emptyMessage(emptyStudentText) :
             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>
-- 
GitLab