hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

作业列表优化，课程加入退出

Browse Source
cxt_course
Tim 10 years ago
parent 900b861f31
commit 821ade7985
4 changed files with 282 additions and 280 deletions
Show Stats Download Patch File Download Diff File

4
app/views/layouts/_project_info.html.erb
Unescape View File

@ -9,13 +9,13 @@
<!--<a href="#"><img src="images/courses/pic_courses.jpg" width="60" height="60" alt="logo" /></a>--> <!--<a href="#"><img src="images/courses/pic_courses.jpg" width="60" height="60" alt="logo" /></a>-->
<%= image_tag(url_to_avatar(@course), :width => "60", :height => "60") %> <%= image_tag(url_to_avatar(@course), :width => "60", :height => "60") %>
</div> </div>
<div class="pr_info_id fl mb5 f14"><%= @course.is_public == 0 ? "私有课程" : "公开课程" %> <div class="pr_info_id fl mb5 f14">ID:<%= @course.id%><%= @course.is_public == 0 ? "（私有）" : "（公开）" %>
<% if @course.id == 370 %> <% if @course.id == 370 %>
<img src="/images/course/medal.png" alt="精品课程" style="vertical-align:bottom;" class="ml5" /> <img src="/images/course/medal.png" alt="精品课程" style="vertical-align:bottom;" class="ml5" />
<% end %> <% end %>
</div> </div>
<div class="pr_info_id fl f14"> <div class="pr_info_id fl f14">
ID:<%= @course.id%> <a href="" class="linkGrey">加入课程</a>
</div> </div>
<!--<div class="pr_info_id fl mb5 f14"> <!--<div class="pr_info_id fl mb5 f14">
ID:<%#= @course.id%> ID:<%#= @course.id%>

279
app/views/student_work/_programing_work_show.html.erb
Unescape View File

@ -1,139 +1,140 @@
<div class="show_hwork_arrow"></div> <div class="show_hwork_arrow"></div>
<div class="showHwork"> <div class="showHwork">
<ul> <ul>
<li class="fl" > <li class="fl" >
<span class="tit_fb">上交时间：</span> <span class="tit_fb">上交时间：</span>
<%=format_time work.created_at %> <%=format_time work.created_at %>
</li> </li>
<% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %> <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
<!-- 我的作业 && 匿评作业 && 未开启匿评，显示编辑和删除按钮 --> <!-- 我的作业 && 匿评作业 && 未开启匿评，显示编辑和删除按钮 -->
<li class="fr" > <li class="fr" >
<%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del") %> <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del") %>
</li> </li>
<li class="fr" > <li class="fr" >
<%= link_to "",new_student_work_path(:homework => @homework.id),:class => "pic_edit"%> <%= link_to "",new_student_work_path(:homework => @homework.id),:class => "pic_edit"%>
</li> </li>
<% end%> <% end%>
<% if @homework.homework_detail_manual.comment_status == 3 && work.user != User.current%> <% if @homework.homework_detail_manual.comment_status == 3 && work.user != User.current%>
<!-- 匿评结束阶段，显示点赞按钮 --> <!-- 匿评结束阶段，显示点赞按钮 -->
<li class="fr" id="student_work_praise_<%= work.id%>"> <li class="fr" id="student_work_praise_<%= work.id%>">
<%= render :partial => 'student_work_praise' %> <%= render :partial => 'student_work_praise' %>
</li> </li>
<% end%> <% end%>
<div class="cl"></div> <div class="cl"></div>
<li > <li >
<span class="tit_fb ">编程代码：</span> <span class="tit_fb ">编程代码：</span>
<div class="showHworkP break_word"><pre id="work-src" style="display: none;"><%= work.description if work.description%></pre><div class="fontGrey2 font_cus" id="work-code"> <div class="showHworkP break_word"><pre id="work-src" style="display: none;"><%= work.description if work.description%></pre><div class="fontGrey2 font_cus" id="work-code">
</div> </div>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</li> </li>
<li class="mt10 fl"> <li class="mt10 fl">
<span class="tit_fb "> <span class="tit_fb ">
测试结果： 测试结果：
</span> </span>
<div class="show_hwork_p break_word"> <div class="show_hwork_p break_word">
<% work.student_work_tests.each_with_index do |test, index| %> <% work.student_work_tests.each_with_index do |test, index| %>
<div class="ProResultTop"> <div class="ProResultTop">
<p class="c_blue fl"> <p class="c_blue fl">
第<%= work.student_work_tests.count - index%>次测试 第<%= work.student_work_tests.count - index%>次测试
</p> </p>
<span class="fr c_grey"> <span class="fr c_grey">
<%= test.created_at.to_s(:db) %> <%= test.created_at.to_s(:db) %>
</span> </span>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<% if test.status.to_i == -2 %> <% if test.status.to_i == -2 %>
<div class="ProResultCon "> <div class="ProResultCon ">
<%= test.results.first %> <%= test.results.first %>
</div> </div>
<% else %> <% else %>
<div class="ProResultTable " > <div class="ProResultTable " >
<ul class="ProResultUl " > <ul class="ProResultUl " >
<% test.results.each_with_index do |x, i| %> <% test.results.each_with_index do |x, i| %>
<li > <li >
<span class="w60 T_C">测试<%=i+1%></span> <span class="w60 T_C">测试<%=i+1%></span>
<% if x["status"].to_i != 0 %> <% if x["status"].to_i != 0 %>
<span class="w150 c_red">测试错误！</span> <span class="w150 c_red">测试错误！</span>
<span class="w60">您的输出：</span> <span class="w60">您的输出：</span>
<span class="width150"><%=x["result"]%></span> <span class="width150"><%=x["result"]%></span>
<span class="w60">正确输出：</span> <span class="w60">正确输出：</span>
<span class="width150"><%=x["output"]%></span> <span class="width150"><%=x["output"]%></span>
<div class="cl"></div> <div class="cl"></div>
<% else %> <% else %>
<span class="w150 c_green">测试正确！</span> <span class="w150 c_green">测试正确！</span>
<div class="cl"></div> <div class="cl"></div>
<% end %> <% end %>
</li> </li>
<% end %> <% end %>
</ul> </ul>
</div> </div>
<% end %> <% end %>
<% end %> <% end %>
</div> </div>
</li> </li>
<li > <li >
<% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && work.user != User.current )%> <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && work.user != User.current )%>
<!-- 老师 || 开启匿评状态 && 不是当前用户自己的作品 --> <!-- 老师 || 开启匿评状态 && 不是当前用户自己的作品 -->
<div id="add_student_score_<%= work.id%>" class="mt10 evaluation"> <div id="add_student_score_<%= work.id%>" class="mt10 evaluation">
<%= render :partial => 'add_score',:locals => {:work => work,:score => score}%> <%= render :partial => 'add_score',:locals => {:work => work,:score => score}%>
</div> </div>
<% end%> <% end%>
<div class="cl"></div> <div class="cl"></div>
</li> </li>
</ul> </ul>
<div id="revise_attachment"> <div id="revise_attachment">
<%= render :partial => 'student_work/revise_attachment', :locals => {:work => work} %> <%= render :partial => 'student_work/revise_attachment', :locals => {:work => work} %>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<div class="ping_box fl" id="score_list_<%= work.id%>" style="<%= work.student_works_scores.empty? ? 'padding:0px;' : ''%>"> <div class="ping_box fl" id="score_list_<%= work.id%>" style="<%= work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
<%student_work_scores.each do |student_score|%> <%student_work_scores.each do |student_score|%>
<div id="work_score_<%= student_score.id%>"> <div id="work_score_<%= student_score.id%>">
<%= render :partial => 'student_work_score',:locals => {:score => student_score,:is_last => student_score == student_work_scores.last}%> <%= render :partial => 'student_work_score',:locals => {:score => student_score,:is_last => student_score == student_work_scores.last}%>
</div> </div>
<% end%> <% end%>
</div> </div>
<!---ping_box end---> <div class="cl"></div>
<a href="javascript:void(0);" class="fr linkBlue mt5 mb5" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a> <!---ping_box end--->
<div class="cl"></div> <a href="javascript:void(0);" class="linkBlue mt5 mb5" style="margin-left:auto; margin-right: auto; display:block; width: 24px;" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a>
</div> <div class="cl"></div>
<script type="text/javascript"> </div>
function show_upload(){ <script type="text/javascript">
$("#ajax-modal").html('<%= escape_javascript( render :partial => 'student_work/upload_attachment' ,:locals => {:work=>work})%>'); function show_upload(){
showModal('ajax-modal', '452px'); $("#ajax-modal").html('<%= escape_javascript( render :partial => 'student_work/upload_attachment' ,:locals => {:work=>work})%>');
$('#ajax-modal').siblings().remove(); showModal('ajax-modal', '452px');
$('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>"); $('#ajax-modal').siblings().remove();
$('#ajax-modal').parent().css("top","40%").css("left","46%"); $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
$('#ajax-modal').parent().addClass("resourceUploadPopup"); $('#ajax-modal').parent().css("top","40%").css("left","46%");
$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); $('#ajax-modal').parent().addClass("resourceUploadPopup");
} $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
function regex_des() { }
if ($.trim($("#attachment_des").val()) == "") { function regex_des() {
$("#hint_message").text("附件描述不能为空"); if ($.trim($("#attachment_des").val()) == "") {
$("#hint_message").css('color','#ff0000'); $("#hint_message").text("附件描述不能为空");
return false; $("#hint_message").css('color','#ff0000');
} else { return false;
$("#hint_message").text(""); } else {
return true; $("#hint_message").text("");
} return true;
} }
function submit_revise_files(){ }
if (regex_des()) { function submit_revise_files(){
$("#upload_form").submit(); if (regex_des()) {
} $("#upload_form").submit();
} }
function closeModal(){ }
hideModal($(".uploadBoxContainer")); function closeModal(){
} hideModal($(".uploadBoxContainer"));
function disable_choose(){ }
if ($("#attachments_fields .attachment").size() >= 1) { function disable_choose(){
$("#choose_revise_attach").attr("onclick","return false;").addClass(disable_link); if ($("#attachments_fields .attachment").size() >= 1) {
} $("#choose_revise_attach").attr("onclick","return false;").addClass(disable_link);
} }
</script> }
</script>

277
app/views/student_work/_show.html.erb
Unescape View File

@ -1,139 +1,140 @@
<div class="show_hwork_arrow"></div> <div class="show_hwork_arrow"></div>
<div class="showHwork"> <div class="showHwork">
<% is_teacher = User.current.allowed_to?(:as_teacher, @homework.course) || User.current.admin? %> <% is_teacher = User.current.allowed_to?(:as_teacher, @homework.course) || User.current.admin? %>
<% if @homework.homework_type != 3 %> <% if @homework.homework_type != 3 %>
<% is_my_work = work.user == User.current%> <% is_my_work = work.user == User.current%>
<% else %> <% else %>
<% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %> <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
<% is_my_work = pro && pro.student_work_id == work.id%> <% is_my_work = pro && pro.student_work_id == work.id%>
<% end %> <% end %>
<ul> <ul>
<li class="fl" > <li class="fl" >
<span class="tit_fb">上交时间：</span> <span class="tit_fb">上交时间：</span>
<%=format_time work.created_at %> <%=format_time work.created_at %>
</li> </li>
<% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %> <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
<!-- 我的作业 && 匿评作业 && 未开启匿评，显示编辑和删除按钮 --> <!-- 我的作业 && 匿评作业 && 未开启匿评，显示编辑和删除按钮 -->
<li class="fr" > <li class="fr" >
<%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del",:title=>"删除") %> <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del",:title=>"删除") %>
</li> </li>
<li class="fr mr5" > <li class="fr mr5" >
<%= link_to "",edit_student_work_path(work),:class => "pic_edit",:title => "修改"%> <%= link_to "",edit_student_work_path(work),:class => "pic_edit",:title => "修改"%>
</li> </li>
<% end%> <% end%>
<% if @homework.homework_detail_manual.comment_status == 3 && !is_my_work %> <% if @homework.homework_detail_manual.comment_status == 3 && !is_my_work %>
<!-- 匿评结束阶段，显示点赞按钮 --> <!-- 匿评结束阶段，显示点赞按钮 -->
<li class="fr" id="student_work_praise_<%= work.id%>"> <li class="fr" id="student_work_praise_<%= work.id%>">
<%= render :partial => 'student_work_praise' %> <%= render :partial => 'student_work_praise' %>
</li> </li>
<% end%> <% end%>
<div class="cl"></div> <div class="cl"></div>
<!--<li ><span class="tit_fb"> 参与人员：</span>程梦雯&nbsp;&nbsp;王强</li>--> <!--<li ><span class="tit_fb"> 参与人员：</span>程梦雯&nbsp;&nbsp;王强</li>-->
<% if @homework.homework_type == 3 && work.student_work_projects && (@homework.homework_detail_manual.comment_status != 2 || is_my_work || is_teacher ) %> <% if @homework.homework_type == 3 && work.student_work_projects && (@homework.homework_detail_manual.comment_status != 2 || is_my_work || is_teacher ) %>
<div class="cl"></div> <div class="cl"></div>
<li> <li>
<span class="tit_fb"> 参与人员：</span> <span class="tit_fb"> 参与人员：</span>
<%= link_to(work.user.show_name+"（组长）", user_path(work.user.id), :class => "linkBlue" )%> <%= link_to(work.user.show_name+"（组长）", user_path(work.user.id), :class => "linkBlue" )%>
<% members = work.student_work_projects.where("is_leader = 0") %> <% members = work.student_work_projects.where("is_leader = 0") %>
<% members.each do |member| if !members.empty? %> <% members.each do |member| if !members.empty? %>
、<%=link_to((User.find member.user_id).show_name, user_path(member.user.id), :class => "linkBlue" ) %> 、<%=link_to((User.find member.user_id).show_name, user_path(member.user.id), :class => "linkBlue" ) %>
<% end %> <% end %>
<% end %> <% end %>
</li> </li>
<% if @homework.homework_detail_group.base_on_project == 1 %> <% if @homework.homework_detail_group.base_on_project == 1 %>
<li> <li>
<span class="tit_fb"> 关联项目：</span> <span class="tit_fb"> 关联项目：</span>
<% if work.project.is_public || User.current.member_of?(work.project) || User.current.admin? %> <% if work.project.is_public || User.current.member_of?(work.project) || User.current.admin? %>
<%= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%> <%= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
<% else %> <% else %>
<span title ="该项目是私有的"><%=work.project.name %></span> <span title ="该项目是私有的"><%=work.project.name %></span>
<% end %> <% end %>
<%#= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%> <%#= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
<span class="ml5">(综合评分：<font class="c_red"><%=work.project.project_score.score.to_i %></font>)</span> <span class="ml5">(综合评分：<font class="c_red"><%=work.project.project_score.score.to_i %></font>)</span>
</li> </li>
<% end %> <% end %>
<% end%> <% end%>
<li > <li >
<span class="tit_fb ">内容：</span> <span class="tit_fb ">内容：</span>
<div class="showHworkP break_word"> <div class="showHworkP break_word">
<%= text_format(work.description) if work.description%> <%= text_format(work.description) if work.description%>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</li> </li>
<li > <li >
<span class="tit_fb"> 附件：</span> <span class="tit_fb"> 附件：</span>
<% com_attachments = work.attachments.where("attachtype IS NULL OR attachtype <> 7") %> <% com_attachments = work.attachments.where("attachtype IS NULL OR attachtype <> 7") %>
<% if com_attachments.empty?%> <% if com_attachments.empty?%>
<span style="color: #999999">尚未提交附件</span> <span style="color: #999999">尚未提交附件</span>
<% else%> <% else%>
<div class="fl" style="width: 90%;"> <div class="fl" style="width: 90%;">
<%= render :partial => 'work_attachments_status', :locals => {:attachments => com_attachments, :status => @homework.homework_detail_manual.comment_status} %> <%= render :partial => 'work_attachments_status', :locals => {:attachments => com_attachments, :status => @homework.homework_detail_manual.comment_status} %>
</div> </div>
<% end%> <% end%>
<div class="cl"></div> <div class="cl"></div>
</li> </li>
<li > <li >
<% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && !is_my_work)%> <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && !is_my_work)%>
<!-- 老师 || 开启匿评状态 && 不是当前用户自己的作品 --> <!-- 老师 || 开启匿评状态 && 不是当前用户自己的作品 -->
<div id="add_student_score_<%= work.id%>" class="mt10 evaluation"> <div id="add_student_score_<%= work.id%>" class="mt10 evaluation">
<%= render :partial => 'add_score',:locals => {:work => work,:score => score}%> <%= render :partial => 'add_score',:locals => {:work => work,:score => score}%>
</div> </div>
<% end%> <% end%>
<div class="cl"></div> <div class="cl"></div>
</li> </li>
</ul> </ul>
<div id="revise_attachment"> <div id="revise_attachment">
<%= render :partial => 'student_work/revise_attachment', :locals => {:work => work} %> <%= render :partial => 'student_work/revise_attachment', :locals => {:work => work} %>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<div class="ping_box fl" id="score_list_<%= work.id%>" style="<%= work.student_works_scores.empty? ? 'padding:0px;' : ''%>"> <div class="ping_box fl" id="score_list_<%= work.id%>" style="<%= work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
<%student_work_scores.each do |student_score|%> <%student_work_scores.each do |student_score|%>
<div id="work_score_<%= student_score.id%>"> <div id="work_score_<%= student_score.id%>">
<%= render :partial => 'student_work_score',:locals => {:score => student_score,:is_last => student_score == student_work_scores.last}%> <%= render :partial => 'student_work_score',:locals => {:score => student_score,:is_last => student_score == student_work_scores.last}%>
</div> </div>
<% end%> <% end%>
</div> </div>
<!---ping_box end---> <div class="cl"></div>
<a href="javascript:void(0);" class="fr linkBlue mt5 mb5" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a> <!---ping_box end--->
<div class="cl"></div> <a href="javascript:void(0);" class="linkBlue mt5 mb5" style="margin-left:auto; margin-right: auto; display:block; width: 24px;" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a>
</div> <div class="cl"></div>
<script type="text/javascript"> </div>
function show_upload(){ <script type="text/javascript">
$("#ajax-modal").html('<%= escape_javascript( render :partial => 'student_work/upload_attachment' ,:locals => {:work=>work})%>'); function show_upload(){
showModal('ajax-modal', '452px'); $("#ajax-modal").html('<%= escape_javascript( render :partial => 'student_work/upload_attachment' ,:locals => {:work=>work})%>');
$('#ajax-modal').siblings().remove(); showModal('ajax-modal', '452px');
$('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>"); $('#ajax-modal').siblings().remove();
$('#ajax-modal').parent().css("top","40%").css("left","46%"); $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
$('#ajax-modal').parent().addClass("resourceUploadPopup"); $('#ajax-modal').parent().css("top","40%").css("left","46%");
$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); $('#ajax-modal').parent().addClass("resourceUploadPopup");
} $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
function regex_des() { }
if ($.trim($("#attachment_des").val()) == "") { function regex_des() {
$("#hint_message").text("附件描述不能为空"); if ($.trim($("#attachment_des").val()) == "") {
$("#hint_message").css('color','#ff0000'); $("#hint_message").text("附件描述不能为空");
return false; $("#hint_message").css('color','#ff0000');
} else { return false;
$("#hint_message").text(""); } else {
return true; $("#hint_message").text("");
} return true;
} }
function submit_revise_files(){ }
if (regex_des()) { function submit_revise_files(){
$("#upload_form").submit(); if (regex_des()) {
} $("#upload_form").submit();
} }
function closeModal(){ }
hideModal($(".uploadBoxContainer")); function closeModal(){
} hideModal($(".uploadBoxContainer"));
function disable_choose(){ }
if ($("#attachments_fields .attachment").size() >= 1) { function disable_choose(){
$("#choose_revise_attach").attr("onclick","return false;").addClass(disable_link); if ($("#attachments_fields .attachment").size() >= 1) {
} $("#choose_revise_attach").attr("onclick","return false;").addClass(disable_link);
} }
}
</script> </script>

2
app/views/student_work/_work_attachments_status.html.erb
Unescape View File

@ -1,7 +1,7 @@
<% attachments.each_with_index do |attachment,i| %> <% attachments.each_with_index do |attachment,i| %>
<div id="attachment_<%= attachment.id%>"> <div id="attachment_<%= attachment.id%>">
<span class="fl"> <span class="fl">
<span title="<%= attachment.filename %>"> <span title="点击可下载">
<%= link_to_short_attachment attachment,:length=> 58, :class => 'hidden link_file_a fl newsBlue mw360', :download => true -%> <%= link_to_short_attachment attachment,:length=> 58, :class => 'hidden link_file_a fl newsBlue mw360', :download => true -%>
</span> </span>
</span> </span>

Write Preview
Loading…
Cancel
Save