From bf1060fa86f374df3224ef8808c9e3d3e972edc3 Mon Sep 17 00:00:00 2001
From: Roosted7 <thomasroos@live.nl>
Date: Tue, 1 May 2018 16:59:59 +0200
Subject: [PATCH] Make feedbackoption ticks and remarks display actual data
---
client/views/Grade.jsx | 2 +-
client/views/grade/FeedbackBlock.jsx | 4 +++-
client/views/grade/FeedbackPanel.jsx | 17 ++++-------------
3 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/client/views/Grade.jsx b/client/views/Grade.jsx
index 3576b8a6c..cd62fcb6c 100644
--- a/client/views/Grade.jsx
+++ b/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>
diff --git a/client/views/grade/FeedbackBlock.jsx b/client/views/grade/FeedbackBlock.jsx
index c59bcb3b8..a7d4a9833 100644
--- a/client/views/grade/FeedbackBlock.jsx
+++ b/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}
diff --git a/client/views/grade/FeedbackPanel.jsx b/client/views/grade/FeedbackPanel.jsx
index 79fd556e3..04c9ceb5a 100644
--- a/client/views/grade/FeedbackPanel.jsx
+++ b/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>
)
--
GitLab