##// END OF EJS Templates
jro_apps » redmine
RSS
Merged r15890 (#24014)....
Jean-Philippe Lang -
r15511:6501e1451a43
parent child
Show More
Side by Side Unified
Context file:
r15511:6501e1451a43 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,141 +1,151
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2016 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(:tweek, :sortable => ["#{TimeEntry.table_name}.spent_on", "#{TimeEntry.table_name}.created_on"], :caption => l(:label_week)),
26 26 QueryColumn.new(:user, :sortable => lambda {User.fields_for_order_statement}, :groupable => true),
27 27 QueryColumn.new(:activity, :sortable => "#{TimeEntryActivity.table_name}.position", :groupable => true),
28 28 QueryColumn.new(:issue, :sortable => "#{Issue.table_name}.id"),
29 29 QueryColumn.new(:comments),
30 30 QueryColumn.new(:hours, :sortable => "#{TimeEntry.table_name}.hours"),
31 31 ]
32 32
33 33 def initialize(attributes=nil, *args)
34 34 super attributes
35 35 self.filters ||= {}
36 36 add_filter('spent_on', '*') unless filters.present?
37 37 end
38 38
39 39 def initialize_available_filters
40 40 add_available_filter "spent_on", :type => :date_past
41 41
42 42 principals = []
43 43 if project
44 44 principals += project.principals.visible.sort
45 45 unless project.leaf?
46 46 subprojects = project.descendants.visible.to_a
47 47 if subprojects.any?
48 48 add_available_filter "subproject_id",
49 49 :type => :list_subprojects,
50 50 :values => subprojects.collect{|s| [s.name, s.id.to_s] }
51 51 principals += Principal.member_of(subprojects).visible
52 52 end
53 53 end
54 54 else
55 55 if all_projects.any?
56 56 # members of visible projects
57 57 principals += Principal.member_of(all_projects).visible
58 58 # project filter
59 59 project_values = []
60 60 if User.current.logged? && User.current.memberships.any?
61 61 project_values << ["<< #{l(:label_my_projects).downcase} >>", "mine"]
62 62 end
63 63 project_values += all_projects_values
64 64 add_available_filter("project_id",
65 65 :type => :list, :values => project_values
66 66 ) unless project_values.empty?
67 67 end
68 68 end
69 69 principals.uniq!
70 70 principals.sort!
71 71 users = principals.select {|p| p.is_a?(User)}
72 72
73 73 users_values = []
74 74 users_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
75 75 users_values += users.collect{|s| [s.name, s.id.to_s] }
76 76 add_available_filter("user_id",
77 77 :type => :list_optional, :values => users_values
78 78 ) unless users_values.empty?
79 79
80 80 activities = (project ? project.activities : TimeEntryActivity.shared)
81 81 add_available_filter("activity_id",
82 82 :type => :list, :values => activities.map {|a| [a.name, a.id.to_s]}
83 83 ) unless activities.empty?
84 84
85 85 add_available_filter "comments", :type => :text
86 86 add_available_filter "hours", :type => :float
87 87
88 88 add_custom_fields_filters(TimeEntryCustomField)
89 add_associations_custom_fields_filters :project, :issue, :user
89 add_associations_custom_fields_filters :project
90 add_custom_fields_filters(issue_custom_fields, :issue)
91 add_associations_custom_fields_filters :user
90 92 end
91 93
92 94 def available_columns
93 95 return @available_columns if @available_columns
94 96 @available_columns = self.class.available_columns.dup
95 97 @available_columns += TimeEntryCustomField.visible.
96 98 map {|cf| QueryCustomFieldColumn.new(cf) }
97 @available_columns += IssueCustomField.visible.
99 @available_columns += issue_custom_fields.visible.
98 100 map {|cf| QueryAssociationCustomFieldColumn.new(:issue, cf) }
99 101 @available_columns
100 102 end
101 103
102 104 def default_columns_names
103 105 @default_columns_names ||= [:project, :spent_on, :user, :activity, :issue, :comments, :hours]
104 106 end
105 107
106 108 def results_scope(options={})
107 109 order_option = [group_by_sort_order, options[:order]].flatten.reject(&:blank?)
108 110
109 111 TimeEntry.visible.
110 112 where(statement).
111 113 order(order_option).
112 114 joins(joins_for_order_statement(order_option.join(','))).
113 115 includes(:activity).
114 116 references(:activity)
115 117 end
116 118
117 119 def sql_for_activity_id_field(field, operator, value)
118 120 condition_on_id = sql_for_field(field, operator, value, Enumeration.table_name, 'id')
119 121 condition_on_parent_id = sql_for_field(field, operator, value, Enumeration.table_name, 'parent_id')
120 122 ids = value.map(&:to_i).join(',')
121 123 table_name = Enumeration.table_name
122 124 if operator == '='
123 125 "(#{table_name}.id IN (#{ids}) OR #{table_name}.parent_id IN (#{ids}))"
124 126 else
125 127 "(#{table_name}.id NOT IN (#{ids}) AND (#{table_name}.parent_id IS NULL OR #{table_name}.parent_id NOT IN (#{ids})))"
126 128 end
127 129 end
128 130
129 131 # Accepts :from/:to params as shortcut filters
130 132 def build_from_params(params)
131 133 super
132 134 if params[:from].present? && params[:to].present?
133 135 add_filter('spent_on', '><', [params[:from], params[:to]])
134 136 elsif params[:from].present?
135 137 add_filter('spent_on', '>=', [params[:from]])
136 138 elsif params[:to].present?
137 139 add_filter('spent_on', '<=', [params[:to]])
138 140 end
139 141 self
140 142 end
143
144 def issue_custom_fields
145 if project
146 project.all_issue_custom_fields
147 else
148 IssueCustomField.where(:is_for_all => true)
149 end
150 end
141 151 end
Show file before | Show file after | Hide comments
@@ -1,57 +1,81
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2016 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 30 def test_cross_project_activity_filter_should_propose_non_active_activities
31 31 activity = TimeEntryActivity.create!(:name => 'Disabled', :active => false)
32 32 assert !activity.active?
33 33
34 34 query = TimeEntryQuery.new(:name => '_')
35 35 assert options = query.available_filters['activity_id']
36 36 assert values = options[:values]
37 37 assert_include ["Disabled", activity.id.to_s], values
38 38 end
39 39
40 40 def test_activity_filter_should_consider_system_and_project_activities
41 41 TimeEntry.delete_all
42 42 system = TimeEntryActivity.create!(:name => 'Foo')
43 43 TimeEntry.generate!(:activity => system, :hours => 1.0)
44 44 override = TimeEntryActivity.create!(:name => 'Foo', :parent_id => system.id, :project_id => 1)
45 45 other = TimeEntryActivity.create!(:name => 'Bar')
46 46 TimeEntry.generate!(:activity => override, :hours => 2.0)
47 47 TimeEntry.generate!(:activity => other, :hours => 4.0)
48 48
49 49 query = TimeEntryQuery.new(:name => '_')
50 50 query.add_filter('activity_id', '=', [system.id.to_s])
51 51 assert_equal 3.0, query.results_scope.sum(:hours)
52 52
53 53 query = TimeEntryQuery.new(:name => '_')
54 54 query.add_filter('activity_id', '!', [system.id.to_s])
55 55 assert_equal 4.0, query.results_scope.sum(:hours)
56 56 end
57
58 def test_project_query_should_include_project_issue_custom_fields_only_as_filters
59 global = IssueCustomField.generate!(:is_for_all => true, :is_filter => true)
60 field_on_project = IssueCustomField.generate!(:is_for_all => false, :project_ids => [3], :is_filter => true)
61 field_not_on_project = IssueCustomField.generate!(:is_for_all => false, :project_ids => [1,2], :is_filter => true)
62
63 query = TimeEntryQuery.new(:project => Project.find(3))
64
65 assert_include "issue.cf_#{global.id}", query.available_filters.keys
66 assert_include "issue.cf_#{field_on_project.id}", query.available_filters.keys
67 assert_not_include "issue.cf_#{field_not_on_project.id}", query.available_filters.keys
68 end
69
70 def test_project_query_should_include_project_issue_custom_fields_only_as_columns
71 global = IssueCustomField.generate!(:is_for_all => true, :is_filter => true)
72 field_on_project = IssueCustomField.generate!(:is_for_all => false, :project_ids => [3], :is_filter => true)
73 field_not_on_project = IssueCustomField.generate!(:is_for_all => false, :project_ids => [1,2], :is_filter => true)
74
75 query = TimeEntryQuery.new(:project => Project.find(3))
76
77 assert_include "issue.cf_#{global.id}", query.available_columns.map(&:name).map(&:to_s)
78 assert_include "issue.cf_#{field_on_project.id}", query.available_columns.map(&:name).map(&:to_s)
79 assert_not_include "issue.cf_#{field_not_on_project.id}", query.available_columns.map(&:name).map(&:to_s)
80 end
57 81 end
General Comments 0
You need to be logged in to leave comments. Login now