jro_apps/redmine Commit - r1305:4cbe6b626e3b

Accept the following formats for the timelog "hours" field: 1h, 1 h, 1 hour, 2 hours, 30m, 30min, 1h30, 1h30m, 1:30....

Jean-Philippe Lang -

r1305:4cbe6b626e3b

parent child

Context file:

r1305:4cbe6b626e3b

Collapse all files

test/unit/time_entry_test.rb created 644 +46 0

@@ -0,0 +1,46
	1	# redMine - project management software
	2	# Copyright (C) 2006-2008 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../test_helper'
	19
	20	class TimeEntryTest < Test::Unit::TestCase
	21	fixtures :issues, :projects, :users, :time_entries
	22
	23	def test_hours_format
	24	assertions = { "2" => 2.0,
	25	"21.1" => 21.1,
	26	"2,1" => 2.1,
	27	"7:12" => 7.2,
	28	"10h" => 10.0,
	29	"10 h" => 10.0,
	30	"45m" => 0.75,
	31	"45 m" => 0.75,
	32	"3h15" => 3.25,
	33	"3h 15" => 3.25,
	34	"3 h 15" => 3.25,
	35	"3 h 15m" => 3.25,
	36	"3 h 15 m" => 3.25,
	37	"3 hours" => 3.0,
	38	"12min" => 0.2,
	39	}
	40
	41	assertions.each do \|k, v\|
	42	t = TimeEntry.new(:hours => k)
	43	assert_equal v, t.hours
	44	end
	45	end
	46	end

app/models/time_entry.rb +17 -1

             # redMine - project management software
-            # Copyright (C) 2006-2007  Jean-Philippe Lang
+            # Copyright (C) 2006-2008  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.
             class TimeEntry < ActiveRecord::Base
               # could have used polymorphic association
               # project association here allows easy loading of time entries at project level with one database trip
               belongs_to :project
               belongs_to :issue
               belongs_to :user
               belongs_to :activity, :class_name => 'Enumeration', :foreign_key => :activity_id
               attr_protected :project_id, :user_id, :tyear, :tmonth, :tweek
               validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
               validates_numericality_of :hours, :allow_nil => true
               validates_length_of :comments, :maximum => 255
               def before_validation
                 self.project = issue.project if issue && project.nil?
               end
               def validate
                 errors.add :hours, :activerecord_error_invalid if hours && (hours < 0 || hours >= 1000)
                 errors.add :project_id, :activerecord_error_invalid if project.nil?
                 errors.add :issue_id, :activerecord_error_invalid if (issue_id && !issue) || (issue && project!=issue.project)
               end
+              def hours=(h)
+                s = h.dup
+                if s.is_a?(String)
+                  s.strip!
+                  unless s =~ %r{^[\d\.,]+$}
+                    # 2:30 => 2.5
+                    s.gsub!(%r{^(\d+):(\d+)$}) { $1.to_i + $2.to_i / 60.0 }
+                    # 2h30, 2h, 30m
+                    s.gsub!(%r{^((\d+)\s*(h|hours?))?\s*((\d+)\s*(m|min)?)?$}) { |m| ($1 || $4) ? ($2.to_i + $5.to_i / 60.0) : m[0] }
+                  end
+                  # 2,5 => 2.5
+                  s.gsub!(',', '.')
+                end
+                write_attribute :hours, s
+              end
               # tyear, tmonth, tweek assigned where setting spent_on attributes
               # these attributes make time aggregations easier
               def spent_on=(date)
                 super
                 self.tyear = spent_on ? spent_on.year : nil
                 self.tmonth = spent_on ? spent_on.month : nil
                 self.tweek = spent_on ? Date.civil(spent_on.year, spent_on.month, spent_on.day).cweek : nil
               end
               # Returns true if the time entry can be edited by usr, otherwise false
               def editable_by?(usr)
                 (usr == user && usr.allowed_to?(:edit_own_time_entries, project)) || usr.allowed_to?(:edit_time_entries, project)
               end
               def self.visible_by(usr)
                 with_scope(:find => { :conditions => Project.allowed_to_condition(usr, :view_time_entries) }) do
                   yield
                 end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages