jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

日历与甘特图宽度扩展

This commit is contained in:
Tim 2016-10-25 10:42:29 +08:00
parent 8876dcdcec
commit e3ddfd1841
2 changed files with 310 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
app/views/calendars/show.html.erb
View File

@ -1,40 +1,38 @@
<div class="project_r_h" style="width:730px;"> <div class="container-big mb10">
<h2 class="project_h2"><%= @query.new_record? ? l(:label_calendar) : h(@query.name) %></h2> <div class="project_r_h" style="width:970px;">
</div> <h2 class="project_h2"><%= @query.new_record? ? l(:label_calendar) : h(@query.name) %></h2>
</div>
<%= form_tag({:controller => 'calendars', :action => 'show', :project_id => @project}, <%= form_tag({:controller => 'calendars', :action => 'show', :project_id => @project},
:method => :get, :id => 'query_form') do %> :method => :get, :id => 'query_form') do %>
<%= hidden_field_tag 'set_filter', '1' %> <%= hidden_field_tag 'set_filter', '1' %>
<p style="float:right;"> <p style="float:right;">
<%= link_to_previous_month(@year, @month) %> | <%= link_to_next_month(@year, @month) %> <%= link_to_previous_month(@year, @month) %> | <%= link_to_next_month(@year, @month) %>
</p> </p>
<p class="buttons"> <p class="buttons">
<%= label_tag('month', l(:label_month)) %> <%= label_tag('month', l(:label_month)) %>
<%= select_month(@month, :prefix => "month", :discard_type => true) %> <%= select_month(@month, :prefix => "month", :discard_type => true) %>
<%= label_tag('year', l(:label_year)) %> <%= label_tag('year', l(:label_year)) %>
<%= select_year(@year, :prefix => "year", :discard_type => true) %> <%= select_year(@year, :prefix => "year", :discard_type => true) %>
<%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %> <%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
<%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 }, :class => 'icon icon-reload' %> <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 }, :class => 'icon icon-reload' %>
</p> </p>
<% end %> <% end %>
<%= error_messages_for 'query' %> <%= error_messages_for 'query' %>
<% if @query.valid? %> <% if @query.valid? %>
<%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %> <%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %>
<p class="legend cal"> <p class="legend cal">
<span class="starting"><%= l(:text_tip_issue_begin_day) %></span> <span class="starting"><%= l(:text_tip_issue_begin_day) %></span>
<span class="ending"><%= l(:text_tip_issue_end_day) %></span> <span class="ending"><%= l(:text_tip_issue_end_day) %></span>
<span class="starting ending"><%= l(:text_tip_issue_begin_end_day) %></span> <span class="starting ending"><%= l(:text_tip_issue_begin_end_day) %></span>
</p> </p>
<% end %> <% end %>
<% content_for :sidebar do %> <% content_for :sidebar do %>
<%= render :partial => 'issues/sidebar' %> <%= render :partial => 'issues/sidebar' %>
<% end %> <% end %>
<% html_title(l(:label_calendar)) -%> <% html_title(l(:label_calendar)) -%>
</div>
<script>
$(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
</script>

556
app/views/gantts/show.html.erb
View File

@ -1,307 +1,309 @@
<div class="project_r_h" style="width:730px;"> <div class="container-big mb10">
<h2 class="project_h2"><% @gantt.view = self %> <div class="project_r_h" style="width:970px;">
<%= @query.new_record? ? l(:label_gantt) : h(@query.name) %></h2> <h2 class="project_h2"><% @gantt.view = self %>
</div> <%= @query.new_record? ? l(:label_gantt) : h(@query.name) %></h2>
</div>
<%= form_tag({:controller => 'gantts', :action => 'show', <%= form_tag({:controller => 'gantts', :action => 'show',
:project_id => @project, :month => params[:month], :project_id => @project, :month => params[:month],
:year => params[:year], :months => params[:months]}, :year => params[:year], :months => params[:months]},
:method => :get, :id => 'query_form') do %> :method => :get, :id => 'query_form') do %>
<%= hidden_field_tag 'set_filter', '1' %> <%= hidden_field_tag 'set_filter', '1' %>
<!--<fieldset id="filters" class="collapsible <%#= @query.new_record? ? "" : "collapsed" %>">--> <!--<fieldset id="filters" class="collapsible <%#= @query.new_record? ? "" : "collapsed" %>">-->
<!--<legend onclick="toggleFieldset(this);"><%#= l(:label_filter_plural) %></legend>--> <!--<legend onclick="toggleFieldset(this);"><%#= l(:label_filter_plural) %></legend>-->
<!--<div style="<%#= @query.new_record? ? "" : "display: none;" %>">--> <!--<div style="<%#= @query.new_record? ? "" : "display: none;" %>">-->
<!--<%#= render :partial => 'queries/filters', :locals => {:query => @query} %>--> <!--<%#= render :partial => 'queries/filters', :locals => {:query => @query} %>-->
<!--</div>--> <!--</div>-->
<!--</fieldset>--> <!--</fieldset>-->
<fieldset class="collapsible collapsed"> <fieldset class="collapsible collapsed">
<legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend> <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
<div style="display: none;"> <div style="display: none;">
<table> <table>
<tr> <tr>
<td> <td>
<fieldset> <fieldset>
<legend><%= l(:label_related_issues) %></legend> <legend><%= l(:label_related_issues) %></legend>
<label style="padding:10px;"> <label style="padding:10px;">
<%= check_box_tag "draw_rels", params["draw_rels"], params[:set_filter].blank? || params[:draw_rels] %> <%= check_box_tag "draw_rels", params["draw_rels"], params[:set_filter].blank? || params[:draw_rels] %>
<% rels = [IssueRelation::TYPE_BLOCKS, IssueRelation::TYPE_PRECEDES] %> <% rels = [IssueRelation::TYPE_BLOCKS, IssueRelation::TYPE_PRECEDES] %>
<% rels.each do |rel| %> <% rels.each do |rel| %>
<% color = Redmine::Helpers::Gantt::DRAW_TYPES[rel][:color] %> <% color = Redmine::Helpers::Gantt::DRAW_TYPES[rel][:color] %>
<%= content_tag(:span, '&nbsp;&nbsp;&nbsp;'.html_safe, <%= content_tag(:span, '&nbsp;&nbsp;&nbsp;'.html_safe,
:style => "background-color: #{color}") %> :style => "background-color: #{color}") %>
<%= l(IssueRelation::TYPES[rel][:name]) %> <%= l(IssueRelation::TYPES[rel][:name]) %>
<% end %> <% end %>
</label> </label>
</fieldset> </fieldset>
</td> </td>
<td> <td>
<fieldset> <fieldset>
<legend><%= l(:label_gantt_progress_line) %></legend> <legend><%= l(:label_gantt_progress_line) %></legend>
<label style="padding:10px;"> <label style="padding:10px;">
<%= check_box_tag "draw_progress_line", params[:draw_progress_line], params[:draw_progress_line] %> <%= check_box_tag "draw_progress_line", params[:draw_progress_line], params[:draw_progress_line] %>
<%= l(:label_display) %> <%= l(:label_display) %>
</label> </label>
</fieldset> </fieldset>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
</fieldset> </fieldset>
<!--<p class="contextual">--> <!--<p class="contextual">-->
<!--<%#= gantt_zoom_link(@gantt, :in) %>--> <!--<%#= gantt_zoom_link(@gantt, :in) %>-->
<!--<%#= gantt_zoom_link(@gantt, :out) %>--> <!--<%#= gantt_zoom_link(@gantt, :out) %>-->
<!--</p>--> <!--</p>-->
<p class="buttons"> <p class="buttons">
<%= text_field_tag 'months', @gantt.months, :size => 2 %> <%= text_field_tag 'months', @gantt.months, :size => 2 %>
<%= l(:label_months_from) %> <%= l(:label_months_from) %>
<%= select_month(@gantt.month_from, :prefix => "month", :discard_type => true) %> <%= select_month(@gantt.month_from, :prefix => "month", :discard_type => true) %>
<%= select_year(@gantt.year_from, :prefix => "year", :discard_type => true) %> <%= select_year(@gantt.year_from, :prefix => "year", :discard_type => true) %>
<%= hidden_field_tag 'zoom', @gantt.zoom %> <%= hidden_field_tag 'zoom', @gantt.zoom %>
<%= link_to_function l(:button_apply), '$("#query_form").submit()', <%= link_to_function l(:button_apply), '$("#query_form").submit()',
:class => 'icon icon-checked' %> :class => 'icon icon-checked' %>
<%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 }, <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 },
:class => 'icon icon-reload' %> :class => 'icon icon-reload' %>
</p> </p>
<% end %> <% end %>
<%= error_messages_for 'query' %> <%= error_messages_for 'query' %>
<% if @query.valid? %> <% if @query.valid? %>
<% <%
zoom = 1 zoom = 1
@gantt.zoom.times { zoom = zoom * 2 } @gantt.zoom.times { zoom = zoom * 2 }
subject_width = 330 subject_width = 330
header_height = 18 header_height = 18
headers_height = header_height headers_height = header_height
show_weeks = false show_weeks = false
show_days = false show_days = false
if @gantt.zoom > 1 if @gantt.zoom > 1
show_weeks = true show_weeks = true
headers_height = 2 * header_height headers_height = 2 * header_height
if @gantt.zoom > 2 if @gantt.zoom > 2
show_days = true show_days = true
headers_height = 3 * header_height headers_height = 3 * header_height
end end
end end
# Width of the entire chart # Width of the entire chart
g_width = ((@gantt.date_to - @gantt.date_from + 1) * zoom).to_i g_width = ((@gantt.date_to - @gantt.date_from + 1) * zoom).to_i
@gantt.render(:top => headers_height + 8, @gantt.render(:top => headers_height + 8,
:zoom => zoom, :zoom => zoom,
:g_width => g_width, :g_width => g_width,
:subject_width => subject_width) :subject_width => subject_width)
g_height = [(20 * (@gantt.number_of_rows + 6)) + 150, 206].max g_height = [(20 * (@gantt.number_of_rows + 6)) + 150, 206].max
t_height = g_height + headers_height t_height = g_height + headers_height
%> %>
<%# if @gantt.truncated %> <%# if @gantt.truncated %>
<!--<p class="warning"><%#= l(:notice_gantt_chart_truncated, :max => @gantt.max_rows) %></p>--> <!--<p class="warning"><%#= l(:notice_gantt_chart_truncated, :max => @gantt.max_rows) %></p>-->
<%# end %> <%# end %>
<table style="width:100%; border:0; border-collapse: collapse;"> <table style="width:100%; border:0; border-collapse: collapse;">
<tr> <tr>
<td style="width:<%= subject_width %>px; padding:0px;"> <td style="width:<%= subject_width %>px; padding:0px;">
<% <%
style = "" style = ""
style += "position:relative;" style += "position:relative;"
style += "height: #{t_height + 24}px;" style += "height: #{t_height + 24}px;"
style += "width: #{subject_width + 1}px;" style += "width: #{subject_width + 1}px;"
%> %>
<%= content_tag(:div, :style => style) do %> <%= content_tag(:div, :style => style) do %>
<%
style = ""
style += "right:-2px;"
style += "width: #{subject_width}px;"
style += "height: #{headers_height}px;"
style += 'background: #eee;'
style += 'z-index: 1;'
%>
<%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %>
<%
style = ""
style += "right:-2px;"
style += "width: #{subject_width}px;"
style += "height: #{t_height}px;"
style += 'border-left: 1px solid #c0c0c0;'
style += 'overflow: hidden;'
%>
<%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %>
<%= content_tag(:div, :class => "gantt_subjects") do %>
<%= @gantt.subjects.html_safe %>
<% end %>
<% end %>
</td>
<td>
<div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;" id="gantt_area">
<% <%
style = "" style = ""
style += "right:-2px;" style += "width: #{g_width - 1}px;"
style += "width: #{subject_width}px;"
style += "height: #{headers_height}px;" style += "height: #{headers_height}px;"
style += 'background: #eee;' style += 'background: #eee;'
style += 'z-index: 1;'
%> %>
<%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %> <%= content_tag(:div, '&nbsp;'.html_safe, :style => style, :class => "gantt_hdr") %>
<% ###### Months headers ###### %>
<% <%
style = "" month_f = @gantt.date_from
style += "right:-2px;" left = 0
style += "width: #{subject_width}px;" height = (show_weeks ? header_height : header_height + g_height)
style += "height: #{t_height}px;"
style += 'border-left: 1px solid #c0c0c0;'
style += 'overflow: hidden;'
%> %>
<%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %> <% @gantt.months.times do %>
<%= content_tag(:div, :class => "gantt_subjects") do %> <%
<%= @gantt.subjects.html_safe %> width = (((month_f >> 1) - month_f) * zoom - 1).to_i
style = ""
style += "left: #{left}px;"
style += "width: #{width}px;"
style += "height: #{height}px;"
%>
<%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>
<%= link_to h("#{month_f.year}-#{month_f.month}"),
@gantt.params.merge(:year => month_f.year, :month => month_f.month),
:title => "#{month_name(month_f.month)} #{month_f.year}" %>
<% end %>
<%
left = left + width + 1
month_f = month_f >> 1
%>
<% end %> <% end %>
<% end %>
</td>
<td> <% ###### Weeks headers ###### %>
<div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;" id="gantt_area"> <% if show_weeks %>
<% <%
style = "" left = 0
style += "width: #{g_width - 1}px;" height = (show_days ? header_height - 1 : header_height - 1 + g_height)
style += "height: #{headers_height}px;" %>
style += 'background: #eee;' <% if @gantt.date_from.cwday == 1 %>
%> <%
<%= content_tag(:div, '&nbsp;'.html_safe, :style => style, :class => "gantt_hdr") %> # @date_from is monday
week_f = @gantt.date_from
<% ###### Months headers ###### %> %>
<% <% else %>
month_f = @gantt.date_from <%
left = 0 # find next monday after @date_from
height = (show_weeks ? header_height : header_height + g_height) week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
%> width = (7 - @gantt.date_from.cwday + 1) * zoom - 1
<% @gantt.months.times do %> style = ""
<% style += "left: #{left}px;"
width = (((month_f >> 1) - month_f) * zoom - 1).to_i style += "top: 19px;"
style = "" style += "width: #{width}px;"
style += "left: #{left}px;" style += "height: #{height}px;"
style += "width: #{width}px;" %>
style += "height: #{height}px;" <%= content_tag(:div, '&nbsp;'.html_safe,
%> :style => style, :class => "gantt_hdr") %>
<%= content_tag(:div, :style => style, :class => "gantt_hdr") do %> <% left = left + width + 1 %>
<%= link_to h("#{month_f.year}-#{month_f.month}"), <% end %>
@gantt.params.merge(:year => month_f.year, :month => month_f.month), <% while week_f <= @gantt.date_to %>
:title => "#{month_name(month_f.month)} #{month_f.year}" %> <%
<% end %> width = ((week_f + 6 <= @gantt.date_to) ?
<% 7 * zoom - 1 :
left = left + width + 1 (@gantt.date_to - week_f + 1) * zoom - 1).to_i
month_f = month_f >> 1 style = ""
%> style += "left: #{left}px;"
<% end %> style += "top: 19px;"
style += "width: #{width}px;"
<% ###### Weeks headers ###### %> style += "height: #{height}px;"
<% if show_weeks %> %>
<% <%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>
left = 0 <%= content_tag(:small) do %>
height = (show_days ? header_height - 1 : header_height - 1 + g_height) <%= week_f.cweek if width >= 16 %>
%> <% end %>
<% if @gantt.date_from.cwday == 1 %> <% end %>
<% <%
# @date_from is monday left = left + width + 1
week_f = @gantt.date_from week_f = week_f + 7
%> %>
<% else %>
<%
# find next monday after @date_from
week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
width = (7 - @gantt.date_from.cwday + 1) * zoom - 1
style = ""
style += "left: #{left}px;"
style += "top: 19px;"
style += "width: #{width}px;"
style += "height: #{height}px;"
%>
<%= content_tag(:div, '&nbsp;'.html_safe,
:style => style, :class => "gantt_hdr") %>
<% left = left + width + 1 %>
<% end %>
<% while week_f <= @gantt.date_to %>
<%
width = ((week_f + 6 <= @gantt.date_to) ?
7 * zoom - 1 :
(@gantt.date_to - week_f + 1) * zoom - 1).to_i
style = ""
style += "left: #{left}px;"
style += "top: 19px;"
style += "width: #{width}px;"
style += "height: #{height}px;"
%>
<%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>
<%= content_tag(:small) do %>
<%= week_f.cweek if width >= 16 %>
<% end %> <% end %>
<% end %> <% end %>
<%
left = left + width + 1
week_f = week_f + 7
%>
<% end %>
<% end %>
<% ###### Days headers ####### %> <% ###### Days headers ####### %>
<% if show_days %> <% if show_days %>
<% <%
left = 0 left = 0
height = g_height + header_height - 1 height = g_height + header_height - 1
wday = @gantt.date_from.cwday wday = @gantt.date_from.cwday
%> %>
<% (@gantt.date_to - @gantt.date_from + 1).to_i.times do %> <% (@gantt.date_to - @gantt.date_from + 1).to_i.times do %>
<% <%
width = zoom - 1 width = zoom - 1
style = "" style = ""
style += "left: #{left}px;" style += "left: #{left}px;"
style += "top:37px;" style += "top:37px;"
style += "width: #{width}px;" style += "width: #{width}px;"
style += "height: #{height}px;" style += "height: #{height}px;"
style += "font-size:0.7em;" style += "font-size:0.7em;"
clss = "gantt_hdr" clss = "gantt_hdr"
clss << " nwday" if @gantt.non_working_week_days.include?(wday) clss << " nwday" if @gantt.non_working_week_days.include?(wday)
%> %>
<%= content_tag(:div, :style => style, :class => clss) do %> <%= content_tag(:div, :style => style, :class => clss) do %>
<%= day_letter(wday) %> <%= day_letter(wday) %>
<% end %>
<%
left = left + width + 1
wday = wday + 1
wday = 1 if wday > 7
%>
<% end %>
<% end %>
<%= @gantt.lines.html_safe %>
<% ###### Today red line (excluded from cache) ###### %>
<% if Date.today >= @gantt.date_from and Date.today <= @gantt.date_to %>
<%
today_left = (((Date.today - @gantt.date_from + 1) * zoom).floor() - 1).to_i
style = ""
style += "position: absolute;"
style += "height: #{g_height}px;"
style += "top: #{headers_height + 1}px;"
style += "left: #{today_left}px;"
style += "width:10px;"
style += "border-left: 1px dashed red;"
%>
<%= content_tag(:div, '&nbsp;'.html_safe, :style => style, :id => 'today_line') %>
<% end %> <% end %>
<% <%
left = left + width + 1 style = ""
wday = wday + 1 style += "position: absolute;"
wday = 1 if wday > 7 style += "height: #{g_height}px;"
style += "top: #{headers_height + 1}px;"
style += "left: 0px;"
style += "width: #{g_width - 1}px;"
%> %>
<% end %> <%= content_tag(:div, '', :style => style, :id => "gantt_draw_area") %>
<% end %> </div>
</td>
</tr>
</table>
<%= @gantt.lines.html_safe %> <table style="width:100%">
<tr>
<td align="left">
<%= link_to_content_update("\xc2\xab " + l(:label_previous),
params.merge(@gantt.params_previous)) %>
</td>
<td align="right">
<%= link_to_content_update(l(:label_next) + " \xc2\xbb",
params.merge(@gantt.params_next)) %>
</td>
</tr>
</table>
<% ###### Today red line (excluded from cache) ###### %>
<% if Date.today >= @gantt.date_from and Date.today <= @gantt.date_to %> <% end # query.valid? %>
<%
today_left = (((Date.today - @gantt.date_from + 1) * zoom).floor() - 1).to_i <% content_for :sidebar do %>
style = "" <%= render :partial => 'issues/sidebar' %>
style += "position: absolute;" <% end %>
style += "height: #{g_height}px;"
style += "top: #{headers_height + 1}px;" <% html_title(l(:label_gantt)) -%>
style += "left: #{today_left}px;"
style += "width:10px;"
style += "border-left: 1px dashed red;"
%>
<%= content_tag(:div, '&nbsp;'.html_safe, :style => style, :id => 'today_line') %>
<% end %>
<%
style = ""
style += "position: absolute;"
style += "height: #{g_height}px;"
style += "top: #{headers_height + 1}px;"
style += "left: 0px;"
style += "width: #{g_width - 1}px;"
%>
<%= content_tag(:div, '', :style => style, :id => "gantt_draw_area") %>
</div> </div>
</td>
</tr>
</table>
<table style="width:100%">
<tr>
<td align="left">
<%= link_to_content_update("\xc2\xab " + l(:label_previous),
params.merge(@gantt.params_previous)) %>
</td>
<td align="right">
<%= link_to_content_update(l(:label_next) + " \xc2\xbb",
params.merge(@gantt.params_next)) %>
</td>
</tr>
</table>
<% end # query.valid? %>
<% content_for :sidebar do %>
<%= render :partial => 'issues/sidebar' %>
<% end %>
<% html_title(l(:label_gantt)) -%>
<% content_for :header_tags do %> <% content_for :header_tags do %>
<%= javascript_include_tag 'raphael' %> <%= javascript_include_tag 'raphael' %>
@ -317,7 +319,3 @@
$("#draw_progress_line").change(drawGanttHandler); $("#draw_progress_line").change(drawGanttHandler);
}); });
<% end %> <% end %>
<script>
$(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
</script>