Changeset [6679ed98681c3447c4f0aced61c33dda0d0069b6] by Shawn Balestracci
Revision 6679ed98681c3447c4f0aced61c33dda0d0069b6,
committed by Shawn Balestracci
· March 25th, 2012 @ 10:52 AM
Merge branch 'master' into 632_sld_enhancements
Conflicts:
app/models/intervention.rb
app/reports/student_interventions_report.rb
app/views/reports/intervention_definition_summary_report.html.erb
https://github.com/vegantech/sims/commit/6679ed98681c3447c4f0aced61...
10 changed files
-
A
app/views/layouts/pdf.html.erb -
A
app/views/reports/_student_interventions.html.erb -
A
app/views/reports/student_interventions.csv.erb -
R
app/reports/student_interventions_report.rb -
M
app/controllers/reports_controller.rb -
M
app/models/flag.rb -
M
app/models/intervention.rb -
M
app/views/reports/intervention_definition_summary_report.html.erb -
M
config/routes.rb -
M
spec/reports/student_interventions_report_spec.rb