From eeb2e4b04443a6da4e829802a1b07dd9a949daf0 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 17 Jul 2015 17:59:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A2=9E=E5=8A=A0=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E8=BE=93=E5=87=BA=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_common/index.html.erb | 26 ++++++++++++++++++++++++
 app/views/student_work/index.html.erb    | 20 +++++++++++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index db7dad9c7..2de96bca1 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -48,6 +48,32 @@
         </div>
         <div class="cl"></div>
 
+        <% if homework.homework_type == 2 && homework.homework_detail_programing%>
+            <table class="border_ce" cellpadding="0" cellspacing="0">
+              <tbody>
+              <tr class="<%= cycle("", "b_grey") %>">
+                <td  class="td_tit">
+                  输入
+                </td>
+                <td  class="td_tit">
+                  输出
+                </td>
+              </tr>
+              <% homework.homework_tests.each do |test|%>
+                  <tr class="<%= cycle("", "b_grey") %>">
+                    <td  class="td_tit">
+                      <%=test.input%>
+                    </td>
+                    <td  class="td_tit">
+                      <%= test.output%>
+                    </td>
+                  </tr>
+              <% end%>
+              </tbody>
+            </table>
+        <% end%>
+        <div class="cl"></div>
+
         <div class="mt5">
           <% unless homework.attachments.empty?%>
               <span class="tit_fb"  style="width: auto;"> 附件：</span>
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index b9148a88f..1eaee54af 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -127,13 +127,31 @@
             <%= student_anonymous_comment @homework %>
             <%= student_new_homework @homework %>
         <% end %>
-
         <div class="cl"></div>
+
         <div  id="bid_description_<%= @homework.id%>" class="mt5 upload_img">
           <%= @homework.description.html_safe %>
         </div>
+        <div class="cl"></div>
 
+        <% if @homework.homework_type == 2 && @homework.homework_detail_programing%>
+            <table class="border_ce" cellpadding="0" cellspacing="0">
+              <tbody>
+              <% @homework.homework_tests.each do |test|%>
+                  <tr class="<%= cycle("", "b_grey") %>">
+                    <td  class="td_tit">
+                      <%=test.input%>
+                    </td>
+                    <td  class="td_tit">
+                      <%= test.output%>
+                    </td>
+                  </tr>
+              <% end%>
+              </tbody>
+            </table>
+        <% end%>
         <div class="cl"></div>
+
         <div class="mt5">
           <% unless @homework.attachments.empty?%>
               <span class="tit_fb"  style="width: auto;"> 附件：</span>