Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop

Browse Source
dev_bj
caishi 5 years ago
parent 97685fb394 d4af2c8785
commit f1dfb2b4bb
16 changed files with 159 additions and 98 deletions
Show Stats Download Patch File Download Diff File

10
Gemfile
Unescape View File

@ -1,4 +1,4 @@
source 'http://gems.ruby-china.com' source 'https://gems.ruby-china.com'
unless RUBY_PLATFORM =~ /w32/ unless RUBY_PLATFORM =~ /w32/
# unix-like only # unix-like only
@ -57,18 +57,18 @@ gem 'chinese_pinyin'
gem 'ansi' gem 'ansi'
gem 'diff-lcs', '~> 1.3' gem 'diff-lcs', '~> 1.3'
# gem 'kaminari' gem 'kaminari'
gem 'elasticsearch-model' gem 'elasticsearch-model'
gem 'elasticsearch-rails' gem 'elasticsearch-rails'
gem 'oauth2' gem 'oauth2'
# xlsx # xlsx
# gem 'axlsx', '3.0.0.pre' gem 'axlsx', '3.0.0.pre'
# gem 'axlsx_rails', '0.3.0' gem 'axlsx_rails', '0.3.0'
# state machine # state machine
# gem 'aasm' gem 'aasm'
#Ruby 2.2+ has removed test/unit from the core library. #Ruby 2.2+ has removed test/unit from the core library.
if RUBY_VERSION>='2.2' if RUBY_VERSION>='2.2'

4
app/controllers/competition_teams_controller.rb
Unescape View File

@ -145,7 +145,7 @@ class CompetitionTeamsController < ApplicationController
# 老师身份加入战队 # 老师身份加入战队
if User.current.user_extensions.identity == 0 if User.current.user_extensions.identity == 0
teacher_staff = @competition.where(category: 'teacher').first teacher_staff = @competition.competition_staffs.where(category: 'teacher').first
if teacher_staff.blank? if teacher_staff.blank?
@status, @message = -1, '该竞赛不能配备导师' @status, @message = -1, '该竞赛不能配备导师'
@ -158,7 +158,7 @@ class CompetitionTeamsController < ApplicationController
end end
team.team_members.create!(user_id: User.current.id, role: 3, competition_id: @competition.id, is_teacher: true) team.team_members.create!(user_id: User.current.id, role: 3, competition_id: @competition.id, is_teacher: true)
else else
max_member_count = @competition.where('category != "teacher"').sum(:maximum) max_member_count = @competition.competition_staffs.where('category != "teacher"').sum(:maximum)
if team.members.count + 1 > max_member_count if team.members.count + 1 > max_member_count
@status, @message = -1, '该战队成员人数已满' @status, @message = -1, '该战队成员人数已满'
return return

47
app/controllers/courses_controller.rb
Unescape View File

@ -1176,7 +1176,7 @@ class CoursesController < ApplicationController
def export_course_member_excel def export_course_member_excel
q = params[:name] ? "#{params[:name].strip}" : "" q = params[:name] ? "#{params[:name].strip}" : ""
filename="#{@course.teacher.show_real_name.to_s }_#{@course.name}_#{l(:excel_member_list)}"; filename="#{@course.teacher.show_real_name.to_s }_#{@course.name}_#{l(:excel_member_list)}"
if params[:group_id] && params[:group_id] != "0" && params[:group_id] != "-1" if params[:group_id] && params[:group_id] != "0" && params[:group_id] != "-1"
group = CourseGroup.find params[:group_id] group = CourseGroup.find params[:group_id]
unless group.nil? unless group.nil?
@ -2437,48 +2437,48 @@ class CoursesController < ApplicationController
sheet1[count_row,column+=1] = member.course_group_id == 0 ? "暂无" : member.course_group.name sheet1[count_row,column+=1] = member.course_group_id == 0 ? "暂无" : member.course_group.name
# current_col = 5 # current_col = 5
shixun_score = 0 shixun_score = 0
homeworks.where(:homework_type => 4).includes(:student_works).each do |homework| homeworks.where(:homework_type => 4).each do |homework|
student_works = homework.student_works.where("user_id = #{member.user.id}") student_works = homework.score_student_works.find_by_user_id(member.user.id)
if student_works.empty? if student_works.nil?
sheet1[count_row,column+=1] = 0 sheet1[count_row,column+=1] = 0
else else
work_score = student_works.first.work_score.nil? ? 0 : student_works.first.work_score work_score = student_works.work_score.nil? ? 0 : student_works.work_score
sheet1[count_row,column+=1] = work_score < 0 ? 0 : work_score.round(1) sheet1[count_row,column+=1] = work_score < 0 ? 0 : work_score.round(1)
shixun_score += work_score < 0 ? 0 : work_score.round(1) shixun_score += work_score < 0 ? 0 : work_score.round(1)
end end
# current_col += 1 # current_col += 1
end end
common_score = 0 common_score = 0
homeworks.where(:homework_type => 1).includes(:student_works).each do |homework| homeworks.where(:homework_type => 1).each do |homework|
student_works = homework.student_works.where("user_id = #{member.user.id}") student_works = homework.score_student_works.find_by_user_id(member.user.id)
if student_works.empty? if student_works.nil?
sheet1[count_row,column+=1] = 0 sheet1[count_row,column+=1] = 0
else else
work_score = student_works.first.work_score.nil? ? 0 : student_works.first.work_score work_score = student_works.work_score.nil? ? 0 : student_works.work_score
sheet1[count_row,column+=1] = work_score < 0 ? 0 : work_score.round(1) sheet1[count_row,column+=1] = work_score < 0 ? 0 : work_score.round(1)
common_score += work_score < 0 ? 0 : work_score.round(1) common_score += work_score < 0 ? 0 : work_score.round(1)
end end
# current_col += 1 # current_col += 1
end end
group_score = 0 group_score = 0
homeworks.where(:homework_type => 3).includes(:student_works).each do |homework| homeworks.where(:homework_type => 3).each do |homework|
student_works = homework.student_works.where("user_id = #{member.user.id}") student_works = homework.score_student_works.find_by_user_id(member.user.id)
if student_works.empty? if student_works.nil?
sheet1[count_row,column+=1] = 0 sheet1[count_row,column+=1] = 0
else else
work_score = student_works.first.work_score.nil? ? 0 : student_works.first.work_score work_score = student_works.work_score.nil? ? 0 : student_works.work_score
sheet1[count_row,column+=1] = work_score < 0 ? 0 : work_score.round(1) sheet1[count_row,column+=1] = work_score < 0 ? 0 : work_score.round(1)
group_score += work_score < 0 ? 0 : work_score.round(1) group_score += work_score < 0 ? 0 : work_score.round(1)
end end
# current_col += 1 # current_col += 1
end end
exercise_score = 0 exercise_score = 0
exercises.includes(:exercise_users).each do |exercise| exercises.each do |exercise|
exercise_user = exercise.exercise_users.where("user_id = #{member.user.id}") exercise_user = exercise.score_exercise_users.find_by_user_id(member.user.id)
if exercise_user.empty? if exercise_user.nil?
sheet1[count_row,column+=1] = 0 sheet1[count_row,column+=1] = 0
else else
work_score = exercise_user.first.score.nil? ? 0 : exercise_user.first.score work_score = exercise_user.score.nil? ? 0 : exercise_user.score
sheet1[count_row,column+=1] = work_score < 0 ? 0 : work_score.round(1) sheet1[count_row,column+=1] = work_score < 0 ? 0 : work_score.round(1)
exercise_score += work_score < 0 ? 0 : work_score.round(1) exercise_score += work_score < 0 ? 0 : work_score.round(1)
end end
@ -2486,7 +2486,7 @@ class CoursesController < ApplicationController
end end
graduation_score = 0 graduation_score = 0
tasks.includes(:graduation_works).each do |task| tasks.each do |task|
graduation_works = task.graduation_works.where("user_id = #{member.user.id}") graduation_works = task.graduation_works.where("user_id = #{member.user.id}")
if graduation_works.empty? if graduation_works.empty?
sheet1[count_row,column+=1] = 0 sheet1[count_row,column+=1] = 0
@ -2576,7 +2576,7 @@ class CoursesController < ApplicationController
sheet[3,1] = "第#{i+1}次" sheet[3,1] = "第#{i+1}次"
sheet[3,0] = "作业名称" sheet[3,0] = "作业名称"
sheet[3,1] = home.name sheet[3,1] = home.name
sheet.row(4).concat([l(:excel_rank),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_homework_des),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)]) sheet.row(4).concat([l(:excel_rank),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),"分班",l(:excel_homework_des),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
count_row = 5 count_row = 5
items = home.score_student_works items = home.score_student_works
# if items.count == 0 && home.publish_time < Time.now && !course.is_end # if items.count == 0 && home.publish_time < Time.now && !course.is_end
@ -2588,10 +2588,11 @@ class CoursesController < ApplicationController
sheet[count_row,1] = stu.user.show_real_name sheet[count_row,1] = stu.user.show_real_name
sheet[count_row,2] = stu.user.login sheet[count_row,2] = stu.user.login
sheet[count_row,3] = stu.user.user_extensions.student_id sheet[count_row,3] = stu.user.user_extensions.student_id
sheet[count_row,4] = strip_html stu.description sheet[count_row,4] = member_group_name course.members, stu.user_id
sheet[count_row,5] = stu.late_penalty sheet[count_row,5] = strip_html stu.description
sheet[count_row,6] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(1) sheet[count_row,6] = stu.late_penalty
sheet[count_row,7] = format_time(stu.commit_time) sheet[count_row,7] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(1)
sheet[count_row,8] = format_time(stu.commit_time)
count_row += 1 count_row += 1
end end
end end

2
app/models/exercise.rb
Unescape View File

@ -7,7 +7,7 @@ class Exercise < ActiveRecord::Base
has_many :exercise_group_settings, :dependent => :destroy has_many :exercise_group_settings, :dependent => :destroy
has_many :exercise_questions, :dependent => :destroy,:order => "#{ExerciseQuestion.table_name}.question_number" has_many :exercise_questions, :dependent => :destroy,:order => "#{ExerciseQuestion.table_name}.question_number"
has_many :exercise_users, :dependent => :destroy, :conditions => "exercise_users.is_delete = 0" has_many :exercise_users, :dependent => :destroy, :conditions => "exercise_users.is_delete = 0"
has_many :score_exercise_users, :conditions => "exercise_users.is_delete = 0 and commit_status != 0", :order => "exercise_users.score desc" has_many :score_exercise_users, :class_name => "ExerciseUser", :conditions => "exercise_users.is_delete = 0 and commit_status != 0", :order => "exercise_users.score desc"
has_many :users, :through => :exercise_users #该测试被哪些用户提交答案过 has_many :users, :through => :exercise_users #该测试被哪些用户提交答案过
has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
# 课程消息 # 课程消息

6
app/views/competitions/_gq_second_code_competition.html.erb
Unescape View File

@ -34,11 +34,11 @@
] ]
%> %>
<% @competition.competition_stages.each_with_index do |stage, i| %> <% @competition.competition_stages.includes(:competition_stage_sections).each_with_index do |stage, i| %>
<div class="second_code_<%= index + 1 %>" style="background: url(<%= named_attachment_path(@images[index], @images[index].try(:filename)) %>) no-repeat top center;"> <div class="second_code_<%= index + 1 %>" style="background: url(<%= named_attachment_path(@images[index], @images[index].try(:filename)) %>) no-repeat top center;">
<% <%
first_section = stage.competition_stage_sections.first first_section = stage.competition_stage_sections[0]
second_section = stage.competition_stage_sections.second second_section = stage.competition_stage_sections[1]
%> %>
<div class="enter_panel" style="<%= i.zero? ? "height: 1212px" : ''%>"> <div class="enter_panel" style="<%= i.zero? ? "height: 1212px" : ''%>">
<% if i.zero? %> <% if i.zero? %>

34
app/views/competitions/_qg_second_course_competition.html.erb
Unescape View File

@ -1,14 +1,30 @@
<p class="second_course_1" style="background: url('/images/educoder/competition/qg/qg_teach_1.png') no-repeat top center;"></p> <% index = 0 %>
<p class="second_course_2" style="background: url('/images/educoder/competition/qg/qg_teach_2.png') no-repeat top center;"></p> <p class="second_course_1" style="background: url('<%= named_attachment_path(@images[index], @images[index].try(:filename)) %>') no-repeat top center;"></p>
<p class="second_course_3" style="background: url('/images/educoder/competition/qg/qg_teach_3.png') no-repeat top center;"></p> <% index += 1 %>
<p class="second_course_4" style="background: url('/images/educoder/competition/qg/qg_teach_4.png') no-repeat top center;"></p> <p class="second_course_2" style="background: url('<%= named_attachment_path(@images[index], @images[index].try(:filename)) %>') no-repeat top center;"></p>
<div class="second_course_5" style="background: url('/images/educoder/competition/qg/qg_teach_5.png') no-repeat top center;"> <% index += 1 %>
<p class="second_course_3" style="background: url('<%= named_attachment_path(@images[index], @images[index].try(:filename)) %>') no-repeat top center;"></p>
<% index += 1 %>
<p class="second_course_4" style="background: url('<%= named_attachment_path(@images[index], @images[index].try(:filename)) %>') no-repeat top center;"></p>
<% index += 1 %>
<%
stage = @competition.competition_stages.first
first_section = stage.competition_stage_sections.first
is_start = Time.now > first_section.start_time
%>
<div class="second_course_5" style="background: url('<%= named_attachment_path(@images[index], @images[index].try(:filename)) %>') no-repeat top center;">
<div class="enter_panel" style="height: 500px"> <div class="enter_panel" style="height: 500px">
<div class="course_competition_panel"> <div class="course_competition_panel">
<a href="javascript:void(0)" class="active">未知</a> <a href="<%= is_start ? first_section.competition_entries[0].url : 'javascript:void(0)'%>"
<a href="javascript:void(0)">未知</a> class="<%= is_start ? 'active' : '' %>"><%= first_section.competition_entries[0].name %></a>
<a href="<%= is_start ? first_section.competition_entries[1].url : 'javascript:void(0)'%>"
class="<%= is_start ? 'active' : '' %>"><%= first_section.competition_entries[1].name %></a>
</div> </div>
<a href="javascript:void(0)" class="ex_submit">案例提交</a> <a href="<%= is_start ? first_section.competition_entries[2].url : 'javascript:void(0)'%>"
class="ex_submit"><%= first_section.competition_entries[2].name %></a>
</div> </div>
</div> </div>
<p class="second_course_6" style="background: url('/images/educoder/competition/qg/qg_teach_6.png') no-repeat top center;"></p> <% index += 1 %>
<p class="second_course_6" style="background: url('<%= named_attachment_path(@images[index], @images[index].try(:filename)) %>') no-repeat top center;"></p>

2
app/views/competitions/show.html.erb
Unescape View File

@ -11,5 +11,7 @@
<%= render :partial => "qg_second_competition" %> <%= render :partial => "qg_second_competition" %>
<% elsif @competition.identifier == "gcc-annotation-2019" %> <% elsif @competition.identifier == "gcc-annotation-2019" %>
<%= render :partial => "gq_second_code_competition" %> <%= render :partial => "gq_second_code_competition" %>
<% elsif @competition.identifier == "gcc-course-2019" %>
<%= render :partial => "qg_second_course_competition" %>
<% end %> <% end %>
</div> </div>

12
app/views/courses/settings/_student_table.html.erb
Unescape View File

@ -5,7 +5,9 @@
<tr class="eduCenternew"> <tr class="eduCenternew">
<th width="10%" class="tabeltext-alignleft">用户ID</th> <th width="10%" class="tabeltext-alignleft">用户ID</th>
<th width="10%" class="tabeltext-alignleft">姓名</th> <th width="10%" class="tabeltext-alignleft">姓名</th>
<th width="10%" class="tabeltext-alignleft">学号</th> <% if User.current.admin || User.current.member_of_course?(@course) %>
<th width="10%" class="tabeltext-alignleft">学号</th>
<% end %>
<th width="10%" class="tabeltext-alignleft">分班</th> <th width="10%" class="tabeltext-alignleft">分班</th>
<!--<th width="13%" style="white-space:nowrap; overflow:hidden; text-overflow:ellipsis" class="tabeltext-alignleft">课堂成绩</th> <!--<th width="13%" style="white-space:nowrap; overflow:hidden; text-overflow:ellipsis" class="tabeltext-alignleft">课堂成绩</th>
<th width="10%">活跃度</th>--> <th width="10%">活跃度</th>-->
@ -22,9 +24,11 @@
<% end %> <% end %>
<span class="edu-txt-w140 task-hide mt5"><%= user.login %></span></td> <span class="edu-txt-w140 task-hide mt5"><%= user.login %></span></td>
<td class="tabeltext-alignleft"><%= link_to user.show_real_name, user_path(user), :class => 'edu-txt-w140 task-hide mt5 color-grey-3', :target => '_blank' %></td> <td class="tabeltext-alignleft"><%= link_to user.show_real_name, user_path(user), :class => 'edu-txt-w140 task-hide mt5 color-grey-3', :target => '_blank' %></td>
<td class="tabeltext-alignleft"> <% if User.current.admin || User.current.member_of_course?(@course) %>
<span class="edu-txt-w140 task-hide mt5"><%= user.user_extensions ? user.user_extensions.student_id : '' %></span> <td class="tabeltext-alignleft">
</td> <span class="edu-txt-w140 task-hide mt5"><%= user.user_extensions ? user.user_extensions.student_id : '' %></span>
</td>
<% end %>
<td class="tabeltext-alignleft"><%= member.course_group_id == 0 || member.course_group_id.nil? ? '未分班' : member.course_group.name %></td> <td class="tabeltext-alignleft"><%= member.course_group_id == 0 || member.course_group_id.nil? ? '未分班' : member.course_group.name %></td>
<% if false %> <% if false %>
<td class="tabeltext-alignleft"><%= format("%.1f", member.course_score) %></td><!--课堂成绩--> <td class="tabeltext-alignleft"><%= format("%.1f", member.course_score) %></td><!--课堂成绩-->

12
app/views/exercise/_student_exercise.html.erb
Unescape View File

@ -12,7 +12,9 @@
<th>序号</th> <th>序号</th>
<th>姓名</th> <th>姓名</th>
<th class="with10">分班</th> <th class="with10">分班</th>
<th>学号</th> <% if User.current.admin || User.current.member_of_course?(@course) %>
<th>学号</th>
<% end %>
<th>提交状态</th> <th>提交状态</th>
<th>提交时间</th> <th>提交时间</th>
<th>客观题得分</th> <th>客观题得分</th>
@ -35,9 +37,11 @@
<td title="<%= member.try(:course_group_id).to_i == 0 ? '未分班' : member.course_group.name %>"> <td title="<%= member.try(:course_group_id).to_i == 0 ? '未分班' : member.course_group.name %>">
<span class="task-hide" style="display: block;max-width: 120px;"><%= member.try(:course_group_id).to_i == 0 ? '未分班' : member.course_group.name %></span> <span class="task-hide" style="display: block;max-width: 120px;"><%= member.try(:course_group_id).to_i == 0 ? '未分班' : member.course_group.name %></span>
</td> </td>
<td title="<%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id %>"> <% if User.current.admin || User.current.member_of_course?(@course) %>
<%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id %> <td title="<%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id %>">
</td> <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id %>
</td>
<% end %>
<td> <td>
<%= (ex_poll_work_status exercise.commit_status).html_safe %> <%= (ex_poll_work_status exercise.commit_status).html_safe %>
</td> </td>

56
app/views/graduation_tasks/_student_work_list.html.erb
Unescape View File

@ -16,27 +16,29 @@
</div> </div>
</div> </div>
<div class="clearfix minH-280"> <div class="clearfix minH-280">
<table cellpadding="0" cellspacing="0" class="edu-txt-center edu-pop-table aroundRange"> <table class="edu-pop-table edu-txt-center hover-td" cellspacing="0" cellpadding="0">
<thead> <thead>
<tr> <tr>
<th width="4%">序号</th> <th>序号</th>
<th width="10%">姓名</th> <th width="10%">姓名</th>
<th class="flex1">学号</th> <% if User.current.admin || User.current.member_of_course?(@course) %>
<th width="7%">分班</th> <th>学号</th>
<% end %>
<th>分班</th>
<% if @task.task_type == 2 %> <% if @task.task_type == 2 %>
<th width="7%">分组</th> <th>分组</th>
<% if @task.base_on_project %> <% if @task.base_on_project %>
<th width="12%">关联项目</th> <th>关联项目</th>
<% end %> <% end %>
<% end %> <% end %>
<th width="6%">提交状态</th> <th>提交状态</th>
<th width="12%">更新时间</th> <th>更新时间</th>
<th width="8%">教师评分</th> <th>教师评分</th>
<% if @task.cross_comment %> <% if @task.cross_comment %>
<th width="8%">交叉评分</th> <th>交叉评分</th>
<% end %> <% end %>
<th width="8%">最终成绩</th> <th>最终成绩</th>
<th width="11%">操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -44,16 +46,20 @@
<% @works.each_with_index do |work, i| %> <% @works.each_with_index do |work, i| %>
<% score_open = task_score_open || work.user == User.current %> <% score_open = task_score_open || work.user == User.current %>
<tr> <tr>
<td width="4%"><%= (@page - 1) * @limit + i + 1 %></td> <td><%= (@page - 1) * @limit + i + 1 %></td>
<td width="10%"><%= link_to work.user.show_real_name, user_path(work.user), :target => "_blank" %></td> <td><%= link_to work.user.show_real_name, user_path(work.user), :target => "_blank" %></td>
<% student_id = work.user.user_extensions.nil? ? "--" : work.user.user_extensions.student_id %> <% if User.current.admin || User.current.member_of_course?(@course) %>
<td class="task-hide flex1"><%= student_id %></td> <% student_id = work.user.user_extensions.nil? ? "--" : work.user.user_extensions.student_id %>
<td class="task-hide"><%= student_id %></td>
<% end %>
<% group_name = member_group_name @course.members, work.user_id %> <% group_name = member_group_name @course.members, work.user_id %>
<td width="7%" class="task-hide" title="<%= group_name %>"><%= group_name %></td> <td title="<%= group_name %>">
<span class="task-hide" style="display: block;max-width: 120px;"><%= group_name %></span>
</td>
<% if @task.task_type == 2 %> <% if @task.task_type == 2 %>
<td width="7%" class="task-hide"><%= work.group_id == 0 ? '--' : '分组'+work.group_id.to_s %></td> <td class="task-hide"><%= work.group_id == 0 ? '--' : '分组'+work.group_id.to_s %></td>
<% if @task.base_on_project %> <% if @task.base_on_project %>
<td width="12%" class="student_score_info edu-position"> <td class="student_score_info edu-position">
<% if work.project %> <% if work.project %>
<% project = work.project %> <% project = work.project %>
<% if project.status != 9 && (project.is_public || User.current.member_of?(project) || @is_teacher) %> <% if project.status != 9 && (project.is_public || User.current.member_of?(project) || @is_teacher) %>
@ -85,18 +91,18 @@
</td> </td>
<% end %> <% end %>
<% end %> <% end %>
<td width="6%"><%= (ex_poll_work_status work.work_status).html_safe %></td> <td><%= (ex_poll_work_status work.work_status).html_safe %></td>
<td width="12%" class="color-grey-9"><%= work.work_status == 0 ? '--' : format_time(work.update_time) %></td> <td class="color-grey-9"><%= work.work_status == 0 ? '--' : format_time(work.update_time) %></td>
<td width="8%" class="<%= score_color (!score_open || work.teacher_score.nil? ? nil : work.teacher_score)%>"> <td class="<%= score_color (!score_open || work.teacher_score.nil? ? nil : work.teacher_score)%>">
<%= work.work_status == 0 ? '--' : (work.teacher_score.nil? ? "未批阅" : (!score_open ? "**" : format("%.1f", work.teacher_score.round(1)))) %> <%= work.work_status == 0 ? '--' : (work.teacher_score.nil? ? "未批阅" : (!score_open ? "**" : format("%.1f", work.teacher_score.round(1)))) %>
</td> </td>
<% if @task.cross_comment %> <% if @task.cross_comment %>
<td width="8%" class="<%= score_color (!score_open || work.cross_score.nil? ? nil : work.cross_score)%>"> <td class="<%= score_color (!score_open || work.cross_score.nil? ? nil : work.cross_score)%>">
<%= work.work_status == 0 ? '--' : (work.cross_score.nil? ? "未批阅" : (!score_open ? "**" : (format("%.1f", work.cross_score.round(1)) + "（#{work.graduation_work_scores.where(:reviewer_role => 2).group_by(&:user_id).count}）"))) %> <%= work.work_status == 0 ? '--' : (work.cross_score.nil? ? "未批阅" : (!score_open ? "**" : (format("%.1f", work.cross_score.round(1)) + "（#{work.graduation_work_scores.where(:reviewer_role => 2).group_by(&:user_id).count}）"))) %>
</td> </td>
<% end %> <% end %>
<% score = work.work_score %> <% score = work.work_score %>
<td width="8%" class="<%= score_color (!score_open || score.nil? ? nil : score)%> edu-position"> <td class="<%= score_color (!score_open || score.nil? ? nil : score)%> edu-position">
<%= score.nil? ? "--" : (!score_open ? "**" : format("%.1f",score<0 ? 0 : score.round(1)))%> <%= score.nil? ? "--" : (!score_open ? "**" : format("%.1f",score<0 ? 0 : score.round(1)))%>
<% if score.present? %> <% if score.present? %>
<div class="popup_tip_box-black" style="left: 65px;"> <div class="popup_tip_box-black" style="left: 65px;">
@ -110,7 +116,7 @@
</div> </div>
<% end %> <% end %>
</td> </td>
<td width="11%"> <td>
<% if @is_teacher && @task.cross_comment && @task.comment_status == 2 %> <% if @is_teacher && @task.cross_comment && @task.comment_status == 2 %>
<a href="<%= assign_teacher_graduation_work_path(work) %>" data-remote="true" class="color-blue ml5 mr5 allotTeacher">分配</a> <a href="<%= assign_teacher_graduation_work_path(work) %>" data-remote="true" class="color-blue ml5 mr5 allotTeacher">分配</a>
<% end %> <% end %>

10
app/views/graduation_topics/_student_topic_list.html.erb
Unescape View File

@ -3,7 +3,9 @@
<p> <p>
<span>序号</span> <span>序号</span>
<span class="s-w">姓名</span> <span class="s-w">姓名</span>
<span class="m-w">学号</span> <% if User.current.admin || User.current.member_of_course?(@course) %>
<span class="m-w">学号</span>
<% end %>
<span class="m-w">分班</span> <span class="m-w">分班</span>
<span class="m-w">选题时间</span> <span class="m-w">选题时间</span>
<span class="l-w flex1">确认结果</span> <span class="l-w flex1">确认结果</span>
@ -15,8 +17,10 @@
<p> <p>
<span class="color-grey-6"><%= index + 1 %></span> <span class="color-grey-6"><%= index + 1 %></span>
<span class="s-w color-grey-3"><a href="<%= user_path(student_topic.user) %>" target="_blank"><%= student_topic.user.show_real_name %></a></span> <span class="s-w color-grey-3"><a href="<%= user_path(student_topic.user) %>" target="_blank"><%= student_topic.user.show_real_name %></a></span>
<% student_id = student_topic.user.user_extensions.try(:student_id).present? ? student_topic.user.user_extensions.student_id : "--" %> <% if User.current.admin || User.current.member_of_course?(@course) %>
<span class="m-w"><%= student_id %></span> <% student_id = student_topic.user.user_extensions.try(:student_id).present? ? student_topic.user.user_extensions.student_id : "--" %>
<span class="m-w"><%= student_id %></span>
<% end %>
<span class="m-w"><%= student_topic.member.course_group.try(:name) %></span> <span class="m-w"><%= student_topic.member.course_group.try(:name) %></span>
<span class="m-w"><%= format_time student_topic.created_at %></span> <span class="m-w"><%= format_time student_topic.created_at %></span>
<%= (student_topic_status student_topic.status).html_safe %> <%= (student_topic_status student_topic.status).html_safe %>

12
app/views/poll/_student_poll.html.erb
Unescape View File

@ -10,7 +10,9 @@
<th>序号</th> <th>序号</th>
<th>姓名</th> <th>姓名</th>
<th class="with20">分班</th> <th class="with20">分班</th>
<th>学号</th> <% if User.current.admin || User.current.member_of_course?(@course) %>
<th>学号</th>
<% end %>
<th>提交状态</th> <th>提交状态</th>
<th>提交时间</th> <th>提交时间</th>
<% if @poll.un_anonymous && @is_teacher %> <% if @poll.un_anonymous && @is_teacher %>
@ -29,9 +31,11 @@
<td title="<%= member.try(:course_group_id).to_i == 0 ? '未分班' : member.course_group.name %>"> <td title="<%= member.try(:course_group_id).to_i == 0 ? '未分班' : member.course_group.name %>">
<span class="task-hide" style="display: block;max-width: 230px;"><%= member.try(:course_group_id).to_i == 0 ? '未分班' : member.course_group.name %></span> <span class="task-hide" style="display: block;max-width: 230px;"><%= member.try(:course_group_id).to_i == 0 ? '未分班' : member.course_group.name %></span>
</td> </td>
<td title="<%= poll.user.user_extensions.nil? ? "--" : poll.user.user_extensions.student_id %>"> <% if User.current.admin || User.current.member_of_course?(@course) %>
<%= poll.user.user_extensions.nil? ? "--" : poll.user.user_extensions.student_id %> <td title="<%= poll.user.user_extensions.nil? ? "--" : poll.user.user_extensions.student_id %>">
</td> <%= poll.user.user_extensions.nil? ? "--" : poll.user.user_extensions.student_id %>
</td>
<% end %>
<td> <td>
<%= (ex_poll_work_status poll.commit_status).html_safe %> <%= (ex_poll_work_status poll.commit_status).html_safe %>
</td> </td>

14
app/views/student_work/_evaluation_un_common_title.html.erb
Unescape View File

@ -3,7 +3,9 @@
<th>序号</th> <th>序号</th>
<th>姓名</th> <th>姓名</th>
<th class="with10">分班</th> <th class="with10">分班</th>
<th>学号</th> <% if User.current.admin || User.current.member_of_course?(@course) %>
<th>学号</th>
<% end %>
<th>提交状态</th> <th>提交状态</th>
<th>更新时间</th> <th>更新时间</th>
<th>教师评分</th> <th>教师评分</th>
@ -33,10 +35,12 @@
<td title="<%= group_name %>"> <td title="<%= group_name %>">
<span class="task-hide" style="display: block;max-width: 120px;"><%= group_name %></span> <span class="task-hide" style="display: block;max-width: 120px;"><%= group_name %></span>
</td> </td>
<% student_id = student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %> <% if User.current.admin || User.current.member_of_course?(@course) %>
<td title="<%= student_id %>"> <% student_id = student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %>
<%= student_id %> <td title="<%= student_id %>">
</td> <%= student_id %>
</td>
<% end %>
<td> <td>
<%= (ex_poll_work_status student_work.work_status).html_safe %> <%= (ex_poll_work_status student_work.work_status).html_safe %>
</td> </td>

14
app/views/student_work/_evaluation_un_group_title.html.erb
Unescape View File

@ -3,7 +3,9 @@
<th>序号</th> <th>序号</th>
<th>姓名</th> <th>姓名</th>
<th class="with10">分班</th> <th class="with10">分班</th>
<th>学号</th> <% if User.current.admin || User.current.member_of_course?(@course) %>
<th>学号</th>
<% end %>
<th>分组</th> <th>分组</th>
<% if @homework.homework_detail_group.base_on_project == 1 %> <% if @homework.homework_detail_group.base_on_project == 1 %>
<th>关联项目</th> <th>关联项目</th>
@ -38,10 +40,12 @@
<td title="<%= group_name %>"> <td title="<%= group_name %>">
<span class="task-hide" style="display: block;max-width: 120px;"><%= group_name %></span> <span class="task-hide" style="display: block;max-width: 120px;"><%= group_name %></span>
</td> </td>
<% student_id = student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %> <% if User.current.admin || User.current.member_of_course?(@course) %>
<td title="<%= student_id %>"> <% student_id = student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %>
<%= student_id %> <td title="<%= student_id %>">
</td> <%= student_id %>
</td>
<% end %>
<td> <td>
<%= student_work.group_id == 0 ? '--' : '分组'+student_work.group_id.to_s %> <%= student_work.group_id == 0 ? '--' : '分组'+student_work.group_id.to_s %>
</td> </td>

14
app/views/student_work/_evaluation_un_shixun_title.html.erb
Unescape View File

@ -3,7 +3,9 @@
<th>序号</th> <th>序号</th>
<th class="with10">姓名</th> <th class="with10">姓名</th>
<th>分班</th> <th>分班</th>
<th>学号</th> <% if User.current.admin || User.current.member_of_course?(@course) %>
<th>学号</th>
<% end %>
<th>提交状态</th> <th>提交状态</th>
<th>提交耗时</th> <th>提交耗时</th>
<th>更新时间</th> <th>更新时间</th>
@ -30,10 +32,12 @@
<td title="<%= group_name %>"> <td title="<%= group_name %>">
<span class="task-hide"><%= group_name %></span> <span class="task-hide"><%= group_name %></span>
</td> </td>
<% student_id = student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %> <% if User.current.admin || User.current.member_of_course?(@course) %>
<td title="<%= student_id %>"> <% student_id = student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %>
<%= student_id %> <td title="<%= student_id %>">
</td> <%= student_id %>
</td>
<% end %>
<td> <td>
<% status = list_work_status student_work, @homework, group_id %> <% status = list_work_status student_work, @homework, group_id %>
<span class='<%= status == "未提交" ? "" : ((status == "按时提交" || status == "正在提交") ? "color-light-green" : "color-red") %>'><%= status %></span> <span class='<%= status == "未提交" ? "" : ((status == "按时提交" || status == "正在提交") ? "color-light-green" : "color-red") %>'><%= status %></span>

8
db/migrate/20190629060410_change_exec_time_default_for_challenges.rb
Unescape View File

@ -0,0 +1,8 @@
class ChangeExecTimeDefaultForChallenges < ActiveRecord::Migration
def up
change_column :challenges, :exec_time, :integer, :default => 20
end
def down
end
end
Write Preview
Loading…
Cancel
Save