jro_apps/redmine Commit - r3973:cdfc57d5442f

Change the TimelogController's to/from dates based on the project time entries...

Eric Davis -

r3973:cdfc57d5442f

parent child

Context file:

r3973:cdfc57d5442f

Collapse all files

app/controllers/timelog_controller.rb +2 -2

                  end
                  @from, @to = @to, @from if @from && @to && @from > @to
-                 @from ||= (TimeEntry.earilest_date_for_project || Date.today) - 1
-                 @to   ||= (TimeEntry.latest_date_for_project || Date.today)
+                 @from ||= (TimeEntry.earilest_date_for_project(@project) || Date.today)
+                 @to   ||= (TimeEntry.latest_date_for_project(@project) || Date.today)
                end
                def load_available_criterias

app/models/project.rb +9 0

                  end
                end
+               # Returns an array of projects that are in this project's hierarchy
+               #
+               # Example: parents, children, siblings
+               def hierarchy
+                 parents = project.self_and_ancestors || []
+                 descendants = project.descendants || []
+                 project_hierarchy = parents | descendants # Set union
+               end
                # Returns an auto-generated project identifier based on the last identifier used
                def self.next_identifier
                  p = Project.find(:first, :order => 'created_on DESC')

app/models/time_entry.rb +12 -4

                  end
                end
-               def self.earilest_date_for_project
-                 TimeEntry.minimum(:spent_on, :include => :project, :conditions => Project.allowed_to_condition(User.current, :view_time_entries))
+               def self.earilest_date_for_project(project=nil)
+                 finder_conditions = ARCondition.new(Project.allowed_to_condition(User.current, :view_time_entries))
+                 if project
+                   finder_conditions << ["project_id IN (?)", project.hierarchy.collect(&:id)]
+                 end
+                 TimeEntry.minimum(:spent_on, :include => :project, :conditions => finder_conditions.conditions)
                end
-               def self.latest_date_for_project
-                 TimeEntry.maximum(:spent_on, :include => :project, :conditions => Project.allowed_to_condition(User.current, :view_time_entries))
+               def self.latest_date_for_project(project=nil)
+                 finder_conditions = ARCondition.new(Project.allowed_to_condition(User.current, :view_time_entries))
+                 if project
+                   finder_conditions << ["project_id IN (?)", project.hierarchy.collect(&:id)]
+                 end
+                 TimeEntry.maximum(:spent_on, :include => :project, :conditions => finder_conditions.conditions)
                end
              end

test/functional/timelog_controller_test.rb +3 -3

                  assert_not_nil assigns(:total_hours)
                  assert_equal "162.90", "%.2f" % assigns(:total_hours)
                  # display all time by default
-                 assert_equal '2007-03-11'.to_date, assigns(:from)
+                 assert_equal '2007-03-12'.to_date, assigns(:from)
                  assert_equal '2007-04-22'.to_date, assigns(:to)
                end
                  assert_equal 2, assigns(:entries).size
                  assert_not_nil assigns(:total_hours)
                  assert_equal 154.25, assigns(:total_hours)
-                 # display all time by default
-                 assert_equal '2007-03-11'.to_date, assigns(:from)
+                 # display all time based on what's been logged
+                 assert_equal '2007-03-12'.to_date, assigns(:from)
                  assert_equal '2007-04-22'.to_date, assigns(:to)
                end

test/unit/time_entry_test.rb +36 -3

                end
                context "#earilest_date_for_project" do
-                 should "return the lowest spent_on value that is visible to the current user" do
+                 setup do
                    User.current = nil
+                   @public_project = Project.generate!(:is_public => true)
+                   @issue = Issue.generate_for_project!(@public_project)
+                   TimeEntry.generate!(:spent_on => '2010-01-01',
+                                       :issue => @issue,
+                                       :project => @public_project)
+                 end
+                 context "without a project" do
+                   should "return the lowest spent_on value that is visible to the current user" do
                    assert_equal "2007-03-12", TimeEntry.earilest_date_for_project.to_s
                  end
                end
+                 context "with a project" do
+                   should "return the lowest spent_on value that is visible to the current user for that project and it's subprojects only" do
+                     assert_equal "2010-01-01", TimeEntry.earilest_date_for_project(@public_project).to_s
+                   end
+                 end
+               end
                context "#latest_date_for_project" do
-                 should "return the highest spent_on value that is visible to the current user" do
+                 setup do
                    User.current = nil
-                   assert_equal "2007-04-22", TimeEntry.latest_date_for_project.to_s
+                   @public_project = Project.generate!(:is_public => true)
+                   @issue = Issue.generate_for_project!(@public_project)
+                   TimeEntry.generate!(:spent_on => '2010-01-01',
+                                       :issue => @issue,
+                                       :project => @public_project)
+                 end
+                 context "without a project" do
+                   should "return the highest spent_on value that is visible to the current user" do
+                     assert_equal "2010-01-01", TimeEntry.latest_date_for_project.to_s
                  end
                end
+                 context "with a project" do
+                   should "return the highest spent_on value that is visible to the current user for that project and it's subprojects only" do
+                     project = Project.find(1)
+                     assert_equal "2007-04-22", TimeEntry.latest_date_for_project(project).to_s
+                   end
+                 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