From b65e84d166d574ce421b8f99b6fda14694ed8e84 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 18 Dec 2015 12:47:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AD=94=E6=B5=8B=E9=AA=8C=E7=9A=84?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=9C=A8=E6=B5=8B=E9=AA=8C=E6=88=AA=E6=AD=A2?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=88=B0=E4=BA=86=E5=90=8E=E7=AE=97=E4=BD=9C?=
 =?UTF-8?q?=E9=9B=B6=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb        | 10 ++--------
 app/views/exercise/_student_exercise.html.erb |  3 +++
 lib/tasks/exercise_publish.rake               | 12 ++++++++++++
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index 8fa90ea46..25b5dacec 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -16,10 +16,7 @@ class ExerciseController < ApplicationController
         exercise.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2)
       end
     end
-    end_exercises = Exercise.where("end_time <=? and exercise_status = 2",Time.now)
-    end_exercises.each do |exercise|
-      exercise.update_column('exercise_status', 3)
-    end
+
     if @course.is_public == 0 && !(User.current.member_of_course?(@course)||User.current.admin?)
       render_403
       return
@@ -46,10 +43,7 @@ class ExerciseController < ApplicationController
         exercise.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2)
       end
     end
-    end_exercises = Exercise.where("end_time <=? and exercise_status = 2",Time.now)
-    end_exercises.each do |exercise|
-      exercise.update_column('exercise_status', 3)
-    end
+
     unless User.current.member_of_course?(@course) || User.current.admin?
       render_403
       return
diff --git a/app/views/exercise/_student_exercise.html.erb b/app/views/exercise/_student_exercise.html.erb
index bbbe9026d..3bcd6b83f 100644
--- a/app/views/exercise/_student_exercise.html.erb
+++ b/app/views/exercise/_student_exercise.html.erb
@@ -75,6 +75,9 @@
       <li class="hworkList130 c_grey student_work_<%= exercise.id%>">
         <% if exercise.created_at%>
             <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
+            <% if @exercise.end_time <= exercise.created_at %>
+                <span class="c_red">[未答]</span>
+            <% end %>
         <% end %>
       </li>
 
diff --git a/lib/tasks/exercise_publish.rake b/lib/tasks/exercise_publish.rake
index a27c6a6fb..13ae8c484 100644
--- a/lib/tasks/exercise_publish.rake
+++ b/lib/tasks/exercise_publish.rake
@@ -14,9 +14,21 @@ namespace :exercise_publish do
   end
 
   task :end => :environment do
+    include ExerciseHelper
     exercises = Exercise.where("end_time <=? and exercise_status = 2",Time.now)
     exercises.each do |exercise|
+      course = exercise.course
       exercise.update_column('exercise_status', 3)
+      course.student.each do |student|
+        if ExerciseUser.where("user_id = ? && exercise_id = ?",student.student_id,exercise.id).empty?
+          ExerciseUser.create(:user_id => student.student_id, :exercise_id => exercise.id, :start_at => exercise.end_time, :status => true,:score=>0)
+        end
+=begin
+        s_score = calculate_student_score(exercise, student.student)
+        exercise_user = ExerciseUser.where("user_id =? and exercise_id=?", student.student_id, exercise.id).first
+        exercise_user.update_attributes(:score => s_score)
+=end
+      end
     end
   end
 end