Download as
Browse Code »

Commit c0bd7efb179bc38b69ed85eb4a73aa69d57d3ea5

Authored by Victor Costa
2 parents e2cc01db e92fc4ac
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'processed_tasks' into production

Showing 2 changed files with 8 additions and 1 deletions   Show diff stats
app/controllers/my_profile/tasks_controller.rb
  Diff comments   View file @c0bd7ef
@@ -28,6 +28,7 @@ class TasksController < MyProfileController @@ -28,6 +28,7 @@ class TasksController < MyProfileController
28 28
29 def processed 29 def processed
30 @filter_requestor = params[:filter_requestor].presence 30 @filter_requestor = params[:filter_requestor].presence
  31 + @filter_closed_by = params[:filter_closed_by].presence
31 @filter_type = params[:filter_type].presence 32 @filter_type = params[:filter_type].presence
32 @filter_text = params[:filter_text].presence 33 @filter_text = params[:filter_text].presence
33 @filter_status = params[:filter_status].presence 34 @filter_status = params[:filter_status].presence
@@ -42,6 +43,8 @@ class TasksController < MyProfileController @@ -42,6 +43,8 @@ class TasksController < MyProfileController
42 @tasks = @tasks.where('tasks.created_at >= ?', @filter_created_from.beginning_of_day) unless @filter_created_from.blank? 43 @tasks = @tasks.where('tasks.created_at >= ?', @filter_created_from.beginning_of_day) unless @filter_created_from.blank?
43 @tasks = @tasks.where('tasks.created_at <= ?', @filter_created_until.end_of_day) unless @filter_created_until.blank? 44 @tasks = @tasks.where('tasks.created_at <= ?', @filter_created_until.end_of_day) unless @filter_created_until.blank?
44 @tasks = @tasks.joins(:requestor).like('profiles.name', @filter_requestor) unless @filter_requestor.blank? 45 @tasks = @tasks.joins(:requestor).like('profiles.name', @filter_requestor) unless @filter_requestor.blank?
  46 + @tasks = @tasks.joins(:closed_by).like('closed_bies_tasks.name', @filter_closed_by) unless @filter_closed_by.blank?
  47 +
45 @tasks = @tasks.like('tasks.data', @filter_text) unless @filter_text.blank? 48 @tasks = @tasks.like('tasks.data', @filter_text) unless @filter_text.blank?
46 49
47 @tasks = @tasks.paginate(:per_page => Task.per_page, :page => params[:page]) 50 @tasks = @tasks.paginate(:per_page => Task.per_page, :page => params[:page])
app/views/tasks/processed.html.erb
  Diff comments   View file @c0bd7ef
@@ -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' })) %>