教师评分为最终评分

app/controllers/courses_controller.rb

@@ -1077,7 +1077,7 @@ class CoursesController < ApplicationController
     sql_select = ""
     if groupid == 0
       sql_select = "SELECT members.*,(
-          SELECT SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,IF((student_works.final_score - student_works.absence_penalty - student_works.late_penalty) < 0 , 0, student_works.final_score - student_works.absence_penalty - student_works.late_penalty))))
+          SELECT SUM(student_works.work_score)
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{@course.id}
@@ -1089,7 +1089,7 @@ class CoursesController < ApplicationController
         WHERE members.course_id = #{@course.id} ORDER BY score #{score_sort_by}"
     else
       sql_select = "SELECT members.*,(
-          SELECT SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,IF((student_works.final_score - student_works.absence_penalty - student_works.late_penalty) < 0 , 0, student_works.final_score - student_works.absence_penalty - student_works.late_penalty))))
+          SELECT SUM(student_works.work_score)
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{@course.id}

app/controllers/student_work_controller.rb

@@ -224,11 +224,11 @@ class StudentWorkController < ApplicationController
       #开放作品 || 老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
       if @homework.is_open == 1 || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
         if @order == 'lastname'
-          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
         elsif @order == 'student_id'
-          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
         else
-          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
         end
         @show_all = true
       elsif User.current.member_of_course?(@course)
@@ -238,10 +238,10 @@ class StudentWorkController < ApplicationController
             if pro.nil?
               @stundet_works = []
             else
-              @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:id => pro.student_work_id)
+              @stundet_works = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:id => pro.student_work_id)
             end
           else
-            @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:user_id => User.current.id)
+            @stundet_works = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
           end
         elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
           if @homework.homework_type == 3
@@ -261,20 +261,20 @@ class StudentWorkController < ApplicationController
             if pro.nil?
               my_work = []
             else
-              my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:id => pro.student_work_id)
+              my_work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:id => pro.student_work_id)
             end
           else
-            my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:user_id => User.current.id)
+            my_work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
           end
           if my_work.empty?
             @stundet_works = []
           else
             if @order == 'lastname'
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
             elsif @order == 'student_id'
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
             else
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
             end
             @show_all = true
           end
@@ -286,15 +286,15 @@ class StudentWorkController < ApplicationController
         return
       end
 
-      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name).count
+      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name).count
     else
       if @homework.is_open == 1 || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
         if @order == 'lastname'
-          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
         elsif @order == 'student_id'
-          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
         else
-          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}"),@name
         end
         @show_all = true
       elsif User.current.member_of_course?(@course)
@@ -304,10 +304,10 @@ class StudentWorkController < ApplicationController
             if pro.nil?
               @stundet_works = []
             else
-              @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:id => pro.student_work_id)
+              @stundet_works = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:id => pro.student_work_id)
             end
           else
-            @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:user_id => User.current.id)
+            @stundet_works = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
           end
         elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
           if @homework.homework_type == 3
@@ -327,20 +327,20 @@ class StudentWorkController < ApplicationController
             if pro.nil?
               my_work = []
             else
-              my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:id => pro.student_work_id)
+              my_work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:id => pro.student_work_id)
             end
           else
-            my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:user_id => User.current.id)
+            my_work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
           end
           if my_work.empty?
             @stundet_works = []
           else
             if @order == 'lastname'
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
             elsif @order == 'student_id'
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
             else
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}"),@name
             end
             @show_all = true
           end
@@ -351,7 +351,7 @@ class StudentWorkController < ApplicationController
         render_403
         return
       end
-      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name).count
+      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}"),@name).count
     end
 
     @score = @b_sort == "desc" ? "asc" : "desc"
@@ -1162,6 +1162,7 @@ class StudentWorkController < ApplicationController
         if homework.teacher_priority == 1 #教师优先
           if student_work.teacher_score
             student_work.final_score = student_work.teacher_score
+            student_work.work_score = student_work.teacher_score
           else
             if student_work.teaching_asistant_score.nil?
               student_work.final_score = student_work.student_score
@@ -1174,6 +1175,8 @@ class StudentWorkController < ApplicationController
               final_score = final_ta_score + final_s_score
               student_work.final_score = format("%.2f",final_score.to_f)
             end
+            score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty if student_work.final_score
+            student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
           end
         else  #不考虑教师评分
           if student_work.teaching_asistant_score.nil?
@@ -1187,11 +1190,14 @@ class StudentWorkController < ApplicationController
             final_score = final_ta_score + final_s_score
             student_work.final_score = format("%.2f",final_score.to_f)
           end
+          score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty if student_work.final_score
+          student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
         end
       elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业-----设定：系统评分必定不为空
         if homework.teacher_priority == 1 #教师优先
           if student_work.teacher_score
             student_work.final_score = student_work.teacher_score
+            student_work.work_score = student_work.teacher_score
           else
             if student_work.teaching_asistant_score.nil? #教辅未评分
               if student_work.student_score.nil?
@@ -1220,6 +1226,8 @@ class StudentWorkController < ApplicationController
               final_score = final_sy_score + final_ts_score + final_st_score
               student_work.final_score = format("%.2f",final_score.to_f)
             end
+            score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty if student_work.final_score
+            student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
           end
         else  #不考虑教师评分
           if student_work.teaching_asistant_score.nil? #教辅未评分
@@ -1249,6 +1257,8 @@ class StudentWorkController < ApplicationController
             final_score = final_sy_score + final_ts_score + final_st_score
             student_work.final_score = format("%.2f",final_score.to_f)
           end
+          score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty if student_work.final_score
+          student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
         end
       end
     end

app/helpers/courses_helper.rb

@@ -850,7 +850,7 @@ module CoursesHelper
   # 学生按作业总分排序，取前8个
   def hero_homework_score(course, score_sort_by)
     sql_select = "SELECT members.*,(
-          SELECT SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,IF((student_works.final_score - student_works.absence_penalty - student_works.late_penalty) < 0 , 0, student_works.final_score - student_works.absence_penalty - student_works.late_penalty))))
+          SELECT SUM(work_score)
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{course.id}

app/models/member.rb

@@ -150,7 +150,7 @@ class Member < ActiveRecord::Base
 
   #当前学生在指定作业内的得分
   def homework_common_score homework_common
-    StudentWork.select("IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as final_score").where(:homework_common_id => homework_common.id,:user_id => self.user_id)
+    StudentWork.select("work_score").where(:homework_common_id => homework_common.id,:user_id => self.user_id)
   end
 
   def student_work_score_avg
@@ -158,7 +158,7 @@ class Member < ActiveRecord::Base
   end
 
   def student_work_score_sum
-    sql_select = "SELECT (SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,IF((student_works.final_score - student_works.absence_penalty - student_works.late_penalty) < 0 , 0, student_works.final_score - student_works.absence_penalty - student_works.late_penalty))))) AS score
+    sql_select = "SELECT (SUM(student_works.work_score)) AS score
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{self.course_id}

app/models/student_work.rb

@@ -50,6 +50,7 @@ class StudentWork < ActiveRecord::Base
         if homework.teacher_priority == 1 #教师优先
           if student_work.teacher_score
             student_work.final_score = student_work.teacher_score
+            student_work.work_score = student_work.teacher_score
           else
             if student_work.teaching_asistant_score.nil?
               student_work.final_score = student_work.student_score
@@ -62,6 +63,8 @@ class StudentWork < ActiveRecord::Base
               final_score = final_ta_score + final_s_score
               student_work.final_score = format("%.2f",final_score.to_f)
             end
+            score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty if student_work.final_score
+            student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
           end
         else  #不考虑教师评分
           if student_work.teaching_asistant_score.nil?
@@ -75,11 +78,14 @@ class StudentWork < ActiveRecord::Base
             final_score = final_ta_score + final_s_score
             student_work.final_score = format("%.2f",final_score.to_f)
           end
+          score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty if student_work.final_score
+          student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
         end
       elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业-----设定：系统评分必定不为空
         if homework.teacher_priority == 1 #教师优先
           if student_work.teacher_score
             student_work.final_score = student_work.teacher_score
+            student_work.work_score = student_work.teacher_score
           else
             if student_work.teaching_asistant_score.nil? #教辅未评分
               if student_work.student_score.nil?
@@ -108,6 +114,8 @@ class StudentWork < ActiveRecord::Base
               final_score = final_sy_score + final_ts_score + final_st_score
               student_work.final_score = format("%.2f",final_score.to_f)
             end
+            score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty if student_work.final_score
+            student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
           end
         else  #不考虑教师评分
           if student_work.teaching_asistant_score.nil? #教辅未评分
@@ -137,6 +145,8 @@ class StudentWork < ActiveRecord::Base
             final_score = final_sy_score + final_ts_score + final_st_score
             student_work.final_score = format("%.2f",final_score.to_f)
           end
+          score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty if student_work.final_score
+          student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
         end
       end
     end

app/views/courses/_show_member_score.html.erb

@@ -24,7 +24,7 @@
               </span>
               <span class="c_red w70">
                 <% final_score = @member_score.homework_common_score(homework_common).first%>
-                <%= final_score.nil? || final_score.final_score.nil? ? "--" : format("%0.2f", final_score.final_score < 0 ? 0 : final_score.final_score) %>
+                <%= final_score.nil? || final_score.work_score.nil? ? "--" : format("%0.2f", final_score.work_score < 0 ? 0 : final_score.work_score) %>
               </span>
             </li>
        <% end %>

app/views/student_work/_evaluation_un_work.html.erb

@@ -82,7 +82,11 @@
   </li>
   <% end %>
   <!-- 成绩 -->
-  <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
+  <% if student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score %>
+    <% score = student_work.respond_to?("score") ? student_work.score : student_work.teacher_score %>
+  <% else %>
+    <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
+  <% end %>
   <li class="hworkList50 <%= score_color score%> student_final_scor_info">
     <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
     <% unless score.nil?%>

db/migrate/20160427061847_add_column_to_student_works.rb

@@ -0,0 +1,27 @@
+class AddColumnToStudentWorks < ActiveRecord::Migration
+  def change
+    add_column :student_works, :work_score, :float
+    count = StudentWork.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+        StudentWork.page(i).per(30).each do |sw|
+          if sw.homework_common && sw.homework_common.teacher_priority == 0
+            unless sw.final_score.nil?
+              score = sw.final_score - sw.absence_penalty - sw.late_penalty
+              sw.update_column('work_score', score < 0 ? 0 : score)
+            end
+          elsif sw.homework_common && sw.homework_common.teacher_priority == 1
+            unless sw.final_score.nil?
+              if sw.teacher_score
+                sw.update_column('work_score', sw.teacher_score)
+              else
+                score = sw.final_score - sw.absence_penalty - sw.late_penalty
+                sw.update_column('work_score', score < 0 ? 0 : score)
+              end
+            end
+          end
+        end
+      end
+    end
+  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 => 20160421011543) do
+ActiveRecord::Schema.define(:version => 20160427075457) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1700,6 +1700,7 @@ ActiveRecord::Schema.define(:version => 20160421011543) do
     t.boolean  "is_test",                                       :default => false
     t.integer  "simi_id"
     t.integer  "simi_value"
+    t.float    "work_score"
   end
 
   add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"