Make feedbackoption ticks and remarks display actual data

client/views/Grade.jsx

@@ -124,7 +124,7 @@ class Grade extends React.Component {
                                 {this.state.editActive ?
                                     <EditPanel problem={this.props.exam.problems[this.state.pIndex]} editFeedback={this.state.editFeedback} toggleEdit={this.toggleEdit}/>
                                     :
-                                    <FeedbackPanel problem={this.props.exam.problems[this.state.pIndex]} solution={this.props.exam.submissions[this.state.sIndex]}
+                                    <FeedbackPanel problem={this.props.exam.problems[this.state.pIndex]} solution={this.props.exam.submissions[this.state.sIndex].problems[this.state.pIndex]}
                                         toggleEdit={this.toggleEdit} />
                                 }
                             </div>

client/views/grade/FeedbackBlock.jsx

@@ -33,10 +33,12 @@ class FeedbackBlock extends React.Component {
     render() {
         const score = this.props.feedback.score;
 
+        console.log(this.props.checked);
+
         return (
             <a className="panel-block is-active" onClick={this.toggle} >
                 <span className="panel-icon">
-                    <i className={"fa fa-" + (this.state.checked ? "check-square-o" : "square-o")}></i>
+                    <i className={"fa fa-" + (this.props.checked ? "check-square-o" : "square-o")}></i>
                 </span>
                 <span style={{ width: '80%' }}>
                     {this.props.feedback.name}

client/views/grade/FeedbackPanel.jsx

@@ -18,14 +18,11 @@ class FeedbackPanel extends React.Component {
                     Feedback
                 </p>
                 {this.props.problem.feedback.map((feedback, i) =>
-                    <FeedbackBlock key={feedback.id} feedback={feedback} checked={false} onClick={this.props.editFeedback} />
+                    <FeedbackBlock key={feedback.id} feedback={feedback} checked={this.props.solution.feedback.includes(feedback.id)} onClick={this.props.editFeedback} />
                 )}
-                {this.state.remarkActive ?
-                    <div className="panel-block">
-                        <textarea className="textarea" rows="2" placeholder="remark" />
-                    </div>
-                    : null
-                }
+                <div className="panel-block">
+                    <textarea className="textarea" rows="2" placeholder="remark" />
+                </div>
                 <div className="panel-block">
                     <button className="button is-link is-outlined is-fullwidth" onClick={this.props.toggleEdit}>
                         <span className="icon is-small">
@@ -33,12 +30,6 @@ class FeedbackPanel extends React.Component {
                         </span>
                         <span>option</span>
                     </button>
-                    <button className="button is-link is-outlined is-fullwidth" onClick={this.addRemark}>
-                        <span className="icon is-small">
-                            <i className="fa fa-plus"></i>
-                        </span>
-                        <span>remark</span>
-                    </button>
                 </div>
             </nav>
         )