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

Gemfile

@@ -16,8 +16,6 @@ gem "coderay", "~> 1.0.6"
 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
 gem "builder", "3.0.0"
 gem 'acts-as-taggable-on', '2.4.1'
-gem 'spreadsheet'
-gem 'ruby-ole'
 
 group :development do
   gem 'better_errors', path: 'lib/better_errors'

app/controllers/courses_controller.rb

@@ -318,7 +318,7 @@ class CoursesController < ApplicationController
 
     else
       page_from = params[:page].nil? ? 0 : (params[:page].to_i - 1)
-      @results = student_homework_score(0,page_from, 10,"")
+      @results = student_homework_score(0,page_from, 10,"desc")
       @results = paginateHelper_for_members @results, 10
     end
 
@@ -909,11 +909,47 @@ class CoursesController < ApplicationController
   def student_homework_score(groupid,start_from, nums, score_sort_by)
     #teachers = find_course_teachers(@course)
     start_from = start_from * nums
-    sql = ActiveRecord::Base.connection()
+    sql_select = ""
+    if groupid == 0
+      if nums == 0
+        sql_select = "SELECT members.*, SUM(homework_attaches.score) as score FROM members, homework_attaches
+		WHERE members.course_id = 122 AND members.user_id in (SELECT students_for_courses.student_id FROM students_for_courses WHERE course_id = 122) AND members.user_id = homework_attaches.user_id GROUP BY members.user_id
+
+UNION
+SELECT members.*, 0 as  score FROM members,homework_attaches,students_for_courses WHERE members.course_id = 122 AND
+students_for_courses.course_id = 122 and members.user_id = students_for_courses.student_id AND
+members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = 122 )
+)
+GROUP BY members.user_id ORDER BY score #{score_sort_by}"
+      else
+        sql_select = "SELECT members.*, SUM(homework_attaches.score) as score FROM members, homework_attaches
+		WHERE members.course_id = 122 AND members.user_id in (SELECT students_for_courses.student_id FROM students_for_courses WHERE course_id = 122) AND members.user_id = homework_attaches.user_id GROUP BY members.user_id
 
-    homework_scores = Member.find_by_sql("call member_score(#{@course.id},#{groupid},#{start_from},#{nums}, '#{score_sort_by}')")
+UNION
+SELECT members.*, 0 as  score FROM members,homework_attaches,students_for_courses WHERE members.course_id = 122 AND
+students_for_courses.course_id = 122 and members.user_id = students_for_courses.student_id AND
+members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = 122 )
+)
+GROUP BY members.user_id ORDER BY score #{score_sort_by} limit #{start_from}, #{nums}"
 
+      end
+    else
+      sql_select = "SELECT members.*, SUM(homework_attaches.score) as score FROM members, homework_attaches
+		WHERE members.course_id = #{@course.id} AND members.user_id in (SELECT students_for_courses.student_id FROM students_for_courses WHERE course_id = #{@course.id}) AND members.user_id = homework_attaches.user_id
+    and members.course_group_id = #{groupid}
+    GROUP BY members.user_id
+UNION
+SELECT members.*, 0 as  score FROM members,homework_attaches,students_for_courses WHERE members.course_id = #{@course.id}
+and members.course_group_id = #{groupid} AND
+students_for_courses.course_id = #{@course.id} and members.user_id = students_for_courses.student_id AND
+members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = 122 )
+)
+GROUP BY members.user_id ORDER BY score #{score_sort_by}"
+    end
+    sql = ActiveRecord::Base.connection()
+    homework_scores = Member.find_by_sql(sql_select)
     sql.close()
+
     homework_scores
   end
   #获取课程的老师列表

app/controllers/homework_attach_controller.rb

@@ -435,6 +435,7 @@ class HomeworkAttachController < ApplicationController
     @is_teacher,@is_anonymous_comments,@m_score = params[:is_teacher]=="true",params[:is_anonymous_comments]=="true",params[:stars_value]
     @cur_page,@cur_type = params[:cur_page] || 1,params[:cur_type] || 5
     @homework = HomeworkAttach.find(params[:homework_id])
+    homework = @homework
     is_teacher = @is_teacher ? 1 : 0
     #保存评分@homework.rate(@m_score.to_i,User.current.id,:quality, (@is_teacher ? 1 : 0))
     if @m_score
@@ -445,7 +446,23 @@ class HomeworkAttachController < ApplicationController
       else
         @homework.rates(:quality).new(:stars => @m_score, :rater_id => User.current.id, :is_teacher_score => is_teacher).save!
       end
-    end
+      if homework.is_teacher_score == 0
+        if is_teacher == 1
+          homework.score = @m_score
+          homework.is_teacher_score = 1
+        else
+          homework.score = (homework.score.nil? ? 0 : homework.score + @m_score) / homework.rates(:quality).count
+
+        end
+      else
+        if is_teacher == 1
+          homework.score = @m_score
+          homework.is_teacher_score = 1
+        end
+      end
+      homework.save!
+      end
+
     #保存评论
     @is_comprehensive_evaluation = @is_teacher ? 1 : (@is_anonymous_comments ? 2 : 3) #判断当前评论是老师评论？匿评？留言
     if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""  #有没有留言

app/views/courses/_member_list.html.erb

@@ -74,7 +74,7 @@
                   <% end %>
                 </ul>
                 <% if @subPage_title == l(:label_student_list) %>
-                    <%= link_to format("%0.2f",member.score.to_s), {
+                    <%= link_to format("%0.2f",member.score.nil? ? 0 : member.score.to_s), {
                             :action => 'show_member_score',
                             :member_id => member.id,
                             :remote => true},

db/migrate/20141230081209_add_column_to_homeworkattaches.rb

@@ -0,0 +1,6 @@
+class AddColumnToHomeworkattaches < ActiveRecord::Migration
+  def change
+    add_column :homework_attaches, :score, :float, default: 0
+    add_column :homework_attaches, :is_teacher_score, :integer, :default => 0
+  end
+end

db/migrate/20141230081744_update_score_to_homeworkattaches.rb

@@ -0,0 +1,18 @@
+class UpdateScoreToHomeworkattaches < ActiveRecord::Migration
+  def up
+    sql = ("UPDATE homework_attaches set is_teacher_score = 1,
+													score = (SELECT AVG(seems_rateable_rates.stars) FROM seems_rateable_rates
+																	WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id
+			AND is_teacher_score = 1 GROUP BY rateable_id);")
+    sql_student = ("UPDATE homework_attaches set is_teacher_score = 0,
+													score = (SELECT AVG(seems_rateable_rates.stars) FROM seems_rateable_rates
+																	WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id
+			AND is_teacher_score = 0 GROUP BY rateable_id) WHERE homework_attaches.score = 0 OR homework_attaches.score is NULL
+")
+    execute(sql)
+    execute(sql_student)
+  end
+
+  def down
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20141230062844) do
+ActiveRecord::Schema.define(:version => 20141230081744) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -483,13 +483,15 @@ ActiveRecord::Schema.define(:version => 20141230062844) do
   create_table "homework_attaches", :force => true do |t|
     t.integer  "bid_id"
     t.integer  "user_id"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
     t.string   "reward"
     t.string   "name"
     t.text     "description"
     t.integer  "state"
-    t.integer  "project_id",  :default => 0
+    t.integer  "project_id",       :default => 0
+    t.float    "score",            :default => 0.0
+    t.integer  "is_teacher_score", :default => 0
   end
 
   create_table "homework_evaluations", :force => true do |t|