Improves listing of processed tasks

- Filters for processed tasks Signed-off-by: Gustavo Jaruga <darksshades@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>

Improves listing of processed tasks
- Filters for processed tasks Signed-off-by: Gustavo Jaruga <darksshades@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Victor Costa · Marcos Pereira
1 parent 27f11bf7
Showing 7 changed files with 178 additions and 11 deletions Show diff stats
app/controllers/my_profile/tasks_controller.rb
app/models/task.rb
app/views/tasks/_task_processed.html.erb
app/views/tasks/index.html.erb
app/views/tasks/processed.html.erb
public/stylesheets/tasks.scss
test/functional/tasks_controller_test.rb
@@ -26,7 +26,11 @@ class TasksController &lt; MyProfileController
   end
   def processed
-    @tasks = Task.to(profile).without_spam.closed.sort_by(&:created_at)
+    @tasks = Task.to(profile).without_spam.closed.order('tasks.created_at DESC')
+    @filter = params[:filter] || {}
+    @tasks = filter_tasks(@filter, @tasks)
+    @tasks = @tasks.paginate(:per_page => Task.per_page, :page => params[:page])
+    @task_types = Task.closed_types_for(profile)
   end
   def change_responsible
@@ -102,4 +106,37 @@ class TasksController &lt; MyProfileController
     render :json => result.map { |task| {:label => task.data[:name], :value => task.data[:name]} }
   end
+  protected
+
+  def filter_by_closed_date(filter, tasks)
+    filter[:closed_from] = Date.parse(filter[:closed_from]) unless filter[:closed_from].blank?
+    filter[:closed_until] = Date.parse(filter[:closed_until]) unless filter[:closed_until].blank?
+
+    tasks = tasks.where('tasks.end_date >= ?', filter[:closed_from].beginning_of_day) unless filter[:closed_from].blank?
+    tasks = tasks.where('tasks.end_date <= ?', filter[:closed_until].end_of_day) unless filter[:closed_until].blank?
+    tasks
+  end
+
+  def filter_by_creation_date(filter, tasks)
+    filter[:created_from] = Date.parse(filter[:created_from]) unless filter[:created_from].blank?
+    filter[:created_until] = Date.parse(filter[:created_until]) unless filter[:created_until].blank?
+
+    tasks = tasks.where('tasks.created_at >= ?', filter[:created_from].beginning_of_day) unless filter[:created_from].blank?
+    tasks = tasks.where('tasks.created_at <= ?', filter[:created_until].end_of_day) unless filter[:created_until].blank?
+    tasks
+  end
+
+  def filter_tasks(filter, tasks)
+    tasks = tasks.eager_load(:requestor, :closed_by)
+    tasks = tasks.of(filter[:type].presence)
+    tasks = tasks.where(:status => filter[:status]) unless filter[:status].blank?
+    tasks = filter_by_creation_date(filter, tasks)
+    tasks = filter_by_closed_date(filter, tasks)
+
+    tasks = tasks.where('profiles.name LIKE ?', filter[:requestor]) unless filter[:requestor].blank?
+    tasks = tasks.where('closed_bies_tasks.name LIKE ?', filter[:closed_by]) unless filter[:closed_by].blank?
+    tasks = tasks.where('tasks.data LIKE ?', "%#{filter[:text]}%") unless filter[:text].blank?
+    tasks
+  end
+
 end
@@ -329,6 +329,10 @@ class Task &lt; ActiveRecord::Base
     Task.to(profile).pending.select('distinct type').map { |t| [t.class.name, t.title] }
   end
+  def self.closed_types_for(profile)
+    Task.to(profile).closed.select('distinct type').map { |t| [t.class.name, t.title] }
+  end
+
   def opened?
     status == Task::Status::ACTIVE || status == Task::Status::HIDDEN
   end
@@ -0,0 +1,23 @@
+<div class="title">
+  <%= task_information(task) %>
+</div>
+<div class="status">
+  <%= _(Task::Status.names[task.status]) %>
+</div>
+<div class="dates">
+  <span class="created">
+    <span class="label"><%= _('Created:') %></span>
+    <span class="value"><%= show_date(task.created_at) %></span>
+  </span>
+  &nbsp; &#151; &nbsp;
+  <span class="processed">
+    <span class="label"><%= _('Processed:') %></span>
+    <span class="value"><%= show_date(task.end_date) %></span>
+  </span>
+</div>
+<% if task.closed_by.present? %>
+  <div class="closed-by">
+    <span class="label"><%= _('Closed by:') %></span>
+    <span class="value"><%= link_to(task.closed_by.name, task.closed_by.url) %></span>
+  </div>
+<% end %>
@@ -57,7 +57,9 @@
     <% end %>
       <div class="task_boxes">
-        <%= render :partial => 'task', :collection => @tasks %>
+        <% @tasks.each do |task| %>
+          <%= render :partial => partial_for_class(task.class, nil, nil), :locals => {:task => task} %>
+        <% end %>
       </div>
       <% unless @view_only %>
+<%= stylesheet_link_tag 'tasks' %>
+
+<div class="task-processed">
 <h1><%= _("%s's processed tasks") % profile.name %></h1>
+<div class="task-processed-filter">
+<%
+  type_collection = [[nil, _('All')]] + @task_types
+%>
+  <%= form_tag '#', :method => 'get' do %>
+    <%= field_set_tag _('Filter'), :class => 'filter_fields' do %>
+      <div>
+        <%= labelled_select(_('Type of task')+': ', 'filter[type]', :first, :last, @filter[:type],  type_collection, {:id => 'filter-type'}) %>
+        <%= 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] ]) %>
+      </div>
+
+      <div>
+        <%= labelled_text_field(_('Text Filter:'), 'filter[text]', @filter[:text]) %>
+      </div>
+
+      <div>
+        <%= labelled_text_field(_('Requestor:'), 'filter[requestor]', @filter[:requestor]) %>
+        <%= labelled_text_field(_('Closed by:'), 'filter[closed_by]', @filter[:closed_by]) %>
+      </div>
+      <%= labelled_form_field(_('Creation date'), date_range_field('filter[created_from]', 'filter[created_until]', @filter[:created_from], @filter[:created_until], { :change_month => true, :change_year => true, :date_format => 'yy-mm-dd' }, { :size => 14, :from_id => 'filter_created_from', :to_id => 'filter_created_until' })) %>
+      <%= labelled_form_field(_('Processed date'), date_range_field('filter[closed_from]', 'filter[closed_until]', @filter[:closed_from], @filter[:closed_until], { :change_month => true, :change_year => true, :date_format => 'yy-mm-dd' }, { :size => 14, :from_id => 'filter_closed_from', :to_id => 'filter_closed_until' })) %>
+
+      <div class="actions">
+        <%= submit_button(:search, _('Search')) %>
+      </div>
+    <% end %>
+  <% end %>
+</div>
+
 <p>
 <% if @tasks.empty? %>
   <em><%= _('No processed tasks.') %></em>
 <% else %>
-  <ul>
+  <ul class="task-list">
     <% @tasks.each do |item| %>
-      <li>
-        <strong><%= task_information(item) %></strong> <br/>
-        <small>
-          <%= _('Created:')   +' '+ show_date(item.created_at) %>
-          &nbsp; &#151; &nbsp;
-          <%= _('Processed:') +' '+ show_date(item.end_date) %>
-        </small>
+      <li class="task status-<%= item.status%>">
+        <%= render :partial => partial_for_class(item.class, nil, 'processed'), :locals => {:task => item} %>
       </li>
     <% end %>
   </ul>
+  <%= pagination_links(@tasks)%>
 <% end %>
 </p>
 <% button_bar do %>
   <%= button(:back, _('Back'), :action => 'index') %>
 <% end %>
+
+</div>
@@ -82,3 +82,47 @@ div.pending-tasks {
 .task_responsible {
   text-align: right;
 }
+
+.task-processed li {
+  background-color: rgb(240, 240, 240);
+  border-radius: 8px;
+  margin: 10px 0;
+  list-style-type: none;
+  padding: 12px;
+}
+
+.task-processed .task.status-3 {
+  background-color: rgb(205, 252, 218);
+}
+
+.task-processed .task.status-2 {
+  background-color: rgb(255, 203, 203);
+}
+
+.task-processed ul {
+  padding: 0;
+}
+
+.task-processed .task-list .task .title {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+  font-weight: bold;
+  color: rgb(44, 44, 44);
+}
+
+.task-processed .task .status {
+  float: right;
+  color: rgb(156, 156, 156);
+  font-weight: bold;
+}
+
+.task-processed .task .dates {
+  font-size: 11px;
+}
+
+.task-processed .task .closed-by {
+  font-size: 11px;
+}
+
+.task-processed .task .label {
+  font-weight: bold
+}
@@ -75,7 +75,8 @@ class TasksControllerTest &lt; ActionController::TestCase
     assert_response :success
     assert_template 'processed'
-    assert_kind_of Array, assigns(:tasks)
+    assert !assigns(:tasks).nil?
+    assert_kind_of ActiveRecord::Relation, assigns(:tasks)
   end
   should 'display task created_at' do
@@ -762,4 +763,30 @@ class TasksControllerTest &lt; ActionController::TestCase
     assert_equal [email_template], assigns(:rejection_email_templates)
   end
+  should 'filter processed tasks by all filters' do
+    requestor = fast_create(Person)
+    closed_by = fast_create(Person)
+    class AnotherTask < Task; end
+
+    created_date = DateTime.now
+    processed_date = DateTime.now
+
+    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'}}
+
+    task = create(AnotherTask, task_params)
+    create(Task, task_params)
+    create(AnotherTask, task_params.clone.merge(:status => Task::Status::CANCELLED))
+    create(AnotherTask, task_params.clone.merge(:created_at => created_date - 1.day))
+    create(AnotherTask, task_params.clone.merge(:created_at => created_date + 1.day))
+    create(AnotherTask, task_params.clone.merge(:end_date => processed_date - 1.day))
+    create(AnotherTask, task_params.clone.merge(:end_date => processed_date + 1.day))
+    create(AnotherTask, task_params.clone.merge(:requestor => fast_create(Person, :name => 'another-requestor')))
+    create(AnotherTask, task_params.clone.merge(:closed_by => fast_create(Person, :name => 'another-closer')))
+    create(AnotherTask, task_params.clone.merge(:data => {:field => "other data field"}))
+
+    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"}
+    assert_response :success
+    assert_equal [task], assigns(:tasks)
+  end
+
 end
	@@ -26,7 +26,11 @@ class TasksController < MyProfileController		@@ -26,7 +26,11 @@ class TasksController < MyProfileController
26	end	26	end
27		27
28	def processed	28	def processed
29	- @tasks = Task.to(profile).without_spam.closed.sort_by(&:created_at)	29	+ @tasks = Task.to(profile).without_spam.closed.order('tasks.created_at DESC')
		30	+ @filter = params[:filter] \|\| {}
		31	+ @tasks = filter_tasks(@filter, @tasks)
		32	+ @tasks = @tasks.paginate(:per_page => Task.per_page, :page => params[:page])
		33	+ @task_types = Task.closed_types_for(profile)
30	end	34	end
31		35
32	def change_responsible	36	def change_responsible
	@@ -102,4 +106,37 @@ class TasksController < MyProfileController		@@ -102,4 +106,37 @@ class TasksController < MyProfileController
102	render :json => result.map { \|task\| {:label => task.data[:name], :value => task.data[:name]} }	106	render :json => result.map { \|task\| {:label => task.data[:name], :value => task.data[:name]} }
103	end	107	end
104		108
		109	+ protected
		110	+
		111	+ def filter_by_closed_date(filter, tasks)
		112	+ filter[:closed_from] = Date.parse(filter[:closed_from]) unless filter[:closed_from].blank?
		113	+ filter[:closed_until] = Date.parse(filter[:closed_until]) unless filter[:closed_until].blank?
		114	+
		115	+ tasks = tasks.where('tasks.end_date >= ?', filter[:closed_from].beginning_of_day) unless filter[:closed_from].blank?
		116	+ tasks = tasks.where('tasks.end_date <= ?', filter[:closed_until].end_of_day) unless filter[:closed_until].blank?
		117	+ tasks
		118	+ end
		119	+
		120	+ def filter_by_creation_date(filter, tasks)
		121	+ filter[:created_from] = Date.parse(filter[:created_from]) unless filter[:created_from].blank?
		122	+ filter[:created_until] = Date.parse(filter[:created_until]) unless filter[:created_until].blank?
		123	+
		124	+ tasks = tasks.where('tasks.created_at >= ?', filter[:created_from].beginning_of_day) unless filter[:created_from].blank?
		125	+ tasks = tasks.where('tasks.created_at <= ?', filter[:created_until].end_of_day) unless filter[:created_until].blank?
		126	+ tasks
		127	+ end
		128	+
		129	+ def filter_tasks(filter, tasks)
		130	+ tasks = tasks.eager_load(:requestor, :closed_by)
		131	+ tasks = tasks.of(filter[:type].presence)
		132	+ tasks = tasks.where(:status => filter[:status]) unless filter[:status].blank?
		133	+ tasks = filter_by_creation_date(filter, tasks)
		134	+ tasks = filter_by_closed_date(filter, tasks)
		135	+
		136	+ tasks = tasks.where('profiles.name LIKE ?', filter[:requestor]) unless filter[:requestor].blank?
		137	+ tasks = tasks.where('closed_bies_tasks.name LIKE ?', filter[:closed_by]) unless filter[:closed_by].blank?
		138	+ tasks = tasks.where('tasks.data LIKE ?', "%#{filter[:text]}%") unless filter[:text].blank?
		139	+ tasks
		140	+ end
		141	+
105	end	142	end
@@ -0,0 +1,23 @@		@@ -0,0 +1,23 @@
	1	+<div class="title">
	2	+ <%= task_information(task) %>
	3	+</div>
	4	+<div class="status">
	5	+ <%= _(Task::Status.names[task.status]) %>
	6	+</div>
	7	+<div class="dates">
	8	+ <span class="created">
	9	+ <span class="label"><%= _('Created:') %></span>
	10	+ <span class="value"><%= show_date(task.created_at) %></span>
	11	+ </span>
	12	+
	13	+ <span class="processed">
	14	+ <span class="label"><%= _('Processed:') %></span>
	15	+ <span class="value"><%= show_date(task.end_date) %></span>
	16	+ </span>
	17	+</div>
	18	+<% if task.closed_by.present? %>
	19	+ <div class="closed-by">
	20	+ <span class="label"><%= _('Closed by:') %></span>
	21	+ <span class="value"><%= link_to(task.closed_by.name, task.closed_by.url) %></span>
	22	+ </div>
	23	+<% end %>
		1	+<%= stylesheet_link_tag 'tasks' %>
		2	+
		3	+<div class="task-processed">
1	<h1><%= _("%s's processed tasks") % profile.name %></h1>	4	<h1><%= _("%s's processed tasks") % profile.name %></h1>
2		5
		6	+<div class="task-processed-filter">
		7	+<%
		8	+ type_collection = [[nil, _('All')]] + @task_types
		9	+%>
		10	+ <%= form_tag '#', :method => 'get' do %>
		11	+ <%= field_set_tag _('Filter'), :class => 'filter_fields' do %>
		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] ]) %>
		15	+ </div>
		16	+
		17	+ <div>
		18	+ <%= labelled_text_field(_('Text Filter:'), 'filter[text]', @filter[:text]) %>
		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]) %>
		24	+ </div>
		25	+ <%= labelled_form_field(_('Creation date'), date_range_field('filter[created_from]', 'filter[created_until]', @filter[:created_from], @filter[:created_until], { :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(_('Processed date'), date_range_field('filter[closed_from]', 'filter[closed_until]', @filter[:closed_from], @filter[:closed_until], { :change_month => true, :change_year => true, :date_format => 'yy-mm-dd' }, { :size => 14, :from_id => 'filter_closed_from', :to_id => 'filter_closed_until' })) %>
		27	+
		28	+ <div class="actions">
		29	+ <%= submit_button(:search, _('Search')) %>
		30	+ </div>
		31	+ <% end %>
		32	+ <% end %>
		33	+</div>
		34	+
3	<p>	35	<p>
4	<% if @tasks.empty? %>	36	<% if @tasks.empty? %>
5	<em><%= _('No processed tasks.') %></em>	37	<em><%= _('No processed tasks.') %></em>
6	<% else %>	38	<% else %>
7	- <ul>	39	+ <ul class="task-list">
8	<% @tasks.each do \|item\| %>	40	<% @tasks.each do \|item\| %>
9	- <li>
10	- <strong><%= task_information(item) %></strong> <br/>
11	- <small>
12	- <%= _('Created:') +' '+ show_date(item.created_at) %>
13	-
14	- <%= _('Processed:') +' '+ show_date(item.end_date) %>
15	- </small>	41	+ <li class="task status-<%= item.status%>">
		42	+ <%= render :partial => partial_for_class(item.class, nil, 'processed'), :locals => {:task => item} %>
16	</li>	43	</li>
17	<% end %>	44	<% end %>
18	</ul>	45	</ul>
		46	+ <%= pagination_links(@tasks)%>
19	<% end %>	47	<% end %>
20	</p>	48	</p>
21		49
22	<% button_bar do %>	50	<% button_bar do %>
23	<%= button(:back, _('Back'), :action => 'index') %>	51	<%= button(:back, _('Back'), :action => 'index') %>
24	<% end %>	52	<% end %>
		53	+
		54	+</div>
	@@ -82,3 +82,47 @@ div.pending-tasks {		@@ -82,3 +82,47 @@ div.pending-tasks {
82	.task_responsible {	82	.task_responsible {
83	text-align: right;	83	text-align: right;
84	}	84	}
		85	+
		86	+.task-processed li {
		87	+ background-color: rgb(240, 240, 240);
		88	+ border-radius: 8px;
		89	+ margin: 10px 0;
		90	+ list-style-type: none;
		91	+ padding: 12px;
		92	+}
		93	+
		94	+.task-processed .task.status-3 {
		95	+ background-color: rgb(205, 252, 218);
		96	+}
		97	+
		98	+.task-processed .task.status-2 {
		99	+ background-color: rgb(255, 203, 203);
		100	+}
		101	+
		102	+.task-processed ul {
		103	+ padding: 0;
		104	+}
		105	+
		106	+.task-processed .task-list .task .title {
		107	+ border-bottom: 1px solid rgba(0, 0, 0, 0.1);
		108	+ font-weight: bold;
		109	+ color: rgb(44, 44, 44);
		110	+}
		111	+
		112	+.task-processed .task .status {
		113	+ float: right;
		114	+ color: rgb(156, 156, 156);
		115	+ font-weight: bold;
		116	+}
		117	+
		118	+.task-processed .task .dates {
		119	+ font-size: 11px;
		120	+}
		121	+
		122	+.task-processed .task .closed-by {
		123	+ font-size: 11px;
		124	+}
		125	+
		126	+.task-processed .task .label {
		127	+ font-weight: bold
		128	+}
	@@ -75,7 +75,8 @@ class TasksControllerTest < ActionController::TestCase		@@ -75,7 +75,8 @@ class TasksControllerTest < ActionController::TestCase
75		75
76	assert_response :success	76	assert_response :success
77	assert_template 'processed'	77	assert_template 'processed'
78	- assert_kind_of Array, assigns(:tasks)	78	+ assert !assigns(:tasks).nil?
		79	+ assert_kind_of ActiveRecord::Relation, assigns(:tasks)
79	end	80	end
80		81
81	should 'display task created_at' do	82	should 'display task created_at' do
	@@ -762,4 +763,30 @@ class TasksControllerTest < ActionController::TestCase		@@ -762,4 +763,30 @@ class TasksControllerTest < ActionController::TestCase
762	assert_equal [email_template], assigns(:rejection_email_templates)	763	assert_equal [email_template], assigns(:rejection_email_templates)
763	end	764	end
764		765
		766	+ should 'filter processed tasks by all filters' do
		767	+ requestor = fast_create(Person)
		768	+ closed_by = fast_create(Person)
		769	+ class AnotherTask < Task; end
		770	+
		771	+ created_date = DateTime.now
		772	+ processed_date = DateTime.now
		773	+
		774	+ 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'}}
		775	+
		776	+ task = create(AnotherTask, task_params)
		777	+ create(Task, task_params)
		778	+ create(AnotherTask, task_params.clone.merge(:status => Task::Status::CANCELLED))
		779	+ create(AnotherTask, task_params.clone.merge(:created_at => created_date - 1.day))
		780	+ create(AnotherTask, task_params.clone.merge(:created_at => created_date + 1.day))
		781	+ create(AnotherTask, task_params.clone.merge(:end_date => processed_date - 1.day))
		782	+ create(AnotherTask, task_params.clone.merge(:end_date => processed_date + 1.day))
		783	+ create(AnotherTask, task_params.clone.merge(:requestor => fast_create(Person, :name => 'another-requestor')))
		784	+ create(AnotherTask, task_params.clone.merge(:closed_by => fast_create(Person, :name => 'another-closer')))
		785	+ create(AnotherTask, task_params.clone.merge(:data => {:field => "other data field"}))
		786	+
		787	+ 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"}
		788	+ assert_response :success
		789	+ assert_equal [task], assigns(:tasks)
		790	+ end
		791	+
765	end	792	end