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

Merge branch 'develop' into szzh

Browse Source 
Conflicts:
	app/views/my/account.html.erb
szzh
huang 10 years ago
parent 3c618de2f9 9a9658baf3
commit 59bd915cf6
7 changed files with 77 additions and 55 deletions
Show Stats Download Patch File Download Diff File

2
app/controllers/courses_controller.rb
Unescape View File

@ -604,7 +604,7 @@ class CoursesController < ApplicationController
def toggleCourse def toggleCourse
@course_prefs = Course.find_by_extra(@course.extra) @course_prefs = Course.find_by_extra(@course.extra)
unless (@course_prefs.student != User.current || User.current.admin?) unless (User.current.allowed_to?(:as_teacher,@course_prefs) || User.current.admin?)
render_403 render_403
end end
end end

50
app/controllers/homework_common_controller.rb
Unescape View File

@ -18,31 +18,31 @@ class HomeworkCommonController < ApplicationController
end end
def new def new
# @homework_type = "1" @homework_type = "1"
#
# @homework = HomeworkCommon.new @homework = HomeworkCommon.new
# @homework.safe_attributes = params[:homework_common] @homework.safe_attributes = params[:homework_common]
# @homework.late_penalty = 0 @homework.late_penalty = 0
# @homework.end_time = (Time.now + 3600 * 24).strftime('%Y-%m-%d') @homework.end_time = (Time.now + 3600 * 24).strftime('%Y-%m-%d')
# @homework.publish_time = Time.now.strftime('%Y-%m-%d') @homework.publish_time = Time.now.strftime('%Y-%m-%d')
#
# if @homework_type == "1" if @homework_type == "1"
# #匿评作业相关属性 #匿评作业相关属性
# @homework_detail_manual = HomeworkDetailManual.new @homework_detail_manual = HomeworkDetailManual.new
# @homework_detail_manual.ta_proportion = 0.6 @homework_detail_manual.ta_proportion = 0.6
# @homework_detail_manual.absence_penalty = 0 @homework_detail_manual.absence_penalty = 0
# @homework_detail_manual.evaluation_num = 3 @homework_detail_manual.evaluation_num = 3
# @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d') @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
# @homework_detail_manual.evaluation_end = (Time.now + 3600 * 24).strftime('%Y-%m-%d') @homework_detail_manual.evaluation_end = (Time.now + 3600 * 24).strftime('%Y-%m-%d')
# @homework.homework_detail_manual = @homework_detail_manual @homework.homework_detail_manual = @homework_detail_manual
# elsif @homework_type == "2" elsif @homework_type == "2"
# #编程作业相关属性 #编程作业相关属性
# @homework_detail_programing = HomeworkDetailPrograming.new @homework_detail_programing = HomeworkDetailPrograming.new
# @homework.homework_detail_programing = @homework_detail_programing @homework.homework_detail_programing = @homework_detail_programing
# end end
# respond_to do |format| respond_to do |format|
# format.html format.html
# end end
end end
#新建作业下一步 #新建作业下一步

4
app/views/courses/_new_groups_name.html.erb
Unescape View File

@ -31,7 +31,7 @@
<% if @canShowCode%> <% if @canShowCode%>
<%= form_tag(updategroupname_course_path(@course,:group_id => group.id), method: 'get', remote:true, :id => 'update_group_'+group.id.to_s) do %> <%= form_tag(updategroupname_course_path(@course,:group_id => group.id), method: 'get', remote:true, :id => 'update_group_'+group.id.to_s) do %>
<span id="edit_group_<%= group.id %>" style="display:none; vertical-align: middle;" class=" f_l"> <span id="edit_group_<%= group.id %>" style="display:none; vertical-align: middle;" class=" f_l">
<input type="text" id="group_name_<%= group.id%>" name="group_name" size="20" class="isTxt w90 f_l" maxlength="100" /> <input type="text" id="group_name_<%= group.id%>" name="group_name" size="20" class="isTxt w90 f_l" maxlength="20" />
<input type="button" class="submit f_l" onclick="edit_group('group_name_<%= group.id%>','<%= valid_ajax_course_path%>','<%= @course.id%>','<%= group.id%>');"/> <input type="button" class="submit f_l" onclick="edit_group('group_name_<%= group.id%>','<%= valid_ajax_course_path%>','<%= @course.id%>','<%= group.id%>');"/>
</span> </span>
<% end %> <% end %>
@ -47,7 +47,7 @@
<li > <li >
<span id="new_group_name" style="display:none; vertical-align: middle;" class="ml10 f_l"> <span id="new_group_name" style="display:none; vertical-align: middle;" class="ml10 f_l">
<%= form_tag( addgroups_course_path(@course), method: 'get',:remote=>true,:id => 'add_group_name') do %> <%= form_tag( addgroups_course_path(@course), method: 'get',:remote=>true,:id => 'add_group_name') do %>
<input type="text" id="group_name" name="group_name" size="20" class="isTxt w90 f_l" maxlength="100" /> <input type="text" id="group_name" name="group_name" size="20" class="isTxt w90 f_l" maxlength="20" />
<input type="button" class="submit f_l" onclick="add_group('<%= valid_ajax_course_path%>','<%= @course.id%>');"/> <input type="button" class="submit f_l" onclick="add_group('<%= valid_ajax_course_path%>','<%= @course.id%>');"/>
<% end %> <% end %>
</span> </span>

24
app/views/homework_common/index.html.erb
Unescape View File

@ -71,18 +71,30 @@
<% end%> <% end%>
</tbody> </tbody>
</table> </table>
<div class="cl"></div>
<div class="mt5">
<span class="tit_fb" style="width: auto;"> 开发语言：</span>
<div class="fl">
<% if homework.homework_detail_programing.language.to_i == 1%>
C
<% elsif homework.homework_detail_programing.language.to_i == 2%>
C++
<% end%>
</div>
</div>
<div class="cl"></div>
<% end%> <% end%>
<div class="cl"></div>
<div class="mt5"> <% unless homework.attachments.empty?%>
<% unless homework.attachments.empty?%> <div class="mt5">
<span class="tit_fb" style="width: auto;"> 附件：</span> <span class="tit_fb" style="width: auto;"> 附件：</span>
<div class="fl mb5"> <div class="fl mb5">
<%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework.attachments} %> <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework.attachments} %>
</div> </div>
<% end%> </div>
</div> <div class="cl"></div>
<div class="cl"></div> <% end%>
<div class="mt5"> <div class="mt5">
<span class="tit_fb" style="width: auto;"> 扣分标准：</span> <span class="tit_fb" style="width: auto;"> 扣分标准：</span>

28
app/views/homework_common/new.html.erb
Unescape View File

@ -1,27 +1,17 @@
<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
<%= error_messages_for 'homework_common' %>
<div class="project_r_h"> <div class="project_r_h">
<h2 class="project_h2"> <h2 class="project_h2">
<%= l(:label_course_homework_new)%> <%= l(:label_course_homework_new)%>
</h2> </h2>
</div> </div>
<div class="hwork_new" id="hwork_new"> <div class="hwork_new">
<%= form_for("new_homework_common",:url => next_step_homework_common_index_path) do |f|%> <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
<input type="hidden" name="course" value="<%= @course.id%>"> <%= hidden_field_tag "course",@course.id%>
<h3 class="c_blue f16 mb10"> <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
请选择将要发布的作业类型 <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('new_homework_common');" >提交</a>
</h3> <%#= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
<input type="radio" class="mb10 fl" name="homework_common_type" value="1" id="homework_detail_manual_radio" checked/> <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
<span class="ml5 fl">
人工评分的作业（支持匿名互评、灵活设置评分比例）
</span>
<div class="cl"></div>
<input type="radio" class="mb20 fl" name="homework_common_type" value="2" id="homework_detail_programing_radio"/>
<span class="ml5 fl">
自动评测的编程作业（支持C/C++程序的自动评分）
</span>
<div class="cl"></div>
<a href="javascript:void(0);" class=" orange_btn" onclick="$(this).parent().submit();">
下一步
</a>
<% end%> <% end%>
</div><!--hwork_new end--> </div><!--hwork_new end-->
<div class="cl"></div> <div class="cl"></div>

2
app/views/layouts/_base_header.html.erb
Unescape View File

@ -34,7 +34,7 @@
</li> </li>
<li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;"> <li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;">
<%=link_to l(:label_my_message)+'('+User.current.count_new_jour.to_s+')', <%=link_to l(:label_my_message)+'('+User.current.count_new_jour.to_s+')',
{ :controller => 'users', :action => 'user_newfeedback', id: User.current.id, host: Setting.host_user }, {:controller=> 'users', :action => 'show', id: User.current.id, host: Setting.host_user},
{:class => 'my-message'} if User.current.logged?%> {:class => 'my-message'} if User.current.logged?%>
</li> </li>
</ul> </ul>

22
app/views/student_work/index.html.erb
Unescape View File

@ -139,6 +139,14 @@
<% if @homework.homework_type == 2 && @homework.homework_detail_programing%> <% if @homework.homework_type == 2 && @homework.homework_detail_programing%>
<table class="border_ce" cellpadding="0" cellspacing="0"> <table class="border_ce" cellpadding="0" cellspacing="0">
<tbody> <tbody>
<tr class="<%= cycle("", "b_grey") %>">
<td class="td_tit">
输入
</td>
<td class="td_tit">
输出
</td>
</tr>
<% @homework.homework_tests.each do |test|%> <% @homework.homework_tests.each do |test|%>
<tr class="<%= cycle("", "b_grey") %>"> <tr class="<%= cycle("", "b_grey") %>">
<td class="td_tit"> <td class="td_tit">
@ -151,8 +159,20 @@
<% end%> <% end%>
</tbody> </tbody>
</table> </table>
<div class="cl"></div>
<div class="mt5">
<span class="tit_fb" style="width: auto;"> 开发语言：</span>
<div class="fl">
<% if @homework.homework_detail_programing.language.to_i == 1%>
C
<% elsif @homework.homework_detail_programing.language.to_i == 2%>
C++
<% end%>
</div>
</div>
<div class="cl"></div>
<% end%> <% end%>
<div class="cl"></div>
<div class="mt5"> <div class="mt5">
<% unless @homework.attachments.empty?%> <% unless @homework.attachments.empty?%>

Write Preview
Loading…
Cancel
Save