* Fixing whitespace

* Localizing graphs sidebar title
This commit is contained in:
Brad Beattie 2009-04-01 10:33:41 -07:00
parent bf61b20956
commit 94d281822a
3 changed files with 208 additions and 207 deletions

View File

@ -2,213 +2,213 @@ require 'SVG/Graph/TimeSeries'
class GraphsController < ApplicationController
before_filter :find_version, :only => [:target_version_graph]
before_filter :find_open_issues, :only => [:old_issues, :issue_age_graph]
before_filter :find_optional_project, :only => [:issue_growth, :issue_growth_graph]
helper IssuesHelper
def issue_growth
end
# Displays projects by total issues over time
def issue_growth_graph
# Initialize the graph
graph = SVG::Graph::TimeSeries.new({
:area_fill => true,
:height => 300,
:min_y_value => 0,
:no_css => true,
:show_x_guidelines => true,
:scale_x_integers => true,
:scale_y_integers => true,
:show_data_points => false,
:show_data_values => false,
:stagger_x_labels => true,
:style_sheet => "/plugin_assets/redmine_graphs/stylesheets/issue_growth.css",
:timescale_divisions => "1 months",
:width => 720,
:x_label_format => "%b %Y"
})
# Get the top visible projects by issue count
sql = "SELECT project_id, COUNT(*) as issue_count"
sql << " FROM issues"
sql << " LEFT JOIN #{Project.table_name} ON #{Issue.table_name}.project_id = #{Project.table_name}.id"
sql << " WHERE (%s)" % Project.allowed_to_condition(User.current, :view_issues)
sql << " AND (project_id = #{@project.id})" unless @project.nil?
sql << " GROUP BY project_id"
sql << " ORDER BY issue_count DESC"
sql << " LIMIT 6"
top_projects = ActiveRecord::Base.connection.select_all(sql).collect { |p| p["project_id"] }
# Get the issues created per project, per day
sql = "SELECT project_id, date(#{Issue.table_name}.created_on) as date, COUNT(*) as issue_count"
sql << " FROM #{Issue.table_name}"
sql << " WHERE project_id IN (%s)" % top_projects.compact.join(',')
sql << " GROUP BY project_id, date"
issue_counts = ActiveRecord::Base.connection.select_all(sql).group_by { |c| c["project_id"] }
before_filter :find_version, :only => [:target_version_graph]
before_filter :find_open_issues, :only => [:old_issues, :issue_age_graph]
before_filter :find_optional_project, :only => [:issue_growth, :issue_growth_graph]
helper IssuesHelper
def issue_growth
end
# Displays projects by total issues over time
def issue_growth_graph
# Initialize the graph
graph = SVG::Graph::TimeSeries.new({
:area_fill => true,
:height => 300,
:min_y_value => 0,
:no_css => true,
:show_x_guidelines => true,
:scale_x_integers => true,
:scale_y_integers => true,
:show_data_points => false,
:show_data_values => false,
:stagger_x_labels => true,
:style_sheet => "/plugin_assets/redmine_graphs/stylesheets/issue_growth.css",
:timescale_divisions => "1 months",
:width => 720,
:x_label_format => "%b %Y"
})
# Get the top visible projects by issue count
sql = "SELECT project_id, COUNT(*) as issue_count"
sql << " FROM issues"
sql << " LEFT JOIN #{Project.table_name} ON #{Issue.table_name}.project_id = #{Project.table_name}.id"
sql << " WHERE (%s)" % Project.allowed_to_condition(User.current, :view_issues)
sql << " AND (project_id = #{@project.id})" unless @project.nil?
sql << " GROUP BY project_id"
sql << " ORDER BY issue_count DESC"
sql << " LIMIT 6"
top_projects = ActiveRecord::Base.connection.select_all(sql).collect { |p| p["project_id"] }
# Get the issues created per project, per day
sql = "SELECT project_id, date(#{Issue.table_name}.created_on) as date, COUNT(*) as issue_count"
sql << " FROM #{Issue.table_name}"
sql << " WHERE project_id IN (%s)" % top_projects.compact.join(',')
sql << " GROUP BY project_id, date"
issue_counts = ActiveRecord::Base.connection.select_all(sql).group_by { |c| c["project_id"] }
# Generate the created_on lines
top_projects.each do |project_id, total_count|
counts = issue_counts[project_id].sort { |a,b| a["date"]<=>b["date"] }
created_count = 0
created_on_line = Hash.new
created_on_line[(Date.parse(counts.first["date"])-1).to_s] = 0
counts.each { |count| created_count += count["issue_count"].to_i; created_on_line[count["date"]] = created_count }
created_on_line[Date.today.to_s] = created_count
graph.add_data({
:data => created_on_line.sort.flatten,
:title => Project.find(project_id).to_s
})
end
# Compile the graph
headers["Content-Type"] = "image/svg+xml"
send_data(graph.burn, :type => "image/svg+xml", :disposition => "inline")
end
def old_issues
@issues_by_created_on = @issues.sort {|a,b| a.created_on<=>b.created_on}
@issues_by_updated_on = @issues.sort {|a,b| a.updated_on<=>b.updated_on}
end
# Generate the created_on lines
top_projects.each do |project_id, total_count|
counts = issue_counts[project_id].sort { |a,b| a["date"]<=>b["date"] }
created_count = 0
created_on_line = Hash.new
created_on_line[(Date.parse(counts.first["date"])-1).to_s] = 0
counts.each { |count| created_count += count["issue_count"].to_i; created_on_line[count["date"]] = created_count }
created_on_line[Date.today.to_s] = created_count
graph.add_data({
:data => created_on_line.sort.flatten,
:title => Project.find(project_id).to_s
})
end
# Compile the graph
headers["Content-Type"] = "image/svg+xml"
send_data(graph.burn, :type => "image/svg+xml", :disposition => "inline")
end
def old_issues
@issues_by_created_on = @issues.sort {|a,b| a.created_on<=>b.created_on}
@issues_by_updated_on = @issues.sort {|a,b| a.updated_on<=>b.updated_on}
end
# Displays issues by creation date, cumulatively
def issue_age_graph
# Initialize the graph
graph = SVG::Graph::TimeSeries.new({
:area_fill => true,
:height => 300,
:min_y_value => 0,
:no_css => true,
:show_x_guidelines => true,
:scale_x_integers => true,
:scale_y_integers => true,
:show_data_points => false,
:show_data_values => false,
:stagger_x_labels => true,
:style_sheet => "/plugin_assets/redmine_graphs/stylesheets/issue_age.css",
:timescale_divisions => "1 weeks",
:width => 720,
:x_label_format => "%b %d"
})
# Displays issues by creation date, cumulatively
def issue_age_graph
# Initialize the graph
graph = SVG::Graph::TimeSeries.new({
:area_fill => true,
:height => 300,
:min_y_value => 0,
:no_css => true,
:show_x_guidelines => true,
:scale_x_integers => true,
:scale_y_integers => true,
:show_data_points => false,
:show_data_values => false,
:stagger_x_labels => true,
:style_sheet => "/plugin_assets/redmine_graphs/stylesheets/issue_age.css",
:timescale_divisions => "1 weeks",
:width => 720,
:x_label_format => "%b %d"
})
# Group issues
issues_by_created_on = @issues.group_by {|issue| issue.created_on.to_date }.sort
issues_by_updated_on = @issues.group_by {|issue| issue.updated_on.to_date }.sort
# Generate the created_on line
created_count = 0
created_on_line = Hash.new
issues_by_created_on.each { |created_on, issues| created_on_line[(created_on-1).to_s] = created_count; created_count += issues.size; created_on_line[created_on.to_s] = created_count }
created_on_line[Date.today.to_s] = created_count
graph.add_data({
:data => created_on_line.sort.flatten,
:title => l(:field_created_on)
})
# Generate the closed_on line
updated_count = 0
updated_on_line = Hash.new
issues_by_updated_on.each { |updated_on, issues| updated_on_line[(updated_on-1).to_s] = updated_count; updated_count += issues.size; updated_on_line[updated_on.to_s] = updated_count }
updated_on_line[Date.today.to_s] = updated_count
graph.add_data({
:data => updated_on_line.sort.flatten,
:title => l(:field_updated_on)
})
# Compile the graph
headers["Content-Type"] = "image/svg+xml"
send_data(graph.burn, :type => "image/svg+xml", :disposition => "inline")
end
# Displays open and total issue counts over time
def target_version_graph
# Group issues
issues_by_created_on = @issues.group_by {|issue| issue.created_on.to_date }.sort
issues_by_updated_on = @issues.group_by {|issue| issue.updated_on.to_date }.sort
# Generate the created_on line
created_count = 0
created_on_line = Hash.new
issues_by_created_on.each { |created_on, issues| created_on_line[(created_on-1).to_s] = created_count; created_count += issues.size; created_on_line[created_on.to_s] = created_count }
created_on_line[Date.today.to_s] = created_count
graph.add_data({
:data => created_on_line.sort.flatten,
:title => l(:field_created_on)
})
# Generate the closed_on line
updated_count = 0
updated_on_line = Hash.new
issues_by_updated_on.each { |updated_on, issues| updated_on_line[(updated_on-1).to_s] = updated_count; updated_count += issues.size; updated_on_line[updated_on.to_s] = updated_count }
updated_on_line[Date.today.to_s] = updated_count
graph.add_data({
:data => updated_on_line.sort.flatten,
:title => l(:field_updated_on)
})
# Compile the graph
headers["Content-Type"] = "image/svg+xml"
send_data(graph.burn, :type => "image/svg+xml", :disposition => "inline")
end
# Displays open and total issue counts over time
def target_version_graph
# Initialize the graph
graph = SVG::Graph::TimeSeries.new({
:area_fill => true,
:height => 300,
:no_css => true,
:show_x_guidelines => true,
:scale_x_integers => true,
:scale_y_integers => true,
:show_data_points => true,
:show_data_values => false,
:stagger_x_labels => true,
:style_sheet => "/plugin_assets/redmine_graphs/stylesheets/target_version.css",
:width => 800,
:x_label_format => "%b %d"
})
# Initialize the graph
graph = SVG::Graph::TimeSeries.new({
:area_fill => true,
:height => 300,
:no_css => true,
:show_x_guidelines => true,
:scale_x_integers => true,
:scale_y_integers => true,
:show_data_points => true,
:show_data_values => false,
:stagger_x_labels => true,
:style_sheet => "/plugin_assets/redmine_graphs/stylesheets/target_version.css",
:width => 800,
:x_label_format => "%b %d"
})
# Group issues
issues_by_created_on = @version.fixed_issues.group_by {|issue| issue.created_on.to_date }.sort
issues_by_updated_on = @version.fixed_issues.group_by {|issue| issue.updated_on.to_date }.sort
issues_by_closed_on = @version.fixed_issues.collect { |issue| issue if issue.closed? }.compact.group_by {|issue| issue.updated_on.to_date }.sort
# Set the scope of the graph
scope_end_date = issues_by_updated_on.keys.last
scope_end_date = @version.effective_date if !@version.effective_date.nil? && @version.effective_date > scope_end_date
scope_end_date = Date.today if !@version.completed?
line_end_date = Date.today
line_end_date = scope_end_date if scope_end_date < line_end_date
# Generate the created_on line
created_count = 0
created_on_line = Hash.new
issues_by_created_on.each { |created_on, issues| created_on_line[(created_on-1).to_s] = created_count; created_count += issues.size; created_on_line[created_on.to_s] = created_count }
created_on_line[scope_end_date.to_s] = created_count
graph.add_data({
:data => created_on_line.sort.flatten,
:title => l(:label_total).capitalize
})
# Generate the closed_on line
closed_count = 0
closed_on_line = Hash.new
issues_by_closed_on.each { |closed_on, issues| closed_on_line[(closed_on-1).to_s] = closed_count; closed_count += issues.size; closed_on_line[closed_on.to_s] = closed_count }
closed_on_line[line_end_date.to_s] = closed_count
graph.add_data({
:data => closed_on_line.sort.flatten,
:title => l(:label_closed_issues).capitalize
})
# Add the version due date marker
graph.add_data({
:data => [@version.effective_date.to_s, created_count],
:title => l(:field_due_date).capitalize
}) unless @version.effective_date.nil?
# Compile the graph
headers["Content-Type"] = "image/svg+xml"
send_data(graph.burn, :type => "image/svg+xml", :disposition => "inline")
end
private
def find_open_issues
find_optional_project
@issues = Issue.visible.find(:all, :include => [:status], :conditions => ["#{IssueStatus.table_name}.is_closed=?", false]) if @project.nil?
@issues = @project.issues.collect { |issue| issue unless issue.closed? }.compact unless @project.nil?
rescue ActiveRecord::RecordNotFound
render_404
end
def find_optional_project
@project = Project.find(params[:project_id]) unless params[:project_id].blank?
deny_access unless User.current.allowed_to?(:view_issues, @project, :global => true)
rescue ActiveRecord::RecordNotFound
render_404
end
def find_version
@version = Version.find(params[:id])
deny_access unless User.current.allowed_to?(:view_issues, @version.project)
rescue ActiveRecord::RecordNotFound
render_404
end
# Group issues
issues_by_created_on = @version.fixed_issues.group_by {|issue| issue.created_on.to_date }.sort
issues_by_updated_on = @version.fixed_issues.group_by {|issue| issue.updated_on.to_date }.sort
issues_by_closed_on = @version.fixed_issues.collect { |issue| issue if issue.closed? }.compact.group_by {|issue| issue.updated_on.to_date }.sort
# Set the scope of the graph
scope_end_date = issues_by_updated_on.keys.last
scope_end_date = @version.effective_date if !@version.effective_date.nil? && @version.effective_date > scope_end_date
scope_end_date = Date.today if !@version.completed?
line_end_date = Date.today
line_end_date = scope_end_date if scope_end_date < line_end_date
# Generate the created_on line
created_count = 0
created_on_line = Hash.new
issues_by_created_on.each { |created_on, issues| created_on_line[(created_on-1).to_s] = created_count; created_count += issues.size; created_on_line[created_on.to_s] = created_count }
created_on_line[scope_end_date.to_s] = created_count
graph.add_data({
:data => created_on_line.sort.flatten,
:title => l(:label_total).capitalize
})
# Generate the closed_on line
closed_count = 0
closed_on_line = Hash.new
issues_by_closed_on.each { |closed_on, issues| closed_on_line[(closed_on-1).to_s] = closed_count; closed_count += issues.size; closed_on_line[closed_on.to_s] = closed_count }
closed_on_line[line_end_date.to_s] = closed_count
graph.add_data({
:data => closed_on_line.sort.flatten,
:title => l(:label_closed_issues).capitalize
})
# Add the version due date marker
graph.add_data({
:data => [@version.effective_date.to_s, created_count],
:title => l(:field_due_date).capitalize
}) unless @version.effective_date.nil?
# Compile the graph
headers["Content-Type"] = "image/svg+xml"
send_data(graph.burn, :type => "image/svg+xml", :disposition => "inline")
end
private
def find_open_issues
find_optional_project
@issues = Issue.visible.find(:all, :include => [:status], :conditions => ["#{IssueStatus.table_name}.is_closed=?", false]) if @project.nil?
@issues = @project.issues.collect { |issue| issue unless issue.closed? }.compact unless @project.nil?
rescue ActiveRecord::RecordNotFound
render_404
end
def find_optional_project
@project = Project.find(params[:project_id]) unless params[:project_id].blank?
deny_access unless User.current.allowed_to?(:view_issues, @project, :global => true)
rescue ActiveRecord::RecordNotFound
render_404
end
def find_version
@version = Version.find(params[:id])
deny_access unless User.current.allowed_to?(:view_issues, @version.project)
rescue ActiveRecord::RecordNotFound
render_404
end
end

View File

@ -1,5 +1,6 @@
en:
label_graphs: Graphs
label_graphs_total_vs_closed_issues: Total issues vs. Closed issues
label_graphs_old_issues: Open aging issues
label_graphs_issue_growth: Total issues over time

View File

@ -1,7 +1,7 @@
# Provides a link to the issue age graph on the issue index page
class IssuesSidebarGraphHook < Redmine::Hook::ViewListener
def view_issues_sidebar_issues_bottom(context = { })
output = "<h3>Graphs</h3>"
output = "<h3>#{l(:label_graphs)}</h3>"
output << link_to(l(:label_graphs_old_issues), {:controller => 'graphs', :action => 'old_issues'}) if context[:project].nil?
output << link_to(l(:label_graphs_old_issues), {:controller => 'graphs', :action => 'old_issues', :project_id => context[:project]}) unless context[:project].nil?
output << "<br/>"
@ -10,4 +10,4 @@ class IssuesSidebarGraphHook < Redmine::Hook::ViewListener
output << "<br/>"
return output
end
end
end