jro_apps/redmine Commit - r698:22c5e0d61481

1

# redMine - project management software

1

# redMine - project management software

2

3

#

3

#

4

# This program is free software; you can redistribute it and/or

4

# This program is free software; you can redistribute it and/or

5

# modify it under the terms of the GNU General Public License

5

# modify it under the terms of the GNU General Public License

6

# as published by the Free Software Foundation; either version 2

6

# as published by the Free Software Foundation; either version 2

7

# of the License, or (at your option) any later version.

7

# of the License, or (at your option) any later version.

8

#

8

#

9

# This program is distributed in the hope that it will be useful,

9

# This program is distributed in the hope that it will be useful,

10

# but WITHOUT ANY WARRANTY; without even the implied warranty of

10

# but WITHOUT ANY WARRANTY; without even the implied warranty of

11

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

12

# GNU General Public License for more details.

12

# GNU General Public License for more details.

13

#

13

#

14

# You should have received a copy of the GNU General Public License

14

# You should have received a copy of the GNU General Public License

15

# along with this program; if not, write to the Free Software

15

# along with this program; if not, write to the Free Software

16

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

16

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

17

18

class Query < ActiveRecord::Base

18

class Query < ActiveRecord::Base

19

belongs_to :project

19

belongs_to :project

20

belongs_to :user

20

belongs_to :user

21

serialize :filters

21

serialize :filters

22

23

attr_protected :project, :user

23

attr_protected :project, :user

24

attr_accessor :executed_by

24

attr_accessor :executed_by

25

26

validates_presence_of :name, :on => :save

26

validates_presence_of :name, :on => :save

27

validates_length_of :name, :maximum => 255

27

validates_length_of :name, :maximum => 255

28

29

@@operators = { "=" => :label_equals,

29

@@operators = { "=" => :label_equals,

30

"!" => :label_not_equals,

30

"!" => :label_not_equals,

31

"o" => :label_open_issues,

31

"o" => :label_open_issues,

32

"c" => :label_closed_issues,

32

"c" => :label_closed_issues,

33

"!*" => :label_none,

33

"!*" => :label_none,

34

"*" => :label_all,

34

"*" => :label_all,

35

"<t+" => :label_in_less_than,

35

"<t+" => :label_in_less_than,

36

">t+" => :label_in_more_than,

36

">t+" => :label_in_more_than,

37

"t+" => :label_in,

37

"t+" => :label_in,

38

"t" => :label_today,

38

"t" => :label_today,

39

"w" => :label_this_week,

39

"w" => :label_this_week,

40

">t-" => :label_less_than_ago,

40

">t-" => :label_less_than_ago,

41

"<t-" => :label_more_than_ago,

41

"<t-" => :label_more_than_ago,

42

"t-" => :label_ago,

42

"t-" => :label_ago,

43

"~" => :label_contains,

43

"~" => :label_contains,

44

"!~" => :label_not_contains }

44

"!~" => :label_not_contains }

45

46

cattr_reader :operators

46

cattr_reader :operators

47

48

@@operators_by_filter_type = { :list => [ "=", "!" ],

48

@@operators_by_filter_type = { :list => [ "=", "!" ],

49

:list_status => [ "o", "=", "!", "c", "*" ],

49

:list_status => [ "o", "=", "!", "c", "*" ],

50

:list_optional => [ "=", "!", "!*", "*" ],

50

:list_optional => [ "=", "!", "!*", "*" ],

51

:list_one_or_more => [ "*", "=" ],

51

:list_one_or_more => [ "*", "=" ],

52

:date => [ "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-" ],

52

:date => [ "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-" ],

53

:date_past => [ ">t-", "<t-", "t-", "t", "w" ],

53

:date_past => [ ">t-", "<t-", "t-", "t", "w" ],

54

:string => [ "=", "~", "!", "!~" ],

54

:string => [ "=", "~", "!", "!~" ],

55

:text => [ "~", "!~" ] }

55

:text => [ "~", "!~" ] }

56

57

cattr_reader :operators_by_filter_type

57

cattr_reader :operators_by_filter_type

58

59

def initialize(attributes = nil)

59

def initialize(attributes = nil)

60

super attributes

60

super attributes

61

self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }

61

self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }

62

end

62

end

63

64

def executed_by=(user)

64

def executed_by=(user)

65

@executed_by = user

65

@executed_by = user

66

set_language_if_valid(user.language) if user

66

set_language_if_valid(user.language) if user

67

end

67

end

68

69

def validate

69

def validate

70

filters.each_key do |field|

70

filters.each_key do |field|

71

errors.add label_for(field), :activerecord_error_blank unless

71

errors.add label_for(field), :activerecord_error_blank unless

72

# filter requires one or more values

72

# filter requires one or more values

73

(values_for(field) and !values_for(field).first.empty?) or

73

(values_for(field) and !values_for(field).first.empty?) or

74

# filter doesn't require any value

74

# filter doesn't require any value

75

["o", "c", "!*", "*", "t", "w"].include? operator_for(field)

75

["o", "c", "!*", "*", "t", "w"].include? operator_for(field)

76

end if filters

76

end if filters

77

end

77

end

78

79

def editable_by?(user)

79

def editable_by?(user)

80

return false unless user

80

return false unless user

81

return true if !is_public && self.user_id == user.id

81

return true if !is_public && self.user_id == user.id

82

is_public && user.allowed_to?(:manage_pulic_queries, project)

82

is_public && user.allowed_to?(:manage_pulic_queries, project)

83

end

83

end

84

85

def available_filters

85

def available_filters

86

return @available_filters if @available_filters

86

return @available_filters if @available_filters

87

@available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },

87

@available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },

88

"tracker_id" => { :type => :list, :order => 2, :values => Tracker.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },

88

"tracker_id" => { :type => :list, :order => 2, :values => Tracker.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },

89

"priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect{|s| [s.name, s.id.to_s] } },

89

"priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect{|s| [s.name, s.id.to_s] } },

90

"subject" => { :type => :text, :order => 8 },

90

"subject" => { :type => :text, :order => 8 },

91

"created_on" => { :type => :date_past, :order => 9 },

91

"created_on" => { :type => :date_past, :order => 9 },

92

"updated_on" => { :type => :date_past, :order => 10 },

92

"updated_on" => { :type => :date_past, :order => 10 },

93

"start_date" => { :type => :date, :order => 11 },

93

"start_date" => { :type => :date, :order => 11 },

94

"due_date" => { :type => :date, :order => 12 } }

94

"due_date" => { :type => :date, :order => 12 } }

95

96

user_values = []

96

user_values = []

97

if project

97

if project

98

user_values += project.users.collect{|s| [s.name, s.id.to_s] }

98

user_values += project.users.collect{|s| [s.name, s.id.to_s] }

99

elsif executed_by

99

elsif executed_by

100

user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by

100

user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by

101

# members of the user's projects

101

# members of the user's projects

102

user_values += executed_by.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }

102

user_values += executed_by.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }

103

end

103

end

104

@available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values } unless user_values.empty?

104

@available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values } unless user_values.empty?

105

@available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values } unless user_values.empty?

105

@available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values } unless user_values.empty?

106

107

if project

107

if project

108

# project specific filters

108

# project specific filters

109

@available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }

109

@available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }

110

@available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.sort.collect{|s| [s.name, s.id.to_s] } }

110

@available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.sort.collect{|s| [s.name, s.id.to_s] } }

111

unless @project.active_children.empty?

111

unless @project.active_children.empty?

112

@available_filters["subproject_id"] = { :type => :list_one_or_more, :order => 13, :values => @project.active_children.collect{|s| [s.name, s.id.to_s] } }

112

@available_filters["subproject_id"] = { :type => :list_one_or_more, :order => 13, :values => @project.active_children.collect{|s| [s.name, s.id.to_s] } }

113

end

113

end

114

@project.all_custom_fields.select(&:is_filter?).each do |field|

114

@project.all_custom_fields.select(&:is_filter?).each do |field|

115

case field.field_format

115

case field.field_format

116

when "string", "int"

116

when "string", "int"

117

options = { :type => :string, :order => 20 }

117

options = { :type => :string, :order => 20 }

118

when "text"

118

when "text"

119

options = { :type => :text, :order => 20 }

119

options = { :type => :text, :order => 20 }

120

when "list"

120

when "list"

121

options = { :type => :list_optional, :values => field.possible_values, :order => 20}

121

options = { :type => :list_optional, :values => field.possible_values, :order => 20}

122

when "date"

122

when "date"

123

options = { :type => :date, :order => 20 }

123

options = { :type => :date, :order => 20 }

124

when "bool"

124

when "bool"

125

options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }

125

options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }

126

end

126

end

127

@available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })

127

@available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })

128

end

128

end

129

# remove category filter if no category defined

129

# remove category filter if no category defined

130

@available_filters.delete "category_id" if @available_filters["category_id"][:values].empty?

130

@available_filters.delete "category_id" if @available_filters["category_id"][:values].empty?

131

end

131

end

132

@available_filters

132

@available_filters

133

end

133

end

134

135

def add_filter(field, operator, values)

135

def add_filter(field, operator, values)

136

# values must be an array

136

# values must be an array

137

return unless values and values.is_a? Array # and !values.first.empty?

137

return unless values and values.is_a? Array # and !values.first.empty?

138

# check if field is defined as an available filter

138

# check if field is defined as an available filter

139

if available_filters.has_key? field

139

if available_filters.has_key? field

140

filter_options = available_filters[field]

140

filter_options = available_filters[field]

141

# check if operator is allowed for that filter

141

# check if operator is allowed for that filter

142

#if @@operators_by_filter_type[filter_options[:type]].include? operator

142

#if @@operators_by_filter_type[filter_options[:type]].include? operator

143

# allowed_values = values & ([""] + (filter_options[:values] || []).collect {|val| val[1]})

143

# allowed_values = values & ([""] + (filter_options[:values] || []).collect {|val| val[1]})

144

# filters[field] = {:operator => operator, :values => allowed_values } if (allowed_values.first and !allowed_values.first.empty?) or ["o", "c", "!*", "*", "t"].include? operator

144

# filters[field] = {:operator => operator, :values => allowed_values } if (allowed_values.first and !allowed_values.first.empty?) or ["o", "c", "!*", "*", "t"].include? operator

145

#end

145

#end

146

filters[field] = {:operator => operator, :values => values }

146

filters[field] = {:operator => operator, :values => values }

147

end

147

end

148

end

148

end

149

150

def add_short_filter(field, expression)

150

def add_short_filter(field, expression)

151

return unless expression

151

return unless expression

152

parms = expression.scan(/^(o|c|\!|\*)?(.*)$/).first

152

parms = expression.scan(/^(o|c|\!|\*)?(.*)$/).first

153

add_filter field, (parms[0] || "="), [parms[1] || ""]

153

add_filter field, (parms[0] || "="), [parms[1] || ""]

154

end

154

end

155

156

def has_filter?(field)

156

def has_filter?(field)

157

filters and filters[field]

157

filters and filters[field]

158

end

158

end

159

160

def operator_for(field)

160

def operator_for(field)

161

has_filter?(field) ? filters[field][:operator] : nil

161

has_filter?(field) ? filters[field][:operator] : nil

162

end

162

end

163

164

def values_for(field)

164

def values_for(field)

165

has_filter?(field) ? filters[field][:values] : nil

165

has_filter?(field) ? filters[field][:values] : nil

166

end

166

end

167

168

def label_for(field)

168

def label_for(field)

169

label = @available_filters[field][:name] if @available_filters.has_key?(field)

169

label = @available_filters[field][:name] if @available_filters.has_key?(field)

170

label ||= field.gsub(/\_id$/, "")

170

label ||= field.gsub(/\_id$/, "")

171

end

171

end

172

173

def statement

173

def statement

174

# project/subprojects clause

174

# project/subprojects clause

175

clause = ''

175

clause = ''

176

if project && has_filter?("subproject_id")

176

if project && has_filter?("subproject_id")

177

subproject_ids = []

177

subproject_ids = []

178

if operator_for("subproject_id") == "="

178

if operator_for("subproject_id") == "="

179

subproject_ids = values_for("subproject_id").each(&:to_i)

179

subproject_ids = values_for("subproject_id").each(&:to_i)

180

else

180

else

181

subproject_ids = project.active_children.collect{|p| p.id}

181

subproject_ids = project.active_children.collect{|p| p.id}

182

end

182

end

183

clause << "#{Issue.table_name}.project_id IN (%d,%s)" % [project.id, subproject_ids.join(",")] if project

183

clause << "#{Issue.table_name}.project_id IN (%d,%s)" % [project.id, subproject_ids.join(",")] if project

184

elsif project

184

elsif project

185

clause << "#{Issue.table_name}.project_id=%d" % project.id

185

clause << "#{Issue.table_name}.project_id=%d" % project.id

186

else

186

else

187

clause << Project.visible_by(executed_by)

187

clause << Project.visible_by(executed_by)

188

end

188

end

189

190

# filters clauses

190

# filters clauses

191

filters_clauses = []

191

filters_clauses = []

192

filters.each_key do |field|

192

filters.each_key do |field|

193

next if field == "subproject_id"

193

next if field == "subproject_id"

194

v = values_for(field).clone

194

v = values_for(field).clone

195

next unless v and !v.empty?

195

next unless v and !v.empty?

196

197

sql = ''

197

sql = ''

198

if field =~ /^cf_(\d+)$/

198

if field =~ /^cf_(\d+)$/

199

# custom field

199

# custom field

200

db_table = CustomValue.table_name

200

db_table = CustomValue.table_name

201

db_field = 'value'

201

db_field = 'value'

202

sql << "#{Issue.table_name}.id IN (SELECT #{db_table}.customized_id FROM #{db_table} where #{db_table}.customized_type='Issue' AND #{db_table}.customized_id=#{Issue.table_name}.id AND #{db_table}.custom_field_id=#{$1} AND "

202

sql << "#{Issue.table_name}.id IN (SELECT #{db_table}.customized_id FROM #{db_table} where #{db_table}.customized_type='Issue' AND #{db_table}.customized_id=#{Issue.table_name}.id AND #{db_table}.custom_field_id=#{$1} AND "

203

else

203

else

204

# regular field

204

# regular field

205

db_table = Issue.table_name

205

db_table = Issue.table_name

206

db_field = field

206

db_field = field

207

sql << '('

207

sql << '('

208

end

208

end

209

210

# "me" value subsitution

210

# "me" value subsitution

211

if %w(assigned_to_id author_id).include?(field)

211

if %w(assigned_to_id author_id).include?(field)

212

v.push(executed_by ? executed_by.id.to_s : "0") if v.delete("me")

212

v.push(executed_by ? executed_by.id.to_s : "0") if v.delete("me")

213

end

213

end

214

215

case operator_for field

215

case operator_for field

216

when "="

216

when "="

217

sql = sql + "#{db_table}.#{db_field} IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"

217

sql = sql + "#{db_table}.#{db_field} IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"

218

when "!"

218

when "!"

219

sql = sql + "#{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"

219

sql = sql + "#{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"

220

when "!*"

220

when "!*"

221

sql = sql + "#{db_table}.#{db_field} IS NULL"

221

sql = sql + "#{db_table}.#{db_field} IS NULL"

222

when "*"

222

when "*"

223

sql = sql + "#{db_table}.#{db_field} IS NOT NULL"

223

sql = sql + "#{db_table}.#{db_field} IS NOT NULL"

224

when "o"

224

when "o"

225

sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"

225

sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"

226

when "c"

226

when "c"

227

sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id"

227

sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id"

228

when ">t-"

228

when ">t-"

229

sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today - v.first.to_i).to_time), connection.quoted_date((Date.today + 1).to_time)]

229

sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today - v.first.to_i).to_time), connection.quoted_date((Date.today + 1).to_time)]

230

when "<t-"

230

when "<t-"

231

sql = sql + "#{db_table}.#{db_field} <= '%s'" % connection.quoted_date((Date.today - v.first.to_i).to_time)

231

sql = sql + "#{db_table}.#{db_field} <= '%s'" % connection.quoted_date((Date.today - v.first.to_i).to_time)

232

when "t-"

232

when "t-"

233

sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today - v.first.to_i).to_time), connection.quoted_date((Date.today - v.first.to_i + 1).to_time)]

233

sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today - v.first.to_i).to_time), connection.quoted_date((Date.today - v.first.to_i + 1).to_time)]

234

when ">t+"

234

when ">t+"

235

sql = sql + "#{db_table}.#{db_field} >= '%s'" % connection.quoted_date((Date.today + v.first.to_i).to_time)

235

sql = sql + "#{db_table}.#{db_field} >= '%s'" % connection.quoted_date((Date.today + v.first.to_i).to_time)

236

when "<t+"

236

when "<t+"

237

sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Date.today.to_time), connection.quoted_date((Date.today + v.first.to_i + 1).to_time)]

237

sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Date.today.to_time), connection.quoted_date((Date.today + v.first.to_i + 1).to_time)]

238

when "t+"

238

when "t+"

239

sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today + v.first.to_i).to_time), connection.quoted_date((Date.today + v.first.to_i + 1).to_time)]

239

sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today + v.first.to_i).to_time), connection.quoted_date((Date.today + v.first.to_i + 1).to_time)]

240

when "t"

240

when "t"

241

sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Date.today.to_time), connection.quoted_date((Date.today+1).to_time)]

241

sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Date.today.to_time), connection.quoted_date((Date.today+1).to_time)]

242

when "w"

242

when "w"

243

sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Time.now.at_beginning_of_week), connection.quoted_date(Time.now.next_week)]

243

sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Time.now.at_beginning_of_week), connection.quoted_date(Time.now.next_week.yesterday)]

244

when "~"

244

when "~"

245

sql = sql + "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(v.first)}%'"

245

sql = sql + "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(v.first)}%'"

246

when "!~"

246

when "!~"

247

sql = sql + "#{db_table}.#{db_field} NOT LIKE '%#{connection.quote_string(v.first)}%'"

247

sql = sql + "#{db_table}.#{db_field} NOT LIKE '%#{connection.quote_string(v.first)}%'"

248

end

248

end

249

sql << ')'

249

sql << ')'

250

filters_clauses << sql

250

filters_clauses << sql

251

end if filters and valid?

251

end if filters and valid?

252

253

clause << ' AND ' unless clause.empty?

253

clause << ' AND ' unless clause.empty?

254

clause << filters_clauses.join(' AND ') unless filters_clauses.empty?

254

clause << filters_clauses.join(' AND ') unless filters_clauses.empty?

255

clause

255

clause

256

end

256

end

257

end

257

end

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Query < ActiveRecord::Base
               belongs_to :project
               belongs_to :user
               serialize :filters
               attr_protected :project, :user
               attr_accessor :executed_by
               validates_presence_of :name, :on => :save
               validates_length_of :name, :maximum => 255
               @@operators = { "="   => :label_equals,
                               "!"   => :label_not_equals,
                               "o"   => :label_open_issues,
                               "c"   => :label_closed_issues,
                               "!*"  => :label_none,
                               "*"   => :label_all,
                               "<t+" => :label_in_less_than,
                               ">t+" => :label_in_more_than,
                               "t+"  => :label_in,
                               "t"   => :label_today,
                               "w"   => :label_this_week,
                               ">t-" => :label_less_than_ago,
                               "<t-" => :label_more_than_ago,
                               "t-"  => :label_ago,
                               "~"   => :label_contains,
                               "!~"  => :label_not_contains }
               cattr_reader :operators
               @@operators_by_filter_type = { :list => [ "=", "!" ],
                                              :list_status => [ "o", "=", "!", "c", "*" ],
                                              :list_optional => [ "=", "!", "!*", "*" ],
                                              :list_one_or_more => [ "*", "=" ],
                                              :date => [ "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-" ],
                                              :date_past => [ ">t-", "<t-", "t-", "t", "w" ],
                                              :string => [ "=", "~", "!", "!~" ],
                                              :text => [  "~", "!~" ] }
               cattr_reader :operators_by_filter_type
               def initialize(attributes = nil)
                 super attributes
                 self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
               end
               def executed_by=(user)
                 @executed_by = user
                 set_language_if_valid(user.language) if user
               end
               def validate
                 filters.each_key do |field|
                   errors.add label_for(field), :activerecord_error_blank unless
                       # filter requires one or more values
                       (values_for(field) and !values_for(field).first.empty?) or
                       # filter doesn't require any value
                       ["o", "c", "!*", "*", "t", "w"].include? operator_for(field)
                 end if filters
               end
               def editable_by?(user)
                 return false unless user
                 return true if !is_public && self.user_id == user.id
                 is_public && user.allowed_to?(:manage_pulic_queries, project)
               end
               def available_filters
                 return @available_filters if @available_filters
                 @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },
                                        "tracker_id" => { :type => :list, :order => 2, :values => Tracker.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },
                                        "priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect{|s| [s.name, s.id.to_s] } },
                                        "subject" => { :type => :text, :order => 8 },
                                        "created_on" => { :type => :date_past, :order => 9 },
                                        "updated_on" => { :type => :date_past, :order => 10 },
                                        "start_date" => { :type => :date, :order => 11 },
                                        "due_date" => { :type => :date, :order => 12 } }
                 user_values = []
                 if project
                   user_values += project.users.collect{|s| [s.name, s.id.to_s] }
                 elsif executed_by
                   user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by
                   # members of the user's projects
                   user_values += executed_by.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }
                 end
                 @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values } unless user_values.empty?
                 @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values } unless user_values.empty?
                 if project
                   # project specific filters
                   @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
                   @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.sort.collect{|s| [s.name, s.id.to_s] } }
                   unless @project.active_children.empty?
                     @available_filters["subproject_id"] = { :type => :list_one_or_more, :order => 13, :values => @project.active_children.collect{|s| [s.name, s.id.to_s] } }
                   end
                   @project.all_custom_fields.select(&:is_filter?).each do |field|
                     case field.field_format
                     when "string", "int"
                       options = { :type => :string, :order => 20 }
                     when "text"
                       options = { :type => :text, :order => 20 }
                     when "list"
                       options = { :type => :list_optional, :values => field.possible_values, :order => 20}
                     when "date"
                       options = { :type => :date, :order => 20 }
                     when "bool"
                       options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }
                     end
                     @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })
                   end
                   # remove category filter if no category defined
                   @available_filters.delete "category_id" if @available_filters["category_id"][:values].empty?
                 end
                 @available_filters
               end
               def add_filter(field, operator, values)
                 # values must be an array
                 return unless values and values.is_a? Array # and !values.first.empty?
                 # check if field is defined as an available filter
                 if available_filters.has_key? field
                   filter_options = available_filters[field]
                   # check if operator is allowed for that filter
                   #if @@operators_by_filter_type[filter_options[:type]].include? operator
                   #  allowed_values = values & ([""] + (filter_options[:values] || []).collect {|val| val[1]})
                   #  filters[field] = {:operator => operator, :values => allowed_values } if (allowed_values.first and !allowed_values.first.empty?) or ["o", "c", "!*", "*", "t"].include? operator
                   #end
                   filters[field] = {:operator => operator, :values => values }
                 end
               end
               def add_short_filter(field, expression)
                 return unless expression
                 parms = expression.scan(/^(o|c|\!|\*)?(.*)$/).first
                 add_filter field, (parms[0] || "="), [parms[1] || ""]
               end
               def has_filter?(field)
                 filters and filters[field]
               end
               def operator_for(field)
                 has_filter?(field) ? filters[field][:operator] : nil
               end
               def values_for(field)
                 has_filter?(field) ? filters[field][:values] : nil
               end
               def label_for(field)
                 label = @available_filters[field][:name] if @available_filters.has_key?(field)
                 label ||= field.gsub(/\_id$/, "")
               end
               def statement
                 # project/subprojects clause
                 clause = ''
                 if project && has_filter?("subproject_id")
                   subproject_ids = []
                   if operator_for("subproject_id") == "="
                     subproject_ids = values_for("subproject_id").each(&:to_i)
                   else
                     subproject_ids = project.active_children.collect{|p| p.id}
                   end
                   clause << "#{Issue.table_name}.project_id IN (%d,%s)" % [project.id, subproject_ids.join(",")] if project
                 elsif project
                   clause << "#{Issue.table_name}.project_id=%d" % project.id
                 else
                   clause << Project.visible_by(executed_by)
                 end
                 # filters clauses
                 filters_clauses = []
                 filters.each_key do |field|
                   next if field == "subproject_id"
                   v = values_for(field).clone
                   next unless v and !v.empty?
                   sql = ''
                   if field =~ /^cf_(\d+)$/
                     # custom field
                     db_table = CustomValue.table_name
                     db_field = 'value'
                     sql << "#{Issue.table_name}.id IN (SELECT #{db_table}.customized_id FROM #{db_table} where #{db_table}.customized_type='Issue' AND #{db_table}.customized_id=#{Issue.table_name}.id AND #{db_table}.custom_field_id=#{$1} AND "
                   else
                     # regular field
                     db_table = Issue.table_name
                     db_field = field
                     sql << '('
                   end
                   # "me" value subsitution
                   if %w(assigned_to_id author_id).include?(field)
                     v.push(executed_by ? executed_by.id.to_s : "0") if v.delete("me")
                   end
                   case operator_for field
                   when "="
                     sql = sql + "#{db_table}.#{db_field} IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
                   when "!"
                     sql = sql + "#{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
                   when "!*"
                     sql = sql + "#{db_table}.#{db_field} IS NULL"
                   when "*"
                     sql = sql + "#{db_table}.#{db_field} IS NOT NULL"
                   when "o"
                     sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"
                   when "c"
                     sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id"
                   when ">t-"
                     sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today - v.first.to_i).to_time), connection.quoted_date((Date.today + 1).to_time)]
                   when "<t-"
                     sql = sql + "#{db_table}.#{db_field} <= '%s'" % connection.quoted_date((Date.today - v.first.to_i).to_time)
                   when "t-"
                     sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today - v.first.to_i).to_time), connection.quoted_date((Date.today - v.first.to_i + 1).to_time)]
                   when ">t+"
                     sql = sql + "#{db_table}.#{db_field} >= '%s'" % connection.quoted_date((Date.today + v.first.to_i).to_time)
                   when "<t+"
                     sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Date.today.to_time), connection.quoted_date((Date.today + v.first.to_i + 1).to_time)]
                   when "t+"
                     sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today + v.first.to_i).to_time), connection.quoted_date((Date.today + v.first.to_i + 1).to_time)]
                   when "t"
                     sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Date.today.to_time), connection.quoted_date((Date.today+1).to_time)]
                   when "w"
-                    sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Time.now.at_beginning_of_week), connection.quoted_date(Time.now.next_week)]
+                    sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Time.now.at_beginning_of_week), connection.quoted_date(Time.now.next_week.yesterday)]
                   when "~"
                     sql = sql + "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(v.first)}%'"
                   when "!~"
                     sql = sql + "#{db_table}.#{db_field} NOT LIKE '%#{connection.quote_string(v.first)}%'"
                   end
                   sql << ')'
                   filters_clauses << sql
                 end if filters and valid?
                 clause << ' AND ' unless clause.empty?
                 clause << filters_clauses.join(' AND ') unless filters_clauses.empty?
                 clause
               end
             end