|
|
@@ -71,21 +71,6 @@ module TimelogHelper |
|
|
|
sum |
|
|
|
end |
|
|
|
|
|
|
|
def options_for_period_select(value) |
|
|
|
options_for_select([[l(:label_all_time), 'all'], |
|
|
|
[l(:label_today), 'today'], |
|
|
|
[l(:label_yesterday), 'yesterday'], |
|
|
|
[l(:label_this_week), 'current_week'], |
|
|
|
[l(:label_last_week), 'last_week'], |
|
|
|
[l(:label_last_n_weeks, 2), 'last_2_weeks'], |
|
|
|
[l(:label_last_n_days, 7), '7_days'], |
|
|
|
[l(:label_this_month), 'current_month'], |
|
|
|
[l(:label_last_month), 'last_month'], |
|
|
|
[l(:label_last_n_days, 30), '30_days'], |
|
|
|
[l(:label_this_year), 'current_year']], |
|
|
|
value) |
|
|
|
end |
|
|
|
|
|
|
|
def format_criteria_value(criteria_options, value) |
|
|
|
if value.blank? |
|
|
|
"[#{l(:label_none)}]" |