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

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

Conflicts:
	app/views/bids/_bid_homework_show.html.erb
	app/views/layouts/base_homework.html.erb
This commit is contained in:
sw 2014-11-06 09:01:01 +08:00
parent 9520007bec c52e87c74f
commit 7d97889261
3 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/helpers/application_helper.rb
View File

@ -1907,4 +1907,28 @@ module ApplicationHelper
'#' '#'
end end
end end
def anonymous_comment_link(bid, course)
link = case bid.comment_status
when 0
@student_size ||= searchStudent(course).size
@homework_size = bid.homeworks.size
percent = @homework_size.to_f / @student_size
confirm_info = "开启匿评后学生将不能对作业进行提交、修改、删除等操作\n"
confirm_info += percent >= 0.8 ? '' : "目前#{@student_size}个学生,总共提交了#{@homework_size}份作业,只占#{number_to_percentage(percent * 100, precision: 1)}\n"
confirm_info += '是否确定开启匿评？'
link_to '启动匿评', start_anonymous_comment_bid_path(bid), id: "#{bid.id}_start_anonymous_comment", remote: true, :confirm => confirm_info, disable_with: '加载中...'
when 1
@student_size ||= searchStudent(course).size
@homework_size = bid.homeworks.size
percent = @homework_size.to_f / @student_size
confirm_info = "关闭匿评后所有同学将看到匿评的结果。学生将可以自由的进行公开互评了，但公开互评不影响作业的匿名评分\n"
confirm_info += "" # TODO 当前有多少学生完成了匿评，有多少学生没有进行匿评，并据此给出建议：建议老师暂缓关闭匿评，因为只有x%的学生完成了匿评任务。。。
confirm_info += '是否确定关闭匿评？'
link_to '关闭匿评', stop_anonymous_comment_bid_path(bid), id: "#{bid.id}_stop_anonymous_comment", remote: true, :confirm => confirm_info
when 2
'匿评结束'
end
content_tag('span', link, id: "#{bid.id}_anonymous_comment")
end
end end

27
app/views/bids/_bid_homework_show.html.erb
View File

@ -23,35 +23,18 @@
<%= link_to(bid.name, course_for_bid_path(bid), :class => 'bid_path') %> <%= link_to(bid.name, course_for_bid_path(bid), :class => 'bid_path') %>
</span> </span>
<span style="float: right"> <span style="float: right">
<% if User.current.logged? && is_cur_course_student(@course) %> <% if(User.current.logged? && (!Member.where('user_id = ? and course_id = ?', User.current.id, bid.courses.first.id).first.nil? && (Member.where('user_id = ? and course_id = ?', User.current.id, bid.courses.first.id).first.roles&Role.where('id = ? or id = ? or id =?',5, 10, 7)).size >0)) %>
<% cur_user_homework = cur_user_homework_for_bid(bid) %> <% cur_user_homework = cur_user_homework_for_bid(bid) %>
<% if cur_user_homework!= nil && cur_user_homework.empty? %> <% if cur_user_homework!= nil && cur_user_homework.count == 0 %>
<% if bid.comment_status == 0 %> <%= link_to l(:label_commit_homework),new_homework_attach_path(bid) %>
<%= link_to l(:label_commit_homework),new_exercise_book_path(bid) %>
<% else %>
<span title="只有开启匿评之前才能创建作业哦！">
<a style="color:#8e8e8e;">提交作业</a>
</span>
<% end %>
<% else %> <% else %>
<span style="color: green; float: right"> <span style="color: green; float: right">
<%= l(:lable_has_commit_homework)%> <%= l(:lable_has_commit_homework)%>
</span> </span>
<% end %> <% end %>
<% end %> <% end %>
<% if (User.current.admin?||User.current.id==bid.author_id)%> <% if (User.current.admin?||User.current.id==bid.author_id) %>
<% if bid.homeworks.count >= 2 %> <%= anonymous_comment_link(bid, @course) %>
<span id="<%=bid.id %>_anonymous_comment">
<% case bid.comment_status %>
<% when 0 %>
<%= link_to '启动匿评', start_anonymous_comment_bid_path(bid), id: "#{bid.id}_start_anonymous_comment", remote: true, :confirm => "开启匿评后学生将不能对作业进行提交、修改、删除等操作\n是否确定开启匿评？", disable_with: '加载中...' %>
<% when 1 %>
<%= link_to '关闭匿评', stop_anonymous_comment_bid_path(bid), id: "#{bid.id}_stop_anonymous_comment", remote: true, :confirm => "关闭匿评后学生将不能对作业进行评分,且学生作业列表将会被公开\n是否确定关闭匿评？" %>
<% when 2 %>
匿评结束
<% end %>
</span>
<% end %>
<%= link_to( <%= link_to(
l(:button_edit), l(:button_edit),
{:action => 'edit', :controller=>'bids', :course_id =>@course.id, :bid_id => bid.id}, {:action => 'edit', :controller=>'bids', :course_id =>@course.id, :bid_id => bid.id},

19
app/views/layouts/base_homework.html.erb
View File

@ -79,7 +79,7 @@
<td style="vertical-align: top;font-size: 15px;"> <td style="vertical-align: top;font-size: 15px;">
<span style=" word-wrap: break-word; word-break: break-all"> <span style=" word-wrap: break-word; word-break: break-all">
<strong> <strong>
<%= link_to "返回课程主页", course_path(course) if course %> <%= link_to course.name.to_s, homework_course_path(course) if course %>
</strong> </strong>
</span> </span>
</td> </td>
@ -87,9 +87,7 @@
<tr> <tr>
<td style=" word-wrap: break-word; word-break: break-all;font-size: 15px;"> <td style=" word-wrap: break-word; word-break: break-all;font-size: 15px;">
<span style=" color:#ed8924"> <span style=" color:#ed8924">
<strong> <strong><%=link_to(@bid.name, course_for_bid_path(@bid)) %></strong>
<%=link_to("第#{course.homeworks.index(@bid) + 1}次作业", course_for_bid_path(@bid)) %>
</strong>
</span> </span>
</td> </td>
</tr> </tr>
@ -103,19 +101,10 @@
<div class="inf_user_image"> <div class="inf_user_image">
<table> <table>
<% if (User.current.admin?||User.current.id==@bid.author_id) && @bid.homeworks.count >= 2 %> <% if (User.current.admin?||User.current.id==@bid.author_id) %>
<tr> <tr>
<td valign="top" style="padding-left: 8px; font-size: 15px" colspan="2"> <td valign="top" style="padding-left: 8px; font-size: 15px" colspan="2">
<span id="<%=@bid.id %>_anonymous_comment"> <%= anonymous_comment_link(@bid, course) %>
<% case @bid.comment_status %>
<% when 0 %>
<%= link_to '启动匿评', start_anonymous_comment_bid_path(@bid), id: "#{@bid.id}_start_anonymous_comment", remote: true, :confirm => "开启匿评后学生将不能对作业进行提交、修改、删除等操作\n是否确定开启匿评？", disable_with: '加载中...' %>
<% when 1 %>
<%= link_to '关闭匿评', stop_anonymous_comment_bid_path(@bid), id: "#{@bid.id}_stop_anonymous_comment", remote: true, :confirm => "关闭匿评后学生将不能对作业进行评分,且学生作业列表将会被公开\n是否确定关闭匿评？" %>
<% when 2 %>
匿评结束
<% end %>
</span>
</td> </td>
</tr> </tr>
<% end %> <% end %>