ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added grade_matches_current_submission to submission api response 

fixes #4240

Change-Id: I3e6b6e0406f815fb50972bd606794116907ac848
Reviewed-on: https://gerrit.instructure.com/3033
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
This commit is contained in:
Mark Suman 2011-04-12 10:27:24 -06:00
parent def8e1dad9
commit 88242820c8
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/submissions_api_controller.rb
View File

@ -230,7 +230,7 @@ class SubmissionsApiController < ApplicationController
hash
end
SUBMISSION_JSON_FIELDS = %w(user_id url score grade attempt submission_type submitted_at body assignment_id)
SUBMISSION_JSON_FIELDS = %w(user_id url score grade attempt submission_type submitted_at body assignment_id grade_matches_current_submission)
def submission_attempt_json(attempt, assignment, version_idx = nil)
hash = attempt.as_json(

6
spec/apis/v1/submissions_api_spec.rb
View File

@ -150,6 +150,7 @@ describe SubmissionsApiController, :type => :integration do
"assignment_id" => a1.id,
"submitted_at"=>"1970-01-01T03:00:00Z",
"preview_url" => "http://www.example.com/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student1.id}?preview=1",
"grade_matches_current_submission"=>true,
"attachments" =>
[
{ "content-type" => "application/loser",
@ -170,6 +171,7 @@ describe SubmissionsApiController, :type => :integration do
"user_id"=>student1.id,
"comparison"=>nil,
"preview_url" => "http://www.example.com/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student1.id}?preview=1&version=0",
"grade_matches_current_submission"=>nil,
"score"=>nil},
{"grade"=>nil,
"assignment_id" => a1.id,
@ -186,6 +188,7 @@ describe SubmissionsApiController, :type => :integration do
"user_id"=>student1.id,
"comparison"=>nil,
"preview_url" => "http://www.example.com/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student1.id}?preview=1&version=1",
"grade_matches_current_submission"=>nil,
"score"=>nil},
{"grade"=>"A-",
"assignment_id" => a1.id,
@ -209,6 +212,7 @@ describe SubmissionsApiController, :type => :integration do
"user_id"=>student1.id,
"comparison"=>nil,
"preview_url" => "http://www.example.com/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student1.id}?preview=1&version=2",
"grade_matches_current_submission"=>true,
"score"=>13.5}],
"attempt"=>3,
"url"=>nil,
@ -234,6 +238,7 @@ describe SubmissionsApiController, :type => :integration do
"prior"=>nil,
"body"=>nil,
"preview_url" => "http://www.example.com/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student2.id}?preview=1",
"grade_matches_current_submission"=>true,
"submitted_at"=>"1970-01-01T04:00:00Z",
"submission_history"=>
[{"grade"=>"F",
@ -248,6 +253,7 @@ describe SubmissionsApiController, :type => :integration do
"user_id"=>student2.id,
"comparison"=>nil,
"preview_url" => "http://www.example.com/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student2.id}?preview=1&version=0",
"grade_matches_current_submission"=>true,
"attachments" =>
[{"content-type" => "image/png",
"display_name" => "snapshot.png",