jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' into develop

This commit is contained in:
huang 2015-12-11 19:14:30 +08:00
parent 7e85302d9b 7a0828a826
commit 625f993ed2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/student_work_controller.rb
View File

@ -923,7 +923,7 @@ class StudentWorkController < ApplicationController
#成绩计算 #成绩计算
def set_final_score homework,student_work def set_final_score homework,student_work
if homework && homework.homework_detail_manual if homework && homework.homework_detail_manual
if homework.homework_type == 1 #匿评作业 if homework.homework_type != 2 #匿评作业
if homework.teacher_priority == 1 #教师优先 if homework.teacher_priority == 1 #教师优先
if student_work.teacher_score if student_work.teacher_score
student_work.final_score = student_work.teacher_score student_work.final_score = student_work.teacher_score

2
app/models/student_work.rb
View File

@ -46,7 +46,7 @@ class StudentWork < ActiveRecord::Base
#成绩计算 #成绩计算
def set_final_score homework,student_work def set_final_score homework,student_work
if homework && homework.homework_detail_manual if homework && homework.homework_detail_manual
if homework.homework_type == 1 #匿评作业 if homework.homework_type != 2 #匿评作业
if homework.teacher_priority == 1 #教师优先 if homework.teacher_priority == 1 #教师优先
if student_work.teacher_score if student_work.teacher_score
student_work.final_score = student_work.teacher_score student_work.final_score = student_work.teacher_score