#8: remove withdrawn proposals from proposal count for reviewers

NYCrb · Dec 9, 2015 · bed416c · bed416c
1 parent 42d9b5d
commit bed416c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/app/decorators/event_decorator.rb b/app/decorators/event_decorator.rb
@@ -3,7 +3,7 @@ class EventDecorator < ApplicationDecorator
 
   def proposals_rated_message
     rated_count = h.current_user.ratings.for_event(object).size
-    proposals_count = object.proposals.size
+    proposals_count = object.proposals.not_withdrawn.size
 
     message = "#{rated_count}/#{proposals_count}"
 

diff --git a/app/models/event.rb b/app/models/event.rb
@@ -23,6 +23,7 @@ class Event < ActiveRecord::Base
 
   scope :recent, -> { order('name ASC') }
   scope :live, -> { where("state = 'open' and (closes_at is null or closes_at > ?)", Time.current).order('closes_at ASC') }
+  scope :not_withdrawn, -> {where.not(event.proposal(state: WITHDRAWN))}
 
   validates :name, :contact_email, presence: true
   validates :slug, presence: true, uniqueness: true

diff --git a/app/views/reviewer/proposals/index.html.haml b/app/views/reviewer/proposals/index.html.haml
@@ -10,7 +10,7 @@
           %dt Proposals Rated:
           %dd= event.proposals_rated_message
           %dt Unrated Proposals:
-          %dd= event.proposals.unrated.count
+          %dd= event.proposals.unrated.not_withdrawn.count
   .row
     .col-md-10
       %small <em>Hint:</em> Hold <kbd>shift</kbd> and click sorting arrows to sort by multiple columns