##// END OF EJS Templates
jro_apps » redmine
RSS
Merged r9387 from trunk....
Jean-Philippe Lang -
r9267:59f14478eda8
parent child
Show More
Side by Side Unified
Context file:
r9267:59f14478eda8 Loading diff...:
Show file before | Show file after | Hide comments
@@ -30,7 +30,7 module Redmine #:nodoc:
30 # 2:30 => 2.5
30 # 2:30 => 2.5
31 s.gsub!(%r{^(\d+):(\d+)$}) { $1.to_i + $2.to_i / 60.0 }
31 s.gsub!(%r{^(\d+):(\d+)$}) { $1.to_i + $2.to_i / 60.0 }
32 # 2h30, 2h, 30m => 2.5, 2, 0.5
32 # 2h30, 2h, 30m => 2.5, 2, 0.5
33 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] }
33 s.gsub!(%r{^((\d+)\s*(h|hours?))?\s*((\d+)\s*(m|min)?)?$}i) { |m| ($1 || $4) ? ($2.to_i + $5.to_i / 60.0) : m[0] }
34 end
34 end
35 # 2,5 => 2.5
35 # 2,5 => 2.5
36 s.gsub!(',', '.')
36 s.gsub!(',', '.')
Show file before | Show file after | Hide comments
@@ -45,6 +45,7 class TimeEntryTest < ActiveSupport::TestCase
45 "3 h 15 m" => 3.25,
45 "3 h 15 m" => 3.25,
46 "3 hours" => 3.0,
46 "3 hours" => 3.0,
47 "12min" => 0.2,
47 "12min" => 0.2,
48 "12 Min" => 0.2,
48 }
49 }
49
50
50 assertions.each do |k, v|
51 assertions.each do |k, v|
General Comments 0
You need to be logged in to leave comments. Login now