Add "last 2 weeks" preset to time entries reporting (#11862).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10583 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/controllers/timelog_controller.rb

@@ -308,6 +308,9 @@ private
       when 'last_week'
         @from = Date.today - 7 - (Date.today.cwday - 1)%7
         @to = @from + 6
+      when 'last_2_weeks'
+        @from = Date.today - 14 - (Date.today.cwday - 1)%7
+        @to = @from + 13
       when '7_days'
         @from = Date.today - 7
         @to = Date.today

app/helpers/timelog_helper.rb

@@ -77,6 +77,7 @@ module TimelogHelper
                         [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'],

config/locales/en.yml

@@ -663,6 +663,7 @@ en:
   label_yesterday: yesterday
   label_this_week: this week
   label_last_week: last week
+  label_last_n_weeks: "last %{count} weeks"
   label_last_n_days: "last %{count} days"
   label_this_month: this month
   label_last_month: last month

config/locales/fr.yml

@@ -653,6 +653,7 @@ fr:
   label_yesterday: hier
   label_this_week: cette semaine
   label_last_week: la semaine dernière
+  label_last_n_weeks: "les %{count} dernières semaines"
   label_last_n_days: "les %{count} derniers jours"
   label_this_month: ce mois-ci
   label_last_month: le mois dernier

test/functional/timelog_controller_test.rb

@@ -523,6 +523,13 @@ class TimelogControllerTest < ActionController::TestCase
     assert_equal '2011-12-11'.to_date, assigns(:to)
   end
 
+  def test_index_last_2_week
+    Date.stubs(:today).returns('2011-12-15'.to_date)
+    get :index, :period => 'last_2_weeks'
+    assert_equal '2011-11-28'.to_date, assigns(:from)
+    assert_equal '2011-12-11'.to_date, assigns(:to)
+  end
+
   def test_index_7_days
     Date.stubs(:today).returns('2011-12-15'.to_date)
     get :index, :period => '7_days'