##// END OF EJS Templates
jro_apps » redmine
RSS
Fixes TimeEntry#spent_on= so that datetimes don't get stored in SQLite3 (#7258)....
Jean-Philippe Lang -
r4588:88d847a1d512
parent child
Show More
Side by Side Unified
Context file:
r4588:88d847a1d512 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,100 +1,103
1 1 # redMine - project management software
2 2 # Copyright (C) 2006-2008 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class TimeEntry < ActiveRecord::Base
19 19 # could have used polymorphic association
20 20 # project association here allows easy loading of time entries at project level with one database trip
21 21 belongs_to :project
22 22 belongs_to :issue
23 23 belongs_to :user
24 24 belongs_to :activity, :class_name => 'TimeEntryActivity', :foreign_key => 'activity_id'
25 25
26 26 attr_protected :project_id, :user_id, :tyear, :tmonth, :tweek
27 27
28 28 acts_as_customizable
29 29 acts_as_event :title => Proc.new {|o| "#{l_hours(o.hours)} (#{(o.issue || o.project).event_title})"},
30 30 :url => Proc.new {|o| {:controller => 'timelog', :action => 'index', :project_id => o.project, :issue_id => o.issue}},
31 31 :author => :user,
32 32 :description => :comments
33 33
34 34 acts_as_activity_provider :timestamp => "#{table_name}.created_on",
35 35 :author_key => :user_id,
36 36 :find_options => {:include => :project}
37 37
38 38 validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
39 39 validates_numericality_of :hours, :allow_nil => true, :message => :invalid
40 40 validates_length_of :comments, :maximum => 255, :allow_nil => true
41 41
42 42 def after_initialize
43 43 if new_record? && self.activity.nil?
44 44 if default_activity = TimeEntryActivity.default
45 45 self.activity_id = default_activity.id
46 46 end
47 47 self.hours = nil if hours == 0
48 48 end
49 49 end
50 50
51 51 def before_validation
52 52 self.project = issue.project if issue && project.nil?
53 53 end
54 54
55 55 def validate
56 56 errors.add :hours, :invalid if hours && (hours < 0 || hours >= 1000)
57 57 errors.add :project_id, :invalid if project.nil?
58 58 errors.add :issue_id, :invalid if (issue_id && !issue) || (issue && project!=issue.project)
59 59 end
60 60
61 61 def hours=(h)
62 62 write_attribute :hours, (h.is_a?(String) ? (h.to_hours || h) : h)
63 63 end
64 64
65 65 # tyear, tmonth, tweek assigned where setting spent_on attributes
66 66 # these attributes make time aggregations easier
67 67 def spent_on=(date)
68 68 super
69 if spent_on.is_a?(Time)
70 self.spent_on = spent_on.to_date
71 end
69 72 self.tyear = spent_on ? spent_on.year : nil
70 73 self.tmonth = spent_on ? spent_on.month : nil
71 74 self.tweek = spent_on ? Date.civil(spent_on.year, spent_on.month, spent_on.day).cweek : nil
72 75 end
73 76
74 77 # Returns true if the time entry can be edited by usr, otherwise false
75 78 def editable_by?(usr)
76 79 (usr == user && usr.allowed_to?(:edit_own_time_entries, project)) || usr.allowed_to?(:edit_time_entries, project)
77 80 end
78 81
79 82 def self.visible_by(usr)
80 83 with_scope(:find => { :conditions => Project.allowed_to_condition(usr, :view_time_entries) }) do
81 84 yield
82 85 end
83 86 end
84 87
85 88 def self.earilest_date_for_project(project=nil)
86 89 finder_conditions = ARCondition.new(Project.allowed_to_condition(User.current, :view_time_entries))
87 90 if project
88 91 finder_conditions << ["project_id IN (?)", project.hierarchy.collect(&:id)]
89 92 end
90 93 TimeEntry.minimum(:spent_on, :include => :project, :conditions => finder_conditions.conditions)
91 94 end
92 95
93 96 def self.latest_date_for_project(project=nil)
94 97 finder_conditions = ARCondition.new(Project.allowed_to_condition(User.current, :view_time_entries))
95 98 if project
96 99 finder_conditions << ["project_id IN (?)", project.hierarchy.collect(&:id)]
97 100 end
98 101 TimeEntry.maximum(:spent_on, :include => :project, :conditions => finder_conditions.conditions)
99 102 end
100 103 end
Show file before | Show file after | Hide comments
@@ -1,99 +1,129
1 1 # redMine - project management software
2 2 # Copyright (C) 2006-2008 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require File.expand_path('../../test_helper', __FILE__)
19 19
20 20 class TimeEntryTest < ActiveSupport::TestCase
21 21 fixtures :issues, :projects, :users, :time_entries
22 22
23 23 def test_hours_format
24 24 assertions = { "2" => 2.0,
25 25 "21.1" => 21.1,
26 26 "2,1" => 2.1,
27 27 "1,5h" => 1.5,
28 28 "7:12" => 7.2,
29 29 "10h" => 10.0,
30 30 "10 h" => 10.0,
31 31 "45m" => 0.75,
32 32 "45 m" => 0.75,
33 33 "3h15" => 3.25,
34 34 "3h 15" => 3.25,
35 35 "3 h 15" => 3.25,
36 36 "3 h 15m" => 3.25,
37 37 "3 h 15 m" => 3.25,
38 38 "3 hours" => 3.0,
39 39 "12min" => 0.2,
40 40 }
41 41
42 42 assertions.each do |k, v|
43 43 t = TimeEntry.new(:hours => k)
44 44 assert_equal v, t.hours, "Converting #{k} failed:"
45 45 end
46 46 end
47 47
48 48 def test_hours_should_default_to_nil
49 49 assert_nil TimeEntry.new.hours
50 50 end
51
52 def test_spent_on_with_blank
53 c = TimeEntry.new
54 c.spent_on = ''
55 assert_nil c.spent_on
56 end
57
58 def test_spent_on_with_nil
59 c = TimeEntry.new
60 c.spent_on = nil
61 assert_nil c.spent_on
62 end
63
64 def test_spent_on_with_string
65 c = TimeEntry.new
66 c.spent_on = "2011-01-14"
67 assert_equal Date.parse("2011-01-14"), c.spent_on
68 end
69
70 def test_spent_on_with_date
71 c = TimeEntry.new
72 c.spent_on = Date.today
73 assert_equal Date.today, c.spent_on
74 end
75
76 def test_spent_on_with_time
77 c = TimeEntry.new
78 c.spent_on = Time.now
79 assert_equal Date.today, c.spent_on
80 end
51 81
52 82 context "#earilest_date_for_project" do
53 83 setup do
54 84 User.current = nil
55 85 @public_project = Project.generate!(:is_public => true)
56 86 @issue = Issue.generate_for_project!(@public_project)
57 87 TimeEntry.generate!(:spent_on => '2010-01-01',
58 88 :issue => @issue,
59 89 :project => @public_project)
60 90 end
61 91
62 92 context "without a project" do
63 93 should "return the lowest spent_on value that is visible to the current user" do
64 94 assert_equal "2007-03-12", TimeEntry.earilest_date_for_project.to_s
65 95 end
66 96 end
67 97
68 98 context "with a project" do
69 99 should "return the lowest spent_on value that is visible to the current user for that project and it's subprojects only" do
70 100 assert_equal "2010-01-01", TimeEntry.earilest_date_for_project(@public_project).to_s
71 101 end
72 102 end
73 103
74 104 end
75 105
76 106 context "#latest_date_for_project" do
77 107 setup do
78 108 User.current = nil
79 109 @public_project = Project.generate!(:is_public => true)
80 110 @issue = Issue.generate_for_project!(@public_project)
81 111 TimeEntry.generate!(:spent_on => '2010-01-01',
82 112 :issue => @issue,
83 113 :project => @public_project)
84 114 end
85 115
86 116 context "without a project" do
87 117 should "return the highest spent_on value that is visible to the current user" do
88 118 assert_equal "2010-01-01", TimeEntry.latest_date_for_project.to_s
89 119 end
90 120 end
91 121
92 122 context "with a project" do
93 123 should "return the highest spent_on value that is visible to the current user for that project and it's subprojects only" do
94 124 project = Project.find(1)
95 125 assert_equal "2007-04-22", TimeEntry.latest_date_for_project(project).to_s
96 126 end
97 127 end
98 128 end
99 129 end
General Comments 0
You need to be logged in to leave comments. Login now