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

分组作业宽度调整

This commit is contained in:
Tim 2016-10-08 15:28:09 +08:00
parent 6bb2501ca0
commit b4036ba901
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/student_work/_evaluation_un_group_member_work.html.erb
View File

@ -8,18 +8,18 @@
<span class="fl hidden ml5" style="max-width:90px;"><%= st.user.show_name %></span> <span class="fl hidden ml5" style="max-width:90px;"><%= st.user.show_name %></span>
<span class="fl">(组长)</span> <span class="fl">(组长)</span>
</span> </span>
<span class="fl mr15 hidden student_work_<%= st.id%>" style="width:90px;"> <span class="fl hidden student_work_<%= st.id%>" style="width:90px; margin-right:3px;">
<span class="fontGrey2">学号</span>：<%= st.user.user_extensions.nil? ? "--" : st.user.user_extensions.student_id%> <span class="fontGrey2">学号</span>：<%= st.user.user_extensions.nil? ? "--" : st.user.user_extensions.student_id%>
</span> </span>
<% else %> <% else %>
<span class="fl student_work_<%= st.id%>" style="width:135px;"> <span class="fl student_work_<%= st.id%>" style="width:135px;">
<span class="fl hidden ml5" style="max-width:90px;"><%= st.user.show_name %></span> <span class="fl hidden ml5" style="max-width:90px;"><%= st.user.show_name %></span>
</span> </span>
<span class="fl student_work_<%= st.id%> mr15 hidden" style="width:90px;"> <span class="fl student_work_<%= st.id%> hidden" style="width:90px; margin-right:3px;">
<span class="fontGrey2">学号</span>：<%= st.user.user_extensions.nil? ? "--" : st.user.user_extensions.student_id%> <span class="fontGrey2">学号</span>：<%= st.user.user_extensions.nil? ? "--" : st.user.user_extensions.student_id%>
</span> </span>
<% end %> <% end %>
<div class="flex-container fl" style="width:340px;"> <div class="flex-container fl" style="width:351px;">
<div class="flex-cell"><span class="<%= score_color st.teacher_score%> ml35"><%= st.teacher_score.nil? ? "--" : format("%.1f",st.teacher_score)%></span></div> <div class="flex-cell"><span class="<%= score_color st.teacher_score%> ml35"><%= st.teacher_score.nil? ? "--" : format("%.1f",st.teacher_score)%></span></div>
<div class="flex-cell"><span class="<%= score_color st.teaching_asistant_score%> ml35"><%= st.teaching_asistant_score.nil? ? "--" : format("%.1f",st.teaching_asistant_score)%></span></div> <div class="flex-cell"><span class="<%= score_color st.teaching_asistant_score%> ml35"><%= st.teaching_asistant_score.nil? ? "--" : format("%.1f",st.teaching_asistant_score)%></span></div>
<% if @homework.anonymous_comment == 0 %> <% if @homework.anonymous_comment == 0 %>
@ -68,7 +68,7 @@
</div> </div>
</div> </div>
<% if is_expand %> <% if is_expand %>
<div class="fr" style="width:25px; color: #3b94d6; white-space:nowrap; text-align:right;" onclick = "show_student_work(<%= student_work_path(st)%>)">评分</div> <div class="fr" style="width:25px; color: #3b94d6; white-space:nowrap; text-align:right; margin-right:5px;" onclick = "show_student_work(<%= student_work_path(st)%>)">评分</div>
<% end %> <% end %>
</div> </div>
<div class="hworkTip" style="display: none; left:700px; top:20px; white-space:nowrap; right:auto;" id="work_click_<%= st.id%>"><em></em><span></span><font class="fontGrey2"><%= !st.student_work_projects.empty? ? '大作品评分即组长的评分' : '点击进行评分' %></font></div> <div class="hworkTip" style="display: none; left:700px; top:20px; white-space:nowrap; right:auto;" id="work_click_<%= st.id%>"><em></em><span></span><font class="fontGrey2"><%= !st.student_work_projects.empty? ? '大作品评分即组长的评分' : '点击进行评分' %></font></div>

10
app/views/student_work/_evaluation_un_group_work.html.erb
View File

@ -9,18 +9,18 @@
</span> </span>
</span> </span>
<% if @homework.homework_detail_group.base_on_project == 1 %> <% if @homework.homework_detail_group.base_on_project == 1 %>
<span class="ml15 fl">关联项目：</span>
<% 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? %>
<%= 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), :class => 'link-blue fr hidden', :style => "max-width:200px;", :title => "项目名称"%>
<% else %> <% else %>
<span class="fontBlue fl hidden" style="width:200px;" title="该项目是私有的"><%= student_work.project.name %></span> <span class="fontBlue fr hidden" style="max-width:200px;" title="该项目是私有的"><%= student_work.project.name %></span>
<% end %> <% end %>
<span class="fr">关联项目：</span>
<% end %> <% end %>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<div class="fl sy_p_grey"> <div class="fl sy_p_grey">
<span class="fl" style="width:296px;">提交时间：<%=format_date(student_work.commit_time) %></span> <span class="fl" style="width:285px;">提交时间：<%=format_date(student_work.commit_time) %></span>
<div class="flex-container fl" style="width:340px;"> <div class="flex-container fl" style="width:351px;">
<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.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> <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 %> <% if @homework.anonymous_comment == 0 %>