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

Merge branch 'yuanke' into develop

This commit is contained in:
cxt 2016-07-15 15:56:37 +08:00
parent 1c967ce569 f7942e4d3c
commit dbc8f87346
3 changed files with 2093 additions and 2285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/courses_controller.rb
View File

@ -968,7 +968,7 @@ class CoursesController < ApplicationController
@homework = HomeworkCommon.find params[:homework] @homework = HomeworkCommon.find params[:homework]
#order("#{@order} #{@b_sort}" #order("#{@order} #{@b_sort}"
@student_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("simi_value desc"),@name @student_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("simi_value desc").has_committed,@name
@works_hash = {} @works_hash = {}

4
app/controllers/student_work_controller.rb
View File

@ -271,7 +271,7 @@ class StudentWorkController < ApplicationController
all_studentwork = find_all_student_work_by_homeid() all_studentwork = find_all_student_work_by_homeid()
@work_count = all_studentwork.count @work_count = all_studentwork.has_committed.count
end end
#代码查重 status: 0完成 -2不需要查重 -1查重失败不支持该语言 #代码查重 status: 0完成 -2不需要查重 -1查重失败不支持该语言
@ -282,7 +282,7 @@ class StudentWorkController < ApplicationController
@homework = HomeworkCommon.find params[:homework] @homework = HomeworkCommon.find params[:homework]
all_studentwork = find_all_student_work_by_homeid() all_studentwork = find_all_student_work_by_homeid().has_committed
if all_studentwork == nil if all_studentwork == nil
resultObj[:status] = -2 resultObj[:status] = -2

4372
db/schema.rb
View File

File diff suppressed because it is too large Load Diff