From c0da9257cdc7e48e00ce411d30f3b654f2651a7b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 24 Jul 2015 09:19:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=EF=BC=9A=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=9C=80=E8=BF=91=E5=85=AD=E4=B8=AA=E6=9C=88=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb | 46 +++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index cabc88f6b..e2bfc58fe 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -670,7 +670,51 @@ update
     graph.burn
   end
 
-  
+  # 用户最近六个月的提交次数
+  def author_commits_six_month(repository)
+    @date_to = Date.today
+    @date_from = @date_to << 6
+    @date_from = Date.civil(@date_from.year, @date_from.month, 1)
+    commits_by_author = Changeset.count(:all, :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)
+
+    changes_by_author = Change.count(:all, :group => :committer, :include => :changeset,
+                                     :conditions => ["#{Changeset.table_name}.repository_id = ? AND #{Changeset.table_name}.commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to])
+    h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o}
+
+    fields = commits_by_author.collect {|r| r.first}
+    commits_data = commits_by_author.collect {|r| r.last}
+    changes_data = commits_by_author.collect {|r| h[r.first] || 0}
+
+    fields = fields + [""]*(10 - fields.length) if fields.length<10
+    commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10
+    changes_data = changes_data + [0]*(10 - changes_data.length) if changes_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.add_data(
+    #     :data => changes_data,
+    #     :title => l(:label_change_plural)
+    # )
+    graph.burn
+  end
 
 
   def check_hidden_repo