From f5a2d6acdb4e23e4e8d21c9591303f4038ea8ba5 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 5 Aug 2016 17:33:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E4=BD=9C=E5=93=81=EF=BC=9A?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=8F=90=E4=BA=A4=E4=BD=9C=E5=93=81=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E4=BD=9C=E5=93=81=E6=A0=A1=E9=AA=8C=E6=A1=86=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=87=8D=E8=AF=95=E5=90=8E=EF=BC=8C=E4=BD=9C?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E4=B8=AD=E9=BB=98=E8=AE=A4=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=9A=84=E4=BD=9C=E5=93=81=E8=AE=B0=E5=BD=95=E5=B0=B1?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 34 ++++++++++++----------
 app/models/student_work.rb                 |  2 +-
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 3d87b007d..6ea8baa29 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -775,23 +775,27 @@ class StudentWorkController < ApplicationController
   end
 
   def retry_work
-    if @work.destroy
-      if @homework.homework_type == 3 &&  @homework.homework_detail_group.base_on_project == 1
-        pros = @work.student_work_projects.where("is_leader = 0")
-        pros.each do |pro|
-          pro.destroy
-        end
-        project = @work.student_work_projects.where("is_leader = 1").first
-        project.update_attributes(:student_work_id => nil)
-      elsif @homework.homework_type == 3 &&  @homework.homework_detail_group.base_on_project == 0
-        @work.student_work_projects.each do |pro2|
-          pro2.destroy
+    if @homework.homework_type == 3
+      if @work.destroy
+        if @homework.homework_detail_group.base_on_project == 1
+          pros = @work.student_work_projects.where("is_leader = 0")
+          pros.each do |pro|
+            pro.destroy
+          end
+          project = @work.student_work_projects.where("is_leader = 1").first
+          project.update_attributes(:student_work_id => nil)
+        elsif @homework.homework_detail_group.base_on_project == 0
+          @work.student_work_projects.each do |pro2|
+            pro2.destroy
+          end
         end
       end
-      @student_work = StudentWork.new
-      respond_to do |format|
-        format.js
-      end
+    elsif @homework.homework_type == 1
+      @work.update_attributes(:work_status => 0, :name => "#{@homework.name}的作品提交", :description => nil, :late_penalty => 0)
+    end
+    @student_work = StudentWork.new
+    respond_to do |format|
+      format.js
     end
   end
 
diff --git a/app/models/student_work.rb b/app/models/student_work.rb
index 3fcc9fb8a..3ba3ee2b2 100644
--- a/app/models/student_work.rb
+++ b/app/models/student_work.rb
@@ -1,6 +1,6 @@
 #学生提交作品表
 class StudentWork < ActiveRecord::Base
-  attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score, :project_id, :is_test, :simi_id, :simi_value
+  attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score, :project_id, :is_test, :simi_id, :simi_value, :work_status
 
   belongs_to :homework_common
   belongs_to :user