mirror of
https://github.com/meineerde/redmine.git
synced 2025-12-26 18:31:14 +00:00
Render repository graphs using Chart.js instead of SVG (#26253).
git-svn-id: http://svn.redmine.org/redmine/trunk@16699 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
parent
cf9bf5d446
commit
5c30876f09
@ -15,8 +15,6 @@
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
require 'SVG/Graph/Bar'
|
||||
require 'SVG/Graph/BarHorizontal'
|
||||
require 'digest/sha1'
|
||||
require 'redmine/scm/adapters'
|
||||
|
||||
@ -262,6 +260,7 @@ class RepositoriesController < ApplicationController
|
||||
def stats
|
||||
end
|
||||
|
||||
# Returns JSON data for repository graphs
|
||||
def graph
|
||||
data = nil
|
||||
case params[:graph]
|
||||
@ -271,8 +270,7 @@ class RepositoriesController < ApplicationController
|
||||
data = graph_commits_per_author(@repository)
|
||||
end
|
||||
if data
|
||||
headers["Content-Type"] = "image/svg+xml"
|
||||
send_data(data, :type => "image/svg+xml", :disposition => "inline")
|
||||
render :json => data
|
||||
else
|
||||
render_404
|
||||
end
|
||||
@ -341,51 +339,33 @@ class RepositoriesController < ApplicationController
|
||||
end
|
||||
|
||||
def graph_commits_per_month(repository)
|
||||
@date_to = User.current.today
|
||||
@date_from = @date_to << 11
|
||||
@date_from = Date.civil(@date_from.year, @date_from.month, 1)
|
||||
date_to = User.current.today
|
||||
date_from = date_to << 11
|
||||
date_from = Date.civil(date_from.year, date_from.month, 1)
|
||||
commits_by_day = Changeset.
|
||||
where("repository_id = ? AND commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to).
|
||||
where("repository_id = ? AND commit_date BETWEEN ? AND ?", repository.id, date_from, date_to).
|
||||
group(:commit_date).
|
||||
count
|
||||
commits_by_month = [0] * 12
|
||||
commits_by_day.each {|c| commits_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last }
|
||||
commits_by_day.each {|c| commits_by_month[(date_to.month - c.first.to_date.month) % 12] += c.last }
|
||||
|
||||
changes_by_day = Change.
|
||||
joins(:changeset).
|
||||
where("#{Changeset.table_name}.repository_id = ? AND #{Changeset.table_name}.commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to).
|
||||
where("#{Changeset.table_name}.repository_id = ? AND #{Changeset.table_name}.commit_date BETWEEN ? AND ?", repository.id, date_from, date_to).
|
||||
group(:commit_date).
|
||||
count
|
||||
changes_by_month = [0] * 12
|
||||
changes_by_day.each {|c| changes_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last }
|
||||
changes_by_day.each {|c| changes_by_month[(date_to.month - c.first.to_date.month) % 12] += c.last }
|
||||
|
||||
fields = []
|
||||
today = User.current.today
|
||||
12.times {|m| fields << month_name(((today.month - 1 - m) % 12) + 1)}
|
||||
|
||||
graph = SVG::Graph::Bar.new(
|
||||
:height => 300,
|
||||
:width => 800,
|
||||
:fields => fields.reverse,
|
||||
:stack => :side,
|
||||
:scale_integers => true,
|
||||
:step_x_labels => 2,
|
||||
:show_data_values => false,
|
||||
:graph_title => l(:label_commits_per_month),
|
||||
:show_graph_title => true
|
||||
)
|
||||
|
||||
graph.add_data(
|
||||
:data => commits_by_month[0..11].reverse,
|
||||
:title => l(:label_revision_plural)
|
||||
)
|
||||
|
||||
graph.add_data(
|
||||
:data => changes_by_month[0..11].reverse,
|
||||
:title => l(:label_change_plural)
|
||||
)
|
||||
|
||||
graph.burn
|
||||
data = {
|
||||
:labels => fields.reverse,
|
||||
:commits => commits_by_month[0..11].reverse,
|
||||
:changes => changes_by_month[0..11].reverse
|
||||
}
|
||||
end
|
||||
|
||||
def graph_commits_per_author(repository)
|
||||
@ -406,27 +386,11 @@ class RepositoriesController < ApplicationController
|
||||
# Remove email address in usernames
|
||||
fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') }
|
||||
|
||||
#prepare graph
|
||||
graph = SVG::Graph::BarHorizontal.new(
|
||||
:height => 30 * commits_data.length,
|
||||
:width => 800,
|
||||
:fields => fields,
|
||||
:stack => :side,
|
||||
:scale_integers => true,
|
||||
:show_data_values => false,
|
||||
:rotate_y_labels => false,
|
||||
:graph_title => l(:label_commits_per_author),
|
||||
:show_graph_title => true
|
||||
)
|
||||
graph.add_data(
|
||||
:data => commits_data,
|
||||
:title => l(:label_revision_plural)
|
||||
)
|
||||
graph.add_data(
|
||||
:data => changes_data,
|
||||
:title => l(:label_change_plural)
|
||||
)
|
||||
graph.burn
|
||||
data = {
|
||||
:labels => fields.reverse,
|
||||
:commits => commits_data.reverse,
|
||||
:changes => changes_data.reverse
|
||||
}
|
||||
end
|
||||
|
||||
def disposition(path)
|
||||
|
||||
@ -1,20 +1,98 @@
|
||||
<h2><%= l(:label_statistics) %></h2>
|
||||
|
||||
<p>
|
||||
<%= tag("embed",
|
||||
:type => "image/svg+xml", :src => url_for(:controller => 'repositories',
|
||||
:action => 'graph', :id => @project,
|
||||
:repository_id => @repository.identifier_param,
|
||||
:graph => "commits_per_month")) %>
|
||||
</p>
|
||||
<p>
|
||||
<%= tag("embed",
|
||||
:type => "image/svg+xml", :src => url_for(:controller => 'repositories',
|
||||
:action => 'graph', :id => @project,
|
||||
:repository_id => @repository.identifier_param,
|
||||
:graph => "commits_per_author")) %>
|
||||
</p>
|
||||
<div class="repository-graph">
|
||||
<canvas id="commits_per_month"></canvas>
|
||||
</div>
|
||||
|
||||
<div class="repository-graph">
|
||||
<canvas id="commits_per_author"></canvas>
|
||||
</div>
|
||||
|
||||
|
||||
<%= javascript_tag do %>
|
||||
$(document).ready(function(){
|
||||
$.getJSON(<%= raw url_for(:controller => 'repositories',
|
||||
:action => 'graph', :id => @project,
|
||||
:repository_id => @repository.identifier_param,
|
||||
:graph => "commits_per_month").to_json %>, function(data){
|
||||
|
||||
var chartData = {
|
||||
labels: data['labels'],
|
||||
datasets: [{
|
||||
label: <%= raw l(:label_revision_plural).to_json %>,
|
||||
backgroundColor: 'rgba(255, 99, 132, 0.7)',
|
||||
borderColor: 'rgb(255, 99, 132)',
|
||||
borderWidth: 1,
|
||||
data: data['commits']
|
||||
}, {
|
||||
label: <%= raw l(:label_change_plural).to_json %>,
|
||||
backgroundColor: 'rgba(54, 162, 235, 0.7)',
|
||||
borderColor: 'rgb(54, 162, 235)',
|
||||
data: data['changes']
|
||||
}]
|
||||
};
|
||||
new Chart(document.getElementById("commits_per_month").getContext("2d"), {
|
||||
type: 'bar',
|
||||
data: chartData,
|
||||
options: {
|
||||
elements: {
|
||||
rectangle: {borderWidth: 2}
|
||||
},
|
||||
responsive: true,
|
||||
legend: {position: 'right'},
|
||||
title: {
|
||||
display: true,
|
||||
text: <%= raw l(:label_commits_per_month).to_json %>
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
$.getJSON(<%= raw url_for(:controller => 'repositories',
|
||||
:action => 'graph', :id => @project,
|
||||
:repository_id => @repository.identifier_param,
|
||||
:graph => "commits_per_author").to_json %>, function(data){
|
||||
|
||||
var chartData = {
|
||||
labels: data['labels'],
|
||||
datasets: [{
|
||||
label: <%= raw l(:label_revision_plural).to_json %>,
|
||||
backgroundColor: 'rgba(255, 99, 132, 0.7)',
|
||||
borderColor: 'rgb(255, 99, 132)',
|
||||
borderWidth: 1,
|
||||
data: data['commits']
|
||||
}, {
|
||||
label: <%= raw l(:label_change_plural).to_json %>,
|
||||
backgroundColor: 'rgba(54, 162, 235, 0.7)',
|
||||
borderColor: 'rgb(54, 162, 235)',
|
||||
data: data['changes']
|
||||
}]
|
||||
};
|
||||
|
||||
new Chart(document.getElementById("commits_per_author").getContext("2d"), {
|
||||
type: 'horizontalBar',
|
||||
data: chartData,
|
||||
options: {
|
||||
elements: {
|
||||
rectangle: {borderWidth: 2}
|
||||
},
|
||||
responsive: true,
|
||||
legend: {position: 'right'},
|
||||
title: {
|
||||
display: true,
|
||||
text: <%= raw l(:label_commits_per_author).to_json %>
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
<% end %>
|
||||
|
||||
|
||||
<p><%= link_to l(:button_back), :action => 'show', :id => @project %></p>
|
||||
|
||||
<% html_title(l(:label_repository), l(:label_statistics)) -%>
|
||||
|
||||
<% content_for :header_tags do %>
|
||||
<%= javascript_include_tag "Chart.bundle.min" %>
|
||||
<% end %>
|
||||
|
||||
16
public/javascripts/Chart.bundle.min.js
vendored
Normal file
16
public/javascripts/Chart.bundle.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -1354,6 +1354,8 @@ font-weight: bold;
|
||||
color: #555; text-shadow: 1px 1px 0 #fff;
|
||||
}
|
||||
|
||||
.repository-graph {width:75%; margin-bottom:2em;}
|
||||
|
||||
/* Custom JQuery styles */
|
||||
.ui-datepicker-title select {width:70px !important; margin-top:-2px !important; margin-right:4px !important;}
|
||||
|
||||
|
||||
@ -345,7 +345,11 @@ class RepositoriesControllerTest < Redmine::ControllerTest
|
||||
:graph => 'commits_per_month'
|
||||
}
|
||||
assert_response :success
|
||||
assert_equal 'image/svg+xml', @response.content_type
|
||||
assert_equal 'application/json', response.content_type
|
||||
data = ActiveSupport::JSON.decode(response.body)
|
||||
assert_not_nil data['labels']
|
||||
assert_not_nil data['commits']
|
||||
assert_not_nil data['changes']
|
||||
end
|
||||
|
||||
def test_graph_commits_per_author
|
||||
@ -354,7 +358,11 @@ class RepositoriesControllerTest < Redmine::ControllerTest
|
||||
:graph => 'commits_per_author'
|
||||
}
|
||||
assert_response :success
|
||||
assert_equal 'image/svg+xml', @response.content_type
|
||||
assert_equal 'application/json', response.content_type
|
||||
data = ActiveSupport::JSON.decode(response.body)
|
||||
assert_not_nil data['labels']
|
||||
assert_not_nil data['commits']
|
||||
assert_not_nil data['changes']
|
||||
end
|
||||
|
||||
def test_get_committers
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user