| @@ -71,21 +71,6 module TimelogHelper | |||||
| 71 | sum |
|
71 | sum | |
| 72 | end |
|
72 | end | |
| 73 |
|
73 | |||
| 74 | def options_for_period_select(value) |
|
|||
| 75 | options_for_select([[l(:label_all_time), 'all'], |
|
|||
| 76 | [l(:label_today), 'today'], |
|
|||
| 77 | [l(:label_yesterday), 'yesterday'], |
|
|||
| 78 | [l(:label_this_week), 'current_week'], |
|
|||
| 79 | [l(:label_last_week), 'last_week'], |
|
|||
| 80 | [l(:label_last_n_weeks, 2), 'last_2_weeks'], |
|
|||
| 81 | [l(:label_last_n_days, 7), '7_days'], |
|
|||
| 82 | [l(:label_this_month), 'current_month'], |
|
|||
| 83 | [l(:label_last_month), 'last_month'], |
|
|||
| 84 | [l(:label_last_n_days, 30), '30_days'], |
|
|||
| 85 | [l(:label_this_year), 'current_year']], |
|
|||
| 86 | value) |
|
|||
| 87 | end |
|
|||
| 88 |
|
||||
| 89 | def format_criteria_value(criteria_options, value) |
|
74 | def format_criteria_value(criteria_options, value) | |
| 90 | if value.blank? |
|
75 | if value.blank? | |
| 91 | "[#{l(:label_none)}]" |
|
76 | "[#{l(:label_none)}]" | |
General Comments 0
You need to be logged in to leave comments.
Login now