Merge branch 'szzh' into develop

app/models/attachment.rb

@@ -90,7 +90,7 @@ class Attachment < ActiveRecord::Base
   before_save :files_to_final_location,:act_as_course_activity
   after_create :office_conver, :be_user_score,:act_as_forge_activity,:create_attachment_ealasticsearch_index
   after_update :office_conver, :be_user_score,:update_attachment_ealasticsearch_index
-  after_destroy :delete_from_disk,:down_user_score,:delete_attachment_ealasticsearch_index#, :decrease_attchments_count
+  after_destroy :delete_from_disk,:down_user_score,:delete_attachment_ealasticsearch_index, :decrease_attchments_count
 
   # add by nwb
   # 获取所有可公开的资源文件列表
@@ -641,12 +641,12 @@ class Attachment < ActiveRecord::Base
     end
   end
 
-  # def decrease_attchments_count
-  #   if self.container_type == "Project"
-  #     count = self.container.attachments_count
-  #     #self.container.update_attribute(:attachments_count, self.container.attachments_count - 1)
-  #   end
-  # end
+  def decrease_attchments_count
+    if self.container_type == "Project" && !self.project.project_score.nil?
+      aatach_count = self.container.project_score.attach_num - 1+
+      self.container.project_score.update_attribute(:attach_num, aatach_count)
+    end
+  end
 end
 
 # Delete the previous articles index in Elasticsearch

app/models/journal.rb

@@ -219,15 +219,15 @@ class Journal < ActiveRecord::Base
   def decrease_issues_journal_count
     unless self.issue.project.nil?
       project = self.issue.project
-      project.update_attribute(:journals_count, project.journals_count - 1)
+      project.project_score.update_attribute(:issue_journal_num, project.project_score.issue_journal_num - 1)
     end
   end
 
   # issue留言总数更新
   def add_journals_count
-    if !self.issue.project.nil? && self.journalized_type == "Issue" && self.issue.project.project_score.nil?
+    if !self.issue.project.nil? && self.journalized_type == "Issue" && !self.issue.project.project_score.nil?
       project = self.issue.project
-      project.project_score.update_attribute(:issue_journal_num, project.project_score.journals_count + 1)
+      project.project_score.update_attribute(:issue_journal_num, project.project_score.issue_journal_num + 1)
     end
   end
 end

app/models/message.rb

@@ -128,8 +128,7 @@ class Message < ActiveRecord::Base
 
   # 发帖精辟更新发帖总数
   def add_boards_count
-    unless self.project.project_score.nil?
-      if self.project
+    if self.project && !project.project_score.nil?
       # 讨论区
       if self.parent_id.nil?
         count = self.project.project_score.board_num + 1
@@ -140,12 +139,10 @@ class Message < ActiveRecord::Base
       end
     end
   end
-  end
 
   # 删除帖子的时候更新帖子总数, 删除回复的时候总数不减少
   def decrease_boards_count
-    unless self.project.project_score.nil?
-      if self.project && self.parent_id.nil?
+    if self.project && !project.project_score.nil?
       # 讨论区
       if self.parent_id.nil?
         count = self.project.project_score.board_num - 1
@@ -156,7 +153,6 @@ class Message < ActiveRecord::Base
       end
     end
   end
-  end
 
   def reset_counters!
     if parent && parent.id

app/views/projects/_code_submit_score_index.html.erb

@@ -1,4 +1,4 @@
 <!-- added by bai -->
-<div><%= l(:label_code_submit_number) %> * 4 = <%= changesets_num(@project) %> * 4 = <%= format("%.2f" , changesets_score(@project)).to_i %></div>
-<div><%= l(:label_code_submit_score) %> = <%= format("%.2f" , changesets_score(@project)).to_i %></div>
+<div><%= l(:label_code_submit_number) %> * 4 = <%= project.project_score.changeset_num %> * 4 = <%= project.project_score.changeset_num * 4 %></div>
+<div><%= l(:label_code_submit_score) %> = <%= project.project_score.changeset_num * 4 %></div>
 <!-- end -->

app/views/projects/_file_score_index.html.erb

@@ -1,4 +1,2 @@
-<!-- added by bai -->
-<div><%= l(:label_file_number) %> * 4 = <%= documents_num(@project)  %> * 4 = <%= format("%.2f" , documents_score(@project)).to_i %></div>
-<div><%= l(:label_file_score) %> = <%= format("%.2f" , documents_score(@project)).to_i %></div>
-<!-- end -->
+<div><%= l(:lable_file_attachment_number) %> * 5 = <%= project.project_score.attach_num  %> * 5 = <%= project.project_score.attach_num * 5 %></div>
+<div><%= l(:label_file_attachment_score) %> = <%= project.project_score.attach_num * 5 %></div>

app/views/projects/_issue_score_index.html.erb

@@ -1,4 +1,4 @@
-<div><%= l(:label_issue_number) %> * 4 = <%= issue_num(project) %> * 4 = <%= format("%.2f" , issue_num(project) * 4).to_i %></div>
-<div><%= l(:label_issue_journal_number) %> * 1 = <%= issue_journal_num(project) %> * 1 = <%= format("%.2f" , issue_journal_num(project)).to_i %></div>
-<div><%= l(:label_issue_score) %> = <%= format("%.2f" , issue_num(project) * 4).to_i %> + <%= format("%.2f" , issue_journal_num(project)).to_i %>
-                                  = <%= format("%.2f" , issue_score(project)).to_i %></div>
+<div><%= l(:label_issue_number) %> * 4 = <%= issue_num(project) %> * 4 = <%= project.project_score.issue_num * 4 %></div>
+<div><%= l(:label_issue_journal_number) %> * 1 = <%= project.project_score.issue_journal_num %> * 1 = <%= project.project_score.issue_journal_num * 1 %></div>
+<div><%= l(:label_issue_score) %> = <%= project.project_score.issue_num * 4 %> + <%= project.project_score.issue_journal_num * 1 %>
+                                       = <%= @project.project_score.issue_num * 4 + @project.project_score.issue_journal_num %></div>

app/views/projects/_news_score_index.html.erb

@@ -1,2 +1,2 @@
-<div><%= l(:label_new_number) %> * 1 = <%= news_num(@project) %> * 1 = <%= format("%.2f" , news_score(@project)).to_i %></div>
-<div><%= l(:label_news_score) %> = <%= format("%.2f" ,  news_score(@project)).to_i %></div>
+<div><%= l(:label_new_number) %> * 1 = <%= project.project_score.news_num %> * 1 = <%= project.project_score.news_num * 1 %></div>
+<div><%= l(:label_news_score) %> = <%= project.project_score.news_num * 1 %></div>

app/views/projects/_projects_topic_score_index.html.erb

@@ -1,4 +1,4 @@
 <!-- added by bai -->
-<div><%= l(:label_topic_number) %> * 2 = <%= board_message_num(@project) %> * 2 = <%= board_message_score(@project) %></div>
-<div><%= l(:label_topic_score) %> = <%= format("%.2f" , board_message_score(@project)).to_i %></div>
+<div><%= l(:label_topic_number) %> * 2 = <%= project.project_score.board_num %> * 2 = <%= project.project_score.board_num * 2 %></div>
+<div><%= l(:label_topic_score) %> = <%= project.project_score.board_num * 2 %></div>
 <!-- end -->

app/views/projects/_show_projects_score.html.erb

@@ -19,6 +19,36 @@
 </table>
 </div>
 
+<script type="text/javascript">
+    function show_div(url)
+    {
+        if(url == 'project_score_index')
+        {
+            $('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/project_score_index', :locals => {:project => @project}) %>');
+        }
+        else if(url == 'issue_score_index')
+        {
+            $('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/issue_score_index', :locals => {:project => @project}) %>');
+        }
+        else if(url == 'news_score_index')
+        {
+            $('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/news_score_index', :locals => {:project => @project}) %>');
+        }
+        else if(url == 'file_score_index')
+        {
+            $('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/file_score_index', :locals => {:project => @project}) %>');
+        }
+        else if(url == 'code_submit_score_index')
+        {
+            $('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/code_submit_score_index', :locals => {:project => @project}) %>');
+        }
+        else if(url == 'projects_topic_score_index')
+        {
+            $('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/projects_topic_score_index', :locals => {:project => @project}) %>');
+        }
+    }
+</script>
+
 <div class="tabs_new">
 	<ul>
 		<li>
@@ -31,7 +61,7 @@
 			<%= link_to l(:label_issue_score), "javascript:void(0)", :onclick => "show_div('issue_score_index')"%> : <%= @project.project_score.issue_num * 4 + @project.project_score.issue_journal_num %>
 		</li>
         <li>
-			<%= link_to l(:label_file_attachment_score), "javascript:void(0)", :onclick => "show_div('issue_score_index')"%> : <%= @project.project_score.attach_num * 5 %>
+			<%= link_to l(:label_file_attachment_score), "javascript:void(0)", :onclick => "show_div('file_score_index')"%> : <%= @project.project_score.attach_num * 5 %>
 		</li>
         <li>
             <%= link_to l(:label_topic_score),  "javascript:void(0)", :onclick => "show_div('projects_topic_score_index')"%> : <%= @project.project_score.board_num * 2 + @project.project_score.board_message_num %>

config/locales/projects/zh.yml

@@ -433,6 +433,7 @@ zh:
   label_file_score: 文档得分
   label_file_number: 文档的数量
 
+  lable_file_attachment_number: 资源数
   label_file_attachment_score: 资源得分
   
   label_code_submit_score: 代码提交得分

db/schema.rb

@@ -1213,6 +1213,7 @@ ActiveRecord::Schema.define(:version => 20160112085834) do
   create_table "org_members", :force => true do |t|
     t.integer  "user_id"
     t.integer  "organization_id"
+    t.string   "role"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
   end

public/stylesheets/courses.css

@@ -1099,6 +1099,7 @@ a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; c
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{overflow: hidden; text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: normal !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;}

public/stylesheets/new_user.css

@@ -836,6 +836,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{overflow: hidden; text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: normal !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;display: inline}

public/stylesheets/project.css

@@ -1109,6 +1109,7 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{overflow: hidden; text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: normal !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;}