Commit 0abe320c24f80e6fa07d5568387b8a4d42451d0c
1 parent
334c1ebd
Exists in
theme-brasil-digital-from-staging
and in
9 other branches
Refactor processed task filter
Showing
3 changed files
with
58 additions
and
28 deletions
Show diff stats
app/controllers/my_profile/tasks_controller.rb
| @@ -21,29 +21,10 @@ class TasksController < MyProfileController | @@ -21,29 +21,10 @@ class TasksController < MyProfileController | ||
| 21 | end | 21 | end |
| 22 | 22 | ||
| 23 | def processed | 23 | def processed |
| 24 | - @filter_requestor = params[:filter_requestor].presence | ||
| 25 | - @filter_closed_by = params[:filter_closed_by].presence | ||
| 26 | - @filter_type = params[:filter_type].presence | ||
| 27 | - @filter_text = params[:filter_text].presence | ||
| 28 | - @filter_status = params[:filter_status].presence | ||
| 29 | - @filter_created_from = Date.parse(params[:filter_created_from]) unless params[:filter_created_from].blank? | ||
| 30 | - @filter_created_until = Date.parse(params[:filter_created_until]) unless params[:filter_created_until].blank? | ||
| 31 | - @filter_closed_from = Date.parse(params[:filter_closed_from]) unless params[:filter_closed_from].blank? | ||
| 32 | - @filter_closed_until = Date.parse(params[:filter_closed_until]) unless params[:filter_closed_until].blank? | ||
| 33 | - | ||
| 34 | @tasks = Task.to(profile).without_spam.closed.includes(:requestor, :closed_by).order('tasks.created_at DESC') | 24 | @tasks = Task.to(profile).without_spam.closed.includes(:requestor, :closed_by).order('tasks.created_at DESC') |
| 35 | - | ||
| 36 | - @tasks = @tasks.of(@filter_type) | ||
| 37 | - @tasks = @tasks.where(:status => params[:filter_status]) unless @filter_status.blank? | ||
| 38 | - @tasks = @tasks.where('tasks.created_at >= ?', @filter_created_from.beginning_of_day) unless @filter_created_from.blank? | ||
| 39 | - @tasks = @tasks.where('tasks.created_at <= ?', @filter_created_until.end_of_day) unless @filter_created_until.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 | - | ||
| 43 | - @tasks = @tasks.like('tasks.data', @filter_text) unless @filter_text.blank? | ||
| 44 | - | 25 | + @filter = params[:filter] || {} |
| 26 | + @tasks = filter_tasks(@filter, @tasks) | ||
| 45 | @tasks = @tasks.paginate(:per_page => Task.per_page, :page => params[:page]) | 27 | @tasks = @tasks.paginate(:per_page => Task.per_page, :page => params[:page]) |
| 46 | - | ||
| 47 | @task_types = Task.closed_types_for(profile) | 28 | @task_types = Task.closed_types_for(profile) |
| 48 | end | 29 | end |
| 49 | 30 | ||
| @@ -112,4 +93,27 @@ class TasksController < MyProfileController | @@ -112,4 +93,27 @@ class TasksController < MyProfileController | ||
| 112 | @ticket = Ticket.find(:first, :conditions => ['(requestor_id = ? or target_id = ?) and id = ?', profile.id, profile.id, params[:id]]) | 93 | @ticket = Ticket.find(:first, :conditions => ['(requestor_id = ? or target_id = ?) and id = ?', profile.id, profile.id, params[:id]]) |
| 113 | end | 94 | end |
| 114 | 95 | ||
| 96 | + protected | ||
| 97 | + | ||
| 98 | + def filter_tasks(filter, tasks) | ||
| 99 | + filter[:created_from] = Date.parse(filter[:created_from]) unless filter[:created_from].blank? | ||
| 100 | + filter[:created_until] = Date.parse(filter[:created_until]) unless filter[:created_until].blank? | ||
| 101 | + filter[:closed_from] = Date.parse(filter[:closed_from]) unless filter[:closed_from].blank? | ||
| 102 | + filter[:closed_until] = Date.parse(filter[:closed_until]) unless filter[:closed_until].blank? | ||
| 103 | + | ||
| 104 | + tasks = tasks.of(filter[:type].presence) | ||
| 105 | + tasks = tasks.where(:status => filter[:status]) unless filter[:status].blank? | ||
| 106 | + | ||
| 107 | + tasks = tasks.where('tasks.created_at >= ?', filter[:created_from].beginning_of_day) unless filter[:created_from].blank? | ||
| 108 | + tasks = tasks.where('tasks.created_at <= ?', filter[:created_until].end_of_day) unless filter[:created_until].blank? | ||
| 109 | + | ||
| 110 | + tasks = tasks.where('tasks.end_date >= ?', filter[:closed_from].beginning_of_day) unless filter[:closed_from].blank? | ||
| 111 | + tasks = tasks.where('tasks.end_date <= ?', filter[:closed_until].end_of_day) unless filter[:closed_until].blank? | ||
| 112 | + | ||
| 113 | + tasks = tasks.like('profiles.name', filter[:requestor]) unless filter[:requestor].blank? | ||
| 114 | + tasks = tasks.like('closed_bies_tasks.name', filter[:closed_by]) unless filter[:closed_by].blank? | ||
| 115 | + tasks = tasks.like('tasks.data', filter[:text]) unless filter[:text].blank? | ||
| 116 | + tasks | ||
| 117 | + end | ||
| 118 | + | ||
| 115 | end | 119 | end |
app/views/tasks/processed.html.erb
| @@ -10,21 +10,21 @@ | @@ -10,21 +10,21 @@ | ||
| 10 | <%= form_tag '#', :method => 'get' do %> | 10 | <%= form_tag '#', :method => 'get' do %> |
| 11 | <%= field_set_tag _('Filter'), :class => 'filter_fields' do %> | 11 | <%= field_set_tag _('Filter'), :class => 'filter_fields' do %> |
| 12 | <div> | 12 | <div> |
| 13 | - <%= labelled_select(_('Type of task')+': ', :filter_type, :first, :last, @filter_type, type_collection, {:id => 'filter-type'}) %> | ||
| 14 | - <%= labelled_select(_('Status:'), :filter_status, :last, :first, @filter_status, [[_('Any'), nil], [_(Task::Status.names[Task::Status::CANCELLED]), 2], [_(Task::Status.names[Task::Status::FINISHED]), 3] ]) %> | 13 | + <%= labelled_select(_('Type of task')+': ', 'filter[type]', :first, :last, @filter[:type], type_collection, {:id => 'filter-type'}) %> |
| 14 | + <%= labelled_select(_('Status:'), 'filter[status]', :last, :first, @filter[:status], [[_('Any'), nil], [_(Task::Status.names[Task::Status::CANCELLED]), 2], [_(Task::Status.names[Task::Status::FINISHED]), 3] ]) %> | ||
| 15 | </div> | 15 | </div> |
| 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 | </div> | 19 | </div> |
| 20 | 20 | ||
| 21 | <div> | 21 | <div> |
| 22 | - <%= labelled_text_field(_('Requestor:'), :filter_requestor, @filter_requestor) %> | ||
| 23 | - <%= labelled_text_field(_('Closed by:'), :filter_closed_by, @filter_closed_by) %> | 22 | + <%= labelled_text_field(_('Requestor:'), 'filter[requestor]', @filter[:requestor]) %> |
| 23 | + <%= labelled_text_field(_('Closed by:'), 'filter[closed_by]', @filter[:closed_by]) %> | ||
| 24 | </div> | 24 | </div> |
| 25 | 25 | ||
| 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' })) %> | ||
| 27 | - <%= labelled_form_field(_('Processed date'), date_range_field(:filter_closed_from, :filter_closed_until, @filter_closed_from, @filter_closed_until, '%Y-%m-%d', { :change_month => true, :change_year => true, :date_format => 'yy-mm-dd' }, { :size => 14, :from_id => 'filter_closed_from', :to_id => 'filter_closed_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' })) %> |
| 27 | + <%= labelled_form_field(_('Processed date'), date_range_field('filter[closed_from]', 'filter[closed_until]', @filter[:closed_from], @filter[:closed_until], '%Y-%m-%d', { :change_month => true, :change_year => true, :date_format => 'yy-mm-dd' }, { :size => 14, :from_id => 'filter_closed_from', :to_id => 'filter_closed_until' })) %> | ||
| 28 | 28 | ||
| 29 | <div class="actions"> | 29 | <div class="actions"> |
| 30 | <%= submit_button(:search, _('Search')) %> | 30 | <%= submit_button(:search, _('Search')) %> |
test/functional/tasks_controller_test.rb
| @@ -636,4 +636,30 @@ class TasksControllerTest < ActionController::TestCase | @@ -636,4 +636,30 @@ class TasksControllerTest < ActionController::TestCase | ||
| 636 | assert_equal profile, t.reload.closed_by | 636 | assert_equal profile, t.reload.closed_by |
| 637 | end | 637 | end |
| 638 | 638 | ||
| 639 | + should 'filter processed tasks by all filters' do | ||
| 640 | + requestor = fast_create(Person) | ||
| 641 | + closed_by = fast_create(Person) | ||
| 642 | + class AnotherTask < Task; end | ||
| 643 | + | ||
| 644 | + created_date = DateTime.now | ||
| 645 | + processed_date = DateTime.now | ||
| 646 | + | ||
| 647 | + task_params = {:status => Task::Status::FINISHED, :requestor => requestor, :target => profile, :created_at => created_date, :end_date => processed_date, :closed_by => closed_by, :data => {:field => 'some data field'}} | ||
| 648 | + | ||
| 649 | + task = create(AnotherTask, task_params) | ||
| 650 | + create(Task, task_params) | ||
| 651 | + create(AnotherTask, task_params.clone.merge(:status => Task::Status::CANCELLED)) | ||
| 652 | + create(AnotherTask, task_params.clone.merge(:created_at => created_date - 1.day)) | ||
| 653 | + create(AnotherTask, task_params.clone.merge(:created_at => created_date + 1.day)) | ||
| 654 | + create(AnotherTask, task_params.clone.merge(:end_date => processed_date - 1.day)) | ||
| 655 | + create(AnotherTask, task_params.clone.merge(:end_date => processed_date + 1.day)) | ||
| 656 | + create(AnotherTask, task_params.clone.merge(:requestor => fast_create(Person, :name => 'another-requestor'))) | ||
| 657 | + create(AnotherTask, task_params.clone.merge(:closed_by => fast_create(Person, :name => 'another-closer'))) | ||
| 658 | + create(AnotherTask, task_params.clone.merge(:data => {:field => 'other data field'})) | ||
| 659 | + | ||
| 660 | + get :processed, :filter => {:type => AnotherTask, :status => Task::Status::FINISHED, :created_from => created_date, :created_until => created_date, :closed_from => processed_date, :closed_until => processed_date, :requestor => requestor.name, :closed_by => closed_by.name, :text => 'some data field'} | ||
| 661 | + assert_response :success | ||
| 662 | + assert_equal [task], assigns(:tasks) | ||
| 663 | + end | ||
| 664 | + | ||
| 639 | end | 665 | end |