diff --git a/app/controllers/my_profile/tasks_controller.rb b/app/controllers/my_profile/tasks_controller.rb index 78dcee3..4ca40d9 100644 --- a/app/controllers/my_profile/tasks_controller.rb +++ b/app/controllers/my_profile/tasks_controller.rb @@ -21,7 +21,26 @@ class TasksController < MyProfileController end def processed - @tasks = Task.to(profile).without_spam.closed.sort_by(&:created_at) + @filter_requestor = params[:filter_requestor].presence + @filter_type = params[:filter_type].presence + @filter_text = params[:filter_text].presence + @filter_status = params[:filter_status].presence + @filter_created_from = Date.parse(params[:filter_created_from]) unless params[:filter_created_from].blank? + @filter_created_until = Date.parse(params[:filter_created_until]) unless params[:filter_created_until].blank? + @filter_closed_from = Date.parse(params[:filter_closed_from]) unless params[:filter_closed_from].blank? + @filter_closed_until = Date.parse(params[:filter_closed_until]) unless params[:filter_closed_until].blank? + + @tasks = Task.to(profile).without_spam.closed.order('tasks.created_at DESC') + @tasks = @tasks.of(@filter_type) + @tasks = @tasks.where(:status => params[:filter_status]) unless @filter_status.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 = @tasks.joins(:requestor).like('profiles.name', @filter_requestor) unless @filter_requestor.blank? + @tasks = @tasks.like('tasks.data', @filter_text) unless @filter_text.blank? + + @tasks = @tasks.paginate(:per_page => Task.per_page, :page => params[:page]) + + @task_types = Task.closed_types_for(profile) end def change_responsible diff --git a/app/models/task.rb b/app/models/task.rb index 927031d..da6004e 100644 --- a/app/models/task.rb +++ b/app/models/task.rb @@ -242,7 +242,7 @@ class Task < ActiveRecord::Base scope :canceled, :conditions => { :status => Task::Status::CANCELLED } scope :closed, :conditions => { :status => [Task::Status::CANCELLED, Task::Status::FINISHED] } scope :opened, :conditions => { :status => [Task::Status::ACTIVE, Task::Status::HIDDEN] } - scope :of, lambda { |type| conditions = type ? "type LIKE '#{type}'" : "1=1"; {:conditions => [conditions]} } + scope :of, lambda { |type| conditions = type ? "tasks.type LIKE '#{type}'" : "1=1"; {:conditions => [conditions]} } scope :order_by, lambda { |attribute, ord| {:order => "#{attribute} #{ord}"} } scope :like, lambda { |field, value| where("LOWER(#{field}) LIKE ?", "%#{value.downcase}%") if value} scope :pending_all, lambda { |profile, filter_type, filter_text| @@ -263,6 +263,10 @@ class Task < 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 diff --git a/app/views/tasks/processed.html.erb b/app/views/tasks/processed.html.erb index b76fac6..ade81e8 100644 --- a/app/views/tasks/processed.html.erb +++ b/app/views/tasks/processed.html.erb @@ -1,24 +1,73 @@ +<%= stylesheet_link_tag 'tasks' %> + +

<%= _("%s's processed tasks") % profile.name %>

+
+<% + type_collection = [[nil, _('All')]] + @task_types +%> + <%= form_tag '#', :method => 'get' do %> + <%= field_set_tag _('Filter'), :class => 'filter_fields' do %> +
+ <%= 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] ]) %> +
+ +
+ <%= labelled_text_field(_('Text Filter:'), :filter_text, @filter_text) %> + <%= labelled_text_field(_('Requestor Name:'), :filter_requestor, @filter_requestor) %> +
+ + <%= 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' })) %> + <%= 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' })) %> + +
+ <%= submit_button(:search, _('Search')) %> +
+ <% end %> + <% end %> +
+

<% if @tasks.empty? %> <%= _('No processed tasks.') %> <% else %> -

diff --git a/public/stylesheets/tasks.css b/public/stylesheets/tasks.css index 714947d..d0aeaac 100644 --- a/public/stylesheets/tasks.css +++ b/public/stylesheets/tasks.css @@ -53,3 +53,46 @@ .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 +} diff --git a/test/functional/tasks_controller_test.rb b/test/functional/tasks_controller_test.rb index 49d0d6d..9379f6c 100644 --- a/test/functional/tasks_controller_test.rb +++ b/test/functional/tasks_controller_test.rb @@ -46,7 +46,7 @@ class TasksControllerTest < ActionController::TestCase assert_response :success assert_template 'processed' - assert_kind_of Array, assigns(:tasks) + assert !assigns(:tasks).nil? end should 'display task created_at' do -- libgit2 0.21.2