added filter for task status

Ábner Silva de Oliveira
1 parent dbeeb306
Showing 3 changed files with 27 additions and 1 deletions Show diff stats
controllers/myprofile/proposals_discussion_plugin_tasks_controller.rb
lib/proposals_discussion_plugin/proposal_task.rb
views/proposals_discussion_plugin_tasks/index.html.erb
@@ -8,19 +8,33 @@ class ProposalsDiscussionPluginTasksController &lt; TasksController
     @filter_responsible = params[:filter_responsible]
     @filter_tags = params[:filter_tags]
+    @filter_status = params[:filter_status]
+
     @view_only = !current_person.has_permission?(:perform_task, profile) || params[:view_only]
     @task_tags = [OpenStruct.new(:name => _('All'), :id => nil) ] + Task.all_tags
     @task_types = Task.pending_types_for(profile)
+    # maps statuses which would be used in status filter
+    @task_statuses = ProposalsDiscussionPlugin::ProposalTask::Status.names.each_with_index.map { |x,i| OpenStruct.new(:id => i, :name =>x) }
+    @task_statuses.reject! {|status| [2,3,4].include? status.id}
+
+    # filter for evaluator profile
     if @view_only
       @tasks = Task.pending_all(profile, false, false).order_by('created_at', 'asc')
       @tasks = @tasks.where(:responsible_id => current_person.id)
     else
+      # filter for moderator
+      if @filter_status.present? && ! "0".eql?(@filter_status) && !["2","3","4"].include?(@filter_status)
+        @tasks = ProposalsDiscussionPlugin::ProposalTask.filter_by_status(profile, @filter_type, @filter_text, @filter_status ).order_by('created_at', 'asc')
+      else
+        @tasks =  ProposalsDiscussionPlugin::ProposalTask.pending_evaluated(profile, @filter_type, @filter_text).order_by('created_at', 'asc')
+      end
-      @tasks =  ProposalsDiscussionPlugin::ProposalTask.pending_evaluated(profile, @filter_type, @filter_text).order_by('created_at', 'asc')
       @tasks = @tasks.where(:responsible_id => @filter_responsible.to_i != -1 ? @filter_responsible : nil) if @filter_responsible.present?
+
       @tasks = @tasks.tagged_with(@filter_tags, any: true) if @filter_tags.present?
+
     end
     @tasks = @tasks.paginate(:per_page => Task.per_page, :page => params[:page])
@@ -20,6 +20,15 @@ class ProposalsDiscussionPlugin::ProposalTask &lt; Task
       .where(:status => ProposalsDiscussionPlugin::ProposalTask::Status.evaluated_statuses)
   }
+  scope :filter_by_status, lambda { |profile, filter_type, filter_text, status_id|
+    self
+        .to(profile)
+        .without_spam.pending
+        .of(filter_type)
+        .like('data', filter_text)
+        .where(:status => status_id)
+  }
+
   before_create do |task|
     if !task.target.nil?
       organization = task.target
@@ -36,6 +36,9 @@
         </p>
       <% end %>
       <p>
+        <%= labelled_select(_('Status')+': ', :filter_status, :id, :name, @filter_status, @task_statuses, {:id => 'filter-statuses'}) %>
+      </p>
+      <p>
         <%= labelled_select(_('Tags')+': ', :filter_tags, :id, :name, @filter_tags, @task_tags, {:id => 'filter-add-tag'}) %>
         <%= text_field_tag( :filter_tags, @filter_tags, :size => 36, :class => 'filter-tags' ) %>
       </p>
	@@ -20,6 +20,15 @@ class ProposalsDiscussionPlugin::ProposalTask < Task		@@ -20,6 +20,15 @@ class ProposalsDiscussionPlugin::ProposalTask < Task
20	.where(:status => ProposalsDiscussionPlugin::ProposalTask::Status.evaluated_statuses)	20	.where(:status => ProposalsDiscussionPlugin::ProposalTask::Status.evaluated_statuses)
21	}	21	}
22		22
		23	+ scope :filter_by_status, lambda { \|profile, filter_type, filter_text, status_id\|
		24	+ self
		25	+ .to(profile)
		26	+ .without_spam.pending
		27	+ .of(filter_type)
		28	+ .like('data', filter_text)
		29	+ .where(:status => status_id)
		30	+ }
		31	+
23	before_create do \|task\|	32	before_create do \|task\|
24	if !task.target.nil?	33	if !task.target.nil?
25	organization = task.target	34	organization = task.target