jro_apps/redmine Commit - r425:708c3c9ec6ef

Added versions due dates on gantt chart....

Jean-Philippe Lang -

r425:708c3c9ec6ef

parent child

Context file:

r425:708c3c9ec6ef

Collapse all files

app/controllers/projects_controller.rb +4 -2

                 @date_from = Date.civil(@year_from, @month_from, 1)
                 @date_to = (@date_from >> @months) - 1
+                @events = []
                 @project.issues_with_subprojects(params[:with_subprojects]) do
-                  @issues = Issue.find(:all,
+                  @events += Issue.find(:all,
                                        :order => "start_date, due_date",
                                        :include => [:tracker, :status, :assigned_to, :priority],
                                        :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?
                 end
-                @issues ||=[]
+                @events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
+                @events.sort! {|x,y| x.start_date <=> y.start_date }
                 if params[:output]=='pdf'
                   @options_for_rfpdf ||= {}

app/models/version.rb +8 0

               validates_uniqueness_of :name, :scope => [:project_id]
               validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :activerecord_error_not_a_date
+              def start_date
+                effective_date
+              end
+              def due_date
+                effective_date
+              end
             private
               def check_integrity
                 raise "Can't delete version" if self.fixed_issues.find(:first)

app/views/projects/gantt.rfpdf +50 -31

@@ -106,51 +106,70 pdf.Cell(subject_width+g_width-15, headers_heigth, "", 1)
106	#	106	#
107	top = headers_heigth + y_start	107	top = headers_heigth + y_start
108	pdf.SetFontStyle('B',7)	108	pdf.SetFontStyle('B',7)
109	@~~issu~~es.each do \|i\|	109	@events.each do \|i\|
110	pdf.SetY(top)	110	pdf.SetY(top)
111	pdf.SetX(15)	111	pdf.SetX(15)
112	pdf.Cell(subject_width-15, 5, "#{i.tracker.name} #{i.id}: #{i.subject}".sub(/^(.{30}[^\s]\s).$/, '\1 (...)'), "LR")	112
		113	if i.is_a? Issue
		114	pdf.Cell(subject_width-15, 5, "#{i.tracker.name} #{i.id}: #{i.subject}".sub(/^(.{30}[^\s]\s).$/, '\1 (...)'), "LR")
		115	else
		116	pdf.Cell(subject_width-15, 5, "#{l(:label_version)}: #{i.name}", "LR")
		117	end
113		118
114	pdf.SetY(top)	119	pdf.SetY(top)
115	pdf.SetX(subject_width)	120	pdf.SetX(subject_width)
116	pdf.Cell(g_width, 5, "", "LR")	121	pdf.Cell(g_width, 5, "", "LR")
		122
		123	pdf.SetY(top+1.5)
117		124
118	i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )	125	if i.is_a? Issue
119	~~i_end~~_date = (i.~~due_date <= @date_to ? i.due~~_date : @date_to )	126	i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
120		127	i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to )
121	i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor	128
122	i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )	129	i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
123	i_done_date = (i_done_date ~~>= @date_to ? @date_to~~ : i_done_date )	130	i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
		131	i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )
		132
		133	i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
		134
		135	i_left = ((i_start_date - @date_from)*zoom)
		136	i_width = ((i_end_date - i_start_date + 1)*zoom)
		137	d_width = ((i_done_date - i_start_date)*zoom)
		138	l_width = ((i_late_date - i_start_date+1)*zoom) if i_late_date
		139	l_width \|\|= 0
124		140
125	i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today	141	pdf.SetX(subject_width + i_left)
		142	pdf.SetFillColor(200,200,200)
		143	pdf.Cell(i_width, 2, "", 0, 0, "", 1)
126		144
127	i_left = ((i_start_date - @date_from)*zoom)	145	if l_width > 0
128	i_width = ((i_end_date - i_start_date + 1)*zoom)	146	pdf.SetY(top+1.5)
129	d_width = ((i_done_date - i_start_date)*zoom)	147	pdf.SetX(subject_width + i_left)
130	l_width = ((i_late_date - i_start_date+1)*zoom) if i_late_date	148	pdf.SetFillColor(255,100,100)
131	l_width \|\|= 0	149	pdf.Cell(l_width, 2, "", 0, 0, "", 1)
132		150	end
133	pdf.SetY(top+1.5)	151	if d_width > 0
134	pdf.SetX(subject_width + i_left)	152	pdf.SetY(top+1.5)
135	pdf.SetFillColor(200,200,200)	153	pdf.SetX(subject_width + i_left)
136	pdf.Cell(i_width, 2, "", 0, 0, "", 1)	154	pdf.SetFillColor(100,100,255)
137		155	pdf.Cell(d_width, 2, "", 0, 0, "", 1)
138	if l_width > 0	156	end
		157
139	pdf.SetY(top+1.5)	158	pdf.SetY(top+1.5)
		159	pdf.SetX(subject_width + i_left + i_width)
		160	pdf.Cell(30, 2, "#{i.status.name} #{i.done_ratio}%")
		161	else
		162	i_left = ((i.start_date - @date_from)*zoom)
		163
140	pdf.SetX(subject_width + i_left)	164	pdf.SetX(subject_width + i_left)
141	pdf.SetFillColor(~~255,100,10~~0)	165	pdf.SetFillColor(50,200,50)
142	pdf.Cell(~~l_width~~, 2, "", 0, 0, "", 1)	166	pdf.Cell(2, 2, "", 0, 0, "", 1)
143	end	167
144	if d_width > 0
145	pdf.SetY(top+1.5)	168	pdf.SetY(top+1.5)
146	pdf.SetX(subject_width + i_left)	169	pdf.SetX(subject_width + i_left + 3)
147	pdf.SetFillColor(100,100,255)	170	pdf.Cell(30, 2, "#{i.name}")
148	pdf.Cell(d_width, 2, "", 0, 0, "", 1)
149	end	171	end
150		172
151	pdf.SetY(top+1.5)
152	pdf.SetX(subject_width + i_left + i_width)
153	pdf.Cell(30, 2, "#{i.status.name} #{i.done_ratio}%")
154		173
155	top = top + 5	174	top = top + 5
156	pdf.SetDrawColor(200, 200, 200)	175	pdf.SetDrawColor(200, 200, 200)

app/views/projects/gantt.rhtml +20 -8

             end
             g_width = (@date_to - @date_from + 1)*zoom
-            g_height = [(20 * @issues.length + 6)+150, 206].max
+            g_height = [(20 * @events.length + 6)+150, 206].max
             t_height = g_height + headers_height
             %>
             # Tasks subjects
             #
             top = headers_height + 8
-            @issues.each do |i| %>
+            @events.each do |i| %>
-                <div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;">
+                <div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;"><small>
-              	<small><%= link_to "#{i.tracker.name} ##{i.id}", { :controller => 'issues', :action => 'show', :id => i }, :title => "#{i.subject}" %>:
+                <% if i.is_a? Issue %>
-              	<%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small>
+                  	<%= link_to "#{i.tracker.name} ##{i.id}", { :controller => 'issues', :action => 'show', :id => i }, :title => "#{i.subject}" %>:
-              	</div>
+                  	<%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %>
+              	<% else %>
+                  	<strong><%= "#{l(:label_version)}: #{i.name}" %></strong>
+              	<% end %>
+              	</small></div>
                 <% top = top + 20
             end %>
             </div>
             # Tasks
             #
             top = headers_height + 10
-            @issues.each do |i| %>
+            @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 )
             	<span class="tip">
                 <%= render :partial => "issues/tooltip", :locals => { :issue => i }%>
             	</span></div>
+            <% else
+                i_left = ((i.start_date - @date_from)*zoom).floor
+                %>
+                <div style="top:<%= top %>px;left:<%= i_left %>px;width:15px;" class="task milestone">&nbsp;</div>
+            	<div style="top:<%= top %>px;left:<%= i_left + 12 %>px;background:#fff;" class="task">
+            	<strong><%= i.name %></strong>
+            	</div>
+            <% end %>
             	<% top = top + 20
             end %>
             </div>

public/stylesheets/application.css +1 0

             .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
             .task_done { background:#66f url(../images/task_done.png); border: 1px solid #66f; }
             .task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
+            .milestone { background-image:url(../images/milestone.png); background-repeat: no-repeat; border: 0; }
             /***** Tooltips ******/
             .tooltip{position:relative;z-index:24;}

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