From 96420f59a89f4167c547a89eb132591e601cb80d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 4 Aug 2015 16:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb             | 22 +++++++++++++++++++
 app/helpers/homework_common_helper.rb         |  1 -
 .../_homework_detail_programing_form.html.erb | 10 ++++-----
 app/views/student_work/new.html.erb           |  4 ++--
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 165e22071..6ac3c234a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2378,4 +2378,26 @@ module ApplicationHelper
     end
     notice.html_safe
   end
+
+  def stantard_code
+    "// 这是一个C语言的样例程序
+// 功能：输入两个整数，输出两者之和
+// 测试：老师可以给出以下测试集：
+//           输入1和2，输出3
+//           输入3和4，输出7
+// 那么下面这段代码将得到满分
+
+// 注意：编程作业采用命令行传参方式
+//           程序的所有输入都通过argv传入
+//           否则您的程序将被判错
+
+#include <stdio.h> //引用必须头文件
+int main(int argc, char** argv) {
+    int a = atoi(argv[1]);  //将第一个输入转成整型
+    int b = atoi(argv[2]);  //将第二个输入转换为整型
+
+    printf(\"%d\",a+b);      //输出a+b
+    return 0;
+}".html_safe
+  end
 end
diff --git a/app/helpers/homework_common_helper.rb b/app/helpers/homework_common_helper.rb
index 59a333aad..43f815250 100644
--- a/app/helpers/homework_common_helper.rb
+++ b/app/helpers/homework_common_helper.rb
@@ -93,5 +93,4 @@ module HomeworkCommonHelper
         '未知错误'
     end
   end
-
 end
\ No newline at end of file
diff --git a/app/views/homework_common/_homework_detail_programing_form.html.erb b/app/views/homework_common/_homework_detail_programing_form.html.erb
index e5cdbb46a..b60b31d8b 100644
--- a/app/views/homework_common/_homework_detail_programing_form.html.erb
+++ b/app/views/homework_common/_homework_detail_programing_form.html.erb
@@ -78,7 +78,7 @@
 
     <li >
       <label class="label02">&nbsp;标准代码：&nbsp;</label>
-      <textarea  name="standard_code"  class=" w547 h350 mb10 fl" oninput="init_programing_test();" onpropertychange="init_programing_test()"><%= homework.homework_detail_programing.standard_code || "// 这是一个C语言的样例程序\n// 功能：输入两个整数，输出两者之和\n// 测试：老师可以给出以下测试集：\n//           输入1和2，输出3\n//           输入3和4，输出7\n// 那么下面这段代码将得到满分\n\n// 注意：编程作业采用命令行传参方式\n//           程序的所有输入都通过argv传入\n//           否则您的程序将被判错\n\n#include <stdio.h> //引用必须头文件\n\nint main(int argc, char** argv) {\n\tint a = atoi(argv[1]);  //将第一个输入转成整型\n\tint b = atoi(argv[2]);  //将第二个输入转换为整型\n\tprintf('%d',a+b);      //输出a+b\n\treturn 0;\n}"%></textarea>
+      <textarea  name="standard_code"  class=" w547 h350 mb10 fl" oninput="init_programing_test();" onpropertychange="init_programing_test()"><%= homework.homework_detail_programing.standard_code || stantard_code%></textarea>
       <div class="cl"></div>
     </li>
 
@@ -114,11 +114,11 @@
         <div>
           <li>
             <label class="label02">&nbsp;测试输入：&nbsp;</label>
-            <input type="text" class="fl h26 w190 mb10" name="input[0]" />
+            <input type="text" class="fl h26 w190 mb10" name="input[0]" value="1 2"/>
           </li>
           <li >
             <label class=" fl f14 ml10">&nbsp;输出：&nbsp;</label>
-            <input type="text" class="fl h26 w190  mb10" name="output[0]" />
+            <input type="text" class="fl h26 w190  mb10" name="output[0]" value="3"/>
           </li>
           <li>
             <a class="icon_add ml10 " href="javascript:void(0);" title="添加测试" onclick="add_programing_test($(this).parent().parent())"></a>
@@ -130,10 +130,10 @@
         </div>
     <% end %>
     <input type="hidden" name="error_msg" id="homework_test_error_msg" value="<%= homework.homework_tests.first.error_msg if homework.homework_tests.first && homework.homework_tests.first && homework.homework_tests.first.error_msg%>">
-    <table class="border_ce" cellpadding="0" cellspacing="0" id="homework_work_test_show" style="display: <%= homework.homework_tests.first && homework.homework_tests.first && homework.homework_tests.first.error_msg ? "block" : "none"%>">
+    <table class="border_ce" cellpadding="0" cellspacing="0" id="homework_work_test_show" style="display: <%= homework.homework_tests.first && homework.homework_tests.first && homework.homework_tests.first.error_msg && !homework.homework_tests.first.error_msg.empty? ? "block" : "none"%>">
       <tbody>
       <tr class="border_t" >
-        <td  class="td_end fb c_red w60 td_board_left">if
+        <td  class="td_end fb c_red w60 td_board_left">
           错误信息:
         </td>
         <td  class="td_end wl" id="homework_work_test_desc">
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index a1f328721..6fbc00be0 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -55,9 +55,9 @@
                 &nbsp;&nbsp;&nbsp;：
               </label>
               <% if @homework.homework_type == 2%>
-                  <%= f.text_area "description", :class => "w620 hwork_txt", :placeholder => "作品描述不能为空", :onkeyup => "regexStudentWorkDescription();", :value => "// 这是一个C语言的样例程序\n// 功能：输入两个整数，输出两者之和\n// 测试：老师可以给出以下测试集：\n//           输入1和2，输出3\n//           输入3和4，输出7\n// 那么下面这段代码将得到满分\n\n// 注意：编程作业采用命令行传参方式\n//           程序的所有输入都通过argv传入\n//           否则您的程序将被判错\n\n#include <stdio.h> //引用必须头文件\n\nint main(int argc, char** argv) {\n\tint a = atoi(argv[1]);  //将第一个输入转成整型\n\tint b = atoi(argv[2]);  //将第二个输入转换为整型\n\tprintf('%d',a+b);      //输出a+b\n\treturn 0;\n}"%>
+                  <%= f.text_area "description", :class => "w620 hwork_txt h350", :placeholder => "作品描述不能为空", :onkeyup => "regexStudentWorkDescription();", :value => stantard_code%>
               <% else %>
-                  <%= f.text_area "description", :class => "w620 hwork_txt h350", :placeholder => "作品描述不能为空", :onkeyup => "regexStudentWorkDescription();"%>
+                  <%= f.text_area "description", :class => "w620 hwork_txt", :placeholder => "作品描述不能为空", :onkeyup => "regexStudentWorkDescription();"%>
               <% end%>
               <div class="cl"></div>
               <p id="student_work_description_textarea" class="c_red ml90 mb10"></p>