Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
commit
912a840d70
@ -0,0 +1,26 @@
|
|||||||
|
<div class="syllabus_courses_box">
|
||||||
|
<% @stundet_works.each_with_index do |student_work, i| %>
|
||||||
|
<div class="syllabus_courses_list" id="student_work_<%= student_work.id%>">
|
||||||
|
<%= render :partial => 'evaluation_un_group_work', :locals => {:student_work => student_work} %>
|
||||||
|
</div>
|
||||||
|
<div id="about_hwork_<%= student_work.id %>"></div>
|
||||||
|
|
||||||
|
<div id="group_member_work_<%= student_work.id%>" class="undis">
|
||||||
|
<%= render :partial => 'group_member_work', :locals => {:student_work => student_work} %>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
<div class="cl"></div>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
$(".icons_sy_close").live('click',function(){
|
||||||
|
$(this).parent().parent().next().next().show();
|
||||||
|
$(this).removeClass("icons_sy_close");
|
||||||
|
$(this).addClass("icons_sy_open");
|
||||||
|
});
|
||||||
|
$(".icons_sy_open").live('click',function(){
|
||||||
|
$(this).parent().parent().next().next().hide();
|
||||||
|
$(this).addClass("icons_sy_close");
|
||||||
|
$(this).removeClass("icons_sy_open");
|
||||||
|
});
|
||||||
|
</script>
|
||||||
@ -1,89 +1,73 @@
|
|||||||
<tr class="hworkListRow" id="student_work_<%= student_work.id%>">
|
<div class="sy_courses_open f14 fontGrey3">
|
||||||
<td class="none"><a name="<%= student_work.id%>"></a></td>
|
<span class="icons_sy_close fl mr5" title="点击展开/收起详情"></span>
|
||||||
<td class="hworkList40 pl5 pr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></td>
|
<span class="fl" style="width:280px;">
|
||||||
<td class="hworkPortrait pr10 float-none">
|
<span class="hidden fl" style="max-width:240px;"><%=student_work.name %></span>
|
||||||
<%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(student_work.user)) %>
|
<span class="fontGrey2 ml5 fl">
|
||||||
</td>
|
<% if student_work.work_status%>
|
||||||
|
<%=get_status student_work.work_status %>
|
||||||
|
<% end %>
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
<% if @homework.homework_detail_group.base_on_project == 1 %>
|
<% if @homework.homework_detail_group.base_on_project == 1 %>
|
||||||
<td class="hworkName float-none pr10 student_work_<%= student_work.id%> width130" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
|
<span class="ml15 fl">关联项目：</span>
|
||||||
<div>
|
|
||||||
<%= link_to student_work.user.show_name,"javascript:void(0)" ,:title => student_work.user.show_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
<% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
|
<% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
|
||||||
<td class="<%=@homework.anonymous_comment == 1 ? 'hworkPrName2' : 'hworkPrName'%> student_work_<%= student_work.id%>" title="项目名称">
|
<%= link_to student_work.project.name, project_path(student_work.project.id), :class => 'link-blue fl hidden', :style => "width:200px;", :title => "项目名称"%>
|
||||||
<%= link_to( student_work.project.name, project_path(student_work.project.id))%>
|
|
||||||
</td>
|
|
||||||
<% else %>
|
<% else %>
|
||||||
<td class="<%=@homework.anonymous_comment == 1 ? 'hworkPrName2' : 'hworkPrName'%> student_work_<%= student_work.id%>" title="该项目是私有的">
|
<span class="fontBlue fl hidden" style="width:200px;" title="该项目是私有的"><%= student_work.project.name %></span>
|
||||||
<%= student_work.project.name %>
|
|
||||||
</td>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
<% elsif @homework.homework_detail_group.base_on_project == 0 %>
|
|
||||||
<td class="hworkName float-none pr10 student_work_<%= student_work.id%> <%=@homework.anonymous_comment == 1 ? 'width280' : 'width210' %>" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
|
|
||||||
<div>
|
|
||||||
<%= link_to student_work.user.show_name,"javascript:void(0)" ,:title => student_work.user.show_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
<td class="hworkList130 c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
|
<a href="javascript:void(0)" onclick="show_student_work('<%= student_work_path(student_work)%>');" class="link-blue fr">评分</a>
|
||||||
<% if student_work.created_at && @homework.end_time%>
|
<div class="cl"></div>
|
||||||
<%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>
|
</div>
|
||||||
<% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
|
<div class="fl sy_p_grey">
|
||||||
<span class="c_red">[迟交]</span>
|
<span class="fl" style="width:296px;">提交时间：<%=format_date(student_work.commit_time) %></span>
|
||||||
<% end %>
|
<div class="flex-container fl" style="width:368px;">
|
||||||
|
<div class="flex-cell">教师：<span class="<%= score_color student_work.teacher_score%>"><%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%></span></div>
|
||||||
|
<div class="flex-cell">助教：<span class="<%= score_color student_work.teaching_asistant_score%>"><%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%></span></div>
|
||||||
|
<% if @homework.anonymous_comment == 0 %>
|
||||||
|
<div class="flex-cell">匿评：
|
||||||
|
<div class="<%= score_color student_work.student_score%> student_score_info" style="display: inline">
|
||||||
|
<% if student_work.student_score.nil? %>
|
||||||
|
<span title="该作品未被匿评">未参与</span>
|
||||||
|
<% else %>
|
||||||
|
<%= format("%.1f", student_work.student_score) %>
|
||||||
|
<% end %>
|
||||||
|
<% unless student_work.student_score.nil? %>
|
||||||
|
<span class="linkBlue">
|
||||||
|
(<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count %>)
|
||||||
|
</span>
|
||||||
|
<div class="g_infoNi none">
|
||||||
|
现共有
|
||||||
|
<span class="c_red"> <%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count %> </span>
|
||||||
|
名学生进行了匿评，平均分为
|
||||||
|
<span class="c_red"> <%= format("%.1f", student_work.student_score) %> </span>分。
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
</td>
|
<div class="flex-cell">成绩：
|
||||||
<td class="hworkList70 <%= score_color student_work.teacher_score%>">
|
<% score = student_work.work_score %>
|
||||||
<%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
|
<div class="<%= score_color score%> student_final_scor_info" style="display: inline">
|
||||||
</td>
|
<%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
|
||||||
<td class="hworkList70 <%= score_color student_work.teaching_asistant_score%>">
|
<% unless score.nil?%>
|
||||||
<%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
|
<div class="g_infoNi none width180">
|
||||||
</td>
|
作品最终评分为
|
||||||
<% if @homework.anonymous_comment == 0%>
|
<span class="c_red"> <%= student_work.final_score%> </span>分。
|
||||||
<td class="hworkList70 <%= score_color student_work.student_score%> student_score_info">
|
迟交扣分
|
||||||
<% if student_work.student_score.nil? %>
|
<span class="c_red">
|
||||||
<span title="该作品未被匿评">未参与</span>
|
<%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.late_penalty %>
|
||||||
<% else %>
|
</span>分，
|
||||||
<%=format("%.1f",student_work.student_score) %>
|
缺评扣分
|
||||||
<% end %>
|
<span class="c_red">
|
||||||
<% unless student_work.student_score.nil?%>
|
<%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.absence_penalty%>
|
||||||
<span class="linkBlue">
|
</span>分，
|
||||||
(<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count%>)
|
最终成绩为
|
||||||
</span>
|
<span class="c_red"> <%= format("%.1f",score<0 ? 0 : score)%> </span>分。
|
||||||
<div class="infoNi none">
|
|
||||||
现共有
|
|
||||||
<span class="c_red"> <%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count%> </span>
|
|
||||||
名学生进行了匿评，平均分为
|
|
||||||
<span class="c_red"> <%= format("%.1f",student_work.student_score)%> </span>分。
|
|
||||||
</div>
|
</div>
|
||||||
<% end%>
|
<% end%>
|
||||||
</td>
|
</div>
|
||||||
<% end %>
|
</div>
|
||||||
<!-- 成绩 -->
|
</div>
|
||||||
<% if student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score %>
|
</div>
|
||||||
<% score = student_work.respond_to?("score") ? student_work.score : student_work.teacher_score %>
|
<div class="cl"></div>
|
||||||
<% else %>
|
|
||||||
<% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
|
|
||||||
<% end %>
|
|
||||||
<td class="hworkList70 <%= score_color score%> student_final_scor_info">
|
|
||||||
<%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
|
|
||||||
<% unless score.nil?%>
|
|
||||||
<div class="infoNi none width180">
|
|
||||||
作品最终评分为
|
|
||||||
<span class="c_red"> <%= student_work.final_score%> </span>分。
|
|
||||||
迟交扣分
|
|
||||||
<span class="c_red">
|
|
||||||
<%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.late_penalty %>
|
|
||||||
</span>分，
|
|
||||||
缺评扣分
|
|
||||||
<span class="c_red">
|
|
||||||
<%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.absence_penalty%>
|
|
||||||
</span>分，
|
|
||||||
最终成绩为
|
|
||||||
<span class="c_red"> <%= format("%.1f",score<0 ? 0 : score)%> </span>分。
|
|
||||||
</div>
|
|
||||||
<% end%>
|
|
||||||
</td>
|
|
||||||
<td><div style="position:relative;"><div class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></div></div></td>
|
|
||||||
</tr>
|
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
<% user_ids = student_work.student_work_projects.empty? ? "(-1)" : "(" + student_work.student_work_projects.map{|st| st.user_id}.join(",") + ")" %>
|
||||||
|
<% student_work_groups = @homework.student_works.where("user_id in #{user_ids}").order("created_at asc") %>
|
||||||
|
<% anon_count = student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count %>
|
||||||
|
<% student_work_groups.each_with_index do |st, j| %>
|
||||||
|
<div class="syllabus_class_box" id="student_work_<%= st.id%>">
|
||||||
|
<%= render :partial => 'evaluation_un_group_member_work', :locals => {:st => st, :anon_count => anon_count} %>
|
||||||
|
</div>
|
||||||
|
<% if j != 0 %>
|
||||||
|
<div id="about_hwork_<%= st.id %>"></div>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
@ -0,0 +1,145 @@
|
|||||||
|
<div class="show_hwork_arrow"></div>
|
||||||
|
<div class="showHwork">
|
||||||
|
<% is_teacher = User.current.allowed_to?(:as_teacher, @homework.course) || User.current.admin? %>
|
||||||
|
<% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
|
||||||
|
<% is_my_work = pro && pro.student_work_id == work.id%>
|
||||||
|
<ul>
|
||||||
|
<li class="fl" >
|
||||||
|
<span class="tit_fb">上交时间：</span>
|
||||||
|
<%=format_time work.created_at %>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<% 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" >
|
||||||
|
<%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del",:title=>"删除") %>
|
||||||
|
</li>
|
||||||
|
<li class="fr mr5" >
|
||||||
|
<%= link_to "",edit_student_work_path(work),:class => "pic_edit",:title => "修改"%>
|
||||||
|
</li>
|
||||||
|
<% end%>
|
||||||
|
<% if @homework.homework_detail_manual.comment_status == 3 && !is_my_work %>
|
||||||
|
<!-- 匿评结束阶段，显示点赞按钮 -->
|
||||||
|
<li class="fr" id="student_work_praise_<%= work.id%>">
|
||||||
|
<%= render :partial => 'student_work_praise',:locals => {:work => work} %>
|
||||||
|
</li>
|
||||||
|
<% end%>
|
||||||
|
<div class="cl"></div>
|
||||||
|
|
||||||
|
<!--<li ><span class="tit_fb"> 参与人员：</span>程梦雯 王强</li>-->
|
||||||
|
|
||||||
|
<% if work.student_work_projects && (@homework.homework_detail_manual.comment_status != 2 || is_my_work || is_teacher ) %>
|
||||||
|
<div class="cl"></div>
|
||||||
|
<li>
|
||||||
|
<span class="tit_fb"> 参与人员：</span>
|
||||||
|
<%= link_to(work.user.show_name+"（组长）", user_path(work.user.id), :class => "linkBlue" )%>
|
||||||
|
<% members = work.student_work_projects.where("is_leader = 0") %>
|
||||||
|
<% members.each do |member| if !members.empty? %>
|
||||||
|
、<%=link_to((User.find member.user_id).show_name, user_path(member.user.id), :class => "linkBlue" ) %>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</li>
|
||||||
|
<% if @homework.homework_detail_group.base_on_project == 1 %>
|
||||||
|
<li>
|
||||||
|
<span class="tit_fb"> 关联项目：</span>
|
||||||
|
<% if work.project_id == 0 || work.project_id.nil? %>
|
||||||
|
<span>暂无</span>
|
||||||
|
<% elsif 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" )%>
|
||||||
|
<span class="ml5">(综合评分：<font class="c_red"><%=static_project_score(work.project.project_score).to_i %></font>)</span>
|
||||||
|
<% else %>
|
||||||
|
<span title ="该项目是私有的"><%=work.project.name %></span>
|
||||||
|
<span class="ml5">(综合评分：<font class="c_red"><%=static_project_score(work.project.project_score).to_i %></font>)</span>
|
||||||
|
<% end %>
|
||||||
|
<%#= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
|
||||||
|
</li>
|
||||||
|
<% end %>
|
||||||
|
<li >
|
||||||
|
<span class="tit_fb ">内容：</span>
|
||||||
|
<div class="showHworkP break_word upload_img" id="student_work_img_<%=work.id %>">
|
||||||
|
<%= work.description.html_safe if work.description%>
|
||||||
|
</div>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</li>
|
||||||
|
<li >
|
||||||
|
<span class="tit_fb"> 附件：</span>
|
||||||
|
<% com_attachments = work.attachments.where("attachtype IS NULL OR attachtype <> 7") %>
|
||||||
|
<% if com_attachments.empty?%>
|
||||||
|
<span style="color: #999999">尚未提交附件</span>
|
||||||
|
<% else%>
|
||||||
|
<div class="fl" style="width: 90%;">
|
||||||
|
<%= render :partial => 'work_attachments_status', :locals => {:attachments => com_attachments, :status => @homework.homework_detail_manual.comment_status} %>
|
||||||
|
</div>
|
||||||
|
<% end%>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</li>
|
||||||
|
<% end%>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
<% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && !is_my_work)%>
|
||||||
|
<!-- 老师 || 开启匿评状态 && 不是当前用户自己的作品 -->
|
||||||
|
<div id="add_student_score_<%= work.id%>" class="mt10 evaluation">
|
||||||
|
<%= render :partial => 'add_score',:locals => {:work => work,:score => score}%>
|
||||||
|
</div>
|
||||||
|
<% end%>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<div id="revise_attachment">
|
||||||
|
<%= render :partial => 'student_work/revise_attachment', :locals => {:work => work} %>
|
||||||
|
</div>
|
||||||
|
<div class="cl"></div>
|
||||||
|
|
||||||
|
<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|%>
|
||||||
|
<div id="work_score_<%= student_score.id%>">
|
||||||
|
<%= render :partial => 'student_work_score',:locals => {:score => student_score,:is_last => student_score == student_work_scores.last}%>
|
||||||
|
</div>
|
||||||
|
<% end%>
|
||||||
|
</div>
|
||||||
|
<div class="cl"></div>
|
||||||
|
<!---ping_box end--->
|
||||||
|
<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 class="cl"></div>
|
||||||
|
</div>
|
||||||
|
<script type="text/javascript">
|
||||||
|
$(function(){
|
||||||
|
showNormalImage('student_work_img_<%=work.id %>');
|
||||||
|
<% if defined?(is_focus) && is_focus.to_i == 1 %>
|
||||||
|
$("#upload_revise_attachment").click();
|
||||||
|
<% end %>
|
||||||
|
});
|
||||||
|
function show_upload(){
|
||||||
|
$("#ajax-modal").html('<%= escape_javascript( render :partial => 'student_work/upload_attachment' ,:locals => {:work=>work})%>');
|
||||||
|
showModal('ajax-modal', '452px');
|
||||||
|
$('#ajax-modal').siblings().remove();
|
||||||
|
$('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
|
||||||
|
$('#ajax-modal').parent().css("top","40%").css("left","46%");
|
||||||
|
$('#ajax-modal').parent().addClass("resourceUploadPopup");
|
||||||
|
$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
|
||||||
|
}
|
||||||
|
function regex_des() {
|
||||||
|
if ($.trim($("#attachment_des").val()) == "") {
|
||||||
|
$("#hint_message").text("附件描述不能为空");
|
||||||
|
$("#hint_message").css('color','#ff0000');
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
|
$("#hint_message").text("");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
function submit_revise_files(){
|
||||||
|
if (regex_des()) {
|
||||||
|
$("#upload_form").submit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
function closeModal(){
|
||||||
|
hideModal($(".uploadBoxContainer"));
|
||||||
|
}
|
||||||
|
function disable_choose(){
|
||||||
|
if ($("#attachments_fields .attachment").size() >= 1) {
|
||||||
|
$("#choose_revise_attach").attr("onclick","return false;").addClass(disable_link);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
Loading…
Reference in new issue