From 6cbafb66d9be3945aecb006673bf7f93defd4fa6 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 23 Jul 2015 10:20:32 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=BB=9F=E8=AE=A1=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/repositories/stats.html.erb |  4 +++-
 public/stylesheets/project.css        | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/views/repositories/stats.html.erb b/app/views/repositories/stats.html.erb
index 7e558119f..fe3bf20ac 100644
--- a/app/views/repositories/stats.html.erb
+++ b/app/views/repositories/stats.html.erb
@@ -1,7 +1,9 @@
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_statistics) %></h2>
 </div>
-<p>
+<div class="riviseRed fl"></div><div class="fl">修订 是版本库的提交次数, 显示为橘红色。</div><br>
+<div class="changeBlue fl"></div><div class="fl">变更 是对版本库中文件的修改次数, 显示为蓝色。</div>
+<p style="padding-top:35px;">
   <%= tag("embed", :width => 670, :height => 300, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "commits_per_month")) %>
 </p>
 <p style="padding-top: 50px;">
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index f005b2df6..fa1bec754 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -551,7 +551,24 @@ p.percent {
     font-size: 12px;
 }
 .repositorytitle select{ width: 110px; height: 21px; }
-
+.riviseRed {
+    width:15px;
+    height:15px;
+    margin-right: 3px;
+    background-color:#FF0000;
+    filter:alpha(opacity=50);  /* ie 有效*/
+    -moz-opacity:0.5; /* Firefox  有效*/
+    opacity: 0.5; /* 通用，其他浏览器  有效*/
+}
+.changeBlue {
+    width:15px;
+    height:15px;
+    margin-right: 3px;
+    background-color:#0000FF;
+    filter:alpha(opacity=50);  /* ie 有效*/
+    -moz-opacity:0.5; /* Firefox  有效*/
+    opacity: 0.5; /* 通用，其他浏览器  有效*/
+}
 
 
 /*导出*/

From 8f0262618305b96a58cded2f1ec4d11c75004244 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 23 Jul 2015 10:36:51 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=91=E5=8C=96?=
 =?UTF-8?q?=E9=83=A8=E7=BD=B2=E8=BF=9B=E5=BA=A6=E6=9D=A1=EF=BC=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=88=90=E7=AD=89=E5=BE=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/yun_dep.html.erb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/projects/yun_dep.html.erb b/app/views/projects/yun_dep.html.erb
index 20abf038f..7a774f4e4 100644
--- a/app/views/projects/yun_dep.html.erb
+++ b/app/views/projects/yun_dep.html.erb
@@ -5,27 +5,27 @@
 <!--JS进度条-->
 <style type="text/css">
     #out{}
-    #in{width:10px; height:20px;background:#15BCCF;color:white;text-align:center;}
+    #in{}
     #font_color{background:yellow;text-align:center;color:white;}
 </style>
 <div style="padding-left: 200px;">
   <div id='out'>
-    <p style="padding-left: 120px;padding-bottom: 10px;font-size: 14px;">云化部署中...</p>
-    <div style="width:300px;height:20px;background:#EEE;">
-      <div id="in" style="width:1%">0%</div>
+    <p style="padding-left: 100px;padding-bottom: 10px;font-size: 14px;padding-top: 10px;">云化部署中....</p>
+    <div>
+      <div id="in" style="width:0%"></div>
       <div>
         <script type="text/javascript">
             i=0;
             $(function(){
-                ba=setInterval("begin()",50);//setInterval 返回的是一个全局变量，一个间隔数值.这个数值是表示调用setInterval的次数
+                ba=setInterval("begin()",60);//setInterval 返回的是一个全局变量，一个间隔数值.这个数值是表示调用setInterval的次数
             });
             function begin()
             {
                 i+=1;
                 if(i<=100)
                 {
-                    document.getElementById("in").style.width=i+"%";
-                    document.getElementById("in").innerHTML=i+"%";}
+                    document.getElementById("in").style.width="";
+                    document.getElementById("in").innerHTML="";}
                 else
                 {
                     clearInterval(ba);

From a2c2f41908f0896a85a81396d1596284f519870e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 23 Jul 2015 17:32:48 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=EF=BC=9A?=
 =?UTF-8?q?=E6=9C=80=E8=BF=91=E4=B8=80=E6=9C=88=E7=9A=84=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=AC=A1=E6=95=B0=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb | 57 +++++++++++++++++++++-
 app/views/repositories/stats.html.erb      |  8 +++
 config/locales/zh.yml                      |  1 +
 3 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index f5fa007a5..f71d11802 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -459,6 +459,10 @@ update
       data = graph_commits_per_month(@repository)
     when "commits_per_author"
       data = graph_commits_per_author(@repository)
+    when "author_commits_per_month"
+      data = graph_author_commits_per_month(@repository)
+    when "author_qoc_per_author"
+      data = graph_author_qoc_per_author(@repository)
     end
     if data
       headers["Content-Type"] = "image/svg+xml"
@@ -536,12 +540,15 @@ update
   def graph_commits_per_month(repository)
     @date_to = Date.today
     @date_from = @date_to << 11
-    @date_from = Date.civil(@date_from.year, @date_from.month, 1)
+    @date_from = Date.civil(@date_from.year, @date_from.month, 1) ##    Date.new(2001,2,-1)       #=> #<Date: 2001-02-28 ...>
+    # commits_by_day[0] 为data 【2】为count
     commits_by_day = Changeset.count(
                           :all, :group => :commit_date,
                           :conditions => ["repository_id = ? AND commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to])
     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 do |c|
+      commits_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last
+    end
 
     changes_by_day = Change.count(
                           :all, :group => :commit_date, :include => :changeset,
@@ -617,6 +624,52 @@ update
     )
     graph.burn
   end
+
+  # 用户每月提交次数
+  def graph_author_commits_per_month(repository)
+    commits_by_author = Changeset.count(:all, :group => :committer, :conditions => ["repository_id = ?", repository.id])
+    commits_by_author = commits_by_author.to_a.sort! {|x, y| x.last <=> y.last}.last(25)
+
+    changes_by_author = Change.count(:all, :group => :committer, :include => :changeset, :conditions => ["#{Changeset.table_name}.repository_id = ?", repository.id])
+    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_per_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 graph_author_qoc_per_author(repository)
+
+  end
+
   def check_hidden_repo
     project = Project.find(params[:id])
     if !User.current.member_of?(project)
diff --git a/app/views/repositories/stats.html.erb b/app/views/repositories/stats.html.erb
index fe3bf20ac..0eb04b891 100644
--- a/app/views/repositories/stats.html.erb
+++ b/app/views/repositories/stats.html.erb
@@ -7,7 +7,15 @@
   <%= tag("embed", :width => 670, :height => 300, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "commits_per_month")) %>
 </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 => "commits_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_commits_per_month")) %>
+</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_qoc_per_author")) %>
+</p>
 <p><%= link_to l(:button_back), :action => 'show', :id => @project %></p>
 <% html_title(l(:label_repository), l(:label_statistics)) -%>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b2faa6319..2c628894e 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -715,6 +715,7 @@ zh:
 
   label_commits_per_month: 每月提交次数
   label_commits_per_author: 每用户提交次数
+  label_author_commits_per_month: 用户最近一月的提交次数
   label_view_diff: 查看差别
   label_diff_inline: 直列
   label_diff_side_by_side: 并排

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

---
 app/controllers/repositories_controller.rb | 23 ++++++++++++----------
 app/views/repositories/stats.html.erb      |  8 ++++++++
 config/locales/zh.yml                      |  2 ++
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index f71d11802..cabc88f6b 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -461,6 +461,8 @@ update
       data = graph_commits_per_author(@repository)
     when "author_commits_per_month"
       data = graph_author_commits_per_month(@repository)
+    when "author_commits_six_month"
+      data = author_commits_six_month(@repository)
     when "author_qoc_per_author"
       data = graph_author_qoc_per_author(@repository)
     end
@@ -540,15 +542,12 @@ update
   def graph_commits_per_month(repository)
     @date_to = Date.today
     @date_from = @date_to << 11
-    @date_from = Date.civil(@date_from.year, @date_from.month, 1) ##    Date.new(2001,2,-1)       #=> #<Date: 2001-02-28 ...>
-    # commits_by_day[0] 为data 【2】为count
+    @date_from = Date.civil(@date_from.year, @date_from.month, 1)
     commits_by_day = Changeset.count(
                           :all, :group => :commit_date,
                           :conditions => ["repository_id = ? AND commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to])
     commits_by_month = [0] * 12
-    commits_by_day.each do |c|
-      commits_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last
-    end
+    commits_by_day.each {|c| commits_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last }
 
     changes_by_day = Change.count(
                           :all, :group => :commit_date, :include => :changeset,
@@ -627,10 +626,15 @@ update
 
   # 用户每月提交次数
   def graph_author_commits_per_month(repository)
-    commits_by_author = Changeset.count(:all, :group => :committer, :conditions => ["repository_id = ?", repository.id])
-    commits_by_author = commits_by_author.to_a.sort! {|x, y| x.last <=> y.last}.last(25)
+    @date_to = Date.today
+    @date_from = @date_to << 1
+    @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 = ?", repository.id])
+    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}
@@ -666,9 +670,8 @@ update
     graph.burn
   end
 
-  def graph_author_qoc_per_author(repository)
+  
 
-  end
 
   def check_hidden_repo
     project = Project.find(params[:id])
diff --git a/app/views/repositories/stats.html.erb b/app/views/repositories/stats.html.erb
index 0eb04b891..ebb670438 100644
--- a/app/views/repositories/stats.html.erb
+++ b/app/views/repositories/stats.html.erb
@@ -17,5 +17,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_commits_six_month")) %>
+</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_qoc_per_author")) %>
+</p>
 <p><%= link_to l(:button_back), :action => 'show', :id => @project %></p>
 <% html_title(l(:label_repository), l(:label_statistics)) -%>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 2c628894e..14a00eb67 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -716,6 +716,8 @@ zh:
   label_commits_per_month: 每月提交次数
   label_commits_per_author: 每用户提交次数
   label_author_commits_per_month: 用户最近一月的提交次数
+  label_author_commits_six_month: 用户最近六个月的提交次数
+  label_author_commits_year: 最近一年的提交次数
   label_view_diff: 查看差别
   label_diff_inline: 直列
   label_diff_side_by_side: 并排

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 5/7] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=EF=BC=9A?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9C=80=E8=BF=91=E5=85=AD=E4=B8=AA=E6=9C=88?=
 =?UTF-8?q?=E6=8F=90=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

From 2fca0f44413ddc85ee9420d388a25886b33edc35 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 24 Jul 2015 09:32:12 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=AC=A1=E6=95=B0?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=AE=80=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index e2bfc58fe..649f4280e 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -633,17 +633,11 @@ update
                                          :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{<.+@.+>}, '') }
@@ -663,10 +657,6 @@ update
         :data => commits_data,
         :title => l(:label_revision_plural)
     )
-    # graph.add_data(
-    #     :data => changes_data,
-    #     :title => l(:label_change_plural)
-    # )
     graph.burn
   end
 
@@ -679,17 +669,11 @@ update
                                         :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{<.+@.+>}, '') }
@@ -709,10 +693,6 @@ update
         :data => commits_data,
         :title => l(:label_revision_plural)
     )
-    # graph.add_data(
-    #     :data => changes_data,
-    #     :title => l(:label_change_plural)
-    # )
     graph.burn
   end
 

From e5801338d610e1338b79a99e1be1557f35cbdf58 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 24 Jul 2015 09:47:28 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=80=E8=BF=91?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=9C=88=E6=97=B6=E9=97=B4=E8=B7=A8=E5=BA=A6?=
 =?UTF-8?q?=20=E5=BD=93=E5=89=8D=E6=97=A5=E6=9C=9F=E5=BB=B6=E7=94=9F?=
 =?UTF-8?q?=E5=88=B0=E4=B8=8A=E6=9C=88=E7=9A=84=E5=BD=93=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 649f4280e..717007f54 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -628,7 +628,7 @@ update
   def graph_author_commits_per_month(repository)
     @date_to = Date.today
     @date_from = @date_to << 1
-    @date_from = Date.civil(@date_from.year, @date_from.month, 1)
+    @date_from = Date.civil(@date_from.year, @date_from.month,  @date_from.day)
     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)
@@ -664,7 +664,7 @@ update
   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)
+    @date_from = Date.civil(@date_from.year, @date_from.month, @date_from.day)
     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)