diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index 959e0fe30..076e0b1c7 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -250,10 +250,8 @@ module Mobile
end
get "course_dynamic/:id" do
cs = CoursesService.new
- p Time.now.to_s
count = cs.all_course_dynamics(params,current_user)
present :data, count, with: Mobile::Entities::CourseDynamic
- p Time.now.to_s
present :status, 0
end
diff --git a/app/api/mobile/entities/course_dynamic.rb b/app/api/mobile/entities/course_dynamic.rb
index 5be0a3d0a..6077a8722 100644
--- a/app/api/mobile/entities/course_dynamic.rb
+++ b/app/api/mobile/entities/course_dynamic.rb
@@ -4,45 +4,44 @@ module Mobile
include Redmine::I18n
def self.course_dynamic_expose(field)
expose field do |c,opt|
- if field == :news_count
- obj = nil
- c[:dynamics].each do |d|
- if d[:type] == 1
- obj = d[:count]
- end
- end
- obj
- elsif field == :document_count
- obj = nil
- c[:dynamics].each do |d|
- if d[:type] == 3
- obj = d[:count]
- end
- end
- obj
- elsif field == :topic_count
- obj = nil
- c[:dynamics].each do |d|
- if d[:type] == 2
- obj = d[:count]
- end
- end
- obj
- elsif field == :homework_count
- obj = nil
- c[:dynamics].each do |d|
- if d[:type] == 4
- obj = d[:count]
- end
- end
- obj
- else
+ # if field == :news_count
+ # obj = nil
+ # c[:dynamics].each do |d|
+ # if d[:type] == 1
+ # obj = d[:count]
+ # end
+ # end
+ # obj
+ # elsif field == :document_count
+ # obj = nil
+ # c[:dynamics].each do |d|
+ # if d[:type] == 3
+ # obj = d[:count]
+ # end
+ # end
+ # obj
+ # elsif field == :topic_count
+ # obj = nil
+ # c[:dynamics].each do |d|
+ # if d[:type] == 2
+ # obj = d[:count]
+ # end
+ # end
+ # obj
+ # elsif field == :homework_count
+ # obj = nil
+ # c[:dynamics].each do |d|
+ # if d[:type] == 4
+ # obj = d[:count]
+ # end
+ # end
+ # obj
+ # else
c[field] if (c.is_a?(Hash) && c.key?(field))
- end
+ # end
end
end
- course_dynamic_expose :type
course_dynamic_expose :course_name
course_dynamic_expose :course_term
course_dynamic_expose :course_time
@@ -68,52 +67,22 @@ module Mobile
# obj
# end
expose :topics,using:Mobile::Entities::Message do |f,opt|
- obj = nil
- f[:dynamics].each do |d|
- if d[:type] == 2
- obj = d[:topics]
- end
- end
- obj
+ f[:topics]
end
expose :homeworks,using:Mobile::Entities::Homework do |f,opt|
- obj = nil
- f[:dynamics].each do |d|
- if d[:type] == 4
- obj = d[:homeworks]
- end
- end
- obj
+ f[:homeworks]
end
expose :news,using:Mobile::Entities::News do |f,opt|
- obj = nil
- f[:dynamics].each do |d|
- if d[:type] == 1
- obj = d[:news]
- end
- end
- obj
+ f[:news]
end
expose :better_students,using:Mobile::Entities::User do |f,opt|
- obj = nil
- f[:dynamics].each do |d|
- if d[:type] == 6
- obj = d[:better_students]
- end
- end
- obj
+ f[:better_students]
end
expose :active_students,using:Mobile::Entities::User do |f,opt|
- obj = nil
- f[:dynamics].each do |d|
- if d[:type] == 7
- obj = d[:active_students]
- end
- end
- obj
+ f[:active_students]
end
end
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index f5fa007a5..717007f54 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -459,6 +459,12 @@ 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_commits_six_month"
+ data = author_commits_six_month(@repository)
+ when "author_qoc_per_author"
+ data = graph_author_qoc_per_author(@repository)
end
if data
headers["Content-Type"] = "image/svg+xml"
@@ -617,6 +623,80 @@ update
)
graph.burn
end
+
+ # 用户每月提交次数
+ 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, @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)
+
+ 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_per_month),
+ :show_graph_title => true
+ )
+ graph.add_data(
+ :data => commits_data,
+ :title => l(:label_revision_plural)
+ )
+ 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, @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)
+
+ 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])
if !User.current.member_of?(project)
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 5c3b69d72..c2944fed5 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -670,18 +670,25 @@ class CoursesService
membership.each do |mp|
course = mp.course
latest_course_dynamics = []
+ notices_count = 0
+ topic_count = 0
+ topics = nil
+ homeworkss = nil
+ notices = nil
# 课程通知
latest_news = course.news.page(1).per(2).order("created_on desc")
unless latest_news.first.nil?
- latest_course_dynamics << {:type => 1, :time => latest_news.first.created_on,:count=>course.news.count,
- :news => latest_news.all}
+ notices_count = course.news.count
+ notices = latest_news.all
+ latest_course_dynamics << {:time => latest_news.first.created_on }
end
# 课程讨论区
latest_message = course.boards.first.topics.page(1).per(2)
unless latest_message.first.nil?
- latest_course_dynamics << {:type => 2, :time => latest_message.first.created_on, :count =>course.boards.nil? ? 0 : course.boards.first.topics.count,
- :topics => latest_message.all}
+ topic_count = course.boards.nil? ? 0 : course.boards.first.topics.count
+ topics = latest_message.all
+ latest_course_dynamics << {:time => latest_message.first.created_on}
end
# 课程资源
# latest_attachment = course.attachments.order("created_on desc").page(1).per(2)
@@ -693,7 +700,8 @@ class CoursesService
#课程作业 已经交的学生列表（暂定显示6人），未交的学生列表，作业的状态
homeworks = course.homework_commons.page(1).per(2).order('created_at desc')
unless homeworks.first.nil?
- latest_course_dynamics << {:type => 4, :time => homeworks.first.updated_at, :count=>course.homework_commons.count , :homeworks => homeworks}
+ homeworkss = homeworks
+ latest_course_dynamics << {:time => homeworks.first.updated_at}
end
latest_course_dynamics.sort! { |order, newer| newer[:time] <=> order[:time] }
# 课程学霸 学生总分数排名靠前的5个人
@@ -713,10 +721,10 @@ class CoursesService
active_students = User.find_by_sql(sql1)
if homework_count != 0 && !better_students.empty?
- latest_course_dynamics <<{:type=> 6,:time=>"1970-01-01 0:0:0 +0800",:count=> 4,:better_students=> better_students}
+ latest_course_dynamics <<{:time=>"1970-01-01 0:0:0 +0800"}
end
unless active_students.empty?
- latest_course_dynamics <<{:type=> 7,:time=>"1970-01-01 0:0:0 +0800",:count=> 4,:active_students=>active_students}
+ latest_course_dynamics <<{:time=>"1970-01-01 0:0:0 +0800"}
end
latest_course_dynamic = latest_course_dynamics.first
unless latest_course_dynamic.nil?
@@ -727,8 +735,15 @@ class CoursesService
:course_img_url => url_to_avatar(course),
:course_time => course.time,
:course_term => course.term,
+ :news_count => notices_count,
+ :homework_count => homework_count,
+ :topic_count => topic_count,
+ :news => notices,
+ :homeworks => homeworkss,
+ :topics => topics,
+ :better_students => better_students,
+ :active_students => active_students,
:message => "",
- :dynamics => latest_course_dynamics,
:course_student_num=>course ? course.members.count : 0,
#:time_from_now=> distance_of_time_in_words(Time.now, latest_course_dynamic[:time].to_time) << "前",
:time_from_now=>time_from_now(latest_course_dynamic[:time].to_time), #.strftime('%Y-%m-%d %H:%M:%S').to_s,
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 @@