From 3abfaed08193575dfba93d3b23c9c8fbb00fb8e0 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 19 May 2015 10:36:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=8F=90=E4=BA=A4=E4=BD=9C?=
 =?UTF-8?q?=E5=93=81=E8=A1=A8=EF=BC=8C=E4=BB=A5=E5=8F=8A=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E7=9A=84=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/homework_common.rb                    |  1 +
 app/models/student_work.rb                       |  7 +++++++
 app/models/user.rb                               |  1 +
 .../20150519022200_create_student_works.rb       | 16 ++++++++++++++++
 db/schema.rb                                     | 15 ++++++++++++++-
 5 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 app/models/student_work.rb
 create mode 100644 db/migrate/20150519022200_create_student_works.rb

diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index 50fb07a9e..a49e2b35e 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -8,4 +8,5 @@ class HomeworkCommon < ActiveRecord::Base
   has_one :homework_detail_manual, :dependent => :destroy
   has_one :homework_detail_programing, :dependent => :destroy
   has_many :homework_tests, :dependent => :destroy
+  has_many :student_works, :dependent => :destroy
 end
diff --git a/app/models/student_work.rb b/app/models/student_work.rb
new file mode 100644
index 000000000..bc217694f
--- /dev/null
+++ b/app/models/student_work.rb
@@ -0,0 +1,7 @@
+#学生提交作品表
+class StudentWork < ActiveRecord::Base
+  attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score
+
+  belongs_to :homework_common
+  belongs_to :user
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index ac8eed0b7..660255a3d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -83,6 +83,7 @@ class User < Principal
   # end
   #作业相关关系
   has_many :homework_commons, :dependent => :destroy
+  has_many :student_works, :dependent => :destroy
   #end
 
   has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
diff --git a/db/migrate/20150519022200_create_student_works.rb b/db/migrate/20150519022200_create_student_works.rb
new file mode 100644
index 000000000..e5a94b275
--- /dev/null
+++ b/db/migrate/20150519022200_create_student_works.rb
@@ -0,0 +1,16 @@
+class CreateStudentWorks < ActiveRecord::Migration
+  def change
+    create_table :student_works do |t|
+      t.string :name
+      t.text  :description
+      t.integer :homework_common_id
+      t.integer :user_id
+      t.float :final_score, default: 0
+      t.float :teacher_score, default: 0
+      t.float :student_score, default: 0
+      t.float :teaching_asistant_score, default: 0
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index fa9de32ea..ace644072 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150519020031) do
+ActiveRecord::Schema.define(:version => 20150519022200) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -1198,6 +1198,19 @@ ActiveRecord::Schema.define(:version => 20150519020031) do
     t.integer  "project_id"
   end
 
+  create_table "student_works", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "homework_common_id"
+    t.integer  "user_id"
+    t.float    "final_score",             :default => 0.0
+    t.float    "teacher_score",           :default => 0.0
+    t.float    "student_score",           :default => 0.0
+    t.float    "teaching_asistant_score", :default => 0.0
+    t.datetime "created_at",                               :null => false
+    t.datetime "updated_at",                               :null => false
+  end
+
   create_table "students_for_courses", :force => true do |t|
     t.integer  "student_id"
     t.integer  "course_id"