From 9ccca401f6c85664243a66235b083dde700d915d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 5 Jan 2016 16:47:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BF=E8=AF=84=E6=97=B6=E4=B9=9F=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=B3=BB=E7=BB=9F=E6=B5=8B=E8=AF=95=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_programing_work_show.html.erb            | 86 +++++++++----------
 .../student_work/_student_work_list.html.erb  | 54 +++++++++---
 2 files changed, 83 insertions(+), 57 deletions(-)

diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index f7ecb0ccf..d98a9fe0f 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -31,52 +31,50 @@
       <div class="cl"></div>
     </li>
 
-    <% if @is_teacher%>
-        <li class="mt10 fl">
-          <span class="tit_fb ">
-            测试结果：
-          </span>
-          <div class="show_hwork_p break_word">
-            <% work.student_work_tests.each_with_index do |test, index| %>
-                <div class="ProResultTop">
-                  <p class="c_blue fl">
-                    第<%= work.student_work_tests.count - index%>次测试
-                  </p>
-                  <span class="fr c_grey">
-                    <%= test.created_at.to_s(:db) %>
-                  </span>
-                  <div class="cl"></div>
+    <li class="mt10 fl">
+      <span class="tit_fb ">
+        测试结果：
+      </span>
+      <div class="show_hwork_p break_word">
+        <% work.student_work_tests.each_with_index do |test, index| %>
+            <div class="ProResultTop">
+              <p class="c_blue fl">
+                第<%= work.student_work_tests.count - index%>次测试
+              </p>
+              <span class="fr c_grey">
+                <%= test.created_at.to_s(:db) %>
+              </span>
+              <div class="cl"></div>
+            </div>
+            <% if test.status.to_i == -2 %>
+                <div class="ProResultCon ">
+                  <%= test.results.first %>
+                </div>
+            <% else %>
+                <div class="ProResultTable " >
+                  <ul class="ProResultUl " >
+                    <% test.results.each_with_index do |x, i| %>
+                        <li >
+                          <span class="w60 T_C">测试<%=i+1%></span>
+                          <% if x["status"].to_i != 0 %>
+                              <span class="w150 c_red">测试错误！</span>
+                              <span class="w60">您的输出：</span>
+                              <span class="width150"><%=x["result"]%></span>
+                              <span class="w60">正确输出：</span>
+                              <span  class="width150"><%=x["output"]%></span>
+                              <div class="cl"></div>
+                          <% else %>
+                              <span class="w150 c_green">测试正确！</span>
+                              <div class="cl"></div>
+                          <% end %>
+                        </li>
+                    <% end %>
+                  </ul>
                 </div>
-                <% if test.status.to_i == -2 %>
-                    <div class="ProResultCon ">
-                      <%= test.results.first %>
-                    </div>
-                <% else %>
-                    <div class="ProResultTable " >
-                      <ul class="ProResultUl " >
-                        <% test.results.each_with_index do |x, i| %>
-                            <li >
-                              <span class="w60 T_C">测试<%=i+1%></span>
-                              <% if x["status"].to_i != 0 %>
-                                  <span class="w150 c_red">测试错误！</span>
-                                  <span class="w60">您的输出：</span>
-                                  <span class="width150"><%=x["result"]%></span>
-                                  <span class="w60">正确输出：</span>
-                                  <span  class="width150"><%=x["output"]%></span>
-                                  <div class="cl"></div>
-                              <% else %>
-                                  <span class="w150 c_green">测试正确！</span>
-                                  <div class="cl"></div>
-                              <% end %>
-                            </li>
-                        <% end %>
-                      </ul>
-                    </div>
-                <% end %>
             <% end %>
-          </div>
-        </li>
-    <% end%>
+        <% end %>
+      </div>
+    </li>
 
     <li >
       <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && work.user != User.current )%>
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index 5598092e9..4f891f4c8 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -40,18 +40,46 @@
     <% end%>
     <div class="cl"></div>
     <div id="about_hwork_<%= student_work.id%>">
-      <% if @homework.homework_type != 3 && student_work.user == User.current && !@is_evaluation %>
-        <% if @homework.homework_type == 2%>
-            <%=render :partial => 'programing_work_show', :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %>
-        <% else %>
-            <%=render :partial => 'show' , :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %>
-        <% end %>
-      <% elsif @homework.homework_type == 3 %>
-          <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
-          <% if pro && pro.student_work_id == student_work.id && !@is_evaluation %>
-            <%=render :partial => 'show' , :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %>
-          <% end %>
-      <% end %>
     </div>
     <div class="cl"></div>
-<% end%>
\ No newline at end of file
+<% end%>
+<script type="text/javascript">
+  $(function(){
+      <% work=@homework.student_works.where("user_id = ?",User.current.id).first %>
+      <% unless @is_evaluation %>
+          <% if @homework.homework_type == 2 %>
+              $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>work,:score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
+
+              var program_name = "text/x-csrc";
+              var language = <%= @homework.language %>;
+              if (language == 1) {
+                  program_name = 'text/x-csrc';
+              } else if(language==2){
+                  program_name = 'text/x-c++src';
+              }else if(language==3){
+                  program_name = 'text/x-cython';
+              } else if(language==4){
+                  program_name = 'text/x-java';
+              }
+              var editor = CodeMirror(document.getElementById("work-code"), {
+                          mode: {name: program_name,
+                              version: 2,
+                              singleLineStringErrors: false},
+                          lineNumbers: true,
+                          indentUnit: 2,
+                          matchBrackets: true,
+                          readOnly: true,
+                          value: $("#work-src").text()
+                      });
+          <% elsif @homework.homework_type == 1 %>
+              $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work => work, :score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
+          <% elsif @homework.homework_type == 3 %>
+              <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
+              <% if pro && pro.student_work_id == work.id %>
+                  $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work => work, :score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
+              <% end %>
+          <% end %>
+          $('#score_<%= work.id%>').peSlider({range: 'min'});
+      <% end %>
+  });
+</script>
\ No newline at end of file