| @@ -36,6 +36,7 class Query < ActiveRecord::Base | |||
|
|
36 | 36 | ">t+" => :label_in_more_than, |
|
|
37 | 37 | "t+" => :label_in, |
|
|
38 | 38 | "t" => :label_today, |
|
|
39 | "w" => :label_this_week, | |
|
|
39 | 40 | ">t-" => :label_less_than_ago, |
|
|
40 | 41 | "<t-" => :label_more_than_ago, |
|
|
41 | 42 | "t-" => :label_ago, |
| @@ -48,8 +49,8 class Query < ActiveRecord::Base | |||
|
|
48 | 49 | :list_status => [ "o", "=", "!", "c", "*" ], |
|
|
49 | 50 | :list_optional => [ "=", "!", "!*", "*" ], |
|
|
50 | 51 | :list_one_or_more => [ "*", "=" ], |
|
|
51 | :date => [ "<t+", ">t+", "t+", "t", ">t-", "<t-", "t-" ], | |
|
|
52 | :date_past => [ ">t-", "<t-", "t-", "t" ], | |
|
|
52 | :date => [ "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-" ], | |
|
|
53 | :date_past => [ ">t-", "<t-", "t-", "t", "w" ], | |
|
|
53 | 54 | :string => [ "=", "~", "!", "!~" ], |
|
|
54 | 55 | :text => [ "~", "!~" ] } |
|
|
55 | 56 | |
| @@ -71,7 +72,7 class Query < ActiveRecord::Base | |||
|
|
71 | 72 | # filter requires one or more values |
|
|
72 | 73 | (values_for(field) and !values_for(field).first.empty?) or |
|
|
73 | 74 | # filter doesn't require any value |
|
|
74 | ["o", "c", "!*", "*", "t"].include? operator_for(field) | |
|
|
75 | ["o", "c", "!*", "*", "t", "w"].include? operator_for(field) | |
|
|
75 | 76 | end if filters |
|
|
76 | 77 | end |
|
|
77 | 78 | |
| @@ -238,6 +239,8 class Query < ActiveRecord::Base | |||
|
|
238 | 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 | 240 | when "t" |
|
|
240 | 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" | |
|
|
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)] | |
|
|
241 | 244 | when "~" |
|
|
242 | 245 | sql = sql + "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(v.first)}%'" |
|
|
243 | 246 | when "!~" |
| @@ -34,6 +34,7 function toggle_operator(field) { | |||
|
|
34 | 34 | case "!*": |
|
|
35 | 35 | case "*": |
|
|
36 | 36 | case "t": |
|
|
37 | case "w": | |
|
|
37 | 38 | case "o": |
|
|
38 | 39 | case "c": |
|
|
39 | 40 | Element.hide("div_values_" + field); |
| @@ -318,6 +318,7 label_in_less_than: по-малко от | |||
|
|
318 | 318 | label_in_more_than: повече от |
|
|
319 | 319 | label_in: в следващите |
|
|
320 | 320 | label_today: днес |
|
|
321 | label_this_week: this week | |
|
|
321 | 322 | label_less_than_ago: преди по-малко от |
|
|
322 | 323 | label_more_than_ago: преди повече от |
|
|
323 | 324 | label_ago: преди дни |
| @@ -318,6 +318,7 label_in_less_than: in weniger als | |||
|
|
318 | 318 | label_in_more_than: in mehr als |
|
|
319 | 319 | label_in: an |
|
|
320 | 320 | label_today: heute |
|
|
321 | label_this_week: this week | |
|
|
321 | 322 | label_less_than_ago: vor weniger als |
|
|
322 | 323 | label_more_than_ago: vor mehr als |
|
|
323 | 324 | label_ago: vor |
| @@ -318,6 +318,7 label_in_less_than: in less than | |||
|
|
318 | 318 | label_in_more_than: in more than |
|
|
319 | 319 | label_in: in |
|
|
320 | 320 | label_today: today |
|
|
321 | label_this_week: this week | |
|
|
321 | 322 | label_less_than_ago: less than days ago |
|
|
322 | 323 | label_more_than_ago: more than days ago |
|
|
323 | 324 | label_ago: days ago |
| @@ -318,6 +318,7 label_in_less_than: en menos que | |||
|
|
318 | 318 | label_in_more_than: en más que |
|
|
319 | 319 | label_in: en |
|
|
320 | 320 | label_today: hoy |
|
|
321 | label_this_week: this week | |
|
|
321 | 322 | label_less_than_ago: hace menos de |
|
|
322 | 323 | label_more_than_ago: hace más de |
|
|
323 | 324 | label_ago: hace |
| @@ -318,6 +318,7 label_in_less_than: dans moins de | |||
|
|
318 | 318 | label_in_more_than: dans plus de |
|
|
319 | 319 | label_in: dans |
|
|
320 | 320 | label_today: aujourd'hui |
|
|
321 | label_this_week: cette semaine | |
|
|
321 | 322 | label_less_than_ago: il y a moins de |
|
|
322 | 323 | label_more_than_ago: il y a plus de |
|
|
323 | 324 | label_ago: il y a |
| @@ -318,6 +318,7 label_in_less_than: è minore di | |||
|
|
318 | 318 | label_in_more_than: è maggiore di |
|
|
319 | 319 | label_in: in |
|
|
320 | 320 | label_today: oggi |
|
|
321 | label_this_week: this week | |
|
|
321 | 322 | label_less_than_ago: meno di giorni fa |
|
|
322 | 323 | label_more_than_ago: più di giorni fa |
|
|
323 | 324 | label_ago: giorni fa |
| @@ -319,6 +319,7 label_in_less_than: 残日数がこれより多い | |||
|
|
319 | 319 | label_in_more_than: 残日数がこれより少ない |
|
|
320 | 320 | label_in: 残日数 |
|
|
321 | 321 | label_today: 今日 |
|
|
322 | label_this_week: this week | |
|
|
322 | 323 | label_less_than_ago: 経過日数がこれより少ない |
|
|
323 | 324 | label_more_than_ago: 経過日数がこれより多い |
|
|
324 | 325 | label_ago: 日前 |
| @@ -318,6 +318,7 label_in_less_than: in minder dan | |||
|
|
318 | 318 | label_in_more_than: in meer dan |
|
|
319 | 319 | label_in: in |
|
|
320 | 320 | label_today: vandaag |
|
|
321 | label_this_week: this week | |
|
|
321 | 322 | label_less_than_ago: minder dan dagen geleden |
|
|
322 | 323 | label_more_than_ago: meer dan dagen geleden |
|
|
323 | 324 | label_ago: dagen geleden |
| @@ -318,6 +318,7 label_in_less_than: e maior que | |||
|
|
318 | 318 | label_in_more_than: e menor que |
|
|
319 | 319 | label_in: em |
|
|
320 | 320 | label_today: hoje |
|
|
321 | label_this_week: this week | |
|
|
321 | 322 | label_less_than_ago: faz menos de |
|
|
322 | 323 | label_more_than_ago: faz mais de |
|
|
323 | 324 | label_ago: dias atras |
| @@ -318,6 +318,7 label_in_less_than: é maior que | |||
|
|
318 | 318 | label_in_more_than: é menor que |
|
|
319 | 319 | label_in: em |
|
|
320 | 320 | label_today: hoje |
|
|
321 | label_this_week: this week | |
|
|
321 | 322 | label_less_than_ago: faz menos de |
|
|
322 | 323 | label_more_than_ago: faz mais de |
|
|
323 | 324 | label_ago: dias atrás |
General Comments 0
You need to be logged in to leave comments.
Login now