From 879f9a0ad5d58698225cf47c8a2c55ebdde7688e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 15 Mar 2016 17:21:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E5=B7=B2=E5=8F=91=E5=B8=83=E7=9A=84?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E8=B0=83=E6=95=B4=E6=97=B6,=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E5=A4=A7?=
 =?UTF-8?q?=E4=BA=8E=E7=AD=89=E4=BA=8E=E5=8C=BF=E8=AF=84=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=94=E5=8C=BF=E8=AF=84=E8=BF=98=E6=9C=AA?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=88=99=E5=8C=BF=E8=AF=84=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=92=8C=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=83=BD=E7=9B=B8=E5=BA=94=E5=BE=80=E5=90=8E=E6=8E=A8=E8=BF=9F?=
 =?UTF-8?q?7=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 8 +++++---
 app/views/users/_user_homework_form.html.erb  | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index ba6c136bb..3532a9e4c 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -73,9 +73,11 @@ class HomeworkCommonController < ApplicationController
       if @homework.publish_time <= Date.today && homework_detail_manual.comment_status == 0
         homework_detail_manual.comment_status = 1
       end
-      homework_detail_manual.evaluation_start = params[:evaluation_start].blank? ? @homework.end_time + 7 : params[:evaluation_start]
-      homework_detail_manual.evaluation_end = params[:evaluation_end].blank? ? homework_detail_manual.evaluation_start + 7 : params[:evaluation_end]
-
+      eval_start = homework_detail_manual.evaluation_start
+      if eval_start <= @homework.end_time && homework_detail_manual.comment_status <= 1
+        homework_detail_manual.evaluation_start = @homework.end_time + 7
+        homework_detail_manual.evaluation_end = homework_detail_manual.evaluation_start + 7
+      end
       @homework.save_attachments(params[:attachments])
       render_attachment_warning_if_needed(@homework)
 
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 100ef0d37..f1f29b0da 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -159,7 +159,7 @@
     <% end %>
     <div class="calendar_div fl mr10">
       <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.end_time%>"  >
-      <% if homework.homework_detail_manual.comment_status.to_i < 3 %>
+      <% if homework.homework_detail_manual.comment_status.to_i < 2 %>
         <%= calendar_for('homework_end_time')%>
       <% end %>
     </div>