合作伙伴图片 及项目管理脚本录入界面

app/views/cooperation/index.html.erb

@@ -40,6 +40,9 @@
       <li>
         <a href="http://www.xtu.edu.cn/" target="_blank"><img src="images/footer_logo/p-xtu.png" width="210" height="40" alt="湘潭大学"></a>
       </li>
+      <li>
+        <a href="http://www.copu.org.cn/" target="_blank"><img src="images/footer_logo/p-zgkyrj.png" width="210" height="40" alt="中国开源软件推进联盟"></a>
+      </li>
     </ul>
     <div class="cl"></div>
   </div>

app/views/projects/settings/_new_trainig_task.html.erb

@@ -1,3 +1,14 @@
+<div class="alert alert-orange ml15 mr15 mb10"><p>提示文字</p></div>
+<div class=" sy_new_tchbox clear ">
+  <a href="#" class="fr sy_btn_green mb10">开启实训</a>
+  <div class="cl"></div>
+  <div class="clear">
+    <textarea style="width:746px; height:300px;border: 1px solid #c8c8c8; padding:5px;margin-bottom: 5px;" placeholder="请输入脚本"></textarea>
+    <a href="javascript:void(0)"  class="fr btn btn-grey">取消</a>
+    <a href="javascript:void(0)"  class="fr btn btn-blue mr5">确定</a>
+  </div>
+
+</div>
 <h3>请输入脚本</h3>
 <p><%= link_to "开启实训", training_project_execute_project_path(@project) %></p>
 <textarea id="pull_request_comment" name="pull_request_comment" class="pullreques_reply_textarea" style="padding-left: 0px;"></textarea>

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20170219025424) do
+ActiveRecord::Schema.define(:version => 20170219062646) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -316,7 +316,6 @@ ActiveRecord::Schema.define(:version => 20170219025424) do
     t.integer "course_id"
     t.integer "org_subfield_id"
     t.integer "contest_id"
-    t.integer "training_project_id"
   end
 
   add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
@@ -359,8 +358,6 @@ ActiveRecord::Schema.define(:version => 20170219025424) do
     t.date     "commit_date"
     t.string   "scmid"
     t.integer  "user_id"
-    t.integer  "project_id"
-    t.integer  "type",          :default => 0
   end
 
   add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
@@ -745,7 +742,6 @@ ActiveRecord::Schema.define(:version => 20170219025424) do
     t.string   "invite_code"
     t.string   "qrcode"
     t.integer  "qrcode_expiretime",              :default => 0
-    t.integer  "professional_level_id", :limit => 1
     t.integer  "invite_code_halt",  :limit => 1, :default => 0
     t.integer  "os_allow",                       :default => 0
   end
@@ -822,11 +818,6 @@ ActiveRecord::Schema.define(:version => 20170219025424) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
-  create_table "disciplines", :force => true do |t|
-    t.string  "name"
-    t.integer "professional_level_id", :limit => 1
-  end
-
   create_table "discuss_demos", :force => true do |t|
     t.string   "title"
     t.text     "body"
@@ -981,7 +972,6 @@ ActiveRecord::Schema.define(:version => 20170219025424) do
     t.integer  "org_id"
     t.datetime "created_at",     :null => false
     t.datetime "updated_at",     :null => false
-    t.integer  "training_project_id"
   end
 
   add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id"
@@ -1147,10 +1137,6 @@ ActiveRecord::Schema.define(:version => 20170219025424) do
     t.datetime "updated_at",         :null => false
   end
 
-  create_table "innodb_monitor", :id => false, :force => true do |t|
-    t.integer "a"
-  end
-
   create_table "invite_lists", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1683,12 +1669,9 @@ ActiveRecord::Schema.define(:version => 20170219025424) do
   end
 
   create_table "professional_levels", :force => true do |t|
-    t.integer "level"
-  end
-
-  create_table "professions", :force => true do |t|
-    t.string  "name"
-    t.integer "discipline_id", :limit => 1
+    t.string   "level"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "project_infos", :force => true do |t|
@@ -1713,7 +1696,6 @@ ActiveRecord::Schema.define(:version => 20170219025424) do
     t.integer  "attach_num",        :default => 0
     t.datetime "commit_time"
     t.integer  "pull_request_num",  :default => 0
-    t.integer  "training_project_id", :default => -1
   end
 
   create_table "project_statuses", :force => true do |t|
@@ -1752,6 +1734,7 @@ ActiveRecord::Schema.define(:version => 20170219025424) do
     t.boolean  "hidden_repo",            :default => false, :null => false
     t.integer  "attachmenttype",         :default => 1
     t.integer  "user_id"
+    t.integer  "dts_test",               :default => 0
     t.string   "enterprise_name"
     t.integer  "organization_id"
     t.integer  "project_new_type"
@@ -1759,11 +1742,6 @@ ActiveRecord::Schema.define(:version => 20170219025424) do
     t.integer  "forked_from_project_id"
     t.integer  "forked_count"
     t.integer  "publish_resource",       :default => 0
-    t.integer  "boards_count",           :default => 0
-    t.integer  "news_count",             :default => 0
-    t.integer  "acts_count",             :default => 0
-    t.integer  "journals_count",         :default => 0
-    t.integer  "boards_reply_count",     :default => 0
     t.integer  "visits",                 :default => 0
     t.integer  "hot",                    :default => 0
     t.string   "invite_code"
@@ -1789,7 +1767,6 @@ ActiveRecord::Schema.define(:version => 20170219025424) do
     t.integer  "user_id"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
-    t.integer  "status",          :default => 0
     t.integer  "project_id"
     t.string   "title"
   end
@@ -2043,6 +2020,7 @@ ActiveRecord::Schema.define(:version => 20170219025424) do
     t.integer  "status",          :default => 9
     t.text     "results"
     t.text     "src"
+    t.integer  "uwait_time",      :default => 0
   end
 
   add_index "student_work_tests", ["student_work_id"], :name => "index_student_work_tests_on_student_work_id"
@@ -2063,8 +2041,8 @@ ActiveRecord::Schema.define(:version => 20170219025424) do
     t.integer  "absence_penalty",                               :default => 0
     t.float    "system_score",                                  :default => 0.0
     t.boolean  "is_test",                                       :default => false
-    t.integer  "simi_id"
-    t.integer  "simi_value"
+    t.integer  "simi_id",                                       :default => 0
+    t.integer  "simi_value",                                    :default => 0
     t.float    "work_score"
     t.integer  "work_status",                                   :default => 0
     t.datetime "commit_time"
@@ -2175,7 +2153,6 @@ ActiveRecord::Schema.define(:version => 20170219025424) do
     t.string   "pre_course"
     t.integer  "visits",           :default => 0
     t.integer  "des_status",       :default => 0
-    t.integer  "professional_level_id", :limit => 1
   end
 
   add_index "syllabuses", ["user_id"], :name => "index_syllabuses_on_user_id"
@@ -2256,46 +2233,6 @@ ActiveRecord::Schema.define(:version => 20170219025424) do
     t.integer "fields_bits",                 :default => 0
   end
 
-  create_table "trackers_training_projects", :id => false, :force => true do |t|
-    t.integer "training_project_id", :default => 0, :null => false
-    t.integer "tracker_id",          :default => 0, :null => false
-  end
-
-  add_index "trackers_training_projects", ["training_project_id"], :name => "projects_trackers_training_project_id"
-
-  create_table "training_projects", :force => true do |t|
-    t.string   "name",                   :limit => 30,                    :null => false
-    t.text     "description"
-    t.string   "homepage",               :limit => 60
-    t.boolean  "is_public",                            :default => true,  :null => false
-    t.integer  "parent_id"
-    t.integer  "projects_count",                       :default => 0
-    t.string   "identifier",                                              :null => false
-    t.integer  "status",                               :default => 1
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.boolean  "inherit_members",                      :default => false, :null => false
-    t.integer  "project_type"
-    t.boolean  "hidden_repo",                          :default => false, :null => false
-    t.integer  "attachmenttype",                       :default => 1
-    t.integer  "user_id"
-    t.integer  "dts_test",                             :default => 0
-    t.string   "enterprise_name"
-    t.integer  "organization_id"
-    t.integer  "project_new_type"
-    t.integer  "gpid"
-    t.integer  "forked_from_project_id"
-    t.integer  "forked_count"
-    t.integer  "publish_resource",                     :default => 0
-    t.integer  "visits",                               :default => 0
-    t.integer  "hot",                                  :default => 0
-    t.string   "invite_code"
-    t.string   "qrcode"
-    t.integer  "qrcode_expiretime",                    :default => 0
-    t.datetime "created_at",                                              :null => false
-    t.datetime "updated_at",                                              :null => false
-  end
-
   create_table "training_tasks", :force => true do |t|
     t.integer  "project_id"
     t.integer  "tracker_id"
@@ -2305,6 +2242,7 @@ ActiveRecord::Schema.define(:version => 20170219025424) do
     t.datetime "updated_at",                              :null => false
     t.integer  "author_id"
     t.integer  "status",      :limit => 1, :default => 1
+    t.integer  "position",    :limit => 1
   end
 
   create_table "user_actions", :force => true do |t|