added more filters options to choices_controller

Ábner Silva de Oliveira
1 parent 1b00d7f2
Showing 4 changed files with 64 additions and 11 deletions Show diff stats
app/controllers/choices_controller.rb
app/controllers/visitors_controller.rb
app/models/choice.rb
app/models/vote.rb
@@ -11,28 +11,50 @@ class ChoicesController &lt; InheritedResources::Base
       @question = current_user.questions.find(params[:question_id])
       find_options = {:conditions => {:question_id => @question.id},
-		      :limit => params[:limit].to_i, 
-		      :order => 'score DESC'
-		      }
+        :limit => params[:limit].to_i, 
+        :order => 'score DESC'
+      }
       find_options[:conditions].merge!(:active => true) unless params[:include_inactive]
+
+      if(params[:ignore_flagged])
+        find_options.merge({ :include => :flags })
+        find_options[:conditions].merge!({:flags => {:id => nil}})
+      end
+
       find_options.merge!(:offset => params[:offset]) if params[:offset]
       @choices = Choice.find(:all, find_options)
     else
-      @question = current_user.questions.find(params[:question_id], :include => :choices) #eagerloads ALL choices
-      unless params[:include_inactive]
-        @choices = @question.choices(true).active.find(:all)
+      @question = current_user.questions.find(params[:question_id]) #eagerloads ALL choices
+
+      if params[:inactive_ignore_flagged]
+        @choices = @question.choices(true).inactive_ignore_flagged.find(:all)
+      elsif params[:inactive]
+        @choices = @question.choices(true).inactive.find(:all)
       else
-        @choices = @question.choices.find(:all)
+        unless params[:include_inactive]
+          @choices = @question.choices(true).active.find(:all)
+        else
+          @choices = @question.choices.find(:all)
+        end
       end
     end
     index! do |format|
-      format.xml { render :xml => @choices.to_xml(:only => [ :data, :score, :id, :active, :created_at, :wins, :losses], :methods => :user_created)}
+      format.xml { render :xml => @choices.to_xml(:only => [ :data, :score, :id, :active, :created_at, :wins, :losses], :methods => [:user_created, :creator_identifier])}
     end
   end
+
+  # method added to provide more choices search options and
+  # provide better tool for manage the suggestions users provided
+  def search
+      @choices = Choice.search(params)
+      index! do |format|
+        format.xml { render :xml => @choices.to_xml(:only => [ :data, :score, :id, :active, :created_at, :wins, :losses], :methods => [:user_created, :creator_identifier])}
+      end
+  end
   def votes
     @choice = Choice.find(params[:id])
+require 'will_paginate/array'
+
 class VisitorsController < InheritedResources::Base
         respond_to :xml, :json
 	before_filter :authenticate
   actions :index
   def index
-    cond = params[:question_id] ? "question_id = #{params[:question_id]}" : nil
-
+    cond = nil
+    if params[:question_id]
+      Question.find(params[:question_id])
+      cond = "question_id = #{params[:question_id]}"
+    end
     counts = {}
     if params[:votes_count]
       counts[:votes_count] = Vote.count(:conditions => cond, :group => "voter_id")
@@ -41,7 +46,15 @@ class VisitorsController &lt; InheritedResources::Base
     counts.each_pair do |attr,values|
       @visitors.each{ |v| v[attr] = values[v.id] || 0 }
     end
+
+    if(params[:page])
+       @visitors = WillPaginate::Collection.create(params[:page], params[:page_size] || 10, @visitors.length) do |pager|
+        result = @visitors.slice(pager.offset, pager.per_page)
+        result ? pager.replace(result) : nil
+      end
+    end
+
     index!
   end
@@ -22,6 +22,7 @@ class Choice &lt; ActiveRecord::Base
   has_many :skips_on_the_right, :through => :prompts_on_the_right, :source => :skips
   named_scope :active, :conditions => { :active => true }
   named_scope :inactive, :conditions => { :active => false}
+  named_scope :inactive_ignore_flagged, :include => :flags, :conditions => {:active => false, :flags => {:id => nil}}
   named_scope :not_created_by, lambda { |creator_id|
     { :conditions => ["creator_id <> ?", creator_id] }
   }
@@ -81,6 +82,10 @@ class Choice &lt; ActiveRecord::Base
     self.creator_id != self.question.creator_id
   end
+  def creator_identifier
+     self.creator.identifier
+  end
+
   def compute_bt_score(btprobs = nil)
       if btprobs.nil?
 	      btprobs = self.question.bradley_terry_probs
@@ -111,6 +116,18 @@ class Choice &lt; ActiveRecord::Base
     self.save!
   end
+  def self.search(params)
+    question = current_user.questions.find(params[:question_id])
+    
+    if params[:limit]
+    end
+
+    if params[:scope] #:active, :inactive, :ignore_flagged
+    end
+
+    #if params[:]
+  end
+
   protected
+require 'will_paginate'
 class Vote < ActiveRecord::Base
 #  belongs_to :voteable, :polymorphic => true, :counter_cache => true
   validates_presence_of :question
@@ -19,7 +20,7 @@ class Vote &lt; ActiveRecord::Base
   named_scope :active, :include => :choice, :conditions => { 'choices.active' => true }
   named_scope :active_loser, :include => :loser_choice, :conditions => { 'choices.active' => true }
-  default_scope :conditions => "#{table_name}.valid_record = 1"
+  default_scope :conditions => {"valid_record"  => true }
   serialize :tracking
	@@ -22,6 +22,7 @@ class Choice < ActiveRecord::Base		@@ -22,6 +22,7 @@ class Choice < ActiveRecord::Base
22	has_many :skips_on_the_right, :through => :prompts_on_the_right, :source => :skips	22	has_many :skips_on_the_right, :through => :prompts_on_the_right, :source => :skips
23	named_scope :active, :conditions => { :active => true }	23	named_scope :active, :conditions => { :active => true }
24	named_scope :inactive, :conditions => { :active => false}	24	named_scope :inactive, :conditions => { :active => false}
		25	+ named_scope :inactive_ignore_flagged, :include => :flags, :conditions => {:active => false, :flags => {:id => nil}}
25	named_scope :not_created_by, lambda { \|creator_id\|	26	named_scope :not_created_by, lambda { \|creator_id\|
26	{ :conditions => ["creator_id <> ?", creator_id] }	27	{ :conditions => ["creator_id <> ?", creator_id] }
27	}	28	}
	@@ -81,6 +82,10 @@ class Choice < ActiveRecord::Base		@@ -81,6 +82,10 @@ class Choice < ActiveRecord::Base
81	self.creator_id != self.question.creator_id	82	self.creator_id != self.question.creator_id
82	end	83	end
83		84
		85	+ def creator_identifier
		86	+ self.creator.identifier
		87	+ end
		88	+
84	def compute_bt_score(btprobs = nil)	89	def compute_bt_score(btprobs = nil)
85	if btprobs.nil?	90	if btprobs.nil?
86	btprobs = self.question.bradley_terry_probs	91	btprobs = self.question.bradley_terry_probs
	@@ -111,6 +116,18 @@ class Choice < ActiveRecord::Base		@@ -111,6 +116,18 @@ class Choice < ActiveRecord::Base
111	self.save!	116	self.save!
112	end	117	end
113		118
		119	+ def self.search(params)
		120	+ question = current_user.questions.find(params[:question_id])
		121	+
		122	+ if params[:limit]
		123	+ end
		124	+
		125	+ if params[:scope] #:active, :inactive, :ignore_flagged
		126	+ end
		127	+
		128	+ #if params[:]
		129	+ end
		130	+
114	protected	131	protected
115		132
116		133