Skip to content
This repository has been archived by the owner on Jan 7, 2025. It is now read-only.

Grader feedback fix #72

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Grader feedback fix #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7962f0d
added ip to settings file
Searay-330 Jun 9, 2020
042b6b5
graded by in feedback for autograded assignments now report the corre…
Searay-330 Jun 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/models/submission.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ def save_additional_form_fields(params)
if assessment.is_section_dependant
form_hash["section"] = (assessment.lecture?) ? course_user_datum.lecture : course_user_datum.section
end
form_hash["ip"] = self.submitter_ip
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is part of a separate change that has been merged - it should not be included here

self.settings = form_hash.to_json
self.save!
end
Expand Down
2 changes: 1 addition & 1 deletion app/views/assessments/viewFeedback.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<%= @score.feedback %>
Score for this problem: <%= @score.score.to_f().round(1) %>

Graded by: <%= if @score.grader && @score.grader.user then @score.grader.user.email end %>
Graded by: <%= if @score.grader && @score.grader.user then @score.grader.user.email elsif @assessment.has_autograder? then "Autograder" end %>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are other places this needs to be resolved as well - for example:

Autolab/app/views/scores/_score.html.erb

Line 10 in c7cb238

Graded by: <%= if @score.grader then @score.grader.email end %>

Autolab/app/views/scores/show.html.erb

Line 10 in c7cb238

Graded by: <%= if @score.grader then @score.grader.email end %>

</pre>

<!--
Expand Down