jro_apps/redmine Commit - r1441:a92749ef93bb

Gantt chart: display issues that don't have a due date if they are assigned to a version with a date (#184)....

Jean-Philippe Lang -

r1441:a92749ef93bb

parent child

Context file:

r1441:a92749ef93bb

Collapse all files

app/controllers/projects_controller.rb +7 0

                 @events = []
                 @project.issues_with_subprojects(@with_subprojects) do
+                  # Issues that have start and due dates
                   @events += Issue.find(:all,
                                        :order => "start_date, due_date",
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
                                        :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
                                        ) unless @selected_tracker_ids.empty?
+                  # Issues that don't have a due date but that are assigned to a version with a date
+                  @events += Issue.find(:all,
+                                       :order => "start_date, effective_date",
+                                       :include => [:tracker, :status, :assigned_to, :priority, :project, :fixed_version],
+                                       :conditions => ["(((start_date>=? and start_date<=?) or (effective_date>=? and effective_date<=?) or (start_date<? and effective_date>?)) and start_date is not null and due_date is null and effective_date is not null and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
+                                       ) unless @selected_tracker_ids.empty?
                   @events += Version.find(:all, :include => :project,
                                                 :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
                 end

app/models/issue.rb +6 0

                 relations.select {|r| r.relation_type == IssueRelation::TYPE_DUPLICATES}.collect {|r| r.other_issue(self)}
               end
+              # Returns the due date or the target due date if any
+              # Used on gantt chart
+              def due_before
+                due_date || (fixed_version ? fixed_version.effective_date : nil)
+              end
               def duration
                 (start_date && due_date) ? due_date - start_date : 0
               end

app/views/projects/gantt.rfpdf +2 -2

             	if i.is_a? Issue
             		i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
-            		i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to )
+            		i_end_date = (i.due_before <= @date_to ? i.due_before : @date_to )
-            		i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
+            		i_done_date = i.start_date + ((i.due_before - i.start_date+1)*i.done_ratio/100).floor
             		i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
             		i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )

app/views/projects/gantt.rhtml +2 -2

             @events.each do |i|
               if i.is_a? Issue
             	i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
-            	i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to )
+            	i_end_date = (i.due_before <= @date_to ? i.due_before : @date_to )
-            	i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
+            	i_done_date = i.start_date + ((i.due_before - i.start_date+1)*i.done_ratio/100).floor
             	i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
             	i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )

test/fixtures/issues.yml +5 -1

               assigned_to_id:
               author_id: 2
               status_id: 1
+              start_date: <%= 1.day.ago.to_date.to_s(:db) %>
+              due_date: <%= 10.day.from_now.to_date.to_s(:db) %>
             issues_002:
               created_on: 2006-07-19 21:04:21 +02:00
               project_id: 1
               priority_id: 5
               subject: Add ingredients categories
               id: 2
-              fixed_version_id:
+              fixed_version_id: 2
               category_id:
               description: Ingredients of the recipe should be classified by categories
               tracker_id: 2
               assigned_to_id: 3
               author_id: 2
               status_id: 2
+              start_date: <%= 2.day.ago.to_date.to_s(:db) %>
+              due_date:
             issues_003:
               created_on: 2006-07-19 21:07:27 +02:00
               project_id: 1

test/fixtures/versions.yml +1 -1

               updated_on: 2006-07-19 21:00:33 +02:00
               id: 2
               description: Stable release
-              effective_date: 2006-07-19
+              effective_date: <%= 20.day.from_now.to_date.to_s(:db) %>
             versions_003:
               created_on: 2006-07-19 21:00:33 +02:00
               name: "2.0"

test/functional/projects_controller_test.rb +10 -1

@@ -259,7 +259,16 class ProjectsControllerTest < Test::Unit::TestCase
259	get :gantt, :id => 1	259	get :gantt, :id => 1
260	assert_response :success	260	assert_response :success
261	assert_template 'gantt.rhtml'	261	assert_template 'gantt.rhtml'
262	~~assert_not_nil~~ assigns(:events)	262	events = assigns(:events)
		263	assert_not_nil events
		264	# Issue with start and due dates
		265	i = Issue.find(1)
		266	assert_not_nil i.due_date
		267	assert events.include?(Issue.find(1))
		268	# Issue with without due date but targeted to a version with date
		269	i = Issue.find(2)
		270	assert_nil i.due_date
		271	assert events.include?(i)
263	end	272	end
264		273
265	def test_gantt_with_subprojects_should_not_show_private_subprojects	274	def test_gantt_with_subprojects_should_not_show_private_subprojects

test/functional/versions_controller_test.rb +3 -3

             class VersionsController; def rescue_action(e) raise e end; end
             class VersionsControllerTest < Test::Unit::TestCase
-              fixtures :projects, :versions, :users, :roles, :members, :enabled_modules
+              fixtures :projects, :versions, :issues, :users, :roles, :members, :enabled_modules
               def setup
                 @controller = VersionsController.new
               def test_destroy
                 @request.session[:user_id] = 2
-                post :destroy, :id => 2
+                post :destroy, :id => 3
                 assert_redirected_to 'projects/settings/ecookbook'
-                assert_nil Version.find_by_id(2)
+                assert_nil Version.find_by_id(3)
               end
               def test_issue_status_by

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