Patch #18868 ยป feature-query-next-week.diff
| app/models/query.rb | ||
|---|---|---|
|
"t+" => :label_in,
|
||
|
"t" => :label_today,
|
||
|
"ld" => :label_yesterday,
|
||
|
"nw" => :label_next_week,
|
||
|
"w" => :label_this_week,
|
||
|
"lw" => :label_last_week,
|
||
|
"l2w" => [:label_last_n_weeks, {:count => 2}],
|
||
| ... | ... | |
|
:list_status => [ "o", "=", "!", "c", "*" ],
|
||
|
:list_optional => [ "=", "!", "!*", "*" ],
|
||
|
:list_subprojects => [ "*", "!*", "=" ],
|
||
|
:date => [ "=", ">=", "<=", "><", "<t+", ">t+", "><t+", "t+", "t", "ld", "w", "lw", "l2w", "m", "lm", "y", ">t-", "<t-", "><t-", "t-", "!*", "*" ],
|
||
|
:date_past => [ "=", ">=", "<=", "><", ">t-", "<t-", "><t-", "t-", "t", "ld", "w", "lw", "l2w", "m", "lm", "y", "!*", "*" ],
|
||
|
:date => [ "=", ">=", "<=", "><", "<t+", ">t+", "><t+", "t+", "t", "ld", "nw", "w", "lw", "l2w", "m", "lm", "y", ">t-", "<t-", "><t-", "t-", "!*", "*" ],
|
||
|
:date_past => [ "=", ">=", "<=", "><", ">t-", "<t-", "><t-", "t-", "t", "ld", "nw", "w", "lw", "l2w", "m", "lm", "y", "!*", "*" ],
|
||
|
:string => [ "=", "~", "!", "!~", "!*", "*" ],
|
||
|
:text => [ "~", "!~", "!*", "*" ],
|
||
|
:integer => [ "=", ">=", "<=", "><", "!*", "*" ],
|
||
| ... | ... | |
|
# filter requires one or more values
|
||
|
(values_for(field) and !values_for(field).first.blank?) or
|
||
|
# filter doesn't require any value
|
||
|
["o", "c", "!*", "*", "t", "ld", "w", "lw", "l2w", "m", "lm", "y"].include? operator_for(field)
|
||
|
["o", "c", "!*", "*", "t", "ld", "nw", "w", "lw", "l2w", "m", "lm", "y"].include? operator_for(field)
|
||
|
end if filters
|
||
|
end
|
||
| ... | ... | |
|
when "ld"
|
||
|
# = yesterday
|
||
|
sql = relative_date_clause(db_table, db_field, -1, -1)
|
||
|
when "nw"
|
||
|
# = next 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)
|
||
|
sql = relative_date_clause(db_table, db_field, - days_ago + 7, - days_ago + 6 + 7)
|
||
|
when "w"
|
||
|
# = this week
|
||
|
first_day_of_week = l(:general_first_day_of_week).to_i
|
||
| config/locales/en.yml | ||
|---|---|---|
|
label_today: today
|
||
|
label_all_time: all time
|
||
|
label_yesterday: yesterday
|
||
|
label_next_week: next week
|
||
|
label_this_week: this week
|
||
|
label_last_week: last week
|
||
|
label_last_n_weeks: "last %{count} weeks"
|
||
| public/javascripts/application.js | ||
|---|---|---|
|
case "*":
|
||
|
case "t":
|
||
|
case "ld":
|
||
|
case "nw":
|
||
|
case "w":
|
||
|
case "lw":
|
||
|
case "l2w":
|
||