Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

app/controllers/repositories_controller.rb

@@ -465,6 +465,8 @@ update
       data = author_commits_six_month(@repository)
     when "author_qoc_per_author"
       data = graph_author_qoc_per_author(@repository)
+    when "author_code_six_months"
+      data = author_code_six_month(@repository)
     end
     if data
       headers["Content-Type"] = "image/svg+xml"
@@ -696,6 +698,47 @@ update
     graph.burn
   end
 
+  # 最近六个月代码量统计
+  def author_code_six_month(repository)
+    @date_to = Date.today
+    @date_from = @date_to << 6
+    @date_from = Date.civil(@date_from.year, @date_from.month, @date_from.day)
+    commits_by_author = Changeset.count(:group => :committer, :conditions => ["#{Changeset.table_name}.repository_id = ? AND #{Changeset.table_name}.commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to])
+    commits_by_author = commits_by_author.to_a.sort! {|x, y| x.last <=> y.last}.last(40)
+    all_author = []
+    commits_by_author.each do |cba|
+      all_author << cba.first
+    end
+    all_author = all_author.collect {|c| c.gsub(%r{<.+@.+>}, '') }
+    commits_by_author = repository.commits(all_author, @date_from, @date_to)
+
+    fields = commits_by_author.collect {|r| r.first}
+    commits_data = commits_by_author.collect {|r| r.last}
+
+    fields = fields + [""]*(10 - fields.length) if fields.length<10
+    commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10
+
+    # Remove email adress in usernames
+    fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') }
+
+    graph = SVG::Graph::BarHorizontal.new(
+        :height => 400,
+        :width => 600,
+        :fields => fields,
+        :stack => :side,
+        :scale_integers => true,
+        :show_data_values => true,
+        :rotate_y_labels => false,
+        :graph_title => l(:label_author_commits_six_month),
+        :show_graph_title => true
+    )
+    graph.add_data(
+        :data => commits_data,
+        :title => l(:label_revision_plural)
+    )
+    graph.burn
+  end
+
 
   def check_hidden_repo
     project = Project.find(params[:id])

app/views/repositories/stats.html.erb

@@ -25,5 +25,13 @@
   <%# 用户最近一年的提交次数 %>
   <%= tag("embed", :width => 670, :height => 400, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "author_qoc_per_author")) %>
 </p>
+<p style="padding-top: 50px;">
+  <%# 用户最近六个月的代码量 %>
+  <%= tag("embed", :width => 670, :height => 400, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "author_code_six_months")) %>
+</p>
+<p style="padding-top: 50px;">
+  <%# 用户最近一年的代码量 %>
+  <%= tag("embed", :width => 670, :height => 400, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "author_code_year")) %>
+</p>
 <p><%= link_to l(:button_back), :action => 'show', :id => @project %></p>
 <% html_title(l(:label_repository), l(:label_statistics)) -%>

config/locales/zh.yml

@@ -716,8 +716,10 @@ zh:
   label_commits_per_month: 每月提交次数
   label_commits_per_author: 每用户提交次数
   label_author_commits_per_month: 用户最近一月的提交次数
-  label_author_commits_six_month: 用户最近六个月的提交次数
+  label_author_commits_six_month: 用户最近六个月提交次数
   label_author_commits_year: 最近一年的提交次数
+  label_author_code_six_month: 用户最近六个月代码量
+  label_author_code_year: 用户最近一年代码量
   label_view_diff: 查看差别
   label_diff_inline: 直列
   label_diff_side_by_side: 并排