Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project

app/views/challenges/_form.html.erb

@@ -33,8 +33,7 @@
   </li>
   <li class="clearfix">
     <label class="panel-form-label fl">文件路径：</label>
-    <%= f.text_field :subject, :class => "panel-form-width-690 panel-form-height-30 fl", :no_label => true, :placeholder => "进入实训后默认打开该文件" %>
+    <%= f.text_field :path, :class => "panel-form-width-690 panel-form-height-30 fl", :no_label => true, :placeholder => "进入实训后将默认打开该文件" %>
-    <span style="display: none" class="c_red ml90" id="new_shixun_name">任务名称不能为空</span>
   </li>
   <li class="clearfix">
     <label class="panel-form-label fl">预备知识：</label>

db/migrate/20170324090202_add_path_to_challenges.rb

@@ -0,0 +1,5 @@
+class AddPathToChallenges < ActiveRecord::Migration
+  def change
+    add_column :challenges, :path, :string
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20170322095511) do
+ActiveRecord::Schema.define(:version => 20170324090202) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -329,6 +329,39 @@ ActiveRecord::Schema.define(:version => 20170322095511) do
     t.datetime "updated_at",       :null => false
   end
 
+  create_table "challenge_samples", :force => true do |t|
+    t.string   "input"
+    t.string   "output"
+    t.integer  "challenge_id"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+    t.integer  "game_id"
+  end
+
+  create_table "challenge_tags", :force => true do |t|
+    t.string   "name"
+    t.integer  "challenge_id"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  create_table "challenges", :force => true do |t|
+    t.integer  "shixun_id"
+    t.string   "subject"
+    t.text     "description"
+    t.integer  "user_id"
+    t.integer  "status",          :limit => 1, :default => 0
+    t.integer  "position",        :limit => 1, :default => 1
+    t.datetime "created_at",                                  :null => false
+    t.datetime "updated_at",                                  :null => false
+    t.text     "ready_knowledge"
+    t.text     "task_pass"
+    t.text     "answer"
+    t.integer  "score"
+    t.integer  "visits",                       :default => 0
+    t.string   "path"
+  end
+
   create_table "changes", :force => true do |t|
     t.integer "changeset_id",                               :null => false
     t.string  "action",        :limit => 1, :default => "", :null => false
@@ -521,13 +554,6 @@ ActiveRecord::Schema.define(:version => 20170322095511) do
   add_index "contest_messages", ["contest_id"], :name => "index_contest_messages_on_contest_id"
   add_index "contest_messages", ["user_id"], :name => "index_contest_messages_on_user_id"
 
-  create_table "contest_notifications", :force => true do |t|
-    t.text     "title"
-    t.text     "content"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
   create_table "contestant_for_contests", :force => true do |t|
     t.integer  "student_id"
     t.integer  "contest_id"
@@ -595,37 +621,6 @@ ActiveRecord::Schema.define(:version => 20170322095511) do
   add_index "contestant_works", ["user_id"], :name => "index_contestant_works_on_user_id"
   add_index "contestant_works", ["work_id"], :name => "index_contestant_works_on_work_id"
 
-  create_table "contesting_projects", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.string   "reward"
-  end
-
-  create_table "contesting_softapplications", :force => true do |t|
-    t.integer  "softapplication_id"
-    t.integer  "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.string   "reward"
-  end
-
-  create_table "contestnotifications", :force => true do |t|
-    t.integer  "contest_id"
-    t.string   "title"
-    t.string   "summary"
-    t.text     "description"
-    t.integer  "author_id"
-    t.integer  "notificationcomments_count"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-  end
-
   create_table "contests", :force => true do |t|
     t.integer  "user_id"
     t.string   "name"
@@ -1074,6 +1069,32 @@ ActiveRecord::Schema.define(:version => 20170322095511) do
     t.datetime "created_at"
   end
 
+  create_table "game_outputs", :force => true do |t|
+    t.integer  "code"
+    t.integer  "game_id"
+    t.text     "msg"
+    t.text     "out_put"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "games", :force => true do |t|
+    t.integer  "myshixun_id"
+    t.integer  "user_id"
+    t.string   "subject"
+    t.text     "description"
+    t.integer  "stage"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "status",          :default => 0
+    t.text     "ready_knowledge"
+    t.text     "task_pass"
+    t.text     "answer"
+    t.integer  "score"
+    t.integer  "final_score",     :default => 0
+    t.string   "path"
+  end
+
   create_table "groups_users", :id => false, :force => true do |t|
     t.integer "group_id", :null => false
     t.integer "user_id",  :null => false
@@ -1138,8 +1159,8 @@ ActiveRecord::Schema.define(:version => 20170322095511) do
     t.string   "name"
     t.integer  "user_id"
     t.text     "description"
-    t.datetime "publish_time"
+    t.date     "publish_time"
-    t.datetime "end_time"
+    t.date     "end_time"
     t.integer  "homework_type",     :default => 1
     t.string   "late_penalty"
     t.integer  "course_id"
@@ -1456,23 +1477,6 @@ ActiveRecord::Schema.define(:version => 20170322095511) do
 
   add_index "memos", ["root_id"], :name => "index_memos_on_root_id"
 
-  create_table "mess", :id => false, :force => true do |t|
-    t.string   "课程名"
-    t.integer  "课程ID",                    :default => 0,  :null => false
-    t.string   "教师姓",                     :default => "", :null => false
-    t.string   "教师名",       :limit => 30, :default => "", :null => false
-    t.string   "主贴名",                     :default => "", :null => false
-    t.integer  "主贴或回帖ID",                 :default => 0,  :null => false
-    t.integer  "回帖对应主贴ID"
-    t.integer  "帖子点赞数"
-    t.integer  "主贴回复数",                   :default => 0,  :null => false
-    t.text     "主贴或回帖内容"
-    t.datetime "发帖时间",                                    :null => false
-    t.integer  "发帖或回帖用户ID",               :default => 0,  :null => false
-    t.string   "发帖或回帖用户姓",                :default => "", :null => false
-    t.string   "发帖或回帖用户名",  :limit => 30, :default => "", :null => false
-  end
-
   create_table "message_alls", :force => true do |t|
     t.integer  "user_id"
     t.integer  "message_id"
@@ -1509,6 +1513,28 @@ ActiveRecord::Schema.define(:version => 20170322095511) do
   add_index "messages", ["parent_id"], :name => "messages_parent_id"
   add_index "messages", ["root_id"], :name => "index_messages_on_root_id"
 
+  create_table "myshixun_members", :force => true do |t|
+    t.integer  "myshixun_id"
+    t.integer  "user_id"
+    t.integer  "role"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "myshixuns", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "parent_id"
+    t.boolean  "is_public",   :default => true
+    t.integer  "user_id"
+    t.integer  "gpid"
+    t.integer  "forked_from", :default => 0
+    t.integer  "visits",      :default => 0
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "status",      :default => 0
+  end
+
   create_table "news", :force => true do |t|
     t.integer  "project_id"
     t.string   "title",           :limit => 60, :default => "", :null => false
@@ -1704,6 +1730,15 @@ ActiveRecord::Schema.define(:version => 20170322095511) do
     t.integer  "allow_teacher",        :default => 0
   end
 
+  create_table "outputs", :force => true do |t|
+    t.integer  "code"
+    t.integer  "game_id"
+    t.text     "msg"
+    t.text     "out_put"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "phone_app_versions", :force => true do |t|
     t.string   "version"
     t.text     "description"
@@ -1975,6 +2010,8 @@ ActiveRecord::Schema.define(:version => 20170322095511) do
     t.string  "identifier"
     t.boolean "is_default",                  :default => false
     t.boolean "hidden",                      :default => false
+    t.integer "shixun_id"
+    t.integer "myshixun_id"
   end
 
   add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
@@ -2079,6 +2116,42 @@ ActiveRecord::Schema.define(:version => 20170322095511) do
     t.datetime "updated_at",     :null => false
   end
 
+  create_table "shixun_members", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "shixun_id"
+    t.integer  "role"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "shixun_tags", :force => true do |t|
+    t.string   "name"
+    t.integer  "challenge_id"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  create_table "shixuns", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.text     "script"
+    t.boolean  "is_public",       :default => true
+    t.integer  "parent_id"
+    t.integer  "user_id"
+    t.integer  "gpid"
+    t.integer  "forked_count",    :default => 0
+    t.integer  "visits",          :default => 0
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+    t.integer  "changeset_num"
+    t.integer  "forked_form"
+    t.integer  "status",          :default => 0
+    t.text     "ready_knowledge"
+    t.text     "task_pass"
+    t.text     "answer"
+    t.integer  "score"
+  end
+
   create_table "softapplications", :force => true do |t|
     t.string   "name"
     t.text     "description"
@@ -2316,6 +2389,15 @@ ActiveRecord::Schema.define(:version => 20170322095511) do
     t.string   "extra"
   end
 
+  create_table "test_sets", :force => true do |t|
+    t.string   "input"
+    t.text     "output"
+    t.integer  "challenge_id"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+    t.integer  "game_id"
+  end
+
   create_table "time_entries", :force => true do |t|
     t.integer  "project_id",  :null => false
     t.integer  "user_id",     :null => false
@@ -2364,7 +2446,7 @@ ActiveRecord::Schema.define(:version => 20170322095511) do
     t.datetime "updated_at",                              :null => false
     t.integer  "author_id"
     t.integer  "status",      :limit => 1, :default => 0
-    t.integer  "position",    :limit => 1, :default => 0
+    t.integer  "position",    :limit => 1
     t.integer  "result",                   :default => 0
   end