jro_apps/redmine Commit - r10546:d62ef6b9b1dc

Changes how relative date filters work and adds specific filters for filtering dates in past/next n days (#11426)....

Jean-Philippe Lang -

r10546:d62ef6b9b1dc

parent child

Context file:

r10546:d62ef6b9b1dc

Collapse all files

app/models/query.rb +21 -5

                               "><"  => :label_between,
                               "<t+" => :label_in_less_than,
                               ">t+" => :label_in_more_than,
+                              "><t+"=> :label_in_the_next_days,
                               "t+"  => :label_in,
                               "t"   => :label_today,
                               "w"   => :label_this_week,
                               ">t-" => :label_less_than_ago,
                               "<t-" => :label_more_than_ago,
+                              "><t-"=> :label_in_the_past_days,
                               "t-"  => :label_ago,
                               "~"   => :label_contains,
                               "!~"  => :label_not_contains,
                                              :list_status => [ "o", "=", "!", "c", "*" ],
                                              :list_optional => [ "=", "!", "!*", "*" ],
                                              :list_subprojects => [ "*", "!*", "=" ],
-                                             :date => [ "=", ">=", "<=", "><", "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-", "!*", "*" ],
+                                             :date => [ "=", ">=", "<=", "><", "<t+", ">t+", "><t+", "t+", "t", "w", ">t-", "<t-", "><t-", "t-", "!*", "*" ],
-                                             :date_past => [ "=", ">=", "<=", "><", ">t-", "<t-", "t-", "t", "w", "!*", "*" ],
+                                             :date_past => [ "=", ">=", "<=", "><", ">t-", "<t-", "><t-", "t-", "t", "w", "!*", "*" ],
                                              :string => [ "=", "~", "!", "!~", "!*", "*" ],
                                              :text => [  "~", "!~", "!*", "*" ],
                                              :integer => [ "=", ">=", "<=", "><", "!*", "*" ],
                       case operator_for(field)
                       when "=", ">=", "<=", "><"
                         add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && (!v.match(/^\d{4}-\d{2}-\d{2}$/) || (Date.parse(v) rescue nil).nil?) }
-                      when ">t-", "<t-", "t-", ">t+", "<t+", "t+"
+                      when ">t-", "<t-", "t-", ">t+", "<t+", "t+", "><t+", "><t-"
                         add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^\d+$/) }
                       end
                     end
                   sql = "#{Issue.table_name}.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{connection.quoted_false})" if field == "status_id"
                 when "c"
                   sql = "#{Issue.table_name}.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{connection.quoted_true})" if field == "status_id"
-                when ">t-"
+                when "><t-"
+                  # between today - n days and today
                   sql = relative_date_clause(db_table, db_field, - value.first.to_i, 0)
+                when ">t-"
+                  # >= today - n days
+                  sql = relative_date_clause(db_table, db_field, - value.first.to_i, nil)
                 when "<t-"
+                  # <= today - n days
                   sql = relative_date_clause(db_table, db_field, nil, - value.first.to_i)
                 when "t-"
+                  # = n days in past
                   sql = relative_date_clause(db_table, db_field, - value.first.to_i, - value.first.to_i)
+                when "><t+"
+                  # between today and today + n days
+                  sql = relative_date_clause(db_table, db_field, 0, value.first.to_i)
                 when ">t+"
+                  # >= today + n days
                   sql = relative_date_clause(db_table, db_field, value.first.to_i, nil)
                 when "<t+"
-                  sql = relative_date_clause(db_table, db_field, 0, value.first.to_i)
+                  # <= today + n days
+                  sql = relative_date_clause(db_table, db_field, nil, value.first.to_i)
                 when "t+"
+                  # = today + n days
                   sql = relative_date_clause(db_table, db_field, value.first.to_i, value.first.to_i)
                 when "t"
+                  # = today
                   sql = relative_date_clause(db_table, db_field, 0, 0)
                 when "w"
+                  # = this week
                   first_day_of_week = l(:general_first_day_of_week).to_i
                   day_of_week = Date.today.cwday
                   days_ago = (day_of_week >= first_day_of_week ? day_of_week - first_day_of_week : day_of_week + 7 - first_day_of_week)

config/locales/en.yml +2 0

               label_not_equals: is not
               label_in_less_than: in less than
               label_in_more_than: in more than
+              label_in_the_next_days: in the next
+              label_in_the_past_days: in the past
               label_greater_or_equal: '>='
               label_less_or_equal: '<='
               label_between: between

config/locales/fr.yml +2 0

               label_not_equals: différent
               label_in_less_than: dans moins de
               label_in_more_than: dans plus de
+              label_in_the_next_days: dans les prochains jours
+              label_in_the_past_days: dans les derniers jours
               label_in: dans
               label_today: aujourd'hui
               label_all_time: toute la période

public/javascripts/application.js +2 0

                   break;
                 case "<t+":
                 case ">t+":
+                case "><t+":
                 case "t+":
                 case ">t-":
                 case "<t-":
+                case "><t-":
                 case "t-":
                   enableValues(field, [2]);
                   break;

test/unit/query_test.rb +17 0

@@ -413,6 +413,14 class QueryTest < ActiveSupport::TestCase
413	query.add_filter('due_date', '<t+', ['15'])	413	query.add_filter('due_date', '<t+', ['15'])
414	issues = find_issues_with_query(query)	414	issues = find_issues_with_query(query)
415	assert !issues.empty?	415	assert !issues.empty?
		416	issues.each {\|issue\| assert(issue.due_date <= (Date.today + 15))}
		417	end
		418
		419	def test_operator_in_the_next_days
		420	query = Query.new(:project => Project.find(1), :name => '_')
		421	query.add_filter('due_date', '><t+', ['15'])
		422	issues = find_issues_with_query(query)
		423	assert !issues.empty?
416	issues.each {\|issue\| assert(issue.due_date >= Date.today && issue.due_date <= (Date.today + 15))}	424	issues.each {\|issue\| assert(issue.due_date >= Date.today && issue.due_date <= (Date.today + 15))}
417	end	425	end
418		426
@@ -422,6 +430,15 class QueryTest < ActiveSupport::TestCase
422	query.add_filter('due_date', '>t-', ['3'])	430	query.add_filter('due_date', '>t-', ['3'])
423	issues = find_issues_with_query(query)	431	issues = find_issues_with_query(query)
424	assert !issues.empty?	432	assert !issues.empty?
		433	issues.each {\|issue\| assert(issue.due_date >= (Date.today - 3))}
		434	end
		435
		436	def test_operator_in_the_past_days
		437	Issue.find(7).update_attribute(:due_date, (Date.today - 3))
		438	query = Query.new(:project => Project.find(1), :name => '_')
		439	query.add_filter('due_date', '><t-', ['3'])
		440	issues = find_issues_with_query(query)
		441	assert !issues.empty?
425	issues.each {\|issue\| assert(issue.due_date >= (Date.today - 3) && issue.due_date <= Date.today)}	442	issues.each {\|issue\| assert(issue.due_date >= (Date.today - 3) && issue.due_date <= Date.today)}
426	end	443	end
427		444

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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