<%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %>
- <% unless @project.attachments_count == 0 %>
- <%= link_to "(#{@project.attachments_count})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %>
+ <% unless @project.project_score.attach_num == 0 %>
+ <%= link_to "(#{@project.project_score.attach_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %>
<% end %>
<% if User.current.member_of?(@project) %>
<%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
diff --git a/app/views/projects/_show_projects_score.html.erb b/app/views/projects/_show_projects_score.html.erb
index c188bad98..c18060257 100644
--- a/app/views/projects/_show_projects_score.html.erb
+++ b/app/views/projects/_show_projects_score.html.erb
@@ -12,7 +12,7 @@
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 7c6959935..2c1af1b83 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -173,7 +173,7 @@
<% time=project.updated_on %>
<% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
- 更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
+ 更新时间：<%= format_time(ForgeActivity.where("forge_act_type='ProjectCreateInfo' and forge_act_id =#{project.id}").first.updated_at) %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 85e426e92..802723936 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -174,7 +174,7 @@
<% time=project.updated_on %>
<% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
<%=(User.find project.user_id).show_name %>(组长)
-
<%=time_from_now time %>
+
<%=time_from_now time %> <%= project.commits_count %>提交
项目名称：<%=project.name %>
创建者：<%=(User.find project.user_id).show_name %>(组长)
diff --git a/db/migrate/20160113090435_update_forge_and_user_activity.rb b/db/migrate/20160113090435_update_forge_and_user_activity.rb
new file mode 100644
index 000000000..01cedded0
--- /dev/null
+++ b/db/migrate/20160113090435_update_forge_and_user_activity.rb
@@ -0,0 +1,42 @@
+class UpdateForgeAndUserActivity < ActiveRecord::Migration
+ def up
+ user_count = UserActivity.all.count / 30 + 2
+ transaction do
+ for i in 1 ... user_count do i
+ UserActivity.page(i).per(30).each do |user_act|
+ if user_act.act_type == 'Issue'
+ if user_act.act
+ if user_act.act.journals.count > 0
+ user_act.updated_at = user_act.act.journals.maximum("created_on")
+ user_act.save
+ end
+ else
+ user_act.destroy
+ end
+ end
+ end
+ end
+ end
+
+ for_count = ForgeActivity.all.count / 30 + 2
+ transaction do
+ for i in 1 ... for_count do i
+ ForgeActivity.page(i).per(30).each do |for_act|
+ if for_act.forge_act_type == 'Issue'
+ if for_act.forge_act
+ if for_act.forge_act.journals.count > 0
+ for_act.updated_at = for_act.forge_act.journals.maximum("created_on")
+ for_act.save
+ end
+ else
+ for_act.destroy
+ end
+ end
+ end
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20160114022833_add_board_num_to_project_score.rb b/db/migrate/20160114022833_add_board_num_to_project_score.rb
new file mode 100644
index 000000000..4ee56a56b
--- /dev/null
+++ b/db/migrate/20160114022833_add_board_num_to_project_score.rb
@@ -0,0 +1,6 @@
+class AddBoardNumToProjectScore < ActiveRecord::Migration
+ def change
+ add_column :project_scores, :board_num, :integer, :default => false
+ add_column :project_scores, :attach_num, :integer, :default => false
+ end
+end
diff --git a/db/migrate/20160114022928_update_project_score.rb b/db/migrate/20160114022928_update_project_score.rb
new file mode 100644
index 000000000..8a632c2bc
--- /dev/null
+++ b/db/migrate/20160114022928_update_project_score.rb
@@ -0,0 +1,61 @@
+class UpdateProjectScore < ActiveRecord::Migration
+ def up
+ project_count = Project.all.count / 30 + 2
+ transaction do
+ for i in 1 ... project_count do i
+ Project.page(i).per(30).each do |project|
+ puts project.id
+ if ProjectScore.where("project_id=?", project.id).first.nil?
+ puts "create project ==>#{project.id}"
+ ProjectScore.create(:project_id => project.id, :score => false)
+ end
+ unless project.project_score.nil?
+ # update boards
+ unless project.boards.first.nil?
+ boards_count = project.boards.first.topics.count
+ project.project_score.update_attribute(:board_num, boards_count)
+ end
+ # update boards reply
+ unless project.boards.first.nil?
+ messages_count = Message.where("board_id =? and parent_id is not ?", project.boards.first.id, nil).count
+ project.project_score.update_attribute(:board_message_num, messages_count)
+ end
+ # update issues
+ unless project.issues.nil?
+ issues_count = project.issues.count
+ project.project_score.update_attribute(:issue_num, issues_count)
+ end
+ # update issue's journal
+ # if !project.project_score.nil? && !project.project_score.issue_journal_num.nil?
+ # project.project_score.update_attribute(:issue_journal_num, project.project_score.issue_journal_num)
+ # end
+ # update news
+ unless project.news.nil?
+ news_count = project.news.count
+ project.project_score.update_attribute(:news_num, news_count)
+ end
+ # update attach
+ unless project.attachments.nil?
+ attachments_count = project.attachments.count
+ project.project_score.update_attribute(:attach_num, attachments_count)
+ end
+ # update commits
+ unless project.gpid.nil?
+ g = Gitlab.client
+ begin
+ puts project.id
+ count = g.project(project.gpid).commit_count
+ rescue
+ logger.error("The project's rep is not exit!")
+ end
+ project.project_score.update_attribute(:changeset_num, count)
+ end
+ end
+ end
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 85eec4d85..3b51fe0db 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1365,6 +1365,8 @@ ActiveRecord::Schema.define(:version => 20160112085834) do
t.integer "documents_num", :default => 0
t.integer "changeset_num", :default => 0
t.integer "board_message_num", :default => 0
+ t.integer "board_num", :default => 0
+ t.integer "attach_num", :default => 0
end
create_table "project_statuses", :force => true do |t|
diff --git a/public/images/course/boutique.png b/public/images/course/boutique.png
new file mode 100644
index 000000000..4a73020e1
Binary files /dev/null and b/public/images/course/boutique.png differ
diff --git a/public/images/course/medal.png b/public/images/course/medal.png
new file mode 100644
index 000000000..3ddba6b4a
Binary files /dev/null and b/public/images/course/medal.png differ
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 6e9631d80..d92697e93 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1255,3 +1255,4 @@ div.disable_link {background-color: #c1c1c1 !important;}
.boxShadow {box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);}
.fn {font-weight:normal}
+.boutiqueP {position:absolute; left:0px; top:0px;}
+ <% end %>
+
+<%= image_tag(url_to_avatar(@course), :width => "60", :height => "60") %>
+
+ <% end %>
+