Merge remote-tracking branch 'origin/szzh' into szzh

app/helpers/courses_helper.rb

@@ -31,6 +31,31 @@ module CoursesHelper
     # searchStudent(project).count
   end
 
+  # garble count 混淆数量
+  # alias projectCountOrigin projectCount
+  # def projectCount project    
+  #   count = projectCountOrigin project
+  #   garble count
+  # end
+
+  alias teacherCountOrigin teacherCount
+  def teacherCount project
+    count = teacherCountOrigin project
+    garble count
+  end
+
+  alias studentCountOrigin studentCount
+  def studentCount project
+    count = studentCountOrigin project
+    garble count
+  end
+
+  def garble count
+    count = count.round( 1-count.to_s.size ).to_i
+    return count.to_s if count.to_s.size.eql?(1)
+    count.to_s << '+' 
+  end
+
   # =====================================================================================
   # return people list
   def searchTeacherAndAssistant project

app/views/welcome/course.html.erb

@@ -109,7 +109,7 @@
                 <div class='desc_item text_nowrap' style="width: 310px;">
                   [<%= get_course_term project %>]
                   <%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%>
-                  (<%= "#{studentCount(project)}人" %><%#= link_to "#{studentCount(project)}人", project_member_path(project, :role => 2) ,:course =>'1' %>)
+                  (<%= "#{studentCount(project)}人" %>)
                   <% files_count = (project.attachments.count.to_i+Version.joins(:project).where("projects.id=#{project.id}").count.to_i).to_s %>
                   (<%=link_to "#{files_count}份", project_files_path(project) %>资料)
                 </div>
@@ -161,13 +161,11 @@
                 <div class='desc_item text_nowrap'  style="width: 310px;">
                   [<%= get_course_term project %>]
                   <%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%>
-                  (<%= link_to "#{studentCount(project)}人", project_member_path(project, :role => 2) ,:course =>'1' %>)
+                  (<%= "#{studentCount(project)}人" %>)
                   <% files_count = (project.attachments.count.to_i+Version.joins(:project).where("projects.id=#{project.id}").count.to_i).to_s %>
                   (<%=link_to "#{files_count}份", project_files_path(project) %>资料)
                 </div>
-                <!-- 				<div class='desc_item' style="">
+
-                <span class='font_lighter' title=<%#=project.description.to_s%>><%#=project.description.truncate(25, omission: '...')%></span>
-            </div> -->
                 <div class='join_course_link'>
                   <% if !course_endTime_timeout?(project)%>
                       <div >
@@ -207,7 +205,7 @@
                 <div class='desc_item text_nowrap' style="width: 310px;">
                   [<%= get_course_term project %>]
                   <%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%>
-                  (<%= link_to "#{studentCount(project)}人", project_member_path(project, :role => 2) ,:course =>'1' %>)
+                  <%= "#{studentCount(project)}人" %> )
                   <% files_count = (project.attachments.count.to_i+Version.joins(:project).where("projects.id=#{project.id}").count.to_i).to_s %>
                   (<%=link_to "#{files_count}份", project_files_path(project) %>资料)
                 </div>