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

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
ouyangxuhua 2016-03-07 17:18:39 +08:00
parent ce187b4212 64b6af6177
commit 699e1f41a7
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/views/users/_user_programing_attr.html.erb
View File

@ -12,8 +12,8 @@
<% homework.homework_tests.each_with_index do |test, index| %> <% homework.homework_tests.each_with_index do |test, index| %>
<div class="mt10"> <div class="mt10">
<label class="fl mt5" name="inputs_label"><%=index+1 %>&nbsp;&nbsp;</label> <label class="fl mt5" name="inputs_label"><%=index+1 %>&nbsp;&nbsp;</label>
<textarea class="InputBox W320 fl mr10" placeholder="测试输入" id="textarea_input_test"><%= test.input %></textarea> <textarea class="InputBox W320 fl mr10" placeholder="测试输入" name="program[input][]"><%= test.input %></textarea>
<textarea class="InputBox W320 fl mr5" placeholder="测试输出" id="textarea_output_test"><%= test.output %></textarea> <textarea class="InputBox W320 fl mr5" placeholder="测试输出" name="program[output][]"><%= test.output %></textarea>
<a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a> <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
<% if index != 0 %> <% if index != 0 %>
<a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a> <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
@ -24,8 +24,8 @@
<% else %> <% else %>
<div class="mt10"> <div class="mt10">
<label class="fl mt5" name="inputs_label">1&nbsp;&nbsp;</label> <label class="fl mt5" name="inputs_label">1&nbsp;&nbsp;</label>
<textarea class="InputBox W320 fl mr10" placeholder="测试输入" id="textarea_input_test"></textarea> <textarea class="InputBox W320 fl mr10" placeholder="测试输入" name="program[input][]" id="textarea_input_test"></textarea>
<textarea class="InputBox W320 fl mr5" placeholder="测试输出" id="textarea_output_test"></textarea> <textarea class="InputBox W320 fl mr5" placeholder="测试输出" name="program[output][]" id="textarea_output_test"></textarea>
<a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a> <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
@ -41,8 +41,10 @@
</div><!----HomeWorkCon end--> </div><!----HomeWorkCon end-->
<script> <script>
var text = document.getElementById("textarea_input_test"); <% if !edit_mode %>
var text2 = document.getElementById("textarea_output_test"); var text = document.getElementById("textarea_input_test");
autoTextarea2(text,text2); var text2 = document.getElementById("textarea_output_test");
autoTextarea2(text2,text); autoTextarea2(text,text2);
autoTextarea2(text2,text);
<% end %>
</script> </script>

2
app/views/users/new_user_commit_homework.html.erb
View File

@ -97,7 +97,7 @@
<div class="mt10"> <div class="mt10">
<a href="javascript:void(0);" class="BlueCirBtn fl" data-homework-id="<%=@homework.id%>" data-student-work-id="<%=@student_work.id%>" id="test-program-btn">测试代码</a> <a href="javascript:void(0);" class="BlueCirBtn fl" data-homework-id="<%=@homework.id%>" data-student-work-id="<%=@student_work.id%>" id="test-program-btn">测试代码</a>
<% if @is_test %> <% if @is_test %>
<%=link_to '返 回',course_path(@course),:class=>'fr mt6' %> <%=link_to '返 回',homework_common_index_path(:course => @course.id),:class=>'fr mt6' %>
<% else @is_test %> <% else @is_test %>
<a href="javascript:void(0);" class="BlueCirBtn fr" id="commit-program-work-btn">提交代码</a> <a href="javascript:void(0);" class="BlueCirBtn fr" id="commit-program-work-btn">提交代码</a>
<% end %> <% end %>

24
public/javascripts/homework.js
View File

@ -127,7 +127,15 @@ $(function(){
$("a.CloseBtn").on('click', function(){ $("a.CloseBtn").on('click', function(){
$("#BluePopupBox" ).dialog("close"); $("#BluePopupBox" ).dialog("close");
}); });
$('#textarea_input_test').focus(); var inputs = document.getElementsByName("program[input][]");
var outputs = document.getElementsByName("program[output][]");
if (inputs.length == outputs.length) {
for (var i=0; i<inputs.length; i++) {
autoTextarea2(inputs[i], outputs[i]);
autoTextarea2(outputs[i], inputs[i]);
}
}
$(inputs[0]).focus();
} else if($("input[name=homework_type]").val() == "2") { } else if($("input[name=homework_type]").val() == "2") {
$("#NoticePopupBox" ).dialog("close"); $("#NoticePopupBox" ).dialog("close");
$("input[name=homework_type]").val(1); $("input[name=homework_type]").val(1);
@ -168,7 +176,7 @@ $(function(){
$("#cancel_switch").on('click', function(){ $("#cancel_switch").on('click', function(){
$("#NoticePopupBox" ).dialog("close"); $("#NoticePopupBox" ).dialog("close");
}); });
$("#switch_homework_type_notice").text("您的作业类型将改为“分组作业”，并且您的编程设置将被清除。请问是否继续？"); $("#switch_homework_type_notice").text("您的作业类型将改为“编程作业”，并且您的分组设置将被清除。请问是否继续？");
} }
else { else {
$("#BluePopupBox").dialog("open"); $("#BluePopupBox").dialog("open");
@ -176,7 +184,15 @@ $(function(){
$("a.CloseBtn").on('click', function(){ $("a.CloseBtn").on('click', function(){
$("#BluePopupBox" ).dialog("close"); $("#BluePopupBox" ).dialog("close");
}); });
$('#textarea_input_test').focus(); var inputs = document.getElementsByName("program[input][]");
var outputs = document.getElementsByName("program[output][]");
if (inputs.length == outputs.length) {
for (var i=0; i<inputs.length; i++) {
autoTextarea2(inputs[i], outputs[i]);
autoTextarea2(outputs[i], inputs[i]);
}
}
$(inputs[0]).focus();
} }
}); });
@ -280,7 +296,7 @@ $(function(){
$("#cancel_switch").on('click', function(){ $("#cancel_switch").on('click', function(){
$("#NoticePopupBox" ).dialog("close"); $("#NoticePopupBox" ).dialog("close");
}); });
$("#switch_homework_type_notice").text("您的作业类型将改为“编程作业”，并且您的分组设置将被清除。请问是否继续？"); $("#switch_homework_type_notice").text("您的作业类型将改为“分组作业”，并且您的编程设置将被清除。请问是否继续？");
} }
else { else {
$("#GroupPopupBox").dialog("open"); $("#GroupPopupBox").dialog("open");