jro_apps/redmine Commit - r1346:a6311a960370

Estimated time recognizes improved time formats (#1092)....

Jean-Philippe Lang -

r1346:a6311a960370

parent child

Context file:

r1346:a6311a960370

lib/redmine/core_ext.rb created 644 +1 0

	@@ -0,0 +1,1
				1	Dir[File.dirname(__FILE__) + "/core_ext/*.rb"].each { \|file\| require(file) }

lib/redmine/core_ext/string.rb created 644 +5 0

@@ -0,0 +1,5
	1	require File.dirname(__FILE__) + '/string/conversions'
	2
	3	class String #:nodoc:
	4	include Redmine::CoreExtensions::String::Conversions
	5	end

lib/redmine/core_ext/string/conversions.rb created 644 +40 0

@@ -0,0 +1,40
	1	# redMine - project management software
	2	# Copyright (C) 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	module Redmine #:nodoc:
	19	module CoreExtensions #:nodoc:
	20	module String #:nodoc:
	21	# Custom string conversions
	22	module Conversions
	23	# Parses hours format and returns a float
	24	def to_hours
	25	s = self.dup
	26	s.strip!
	27	unless s =~ %r{^[\d\.,]+$}
	28	# 2:30 => 2.5
	29	s.gsub!(%r{^(\d+):(\d+)$}) { $1.to_i + $2.to_i / 60.0 }
	30	# 2h30, 2h, 30m => 2.5, 2, 0.5
	31	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] }
	32	end
	33	# 2,5 => 2.5
	34	s.gsub!(',', '.')
	35	s.to_f
	36	end
	37	end
	38	end
	39	end
	40	end

app/models/issue.rb +5 -1

                 self.priority = nil
                 write_attribute(:priority_id, pid)
               end
+              def estimated_hours=(h)
+                write_attribute :estimated_hours, (h.is_a?(String) ? h.to_hours : h)
+              end
               def validate
                 if self.due_date.nil? && @attributes['due_date'] && !@attributes['due_date'].empty?
                   errors.add :due_date, :activerecord_error_not_a_date

app/models/time_entry.rb +1 -13

@@ -40,19 +40,7 class TimeEntry < ActiveRecord::Base
40	end	40	end
41		41
42	def hours=(h)	42	def hours=(h)
43	s = h.dup	43	write_attribute :hours, (h.is_a?(String) ? h.to_hours : h)
44	if s.is_a?(String)
45	s.strip!
46	unless s =~ %r{^[\d\.,]+$}
47	# 2:30 => 2.5
48	s.gsub!(%r{^(\d+):(\d+)$}) { $1.to_i + $2.to_i / 60.0 }
49	# 2h30, 2h, 30m
50	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] }
51	end
52	# 2,5 => 2.5
53	s.gsub!(',', '.')
54	end
55	write_attribute :hours, s
56	end	44	end
57		45
58	# tyear, tmonth, tweek assigned where setting spent_on attributes	46	# tyear, tmonth, tweek assigned where setting spent_on attributes

lib/redmine.rb +1 0

             require 'redmine/access_control'
             require 'redmine/menu_manager'
             require 'redmine/mime_type'
+            require 'redmine/core_ext'
             require 'redmine/themes'
             require 'redmine/plugin'

test/unit/issue_test.rb +7 0

             class IssueTest < Test::Unit::TestCase
               fixtures :projects, :users, :members, :trackers, :projects_trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :time_entries
+              def test_create
+                issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'test_create', :description => 'IssueTest#test_create', :estimated_hours => '1:30')
+                assert issue.save
+                issue.reload
+                assert_equal 1.5, issue.estimated_hours
+              end
               def test_category_based_assignment
                 issue = Issue.create(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'Assignment test', :description => 'Assignment test', :category_id => 1)
                 assert_equal IssueCategory.find(1).assigned_to, issue.assigned_to

General Comments 0

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

No TODOs yet

	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