Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/models/homework_detail_programing.rb

@@ -4,6 +4,6 @@ class HomeworkDetailPrograming < ActiveRecord::Base
   belongs_to :homework_common
 
   def language_name
-    %W(C C++).at(self.language.to_i - 1)
+    %W(C C++ Python).at(self.language.to_i - 1)
   end
 end

app/views/poll/_poll.html.erb

@@ -30,13 +30,13 @@
   <% if poll.polls_status == 1 %>
       <li><%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml5"%></li>
   <% else%>
-      <li class="polls_de_grey fr ml5">编辑</li>
+      <li class="polls_de_grey fr ml5" title="未发布的问卷才能进行编辑">编辑</li>
   <% end%>
 
   <% if poll.polls_status == 2 %>
       <li><a class="polls_de fr ml5" onclick="close_poll(<%= poll.id%>);" href="javascript:">关闭</a></li>
   <% else %>
-      <li class="polls_de_grey fr ml5">关闭</li>
+      <li class="polls_de_grey fr ml5" title="发布的问卷才能进行关闭">关闭</li>
   <% end%>
 
     <% if poll.polls_status == 1%>

app/views/users/_user_programing_attr.html.erb

@@ -4,7 +4,7 @@
 <div class="HomeWorkCon">
   <div class="mt15">
     <select class="InputBox W120 language_type"  >
-      <%= options_for_select({"C语言"=>1, "C++"=>2}, (edit_mode && homework.is_program_homework?) ? homework.language : 1) %>
+      <%= options_for_select({"C语言"=>1, "C++"=>2, "Python"=>3}, (edit_mode && homework.is_program_homework?) ? homework.language : 1) %>
     </select>
   </div>
   <% if edit_mode && homework.is_program_homework? %>

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150918134804) do
+ActiveRecord::Schema.define(:version => 20150918005722) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -497,26 +497,23 @@ ActiveRecord::Schema.define(:version => 20150918134804) do
   add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
   add_index "documents", ["project_id"], :name => "documents_project_id"
 
-  create_table "dts", :primary_key => "Num", :force => true do |t|
+  create_table "dts", :force => true do |t|
-    t.string   "Defect",        :limit => 50
+    t.string   "IPLineCode"
-    t.string   "Category",      :limit => 50
-    t.string   "File"
-    t.string   "Method"
-    t.string   "Module",        :limit => 20
-    t.string   "Variable",      :limit => 50
-    t.integer  "StartLine"
-    t.integer  "IPLine"
-    t.string   "IPLineCode",    :limit => 200
-    t.string   "Judge",         :limit => 15
-    t.integer  "Review",        :limit => 1
     t.string   "Description"
-    t.text     "PreConditions", :limit => 2147483647
+    t.string   "Num"
-    t.text     "TraceInfo",     :limit => 2147483647
+    t.string   "Variable"
-    t.text     "Code",          :limit => 2147483647
+    t.string   "TraceInfo"
+    t.string   "Method"
+    t.string   "File"
+    t.string   "IPLine"
+    t.string   "Review"
+    t.string   "Category"
+    t.string   "Defect"
+    t.string   "PreConditions"
+    t.string   "StartLine"
     t.integer  "project_id"
-    t.datetime "created_at"
+    t.datetime "created_at",    :null => false
-    t.datetime "updated_at"
+    t.datetime "updated_at",    :null => false
-    t.integer  "id",                                  :null => false
   end
 
   create_table "enabled_modules", :force => true do |t|
@@ -575,7 +572,6 @@ ActiveRecord::Schema.define(:version => 20150918134804) do
     t.integer  "viewed"
     t.datetime "created_at",         :null => false
     t.datetime "updated_at",         :null => false
-    t.string   "secret_key"
   end
 
   create_table "forums", :force => true do |t|
@@ -687,7 +683,6 @@ ActiveRecord::Schema.define(:version => 20150918134804) do
     t.integer  "user_id"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
-    t.string   "mail"
   end
 
   create_table "issue_categories", :force => true do |t|
@@ -1309,9 +1304,9 @@ ActiveRecord::Schema.define(:version => 20150918134804) do
 
   create_table "student_work_tests", :force => true do |t|
     t.integer  "student_work_id"
+    t.integer  "status"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
-    t.integer  "status",          :default => 9
     t.text     "results"
     t.text     "src"
   end
@@ -1330,7 +1325,7 @@ ActiveRecord::Schema.define(:version => 20150918134804) do
     t.datetime "updated_at",                                                       :null => false
     t.integer  "late_penalty",                                  :default => 0
     t.integer  "absence_penalty",                               :default => 0
-    t.integer  "system_score"
+    t.float    "system_score",                                  :default => 0.0
     t.boolean  "is_test",                                       :default => false
   end
 
@@ -1366,8 +1361,6 @@ ActiveRecord::Schema.define(:version => 20150918134804) do
     t.string   "content"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
-    t.text     "description"
-    t.string   "subject"
   end
 
   create_table "taggings", :force => true do |t|
@@ -1559,6 +1552,7 @@ ActiveRecord::Schema.define(:version => 20150918134804) do
     t.string   "identity_url"
     t.string   "mail_notification",               :default => "",    :null => false
     t.string   "salt",              :limit => 64
+    t.integer  "gid"
   end
 
   add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"

public/javascripts/homework.js

@@ -124,7 +124,7 @@ $(function(){
         $('#textarea_input_test').focus();
     });
 
-    $("#BluePopupBox a.BlueCirBtn").live('click', function(){
+    var saveProgramAnswers = function() {
         var test_numbers = 0;
         var valid = true;  
         var input = null;
@@ -159,6 +159,12 @@ $(function(){
             $('.program-input').remove();
             var html=bt('t:program-input-list',data);
             $("input[name=homework_type]").after(html);
+        }
+        return valid;
+    }
+
+    $("#BluePopupBox a.BlueCirBtn").live('click', function(){
+        if(saveProgramAnswers()){
             if($( "#BluePopupBox" ).dialog( "isOpen" )){
                 $("#BluePopupBox").dialog( "close" );    
             }