Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
zesje
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Works on my machine
zesje
Commits
198f4670
Commit
198f4670
authored
5 years ago
by
Hidde Leistra
Browse files
Options
Downloads
Patches
Plain Diff
Move feedback options in exam view inside panel-block
parent
ff5d7c59
Branches
test/add-api-tests
Branches containing commit
No related tags found
3 merge requests
!26
Premade feedback merge
,
!24
Master->develop (this MR contains no useful information)
,
!23
WIP: Highlight feedback
Pipeline
#18104
passed
5 years ago
Stage: build
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
client/views/Exam.jsx
+14
-9
14 additions, 9 deletions
client/views/Exam.jsx
with
14 additions
and
9 deletions
client/views/Exam.jsx
+
14
−
9
View file @
198f4670
...
...
@@ -347,19 +347,24 @@ class Exams extends React.Component {
props
.
saveProblemName
(
e
.
target
.
value
)
}
}
/>
</
div
>
<
br
/>
{
!
this
.
state
.
editActive
&&
<
label
className
=
'label'
>
Feedback options
</
label
>
}
</
React
.
Fragment
>
)
}
</
div
>
</
div
>
{
this
.
isProblemWidget
(
selectedWidgetId
)
&&
(
this
.
state
.
editActive
?
<
EditPanel
problemID
=
{
props
.
problem
.
id
}
feedback
=
{
this
.
state
.
feedbackToEdit
}
goBack
=
{
this
.
backToFeedback
}
updateCallback
=
{
this
.
updateFeedback
}
/>
:
<
FeedbackPanel
examID
=
{
this
.
props
.
examID
}
problem
=
{
props
.
problem
}
editFeedback
=
{
this
.
editFeedback
}
showTooltips
=
{
this
.
state
.
showTooltips
}
grading
=
{
false
}
/>)
}
{
this
.
isProblemWidget
(
selectedWidgetId
)
&&
<
React
.
Fragment
>
<
div
className
=
'panel-block'
>
{
!
this
.
state
.
editActive
&&
<
label
className
=
'label'
>
Feedback options
</
label
>
}
</
div
>
{
this
.
state
.
editActive
?
<
EditPanel
problemID
=
{
props
.
problem
.
id
}
feedback
=
{
this
.
state
.
feedbackToEdit
}
goBack
=
{
this
.
backToFeedback
}
updateCallback
=
{
this
.
updateFeedback
}
/>
:
<
FeedbackPanel
examID
=
{
this
.
props
.
examID
}
problem
=
{
props
.
problem
}
editFeedback
=
{
this
.
editFeedback
}
showTooltips
=
{
this
.
state
.
showTooltips
}
grading
=
{
false
}
/>
}
</
React
.
Fragment
>
}
<
div
className
=
'panel-block'
>
<
button
disabled
=
{
props
.
disabledDelete
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment