Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/projects_controller.rb

@@ -697,8 +697,8 @@ class ProjectsController < ApplicationController
     else # @project.project_type == Project::ProjectType_project
       roles = Role.find_all_givable
       @subPage_title = l :label_member_list
-      @members = @project.member_principals.includes(:roles, :principal).all
-      @members = sort_project_members(@project, @members)
+      @members = @project.member_principals.includes(:roles, :principal).joins("LEFT JOIN #{OptionNumber.table_name} ON #{OptionNumber.table_name}.user_id = #{Member.table_name}.user_id and #{OptionNumber.table_name}.score_type = 2 AND #{Member.table_name}.project_id = #{OptionNumber.table_name}.project_id").order("#{OptionNumber.table_name}.total_score DESC").all
+      #@members = sort_project_members(@project, @members)
       @applied_members = appied_project_members(@project, @members)
     end
     @members = paginateHelper @members

app/views/softapplications/_list.html.erb

@@ -9,9 +9,30 @@
       <div style="float: left; width: 600px; padding-top: 6px; margin-left: 8px"><%= softapplication.description.truncate(95, omission: '...') %></div>
       <div style="float: left; width: 200px; margin-left: 70px; margin-top: -3px; line-height: 0.5em ">
         <%contest = softapplication.contests.first%>
+        <!--<table width="100%" border="0">-->
+          <!--<tr>-->
+            <!--<td style="width: 70px;  word-wrap: break-word; word-break: break-all"><%=l(:label_attendingcontestwork_belongs_contest)%>：</td>-->
+            <!--<td style="width: 100px; word-wrap: break-word; word-break: break-all">-->
+              <!--<%= contest ? link_to(contest.name.truncate(14, omission: '...'), show_attendingcontest_contest_path(contest), title: contest.name.to_s ) : '尚未加入竞赛'%>-->
+            <!--</td>-->
+          <!--</tr>-->
+          <!--<tr>-->
+            <!--<td style="width: 70px;  word-wrap: break-word; word-break: break-all"><%=l(:label_attendingcontestwork_belongs_type)%>：</td>-->
+            <!--<td style="width: 100px; word-wrap: break-word; word-break: break-all">-->
+              <!--<%= softapplication.app_type_name %>-->
+            <!--</td>-->
+          <!--</tr>-->
+          <!--<tr>-->
+            <!--<td style="width: 70px;  word-wrap: break-word; word-break: break-all"><%=l(:label_attendingcontestwork_adaptive_system)%>：</td>-->
+            <!--<td style="width: 100px; word-wrap: break-word; word-break: break-all">-->
+              <!--<%= softapplication.android_min_version_available %>-->
+            <!--</td>-->
+          <!--</tr>-->
+        <!--</table>-->
         <p><%=l(:label_attendingcontestwork_belongs_contest)%>：<%= contest ? link_to(contest.name.truncate(14, omission: '...'), show_attendingcontest_contest_path(contest), title: contest.name.to_s ) : '尚未加入竞赛'%></p>
-        <p><%=l(:label_attendingcontestwork_belongs_type)%>：<%= softapplication.app_type_name.truncate(10, omission: '...') %></p>
-        <p><%=l(:label_attendingcontestwork_adaptive_system)%>：<%= softapplication.android_min_version_available %></p>
+        <p><%=l(:label_attendingcontestwork_belongs_type)%>：<%= softapplication.app_type_name.truncate(14, omission: '...') %></p>
+        <%strTitle = softapplication.android_min_version_available%>
+        <p><%=l(:label_attendingcontestwork_adaptive_system)%>：<lable title="<%= strTitle %>"><%= strTitle.truncate(10,omisiion:'...') %></lable></p>
       </div>
       <div style="padding-left: 53px">
         <span><%=l(:label_attendingcontestwork_developers)%>：<%= softapplication.application_developers %></span>

lib/tasks/user_new_score.rake

@@ -0,0 +1,23 @@
+desc "User New Score description"
+task :user_new_score do
+  puts "user_score sync."
+end
+
+namespace :user_new_score do
+  desc "calculating user score"
+  task :calculating => :environment do
+    include UserScoreHelper
+    User.all.each do |user|
+      result = user_scores(user,1).total_score
+      puts "score of #{user.login} is #{result}"
+    end
+
+    Project.where("project_type != 1").all.each do |project|
+      project.member_principals.includes(:roles, :principal).all.each do |member|
+        result = user_scores(member.user,2,project).total_score
+        puts "#{user.login}/'s score in #{project.name} is #{result}"
+      end
+    end
+    puts "calculate completed"
+   end
+end