From f45a9cc6fb311bbcbcc17068d87ecfa06171720b Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 30 Oct 2014 17:50:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E8=BF=9F=E4=BA=A4?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_homework_list.html.erb                  | 2 +-
 app/views/homework_attach/_homeworks_list.html.erb      | 3 +++
 app/views/homework_attach/get_batch_homeworks.js.erb    | 2 +-
 app/views/homework_attach/get_homeworks.js.erb          | 2 +-
 app/views/homework_attach/get_not_batch_homework.js.erb | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
index 4f2cfcfd9..95b805ba3 100644
--- a/app/views/bids/_homework_list.html.erb
+++ b/app/views/bids/_homework_list.html.erb
@@ -32,7 +32,7 @@
 <div class="cl"></div>
 <div class="ctt">
   <div class="dis" id="tbc_01">
-    <%= render :partial => 'homework_attach/homeworks_list', :locals => {:homeworks => @homework_list, :homework_count => @obj_count}%>
+    <%= render :partial => 'homework_attach/homeworks_list', :locals => {:homeworks => @homework_list, :homework_count => @obj_count, :bid => @bid}%>
   </div><!---未批作业结束-->
 </div>
 </div>
diff --git a/app/views/homework_attach/_homeworks_list.html.erb b/app/views/homework_attach/_homeworks_list.html.erb
index 89b864c3c..f28caa08b 100644
--- a/app/views/homework_attach/_homeworks_list.html.erb
+++ b/app/views/homework_attach/_homeworks_list.html.erb
@@ -59,6 +59,9 @@
             <a href="#" target="_blank">
               <%= l(:label_work_rating)%>
             </a>
+            <% if Time.parse(bid.deadline.to_s).strftime("%Y-%m-%d") < Time.parse(homework.created_at.to_s).strftime("%Y-%m-%d") %>
+                <span class="c_red">&nbsp;&nbsp;迟交！</span>
+            <% end %>
           </li>
         </ul>
         <div class="cl"></div>
diff --git a/app/views/homework_attach/get_batch_homeworks.js.erb b/app/views/homework_attach/get_batch_homeworks.js.erb
index 01abec99c..d85a497e3 100644
--- a/app/views/homework_attach/get_batch_homeworks.js.erb
+++ b/app/views/homework_attach/get_batch_homeworks.js.erb
@@ -1,3 +1,3 @@
-$('#tbc_01').html('<%= escape_javascript(render(:partial => 'homeworks_list', :locals => {:homeworks => @homework_list, :homework_count => @obj_count} )) %>');
+$('#tbc_01').html('<%= escape_javascript(render(:partial => 'homeworks_list', :locals => {:homeworks => @homework_list, :homework_count => @obj_count, :bid => @bid} )) %>');
 for(var i=1;i<=5;i++){$("#tb_"+i).removeClass().addClass("normaltab");}
 $("#tb_2").removeClass().addClass("hovertab");
\ No newline at end of file
diff --git a/app/views/homework_attach/get_homeworks.js.erb b/app/views/homework_attach/get_homeworks.js.erb
index 0a6637709..2632d2a2b 100644
--- a/app/views/homework_attach/get_homeworks.js.erb
+++ b/app/views/homework_attach/get_homeworks.js.erb
@@ -1,4 +1,4 @@
-$('#tbc_01').html('<%= escape_javascript(render(:partial => 'homeworks_list', :locals => {:homeworks => @homework_list, :homework_count => @obj_count} )) %>');
+$('#tbc_01').html('<%= escape_javascript(render(:partial => 'homeworks_list', :locals => {:homeworks => @homework_list, :homework_count => @obj_count, :bid => @bid} )) %>');
 for(var i=1;i<=5;i++){$("#tb_"+i).removeClass().addClass("normaltab");}
 $("#tb_3").removeClass().addClass("hovertab");
 
diff --git a/app/views/homework_attach/get_not_batch_homework.js.erb b/app/views/homework_attach/get_not_batch_homework.js.erb
index 6ce1e5d96..246569e1c 100644
--- a/app/views/homework_attach/get_not_batch_homework.js.erb
+++ b/app/views/homework_attach/get_not_batch_homework.js.erb
@@ -1,3 +1,3 @@
-$('#tbc_01').html('<%= escape_javascript(render(:partial => 'homeworks_list', :locals => {:homeworks => @homework_list, :homework_count => @obj_count} )) %>');
+$('#tbc_01').html('<%= escape_javascript(render(:partial => 'homeworks_list', :locals => {:homeworks => @homework_list, :homework_count => @obj_count, :bid => @bid} )) %>');
 for(var i=1;i<=5;i++){$("#tb_"+i).removeClass().addClass("normaltab");}
 $("#tb_1").removeClass().addClass("hovertab");
\ No newline at end of file