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

app/views/games/_exec_results.html.erb

@@ -25,6 +25,8 @@
         <span class="icon-fail fl mr5"><!= i+1 !></span>
         <p class="fl">错误结果！</p>
         <a href="/myshixuns/<%= @myshixun.id %>/games/<%= @game.id %>/outputs_show?game_output_id=<!= results[i][1] !>" class="fr mr10" data-remote="true">详情</a>
+        <div class="cl"></div>
+        <div class="undis" style="background: #f5f9fc;padding: 10px" id="game_exception_results_<!= results[i][1] !>"></div>
       </div>
       <! } !>
       <! } !>

app/views/games/_extend_test_output.html.erb

@@ -8,7 +8,7 @@
         <a href="javascript:void(0)" onclick="hide_windows();"><i class="fa fa-compress font-14 fl color-grey"></i></a>
       </div>
     </div>
-    <div class="content-history-inner" style="height: 100px;">
+    <div class="content-history-inner" style="height: 90%;">
       <! for(var i=0;i< results.length; i++) { !>
       <! if(results[i][0] == 0){ !>
       <div class="clearfix history-success mb10">
@@ -21,6 +21,8 @@
         <span class="icon-fail fl mr5"><!= i+1 !></span>
         <p class="fl">错误结果！</p>
         <a href="/myshixuns/<%= @myshixun.id %>/games/<%= @game.id %>/outputs_show?game_output_id=<!= results[i][1] !>" class="fr mr10" data-remote="true">详情</a>
+        <div class="cl"></div>
+        <div class="undis" style="background: #f5f9fc;padding: 10px" id="extend_game_exception_results_<!= results[i][1] !>"></div>
       </div>
       <! } !>
       <! } !>

app/views/games/outputs_show.js.erb

@@ -1 +1,7 @@
 $("#game_test_output").html("<%= @game.msg %>");
+// 窄版
+$("#game_exception_results_<%= @game.id %>").html("<%= @game.msg %>");
+$("#game_exception_results_<%= @game.id %>").toggle();
+// 宽版
+$("#extend_game_exception_results_<%= @game.id %>").html("<%= @game.msg %>");
+$("#extend_game_exception_results_<%= @game.id %>").toggle();

db/schema.rb

@@ -1152,8 +1152,8 @@ ActiveRecord::Schema.define(:version => 20170331013652) do
     t.string   "name"
     t.integer  "user_id"
     t.text     "description"
-    t.date     "publish_time"
+    t.datetime "publish_time"
-    t.date     "end_time"
+    t.datetime "end_time"
     t.integer  "homework_type",     :default => 1
     t.string   "late_penalty"
     t.integer  "course_id"
@@ -1250,6 +1250,19 @@ ActiveRecord::Schema.define(:version => 20170331013652) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "ii", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "author_login"
+    t.string   "rep_identifier"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "sonar_version",  :default => 0
+    t.string   "path"
+    t.string   "branch"
+    t.string   "language"
+    t.string   "sonar_name"
+  end
+
   create_table "innodb_monitor", :id => false, :force => true do |t|
     t.integer "a"
   end
@@ -1788,14 +1801,6 @@ ActiveRecord::Schema.define(:version => 20170331013652) do
     t.integer  "show_result",       :default => 1
   end
 
-  create_table "pr_paths", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "gitlab_project_id"
-    t.string   "path"
-    t.datetime "created_at",        :null => false
-    t.datetime "updated_at",        :null => false
-  end
-
   create_table "praise_tread_caches", :force => true do |t|
     t.integer  "object_id",   :null => false
     t.string   "object_type"
@@ -2143,10 +2148,6 @@ ActiveRecord::Schema.define(:version => 20170331013652) do
     t.datetime "updated_at",                      :null => false
     t.integer  "changeset_num"
     t.integer  "status",        :default => 0
-    t.text     "ready_knowledge"
-    t.text     "task_pass"
-    t.text     "answer"
-    t.integer  "score"
     t.string   "language"
   end
 
@@ -2444,7 +2445,7 @@ ActiveRecord::Schema.define(:version => 20170331013652) do
     t.datetime "updated_at",                              :null => false
     t.integer  "author_id"
     t.integer  "status",      :limit => 1, :default => 0
-    t.integer  "position",    :limit => 1
+    t.integer  "position",    :limit => 1, :default => 0
     t.integer  "result",                   :default => 0
   end
 

public/stylesheets/css/taskstyle.css

@@ -115,7 +115,7 @@ a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:15px; margin-top:
 .tab-info{ }
 .content-editor-inner{ overflow:auto;  height:600px; }
 .tab-info-inner{ overflow:auto; height:600px;  margin:0 0 0px 15px;padding-top: 15px}
-.content-history-inner{height:135px; overflow:auto; padding:15px;}
+.content-history-inner{height:120px; overflow:auto; padding:15px;}
 .content-history{width:48.7%; min-width:500px; }
 .history-success{ width: 100%; height:40px; line-height: 40px;  background:#eef1f2; color:#666; }
 .history-fail{ width: 100%; height:40px; line-height: 40px;  background:#fdebeb; color:#e53238; }