jro_apps/redmine Commit - r14256:f9425cbaf37e

Adds day numbers to HTML and PDF gantt (#3034)....

Jean-Philippe Lang -

r14256:f9425cbaf37e

parent child

Context file:

r14256:f9425cbaf37e

Collapse all files

app/views/gantts/show.html.erb +39 -1

               headers_height = header_height
               show_weeks = false
               show_days  = false
+              show_day_num = false
               if @gantt.zoom > 1
                 show_weeks = true
                 if @gantt.zoom > 2
                     show_days = true
                     headers_height = 3 * header_height
+                    if @gantt.zoom > 3
+                      show_day_num = true
+                      headers_height = 4 * header_height
+                    end
                 end
               end
               <% end %>
             <% end %>
+            <% ###### Day numbers headers ###### %>
+            <% if show_day_num %>
+              <%
+                left = 0
+                height = g_height + header_height*2 - 1
+                wday = @gantt.date_from.cwday
+                day_num = @gantt.date_from
+              %>
+              <% (@gantt.date_to - @gantt.date_from + 1).to_i.times do %>
+                <%
+                  width =  zoom - 1
+                  style = ""
+                  style += "left:#{left}px;"
+                  style += "top:37px;"
+                  style += "width:#{width}px;"
+                  style += "height:#{height}px;"
+                  style += "font-size:0.7em;"
+                  clss = "gantt_hdr"
+                  clss << " nwday" if @gantt.non_working_week_days.include?(wday)
+                %>
+                <%= content_tag(:div, :style => style, :class => clss) do %>
+                  <%= day_num.day %>
+                <% end %>
+                <%
+                 left = left + width+1
+                 day_num = day_num + 1
+                 wday = wday + 1
+                 wday = 1 if wday > 7
+                %>
+              <% end %>
+            <% end %>
             <% ###### Days headers ####### %>
             <% if show_days %>
               <%
                 left = 0
                 height = g_height + header_height - 1
+                top = (show_day_num ? 55 : 37)
                 wday = @gantt.date_from.cwday
               %>
               <% (@gantt.date_to - @gantt.date_from + 1).to_i.times do %>
                   width =  zoom - 1
                   style  = ""
                   style += "left: #{left}px;"
-                  style += "top:37px;"
+                  style += "top: #{top}px;"
                   style += "width: #{width}px;"
                   style += "height: #{height}px;"
                   style += "font-size:0.7em;"

lib/redmine/helpers/gantt.rb +26 -1

                       if self.months < 3
                         show_days = true
                         headers_height = 3 * header_height
+                        if self.months < 2
+                          show_day_num = true
+                          headers_height = 4 * header_height
+                        end
                       end
                     end
                     g_width = PDF.right_pane_width
                         week_f = week_f + 7
                       end
                     end
+                    # Day numbers headers
+                    if show_day_num
+                      left = subject_width
+                      height = header_height
+                      day_num = self.date_from
+                      wday = self.date_from.cwday
+                      pdf.SetFontStyle('B', 7)
+                      (self.date_to - self.date_from + 1).to_i.times do
+                        width = zoom
+                        pdf.SetY(y_start + header_height * 2)
+                        pdf.SetX(left)
+                        pdf.SetTextColor(non_working_week_days.include?(wday) ? 150 : 0)
+                        pdf.RDMCell(width, height, day_num.day.to_s, "LTR", 0, "C")
+                        left = left + width
+                        day_num = day_num + 1
+                        wday = wday + 1
+                        wday = 1 if wday > 7
+                      end
+                    end
                     # Days headers
                     if show_days
                       left = subject_width
                       pdf.SetFontStyle('B', 7)
                       (self.date_to - self.date_from + 1).to_i.times do
                         width = zoom
-                        pdf.SetY(y_start + 2 * header_height)
+                        pdf.SetY(y_start + header_height * (show_day_num ? 3 : 2))
                         pdf.SetX(left)
+                        pdf.SetTextColor(non_working_week_days.include?(wday) ? 150 : 0)
                         pdf.RDMCell(width, height, day_name(wday).first, "LTR", 0, "C")
                         left = left + width
                         wday = wday + 1
                     end
                     pdf.SetY(y_start)
                     pdf.SetX(15)
+                    pdf.SetTextColor(0)
                     pdf.RDMCell(subject_width + g_width - 15, headers_height, "", 1)
                     # Tasks
                     top = headers_height + y_start

public/stylesheets/application.css +1 -1

               overflow: hidden;
             }
-            .gantt_hdr.nwday {background-color:#f1f1f1;}
+            .gantt_hdr.nwday {background-color:#f1f1f1; color:#999;}
             .gantt_subjects { font-size: 0.8em; }
             .gantt_subjects div { line-height:16px;height:16px;overflow:hidden;white-space:nowrap;text-overflow: ellipsis; }

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