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

fix report query update progress less often 

fixes CNVS-10286

test plan
 - run outcome results report
 - it should work

Change-Id: I8c32fa9302c5af8c3af3c6ce4a5b2c4a42809ffa
Reviewed-on: https://gerrit.instructure.com/28117
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
This commit is contained in:
Rob Orton 2014-01-05 21:59:47 -07:00
parent 75dba33a5d
commit d5ad89ed09
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vendor/plugins/account_reports/lib/canvas/account_reports/outcome_reports.rb vendored
View File

@ -139,7 +139,7 @@ module Canvas::AccountReports
row['submission date']=default_timezone_format(row['submission date'])
csv << headers.map { |h| row[h] }
if i % 5 == 0
if i % 100 == 0
Shackles.activate(:master) do
@account_report.update_attribute(:progress, (i.to_f/@total)*100)
end
@ -205,6 +205,7 @@ module Canvas::AccountReports
LEFT OUTER JOIN assignments a ON a.id = ct.content_id
AND ct.content_type = 'Assignment'
LEFT OUTER JOIN submissions subs ON subs.assignment_id = a.id
AND subs.user_id = u.id
LEFT OUTER JOIN quiz_submissions qs ON r.artifact_id = qs.id
AND r.artifact_type = 'QuizSubmission'
LEFT OUTER JOIN assessment_questions aq ON aq.id = r.associated_asset_id
@ -239,7 +240,7 @@ module Canvas::AccountReports
csv << headers.map { |h| row[h] }
if i % 5 == 0
if i % 100 == 0
Shackles.activate(:master) do
@account_report.update_attribute(:progress, (i.to_f/@total)*100)
end