Download as
Browse Code »

Commit 334c1ebd66b6b23483c73eafc6db04c194336aa5

Authored by Victor Costa
1 parent 62a74f33
Exists in staging and in 4 other branches captcha_serpro_plugin, login-captcha, production, production-vendorized

Filter processed tasks by who closes it

Showing 2 changed files with 11 additions and 3 deletions   Show diff stats
app/controllers/my_profile/tasks_controller.rb
  Diff comments   View file @334c1eb
@@ -22,6 +22,7 @@ class TasksController < MyProfileController @@ -22,6 +22,7 @@ class TasksController < MyProfileController
22 22
23 def processed 23 def processed
24 @filter_requestor = params[:filter_requestor].presence 24 @filter_requestor = params[:filter_requestor].presence
  25 + @filter_closed_by = params[:filter_closed_by].presence
25 @filter_type = params[:filter_type].presence 26 @filter_type = params[:filter_type].presence
26 @filter_text = params[:filter_text].presence 27 @filter_text = params[:filter_text].presence
27 @filter_status = params[:filter_status].presence 28 @filter_status = params[:filter_status].presence
@@ -30,12 +31,15 @@ class TasksController < MyProfileController @@ -30,12 +31,15 @@ class TasksController < MyProfileController
30 @filter_closed_from = Date.parse(params[:filter_closed_from]) unless params[:filter_closed_from].blank? 31 @filter_closed_from = Date.parse(params[:filter_closed_from]) unless params[:filter_closed_from].blank?
31 @filter_closed_until = Date.parse(params[:filter_closed_until]) unless params[:filter_closed_until].blank? 32 @filter_closed_until = Date.parse(params[:filter_closed_until]) unless params[:filter_closed_until].blank?
32 33
33 - @tasks = Task.to(profile).without_spam.closed.order('tasks.created_at DESC') 34 + @tasks = Task.to(profile).without_spam.closed.includes(:requestor, :closed_by).order('tasks.created_at DESC')
  35 +
34 @tasks = @tasks.of(@filter_type) 36 @tasks = @tasks.of(@filter_type)
35 @tasks = @tasks.where(:status => params[:filter_status]) unless @filter_status.blank? 37 @tasks = @tasks.where(:status => params[:filter_status]) unless @filter_status.blank?
36 @tasks = @tasks.where('tasks.created_at >= ?', @filter_created_from.beginning_of_day) unless @filter_created_from.blank? 38 @tasks = @tasks.where('tasks.created_at >= ?', @filter_created_from.beginning_of_day) unless @filter_created_from.blank?
37 @tasks = @tasks.where('tasks.created_at <= ?', @filter_created_until.end_of_day) unless @filter_created_until.blank? 39 @tasks = @tasks.where('tasks.created_at <= ?', @filter_created_until.end_of_day) unless @filter_created_until.blank?
38 - @tasks = @tasks.joins(:requestor).like('profiles.name', @filter_requestor) unless @filter_requestor.blank? 40 + @tasks = @tasks.like('profiles.name', @filter_requestor) unless @filter_requestor.blank?
  41 + @tasks = @tasks.like('closed_bies_tasks.name', @filter_closed_by) unless @filter_closed_by.blank?
  42 +
39 @tasks = @tasks.like('tasks.data', @filter_text) unless @filter_text.blank? 43 @tasks = @tasks.like('tasks.data', @filter_text) unless @filter_text.blank?
40 44
41 @tasks = @tasks.paginate(:per_page => Task.per_page, :page => params[:page]) 45 @tasks = @tasks.paginate(:per_page => Task.per_page, :page => params[:page])
app/views/tasks/processed.html.erb
  Diff comments   View file @334c1eb
@@ -16,7 +16,11 @@ @@ -16,7 +16,11 @@
16 16
17 <div> 17 <div>
18 <%= labelled_text_field(_('Text Filter:'), :filter_text, @filter_text) %> 18 <%= labelled_text_field(_('Text Filter:'), :filter_text, @filter_text) %>
19 - <%= labelled_text_field(_('Requestor Name:'), :filter_requestor, @filter_requestor) %> 19 + </div>
  20 +
  21 + <div>
  22 + <%= labelled_text_field(_('Requestor:'), :filter_requestor, @filter_requestor) %>
  23 + <%= labelled_text_field(_('Closed by:'), :filter_closed_by, @filter_closed_by) %>
20 </div> 24 </div>
21 25
22 <%= labelled_form_field(_('Creation date'), date_range_field(:filter_created_from, :filter_created_until, @filter_created_from, @filter_created_until, '%Y-%m-%d', { :change_month => true, :change_year => true, :date_format => 'yy-mm-dd' }, { :size => 14, :from_id => 'filter_created_from', :to_id => 'filter_created_until' })) %> 26 <%= labelled_form_field(_('Creation date'), date_range_field(:filter_created_from, :filter_created_until, @filter_created_from, @filter_created_until, '%Y-%m-%d', { :change_month => true, :change_year => true, :date_format => 'yy-mm-dd' }, { :size => 14, :from_id => 'filter_created_from', :to_id => 'filter_created_until' })) %>