kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved Date months/weeks calculations used in Graph to lib. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8540 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Etienne Massip 2012-01-07 19:02:10 +00:00
parent 1653735758
commit 59789c7997
3 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/repositories_controller.rb
View File

@ -1,5 +1,5 @@
# Redmine - project management software
# Copyright (C) 2006-2011 Jean-Philippe Lang
# Copyright (C) 2006-2012 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@ -366,12 +366,3 @@ class RepositoriesController < ApplicationController
end
end
class Date
def months_ago(date = Date.today)
(date.year - self.year)*12 + (date.month - self.month)
end
def weeks_ago(date = Date.today)
(date.year - self.year)*52 + (date.cweek - self.cweek)
end
end

5
lib/redmine/core_ext/date.rb Normal file
View File

@ -0,0 +1,5 @@
require File.dirname(__FILE__) + '/date/calculations'
class Date #:nodoc:
include Redmine::CoreExtensions::Date::Calculations
end

35
lib/redmine/core_ext/date/calculations.rb Normal file
View File

@ -0,0 +1,35 @@
# Redmine - project management software
# Copyright (C) 2006-2012 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
module Redmine #:nodoc:
module CoreExtensions #:nodoc:
module Date #:nodoc:
# Custom date calculations
module Calculations
# Returns difference with specified date in months
def months_ago(date = self.class.today)
(date.year - self.year)*12 + (date.month - self.month)
end
# Returns difference with specified date in weeks
def weeks_ago(date = self.class.today)
(date.year - self.year)*52 + (date.cweek - self.cweek)
end
end
end
end
end