Skip to content

Commit 361bd86

Browse files
author
Ben Lerner
committed
keep method public
1 parent 9a07f54 commit 361bd86

File tree

3 files changed

+28
-22
lines changed

3 files changed

+28
-22
lines changed

app/models/graders/sandbox_grader.rb

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -83,28 +83,8 @@ def to_s
8383
end
8484
end
8585

86-
protected
87-
88-
def get_grading_script(sub)
89-
JSON.load(File.open(self.upload.extracted_files.to_h {|v| [v[:path], v[:full_path]]}["grading_script.json"]))
90-
end
91-
92-
def generate_files_hash(sub)
93-
files = {
94-
submission: {
95-
url: sub.upload.url,
96-
mime_type: sub.upload.read_metadata[:mimetype],
97-
should_replace_paths: false
98-
},
99-
grader: {
100-
url: self.upload.url,
101-
mime_type: self.upload.read_metadata[:mimetype],
102-
should_replace_paths: false
103-
}
104-
}
105-
end
106-
107-
def postprocess_orca_response(grade, response)
86+
def postprocess_orca_response(grade, response)
87+
Audit.log("In SandboxGrader(#{self.id}).postprocess_orca_response(#{grade.id}, #{response.inspect})"
10888
sub = grade.submission
10989
prefix = "Assignment #{assignment.id}, submission #{sub.id}"
11090
if response['errors'].present?
@@ -163,13 +143,36 @@ def postprocess_orca_response(grade, response)
163143
InlineComment.import ics
164144
end
165145
when "plaintext"
146+
Audit.log("Not yet implemented: plaintext response for SandboxGrader(#{self.id}).postprocess_orca_response")
166147
end
167148
rescue Exception => e
168149
Audit.log("#{prefix}: #{self.response_type} error: #{e}")
169150
record_compile_error(sub, grade)
170151
end
171152
end
172153
end
154+
155+
protected
156+
157+
def get_grading_script(sub)
158+
JSON.load(File.open(self.upload.extracted_files.to_h {|v| [v[:path], v[:full_path]]}["grading_script.json"]))
159+
end
160+
161+
def generate_files_hash(sub)
162+
files = {
163+
submission: {
164+
url: sub.upload.url,
165+
mime_type: sub.upload.read_metadata[:mimetype],
166+
should_replace_paths: false
167+
},
168+
grader: {
169+
url: self.upload.url,
170+
mime_type: self.upload.read_metadata[:mimetype],
171+
should_replace_paths: false
172+
}
173+
}
174+
end
175+
173176

174177
def do_grading(assignment, sub)
175178
# Nothing to do, since Orca will handle it!

app/views/graders/_enable_orca.html.erb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<% if current_user.site_admin? %>
2+
<% if !local_assigns[:force_orca] %>
23
<tr class="form-group">
34
<td class="col-sm-4"><%= f.label "orca_status", "Use Orca? (Experimental: do not use yet!)" %></td>
45
<td><%= f.check_box :orca_status, checked: !!f.object.orca_status,
56
data: {toggle: "toggle", on: "Yes", off: "No"} %></td>
67
<td></td>
78
</tr>
9+
<% end %>
810
<% if f.object.orca_status %>
911
<tr>
1012
<td><strong>Orca Grader Build</strong></td>

app/views/graders/_sandbox_grader.html.erb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
</tr>
2424
<%= render "graders/grader_file_picker", f: f, id: f.object.id.to_s,
2525
label: "Grading file:", schema: "sandbox-schema" %>
26+
<%= render partial: "graders/enable_orca", locals: { f: f, force_orca: true } %>
2627
<!--
2728
<tr class="form-group">
2829
<td class="col-sm-2"><%= f.label "extra_upload_file", "Extra file:" %></td>

0 commit comments

Comments
 (0)