- <% graded = subs.select{|s| s.graded? }.length %>
+ <% graded = subs.select(&:graded?).length # this includes resubmissions that were previously graded %>
+ <% resubmitted = subs.select(&:needs_regrading?).length %>
<% submitted = subs.length %>
<%= graded %> out of <%= submitted %> Submission<%= graded == 1 ? "" : "s" %> Graded
+ <% if resubmitted > 0 %>
+
<%= pluralize(resubmitted, "Ungraded Re-submission") %>
+ <% end %>
<% end %>
-
+
<%= (assignment.try_rescue(:due_at).try_rescue(:to_i) || "0") %>
<%= assignment.try_rescue(:submission_types) || nbsp %>
<%= assignment.try_rescue(:due_at).try_rescue(:strftime, "%m/%d/%Y") || nbsp %>
diff --git a/app/views/shared/_menu_assignment.html.erb b/app/views/shared/_menu_assignment.html.erb
index 27e79a51b68..8600e22f3d0 100644
--- a/app/views/shared/_menu_assignment.html.erb
+++ b/app/views/shared/_menu_assignment.html.erb
@@ -9,7 +9,7 @@
<% if title == "To Turn In" %>
due: <%= datetime_string(menu_assignment.due_at, :due_date, nil, true) %>
<% elsif title == "Needing Grading" %>
- <%= menu_assignment.need_graded_count %> need<%= 's' if menu_assignment.need_graded_count.to_i == 1 %> grading
+ <%= menu_assignment.needs_grading_count %> need<%= 's' if menu_assignment.needs_grading_count.to_i == 1 %> grading
<% elsif title == "Recently Graded" %>
<% if menu_assignment.grading_type == 'points' %>
<%= "#{menu_assignment.score}/#{menu_assignment.points_possible}" %>
diff --git a/config/initializers/active_record.rb b/config/initializers/active_record.rb
index 0898351cef1..f49bd4713cb 100644
--- a/config/initializers/active_record.rb
+++ b/config/initializers/active_record.rb
@@ -315,4 +315,31 @@ ActiveRecord::Associations::AssociationCollection.class_eval do
end
end
alias_method_chain :method_missing, :splat_fix
+end
+
+# See https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/66-true-false-conditions-broken-for-sqlite#ticket-66-9
+# The default 't' and 'f' are no good, since sqlite treats them both as 0 in boolean logic.
+# This patch makes it so you can do stuff like:
+# :conditions => "active"
+# instead of having to do:
+# :conditions => ["active = ?", true]
+if defined?(ActiveRecord::ConnectionAdapters::SQLiteAdapter)
+ ActiveRecord::ConnectionAdapters::SQLiteAdapter.class_eval do
+ def quoted_true
+ '1'
+ end
+ def quoted_false
+ '0'
+ end
+ end
+end
+
+if defined?(ActiveRecord::ConnectionAdapters::MysqlAdapter)
+ ActiveRecord::ConnectionAdapters::MysqlAdapter.class_eval do
+ def configure_connection_with_pg_compat
+ configure_connection_without_pg_compat
+ execute "SET SESSION SQL_MODE='PIPES_AS_CONCAT'"
+ end
+ alias_method_chain :configure_connection, :pg_compat
+ end
end
\ No newline at end of file
diff --git a/db/migrate/20110307163027_add_ungraded_count_to_assignments.rb b/db/migrate/20110307163027_add_ungraded_count_to_assignments.rb
new file mode 100644
index 00000000000..02837643557
--- /dev/null
+++ b/db/migrate/20110307163027_add_ungraded_count_to_assignments.rb
@@ -0,0 +1,25 @@
+class AddUngradedCountToAssignments < ActiveRecord::Migration
+ def self.up
+ add_column :assignments, :needs_grading_count, :integer, :default => 0
+
+ execute <<-SQL
+ UPDATE assignments SET needs_grading_count = COALESCE((
+ SELECT COUNT(*)
+ FROM submissions s
+ INNER JOIN enrollments e ON e.user_id = s.user_id AND e.workflow_state = 'active'
+ WHERE s.assignment_id = assignments.id
+ AND e.course_id = assignments.context_id
+ AND (s.score IS NULL
+ OR NOT grade_matches_current_submission
+ OR s.workflow_state = 'submitted'
+ OR s.workflow_state = 'pending_review'
+ )
+ AND s.submission_type IS NOT NULL
+ ), 0)
+ SQL
+ end
+
+ def self.down
+ remove_column :assignments, :needs_grading_count
+ end
+end
diff --git a/db/migrate/20110321234519_ungraded_count_triggers.rb b/db/migrate/20110321234519_ungraded_count_triggers.rb
new file mode 100644
index 00000000000..18bf2ed61d4
--- /dev/null
+++ b/db/migrate/20110321234519_ungraded_count_triggers.rb
@@ -0,0 +1,56 @@
+# This migration was auto-generated via `rake db:generate_trigger_migration'.
+# While you can edit this file, any changes you make to the definitions here
+# will be undone by the next auto-generated trigger migration.
+
+class UngradedCountTriggers < ActiveRecord::Migration
+ def self.up
+ create_trigger("enrollments_after_insert_row_when_new_workflow_state_active__tr", :generated => true).
+ on("enrollments").
+ after(:insert).
+ where("NEW.workflow_state = 'active'") do
+ <<-SQL_ACTIONS
+ UPDATE assignments
+ SET needs_grading_count = needs_grading_count + 1
+ WHERE id IN (SELECT assignment_id
+ FROM submissions
+ WHERE user_id = NEW.user_id
+ AND context_code = 'course_' || NEW.course_id
+ AND ( submissions.submission_type IS NOT NULL AND ( submissions.score IS NULL OR NOT submissions.grade_matches_current_submission OR submissions.workflow_state IN ('submitted', 'pending_review') ) )
+ );
+ SQL_ACTIONS
+ end
+ create_trigger("enrollments_after_update_row_when_new_workflow_state_old_wor_tr", :generated => true).
+ on("enrollments").
+ after(:update).
+ where("NEW.workflow_state <> OLD.workflow_state AND (NEW.workflow_state = 'active' OR OLD.workflow_state = 'active')") do
+ <<-SQL_ACTIONS
+ UPDATE assignments
+ SET needs_grading_count = needs_grading_count + CASE WHEN NEW.workflow_state = 'active' THEN 1 ELSE -1 END
+ WHERE id IN (SELECT assignment_id
+ FROM submissions
+ WHERE user_id = NEW.user_id
+ AND context_code = 'course_' || NEW.course_id
+ AND ( submissions.submission_type IS NOT NULL AND ( submissions.score IS NULL OR NOT submissions.grade_matches_current_submission OR submissions.workflow_state IN ('submitted', 'pending_review') ) )
+ );
+ SQL_ACTIONS
+ end
+ create_trigger("submissions_after_update_row_tr", :generated => true).
+ on("submissions").
+ after(:update) do |t|
+ t.where("( OLD.submission_type IS NOT NULL AND ( OLD.score IS NULL OR NOT OLD.grade_matches_current_submission OR OLD.workflow_state IN ('submitted', 'pending_review') ) ) <> ( NEW.submission_type IS NOT NULL AND ( NEW.score IS NULL OR NOT NEW.grade_matches_current_submission OR NEW.workflow_state IN ('submitted', 'pending_review') ) )") do
+ <<-SQL_ACTIONS
+ UPDATE assignments
+ SET needs_grading_count = needs_grading_count + CASE WHEN ( NEW.submission_type IS NOT NULL AND ( NEW.score IS NULL OR NOT NEW.grade_matches_current_submission OR NEW.workflow_state IN ('submitted', 'pending_review') ) ) THEN 1 ELSE -1 END
+ WHERE id = NEW.assignment_id;
+ SQL_ACTIONS
+ end
+ end
+ end
+
+ def self.down
+ drop_trigger("enrollments_after_insert_row_when_new_workflow_state_active__tr", "enrollments", :generated => true)
+ drop_trigger("enrollments_after_update_row_when_new_workflow_state_old_wor_tr", "enrollments", :generated => true)
+ drop_trigger("submissions_after_update_row_tr", "submissions", :generated => true)
+ drop_trigger("submissions_after_update_row_when_old_submission_type_is_not_tr", "submissions", :generated => true)
+ end
+end
diff --git a/lib/tasks/hair_trigger.rake b/lib/tasks/hair_trigger.rake
new file mode 100644
index 00000000000..9296790b76b
--- /dev/null
+++ b/lib/tasks/hair_trigger.rake
@@ -0,0 +1,2 @@
+$VERBOSE = nil
+Dir["#{Gem.searcher.find('hair_trigger').full_gem_path}/lib/tasks/*.rake"].each { |ext| load ext }
diff --git a/spec/integration/hair_trigger_spec.rb b/spec/integration/hair_trigger_spec.rb
new file mode 100644
index 00000000000..f117410d8d3
--- /dev/null
+++ b/spec/integration/hair_trigger_spec.rb
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2011 Instructure, Inc.
+#
+# This file is part of Canvas.
+#
+# Canvas is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the Free
+# Software Foundation, version 3 of the License.
+#
+# Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along
+# with this program. If not, see .
+#
+
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "hair_trigger" do
+ describe "migrations" do
+ it "should be current for all models" do
+ HairTrigger::migrations_current?.should be_true
+ end
+ end
+end
\ No newline at end of file
diff --git a/spec/models/assignment_spec.rb b/spec/models/assignment_spec.rb
index 36b41625975..93d18e8ed52 100644
--- a/spec/models/assignment_spec.rb
+++ b/spec/models/assignment_spec.rb
@@ -50,6 +50,27 @@ describe Assignment do
@submission.score.should eql(10.0)
@submission.user_id.should eql(@user.id)
end
+
+ it "should update needs_grading_count when submissions transition state" do
+ setup_assignment_with_homework
+ @assignment.needs_grading_count.should eql(1)
+ @assignment.grade_student(@user, :grade => "0")
+ @assignment.reload
+ @assignment.needs_grading_count.should eql(0)
+ end
+
+ it "should update needs_grading_count when enrollment changes" do
+ setup_assignment_with_homework
+ @assignment.needs_grading_count.should eql(1)
+ @course.enrollments.find_by_user_id(@user.id).destroy
+ @assignment.reload
+ @assignment.needs_grading_count.should eql(0)
+ e = @course.enroll_student(@user)
+ e.invite
+ e.accept
+ @assignment.reload
+ @assignment.needs_grading_count.should eql(1)
+ end
it "should not override the grade if the assignment has no points possible" do
setup_assignment_without_submission
@@ -910,12 +931,14 @@ def setup_assignment_without_submission
# Established course too, as a context
assignment_model
user_model
- @course.enroll_student(@user)
+ e = @course.enroll_student(@user)
+ e.invite
+ e.accept
end
def setup_assignment_with_homework
setup_assignment_without_submission
- res = @assignment.submit_homework(@user)
+ res = @assignment.submit_homework(@user, {:submission_type => 'online_text_entry'})
res.should_not be_nil
res.should be_is_a(Submission)
@assignment.reload