From: Toshi MARUYAMA Date: Thu, 1 Sep 2011 02:05:11 +0000 (+0000) Subject: remove trailing white-spaces from lib/redmine/helpers/calendar.rb. X-Git-Tag: 1.3.0~1011 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=325f6a721a1b0d78f5fd58a92b52519790544a75;p=redmine.git remove trailing white-spaces from lib/redmine/helpers/calendar.rb. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6952 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/lib/redmine/helpers/calendar.rb b/lib/redmine/helpers/calendar.rb index 9b3c0e816..461f9b30c 100644 --- a/lib/redmine/helpers/calendar.rb +++ b/lib/redmine/helpers/calendar.rb @@ -1,34 +1,34 @@ -# redMine - project management software -# Copyright (C) 2006-2007 Jean-Philippe Lang +# Redmine - project management software +# Copyright (C) 2006-2011 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 module Helpers - + # Simple class to compute the start and end dates of a calendar class Calendar include Redmine::I18n attr_reader :startdt, :enddt - + def initialize(date, lang = current_language, period = :month) @date = date @events = [] @ending_events_by_days = {} @starting_events_by_days = {} - set_language_if_valid lang + set_language_if_valid lang case period when :month @startdt = Date.civil(date.year, date.month, 1) @@ -44,24 +44,24 @@ module Redmine raise 'Invalid period' end end - + # Sets calendar events def events=(events) @events = events @ending_events_by_days = @events.group_by {|event| event.due_date} @starting_events_by_days = @events.group_by {|event| event.start_date} end - + # Returns events for the given day def events_on(day) ((@ending_events_by_days[day] || []) + (@starting_events_by_days[day] || [])).uniq end - + # Calendar current month def month @date.month end - + # Return the first day of week # 1 = Monday ... 7 = Sunday def first_wday @@ -76,10 +76,10 @@ module Redmine @first_dow ||= (l(:general_first_day_of_week).to_i - 1)%7 + 1 end end - + def last_wday @last_dow ||= (first_wday + 5)%7 + 1 end - end + end end end