diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4b7820037..246dae511 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -52,7 +52,7 @@ module ApplicationHelper
# 获取项目/课程总分
# 发布缺陷 4分 回复缺陷 1分 提交一次 4分 讨论帖子 2分 回复帖子 1分 发布新闻 1分
def static_project_score obj
- score = obj.issues_count * 4 + obj.journals_count + obj.commits_count * 4 + obj.boards_count * 2 + obj.boards_reply_count + obj.news_count
+ score = obj.issues_count * 4 + obj.journals_count + obj.commits_count * 4 + obj.boards_count * 2 + obj.boards_reply_count + obj.news_count + obj.attachments_count * 5
end
# 获取组织成员中文名字
diff --git a/app/views/projects/_project_score_index.html.erb b/app/views/projects/_project_score_index.html.erb
index f10c6b3e7..beff3552e 100644
--- a/app/views/projects/_project_score_index.html.erb
+++ b/app/views/projects/_project_score_index.html.erb
@@ -1,10 +1,9 @@
-
-
<%= l(:label_projects_score) %>
- = <%= l(:label_issue_score) %> + <%= l(:label_news_score) %> + <%= l(:label_file_score) %> +
- <%= l(:label_code_submit_score) %> + <%= l(:label_topic_score) %>
- = <%= format("%.2f" , issue_score(project)).to_i %> + <%= format("%.2f" , news_score(project)).to_i %> +
- <%= format("%.2f" , documents_score(project)).to_i %> + <%= format("%.2f" , changesets_score(project)).to_i %> +
- <%= format("%.2f" , board_message_score(project)).to_i %>
- = <%= format("%.2f" , project_scores(project)).to_i %>
-
\ No newline at end of file
+ = <%= l(:label_code_submit_score) %> + <%= l(:label_issue_score) %> + <%= l(:label_file_attachment_score) %> + <%= l(:label_topic_score) %> + <%= l(:label_news_score) %>
+ = <%= @project.commits_count * 4 %> +
+ <%= @project.issues_count * 4 + @project.journals_count %> +
+ <%= @project.attachments_count * 5 %> +
+ <%= @project.boards_count * 2 + @project.boards_reply_count %> +
+ <%= @project.news_count %>
+
+ = <%= static_project_score(@project) %>
diff --git a/app/views/projects/_show_projects_score.html.erb b/app/views/projects/_show_projects_score.html.erb
index 68ba2f12a..b70a49f80 100644
--- a/app/views/projects/_show_projects_score.html.erb
+++ b/app/views/projects/_show_projects_score.html.erb
@@ -1,5 +1,3 @@
-
-
<%= l(:label_projects_score) %>
-
-
-
- <%= link_to l(:label_projects_score),"javascript:void(0)", :onclick => "show_div('project_score_index')"%> :
- <%= format("%.2f" , project_scores(@project) ).to_i %>
-
- -
- <%= link_to l(:label_issue_score), "javascript:void(0)", :onclick => "show_div('issue_score_index')"%> :
- <%= format("%.2f" , issue_score(@project)).to_i %>
+ <%= link_to l(:label_projects_score),"javascript:void(0)", :onclick => "show_div('project_score_index')"%> : <%= static_project_score(@project) %>
+ -
+ <%= link_to l(:label_code_submit_score), "javascript:void(0)", :onclick => "show_div('code_submit_score_index')" %> : <%= @project.commits_count * 4 %>
+
-
- <%= link_to l(:label_news_score), "javascript:void(0)", :onclick => "show_div('news_score_index')"%> :
- <%= format("%.2f" , news_score(@project)).to_i %>
+ <%= link_to l(:label_issue_score), "javascript:void(0)", :onclick => "show_div('issue_score_index')"%> : <%= @project.issues_count * 4 + @project.journals_count %>
- -
- <%= link_to l(:label_file_score), "javascript:void(0)", :onclick => "show_div('file_score_index')"%> :
- <%= format("%.2f" , documents_score(@project)).to_i %>
-
- -
- <%= link_to l(:label_code_submit_score), "javascript:void(0)", :onclick => "show_div('code_submit_score_index')" %> :
- <%= format("%.2f" , changesets_score(@project)).to_i %>
+
-
+ <%= link_to l(:label_file_attachment_score), "javascript:void(0)", :onclick => "show_div('issue_score_index')"%> : <%= @project.attachments_count * 5 %>
+ -
+ <%= link_to l(:label_topic_score), "javascript:void(0)", :onclick => "show_div('projects_topic_score_index')"%> : <%= @project.boards_count * 2 + @project.boards_reply_count %>
+
-
- <%= link_to l(:label_topic_score), "javascript:void(0)", :onclick => "show_div('projects_topic_score_index')"%> :
- <%= format("%.2f" , board_message_score(@project)).to_i %>
+ <%= link_to l(:label_news_score), "javascript:void(0)", :onclick => "show_div('news_score_index')"%> : <%= @project.news_count %>
<%= render :partial => 'projects/project_score_index', :locals => {:project => @project } %>
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 3f86b4b60..fe89e64e3 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -432,6 +432,8 @@ zh:
label_file_score: 文档得分
label_file_number: 文档的数量
+
+ label_file_attachment_score: 资源得分
label_code_submit_score: 代码提交得分
label_code_submit_number: 代码提交频率