diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 7d1ff6426..e6e0ec087 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -596,12 +596,13 @@ class AdminController < ApplicationController
#代码测试列表
def code_work_tests
#求出所有条数
- tCount = StudentWorkTest.find_by_sql("select count(*) from code_tests").first['count(*)']
+ tCount = CodeTests.count()
#设置个空的数组 以便paginateHelper来分页
@code_work_tests = []
- @code_work_tests[tCount-1] = {}
-
+ if tCount >= 1
+ @code_work_tests[tCount-1] = {}
+ end
@code_work_tests = paginateHelper @code_work_tests,30
@page = (params['page'] || 1).to_i - 1
@@ -615,7 +616,8 @@ class AdminController < ApplicationController
if is_test[test['student_work_id']] != nil
test['is_test'] = is_test[test['student_work_id']]
else
- test['is_test'] = CodeTests.find_by_sql("select is_test from student_works where id = #{test['student_work_id']}").first['is_test']
+ test['is_test'] = StudentWork.find(test['student_work_id']).is_test
+ #test['is_test'] = CodeTests.find_by_sql("select is_test from student_works where id = #{test['student_work_id']}").first['is_test']
is_test[test['student_work_id']] = test['is_test']
end
end
diff --git a/app/views/admin/code_work_tests.html.erb b/app/views/admin/code_work_tests.html.erb
index 385f97169..cb113f1e6 100644
--- a/app/views/admin/code_work_tests.html.erb
+++ b/app/views/admin/code_work_tests.html.erb
@@ -40,7 +40,7 @@
<%=link_to(test['homework_id'], student_work_index_path(:homework => test['homework_id']))%>
'>
- <% if test['is_test'] == 0 %>
+ <% if !test['is_test'] %>
<%=link_to(test['student_work_id'], student_work_index_path(:homework => test['homework_id'],:student_work_id=>test['student_work_id']))%>
<% else %>
<%=link_to(test['student_work_id'], new_user_commit_homework_users_path(homework_id: test['homework_id'], is_test: true))%>
diff --git a/db/migrate/20160418074429_delete_other_works.rb b/db/migrate/20160418074429_delete_other_works.rb
new file mode 100644
index 000000000..54944a6ec
--- /dev/null
+++ b/db/migrate/20160418074429_delete_other_works.rb
@@ -0,0 +1,11 @@
+class DeleteOtherWorks < ActiveRecord::Migration
+ def up
+ works = StudentWork.where("homework_common_id = 3253 and user_id = 10740 and final_score = 0")
+ unless works.empty?
+ works.destroy_all
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b64e61e50..14753784a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,6 +11,10 @@
#
# It's strongly recommended to check this file into your version control system.
+
+
+
+ActiveRecord::Schema.define(:version => 20160405021915) do
ActiveRecord::Schema.define(:version => 20160419074016) do
create_table "activities", :force => true do |t|
@@ -1532,6 +1536,18 @@ ActiveRecord::Schema.define(:version => 20160419074016) do
t.string "topic_resource"
end
+ create_table "rep_statics", :force => true do |t|
+ t.integer "project_id"
+ t.integer "commits_num"
+ t.string "uname"
+ t.string "email"
+ t.integer "add"
+ t.integer "del"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ t.integer "changeset"
+ end
+
create_table "repositories", :force => true do |t|
t.integer "project_id", :default => 0, :null => false
t.string "url", :default => "", :null => false
@@ -1698,8 +1714,8 @@ ActiveRecord::Schema.define(:version => 20160419074016) do
t.integer "absence_penalty", :default => 0
t.float "system_score", :default => 0.0
t.boolean "is_test", :default => false
- t.integer "simi_id", :default => 0
- t.integer "simi_value", :default => 0
+ t.integer "simi_id"
+ t.integer "simi_value"
end
add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
@@ -1932,6 +1948,25 @@ ActiveRecord::Schema.define(:version => 20160419074016) do
add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade"
add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count"
+ create_table "user_wechats", :force => true do |t|
+ t.integer "subscribe"
+ t.string "openid"
+ t.string "nickname"
+ t.integer "sex"
+ t.string "language"
+ t.string "city"
+ t.string "province"
+ t.string "country"
+ t.string "headimgurl"
+ t.string "subscribe_time"
+ t.string "unionid"
+ t.string "remark"
+ t.integer "groupid"
+ t.integer "user_id"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
create_table "users", :force => true do |t|
t.string "login", :default => "", :null => false
t.string "hashed_password", :limit => 40, :default => "", :null => false
@@ -2008,6 +2043,14 @@ ActiveRecord::Schema.define(:version => 20160419074016) do
t.datetime "updated_at", :null => false
end
+ create_table "wechat_logs", :force => true do |t|
+ t.string "openid", :null => false
+ t.text "request_raw"
+ t.text "response_raw"
+ t.text "session_raw"
+ t.datetime "created_at", :null => false
+ end
+
create_table "wiki_content_versions", :force => true do |t|
t.integer "wiki_content_id", :null => false
t.integer "page_id", :null => false
|