From 8c6ea885044b9758a19454166bc56bd09c620330 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 28 May 2015 12:02:26 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8T?=
 =?UTF-8?q?AB=E5=88=87=E6=8D=A2=202=E3=80=81=E4=BD=9C=E5=93=81=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E4=BD=9C=E4=B8=9A=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=203=E3=80=81=E5=88=B0=E5=A4=84Excel=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb |  2 +-
 app/helpers/application_helper.rb          | 21 +++++++++
 app/helpers/homework_common_helper.rb      | 21 ---------
 app/views/student_work/index.html.erb      | 53 ++++++++++------------
 public/javascripts/course.js               |  2 +-
 public/stylesheets/courses.css             |  2 +-
 6 files changed, 47 insertions(+), 54 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 206cf0c1b..4ef64da90 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -15,7 +15,7 @@ class StudentWorkController < ApplicationController
       format.html
       format.xls {
         send_data(homework_to_xls(@stundet_works), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@homework.name}#{l(:excel_homework_list)}(#{l(:excel_not_rated)}).xls")
+                  :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@homework.name}#{l(:excel_homework_list)}.xls")
       }
     end
   end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 571886e17..d05926979 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2270,4 +2270,25 @@ module ApplicationHelper
     tag_list = attachment_tag_list all_attachments
     tag_list
   end
+
+  #获取匿评相关连接代码
+  def homework_anonymous_comment homework
+    if homework.homework_type == 1 && homework.homework_detail_manual #匿评作业
+      if homework.student_works.count >= 2 #作业份数大于2
+        case homework.homework_detail_manual.comment_status
+          when 1
+            link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'fr mr10 work_edit'
+          when 2
+            link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'fr mr10 work_edit'
+          when 3
+            link = "<span class='fr  pr_join_span mr10' title='匿评结束'>匿评结束</span>".html_safe
+        end
+      else
+        link = "<span class='fr mr10 pr_join_span ' title='学生提交作业数大于2时才可以启动匿评'>启动匿评</span>".html_safe
+      end
+    else
+      link = "<span class='fr mr10 pr_join_span ' title='未开启匿评作业不可以启动匿评'>启动匿评</span>".html_safe
+    end
+    link
+  end
 end
diff --git a/app/helpers/homework_common_helper.rb b/app/helpers/homework_common_helper.rb
index 4b9a44c07..f90e14610 100644
--- a/app/helpers/homework_common_helper.rb
+++ b/app/helpers/homework_common_helper.rb
@@ -1,26 +1,5 @@
 # encoding: utf-8
 module HomeworkCommonHelper
-  #获取匿评相关连接代码
-  def homework_anonymous_comment homework
-    if homework.homework_type == 1 && homework.homework_detail_manual #匿评作业
-      if homework.student_works.count >= 2 #作业份数大于2
-        case homework.homework_detail_manual.comment_status
-          when 1
-            link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'fr mr10 work_edit'
-          when 2
-            link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'fr mr10 work_edit'
-          when 3
-            link = "<span class='fr  pr_join_span mr10' title='匿评结束'>匿评结束</span>".html_safe
-        end
-      else
-        link = "<span class='fr mr10 pr_join_span ' title='学生提交作业数大于2时才可以启动匿评'>启动匿评</span>".html_safe
-      end
-    else
-      link = "<span class='fr mr10 pr_join_span ' title='未开启匿评作业不可以启动匿评'>启动匿评</span>".html_safe
-    end
-    link
-  end
-
   def student_new_homework homework
     work = cur_user_works_for_homework homework
     if work.nil?
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 2e96635fe..b904e3b68 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -22,8 +22,8 @@
 <div id="contentbox">
   <div id="tb_" class="hwork_tb_">
     <ul>
-      <li id="tb_1" class="hwork_hovertab"  onclick="x:HoverLi(1);">全部作品</li>
-      <li id="tb_2" class="hwork_normaltab" onclick="i:HoverLi(2);">作业信息</li>
+      <li id="tb_1" class="hwork_hovertab"  onclick="course_setting(1)">全部作品</li>
+      <li id="tb_2" class="hwork_normaltab" onclick="course_setting(2)">作业信息</li>
     </ul>
   </div>
 <div class="cl"></div>
@@ -97,43 +97,36 @@
 
   <div class="undis" id="tbc_02">
     <div class="problem_main mt10">
-      <a class="problem_pic fl"><img src="images/courses/pic_01.jpg" width="42" height="42" /></a>
+      <%= link_to(image_tag(url_to_avatar(@homework.user), :width => "42", :height => "42"), user_path(@homework.user), :class => "problem_pic fl") %>
       <div class="problem_txt fl mt5">
-        <h4 class="r_txt_tit mb5">  请以下同学重新提交作业ppt，只要更新附件，不要删除作否则否则否则评分就丢了</h4>
-        <a class="talk_edit fr  mt3">编辑</a>
-        <span class="nolink_btn fr mr5">开启匿评</span>
+        <h4 class="r_txt_tit mb5">
+            <%= @homework.name%>
+        </h4>
+        <%= homework_anonymous_comment(@homework)%>
+        <%= link_to(l(:button_edit),edit_homework_common_path(@homework), :class => "fr mr10 work_edit") %>
 
         <div class="cl"></div>
-        <p  id="news_description" class="news_description mt5">项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题</p>
-        <a href="javascript:void(0);" class=" c_blue"  onclick="show_more_msg02();">[展开]</a>
+        <div  id="bid_description_<%= @homework.id%>" class="mt5 upload_img">
+          <%= @homework.description.html_safe %>
+        </div>
         <div class="cl"></div>
-        <span class="fl">截止时间：2015-04-02</span>
+        <span class="fl">截止时间：<%= @homework.end_time%></span>
         <div >
-          <form name="formnow" class="fr">
-            <input class="c_red " name="dd" type="text" style="border:0;" size="1" > 天
-            <input class="c_red " name="hh" type="text" style="border:0;" size="1"> 小时
-            <input class="c_red " name="mm" type="text" style="border:0;" size="1"> 分
-            <input class="c_red " name="ss" type="text" style="border:0;" size="1"> 秒
-          </form>
-          <p class="fr">作业提交还剩：</p>
+          <% if betweentime(@homework.end_time) < 0 %>
+            <span class='fr mr10 c_red '>
+              <%= l(:label_commit_limit)%>
+            </span>
+          <% else %>
+              <script type="text/javascript">
+                  window.setInterval(function(){show_bid_dead_line(<%= @homework.end_time.year%>,<%= @homework.end_time.month%>,<%= @homework.end_time.day + 1%>,"bid_deadline_<%= @homework.id%>");},1000)
+              </script>
+              <div id="bid_deadline_<%= @homework.id%>">
+              </div>
+          <% end %>
         </div>
       </div> <!--problem_txt end-->
       <div class="cl"></div>
     </div><!--problem_main end-->
-
-    <div class="problem_main mt10" style="display:none;">
-      <a class="problem_pic fl"><img src="images/courses/pic_01.jpg" width="42" height="42" /></a>
-      <div class="problem_txt fl mt5">
-        <h4 class="r_txt_tit mb5">  请以下同学重新提交作业ppt，只要更新附件，不要删除作否则否则否则评分就丢了</h4>
-        <a class="talk_edit fr  mt3">编辑</a>
-        <a href="javascript:void(0);" class=" work_edit fr mr5">关闭匿评</a>
-        <div class="cl"></div>
-        <p class=" mt5">项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题个数显示问题项目问题个数显示问题项目问题个数显题个数显示问题<br /> 创建时间 ：  2014-11-26 10:19</p>
-        <span class="fr c_red">已截止，但可补交。</span>
-      </div>
-      <div class="cl"></div>
-    </div><!--课程动态 end-->
-
   </div><!---tbc_02 end-->
 
 
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 87566f795..97ee2bd93 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -792,7 +792,7 @@ function clickOK(path)
         }
     });
 }
-
+//查询
 function SearchByName(obj,url,event)
 {
     var keycode = (event.keyCode ? event.keyCode : event.which);
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index adfc4128e..cb47abb09 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -355,7 +355,7 @@ a:hover.st_add{ color:#ff8e15;}
 .upload_box{ width:430px; margin:15px auto;}
 
 a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
-.r_txt_tit{width:500px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}
+.r_txt_tit{max-width:480px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}
 
 blockquote {background: #eeeeee;padding: 10px;margin-bottom: 10px;word-break: break-all;word-wrap: break-word;}
 .respond-form{display: none;margin: auto;clear: both;}