##// END OF EJS Templates
jro_apps » redmine
RSS
Include inactive activities in time entries filter (#20117)....
Jean-Philippe Lang -
r14244:44644679908c
parent child
Show More
Side by Side Unified
Context file:
r14244:44644679908c Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,140 +1,140
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2015 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class TimeEntryQuery < Query
19 19
20 20 self.queried_class = TimeEntry
21 21
22 22 self.available_columns = [
23 23 QueryColumn.new(:project, :sortable => "#{Project.table_name}.name", :groupable => true),
24 24 QueryColumn.new(:spent_on, :sortable => ["#{TimeEntry.table_name}.spent_on", "#{TimeEntry.table_name}.created_on"], :default_order => 'desc', :groupable => true),
25 25 QueryColumn.new(:user, :sortable => lambda {User.fields_for_order_statement}, :groupable => true),
26 26 QueryColumn.new(:activity, :sortable => "#{TimeEntryActivity.table_name}.position", :groupable => true),
27 27 QueryColumn.new(:issue, :sortable => "#{Issue.table_name}.id"),
28 28 QueryColumn.new(:comments),
29 29 QueryColumn.new(:hours, :sortable => "#{TimeEntry.table_name}.hours"),
30 30 ]
31 31
32 32 def initialize(attributes=nil, *args)
33 33 super attributes
34 34 self.filters ||= {}
35 35 add_filter('spent_on', '*') unless filters.present?
36 36 end
37 37
38 38 def initialize_available_filters
39 39 add_available_filter "spent_on", :type => :date_past
40 40
41 41 principals = []
42 42 if project
43 43 principals += project.principals.visible.sort
44 44 unless project.leaf?
45 45 subprojects = project.descendants.visible.to_a
46 46 if subprojects.any?
47 47 add_available_filter "subproject_id",
48 48 :type => :list_subprojects,
49 49 :values => subprojects.collect{|s| [s.name, s.id.to_s] }
50 50 principals += Principal.member_of(subprojects).visible
51 51 end
52 52 end
53 53 else
54 54 if all_projects.any?
55 55 # members of visible projects
56 56 principals += Principal.member_of(all_projects).visible
57 57 # project filter
58 58 project_values = []
59 59 if User.current.logged? && User.current.memberships.any?
60 60 project_values << ["<< #{l(:label_my_projects).downcase} >>", "mine"]
61 61 end
62 62 project_values += all_projects_values
63 63 add_available_filter("project_id",
64 64 :type => :list, :values => project_values
65 65 ) unless project_values.empty?
66 66 end
67 67 end
68 68 principals.uniq!
69 69 principals.sort!
70 70 users = principals.select {|p| p.is_a?(User)}
71 71
72 72 users_values = []
73 73 users_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
74 74 users_values += users.collect{|s| [s.name, s.id.to_s] }
75 75 add_available_filter("user_id",
76 76 :type => :list_optional, :values => users_values
77 77 ) unless users_values.empty?
78 78
79 activities = (project ? project.activities : TimeEntryActivity.shared.active)
79 activities = (project ? project.activities : TimeEntryActivity.shared)
80 80 add_available_filter("activity_id",
81 81 :type => :list, :values => activities.map {|a| [a.name, a.id.to_s]}
82 82 ) unless activities.empty?
83 83
84 84 add_available_filter "comments", :type => :text
85 85 add_available_filter "hours", :type => :float
86 86
87 87 add_custom_fields_filters(TimeEntryCustomField)
88 88 add_associations_custom_fields_filters :project, :issue, :user
89 89 end
90 90
91 91 def available_columns
92 92 return @available_columns if @available_columns
93 93 @available_columns = self.class.available_columns.dup
94 94 @available_columns += TimeEntryCustomField.visible.
95 95 map {|cf| QueryCustomFieldColumn.new(cf) }
96 96 @available_columns += IssueCustomField.visible.
97 97 map {|cf| QueryAssociationCustomFieldColumn.new(:issue, cf) }
98 98 @available_columns
99 99 end
100 100
101 101 def default_columns_names
102 102 @default_columns_names ||= [:project, :spent_on, :user, :activity, :issue, :comments, :hours]
103 103 end
104 104
105 105 def results_scope(options={})
106 106 order_option = [group_by_sort_order, options[:order]].flatten.reject(&:blank?)
107 107
108 108 TimeEntry.visible.
109 109 where(statement).
110 110 order(order_option).
111 111 joins(joins_for_order_statement(order_option.join(','))).
112 112 includes(:activity).
113 113 references(:activity)
114 114 end
115 115
116 116 def sql_for_activity_id_field(field, operator, value)
117 117 condition_on_id = sql_for_field(field, operator, value, Enumeration.table_name, 'id')
118 118 condition_on_parent_id = sql_for_field(field, operator, value, Enumeration.table_name, 'parent_id')
119 119 ids = value.map(&:to_i).join(',')
120 120 table_name = Enumeration.table_name
121 121 if operator == '='
122 122 "(#{table_name}.id IN (#{ids}) OR #{table_name}.parent_id IN (#{ids}))"
123 123 else
124 124 "(#{table_name}.id NOT IN (#{ids}) AND (#{table_name}.parent_id IS NULL OR #{table_name}.parent_id NOT IN (#{ids})))"
125 125 end
126 126 end
127 127
128 128 # Accepts :from/:to params as shortcut filters
129 129 def build_from_params(params)
130 130 super
131 131 if params[:from].present? && params[:to].present?
132 132 add_filter('spent_on', '><', [params[:from], params[:to]])
133 133 elsif params[:from].present?
134 134 add_filter('spent_on', '>=', [params[:from]])
135 135 elsif params[:to].present?
136 136 add_filter('spent_on', '<=', [params[:to]])
137 137 end
138 138 self
139 139 end
140 140 end
Show file before | Show file after | Hide comments
@@ -1,47 +1,57
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2015 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require File.expand_path('../../test_helper', __FILE__)
19 19
20 20 class TimeEntryQueryTest < ActiveSupport::TestCase
21 21 fixtures :issues, :projects, :users,
22 22 :members, :roles, :member_roles,
23 23 :trackers, :issue_statuses,
24 24 :projects_trackers,
25 25 :journals, :journal_details,
26 26 :issue_categories, :enumerations,
27 27 :groups_users,
28 28 :enabled_modules
29 29
30 def test_cross_project_activity_filter_should_propose_non_active_activities
31 activity = TimeEntryActivity.create!(:name => 'Disabled', :active => false)
32 assert !activity.active?
33
34 query = TimeEntryQuery.new(:name => '_')
35 assert options = query.available_filters['activity_id']
36 assert values = options[:values]
37 assert_include ["Disabled", activity.id.to_s], values
38 end
39
30 40 def test_activity_filter_should_consider_system_and_project_activities
31 41 TimeEntry.delete_all
32 42 system = TimeEntryActivity.create!(:name => 'Foo')
33 43 TimeEntry.generate!(:activity => system, :hours => 1.0)
34 44 override = TimeEntryActivity.create!(:name => 'Foo', :parent_id => system.id, :project_id => 1)
35 45 other = TimeEntryActivity.create!(:name => 'Bar')
36 46 TimeEntry.generate!(:activity => override, :hours => 2.0)
37 47 TimeEntry.generate!(:activity => other, :hours => 4.0)
38 48
39 49 query = TimeEntryQuery.new(:name => '_')
40 50 query.add_filter('activity_id', '=', [system.id.to_s])
41 51 assert_equal 3.0, query.results_scope.sum(:hours)
42 52
43 53 query = TimeEntryQuery.new(:name => '_')
44 54 query.add_filter('activity_id', '!', [system.id.to_s])
45 55 assert_equal 4.0, query.results_scope.sum(:hours)
46 56 end
47 57 end
General Comments 0
You need to be logged in to leave comments. Login now