From f262a7cc1300e5c9e3d6ebae096a6ee469c7f2a0 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 20 Nov 2015 22:05:31 +0800
Subject: [PATCH 01/21] cffd

---
 db/schema.rb | 58 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 3 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 95f79b84b..912911185 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20151120134208) do
+ActiveRecord::Schema.define(:version => 20151120115137) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -241,6 +241,58 @@ ActiveRecord::Schema.define(:version => 20151120134208) do
 
   add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
 
+  create_table "code_review_assignments", :force => true do |t|
+    t.integer "issue_id"
+    t.integer "change_id"
+    t.integer "attachment_id"
+    t.string  "file_path"
+    t.string  "rev"
+    t.string  "rev_to"
+    t.string  "action_type"
+    t.integer "changeset_id"
+  end
+
+  create_table "code_review_project_settings", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "tracker_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "updated_by"
+    t.boolean  "hide_code_review_tab",     :default => false
+    t.integer  "auto_relation",            :default => 1
+    t.integer  "assignment_tracker_id"
+    t.text     "auto_assign"
+    t.integer  "lock_version",             :default => 0,     :null => false
+    t.boolean  "tracker_in_review_dialog", :default => false
+  end
+
+  create_table "code_review_user_settings", :force => true do |t|
+    t.integer  "user_id",           :default => 0, :null => false
+    t.integer  "mail_notification", :default => 0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "code_reviews", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "change_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "line"
+    t.integer  "updated_by_id"
+    t.integer  "lock_version",        :default => 0, :null => false
+    t.integer  "status_changed_from"
+    t.integer  "status_changed_to"
+    t.integer  "issue_id"
+    t.string   "action_type"
+    t.string   "file_path"
+    t.string   "rev"
+    t.string   "rev_to"
+    t.integer  "attachment_id"
+    t.integer  "file_count",          :default => 0, :null => false
+    t.boolean  "diff_all"
+  end
+
   create_table "comments", :force => true do |t|
     t.string   "commented_type", :limit => 30, :default => "", :null => false
     t.integer  "commented_id",                 :default => 0,  :null => false
@@ -539,7 +591,7 @@ ActiveRecord::Schema.define(:version => 20151120134208) do
   end
 
   create_table "exercise_questions", :force => true do |t|
-    t.text     "question_title"
+    t.string   "question_title"
     t.integer  "question_type"
     t.integer  "question_number"
     t.integer  "exercise_id"
@@ -568,7 +620,7 @@ ActiveRecord::Schema.define(:version => 20151120134208) do
   end
 
   create_table "exercises", :force => true do |t|
-    t.text     "exercise_name"
+    t.string   "exercise_name"
     t.text     "exercise_description"
     t.integer  "course_id"
     t.integer  "exercise_status"

From e89cb99743e1d8fa8984aa68474ac68964b103b3 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 24 Nov 2015 16:20:29 +0800
Subject: [PATCH 02/21] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb            | 2 +-
 app/views/exercise/student_exercise_list.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index d53dc067c..1598030a2 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -328,7 +328,7 @@ class ExerciseController < ApplicationController
   def student_exercise_list
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
     @exercise = Exercise.find params[:id]
-    @all_exercises = @course.exercises.order("created_at desc")
+    @all_exercises = @course.exercises.where("exercise_status > 1").order("created_at desc")
     @exercise_count = @exercise.exercise_users.where('score is not NULL').count
     if @is_teacher || (!@exercise.exercise_users.where(:user_id => User.current.id).empty? && Time.parse(@exercise.end_time.to_s).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S"))
       @exercise_users_list = @exercise.exercise_users.where('score is not NULL')
diff --git a/app/views/exercise/student_exercise_list.html.erb b/app/views/exercise/student_exercise_list.html.erb
index 8653836ca..2e51d61af 100644
--- a/app/views/exercise/student_exercise_list.html.erb
+++ b/app/views/exercise/student_exercise_list.html.erb
@@ -73,7 +73,7 @@
             <ul>
               <% @all_exercises.each_with_index do |exercise,index |%>
                   <li class="pr10">
-                    <%= link_to "作业#{@all_exercises.count - index}：#{exercise.exercise_name}",''%>
+                    <%= link_to "测验#{@all_exercises.count - index}：#{exercise.exercise_name}",student_exercise_list_exercise_path(exercise.id,:course_id => @course.id)%>
                     <%#= link_to "第#{@homework_commons.count - index}次作业",student_work_index_path(:homework => homework_common.id)%>
                   </li>
               <% end%>

From 0e7cf4b122c7df17684b1a80b8efd08227453ab2 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 24 Nov 2015 16:21:25 +0800
Subject: [PATCH 03/21] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=89=B9=E6=AC=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=B7=B2=E5=8F=91=E5=B8=83=E7=9A=84?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 9ad46cd69..3c60fcaed 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -76,7 +76,7 @@ class StudentWorkController < ApplicationController
     end
     ##################################################################################################################
     @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name] || "",params[:group]
-    @homework_commons = @course.homework_commons.order("created_at desc")
+    @homework_commons = @course.homework_commons.where("publish_time <= ?",Time.now.strftime("%Y-%m-%d")).order("created_at desc")
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
     @is_evaluation = @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status == 2 && !@is_teacher #是不是匿评
     @show_all = false

From 1ae514ca4857d7e2ad53b338731c1e01f899fb4d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 25 Nov 2015 09:38:13 +0800
Subject: [PATCH 04/21] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E7=9A=84=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=97=A5=E6=9C=9F=E5=92=8C=E6=B5=8B=E9=AA=8C=E6=97=B6?=
 =?UTF-8?q?=E9=95=BF=E5=81=9A=E6=88=90=E5=8F=AF=E9=80=89=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb        |  5 +-
 app/views/exercise/_edit_head.html.erb        | 17 +++---
 app/views/exercise/_exercise_form.html.erb    | 60 +++++++++----------
 app/views/exercise/_exercise_teacher.html.erb |  8 ++-
 app/views/exercise/_show_head.html.erb        |  9 ++-
 public/stylesheets/courses.css                |  2 +-
 6 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index 1598030a2..6fcbb0c6c 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -65,7 +65,6 @@ class ExerciseController < ApplicationController
         :end_time => "",
         :publish_time => "",
         :exercise_description => "",
-        :show_result => "",
         :show_result => 1
     }
     @exercise = Exercise.create option
@@ -104,10 +103,10 @@ class ExerciseController < ApplicationController
   def update
     @exercise.exercise_name = params[:exercise][:exercise_name]
     @exercise.exercise_description = params[:exercise][:exercise_description]
-    @exercise.time =  params[:exercise][:time]
+    @exercise.time =  params[:exercise][:time].blank? ? -1 : params[:exercise][:time]
     @exercise.end_time = params[:exercise][:end_time]
     @exercise.publish_time = params[:exercise][:publish_time]
-    @exercise.show_result = params[:exercise][:show_result]
+    @exercise.show_result = params[:exercise][:show_result].blank? ? 1 : params[:exercise][:show_result]
     if @exercise.save
       respond_to do |format|
         format.js
diff --git a/app/views/exercise/_edit_head.html.erb b/app/views/exercise/_edit_head.html.erb
index 3090cc2c5..6c357130c 100644
--- a/app/views/exercise/_edit_head.html.erb
+++ b/app/views/exercise/_edit_head.html.erb
@@ -6,18 +6,17 @@
       <%# if edit_mode %>
       <!--<label class="fl c_grey f14" style="margin-top: 4px;">发布日期(可选)：</label>-->
       <%# end %>
-      <div class="calendar_div fl mr10">
-        <input  type="text" name="exercise[publish_time]" id="exercise_publish_time" placeholder="发布时间" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d") if exercise.publish_time %>"  >
-        <%= calendar_for('exercise_publish_time')%>
-      </div>
-      <%# if edit_mode %>
-      <!--<label class="fl c_grey f14" style="margin-top: 4px;">截止日期：</label>-->
-      <%# end %>
+      <label class="fl c_grey f14" style="margin-top: 4px;">截止时间：</label>
       <div class="calendar_div fl">
-        <input  type="text" name="exercise[end_time]" id="exercise_end_time" placeholder="截止时间" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d") if exercise.end_time %>"  >
+        <input  type="text" name="exercise[end_time]" id="exercise_end_time" placeholder="截止时间" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d") if exercise.end_time %>"/>
         <%= calendar_for('exercise_end_time')%>
       </div>
-      <div class="fl ml10 f14 fontGrey2"><span class="mr5">测验时长:</span><input name="exercise[time]" id="exercise_time" type="text" class="examTime mr5" value="<%=exercise.time %>" />分钟</div>
+      <div class="fl ml15 f14 fontGrey2"><span class="mr5">测验时长:</span><input name="exercise[time]" id="exercise_time" type="text" class="examTime mr5" placeholder="不填即不限时" value="<%=exercise.time if exercise.time!= -1 %>" />分钟</div>
+      <label class="fl c_grey ml15 f14" style="margin-top: 4px;">发布时间(可选)：</label>
+      <div class="calendar_div fl">
+        <input  type="text" name="exercise[publish_time]" id="exercise_publish_time" placeholder="发布时间(可选)" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d") if !exercise.publish_time.nil? %>"/>
+        <%= calendar_for('exercise_publish_time')%>
+      </div>
       <div class="cl"></div>
       <textarea class="testDes mt10" name="exercise[exercise_description]" id="exercise_description" placeholder="发布须知：试题类型有选择和填空两种，其中选择题包括单选题和多选题。您可以在此处填写测验相关说明。" ><%=exercise.exercise_description %></textarea>
       <div class="ur_editor_footer" style="padding-top: 10px;">
diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index 1f415886f..cabd0b5e4 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -112,14 +112,10 @@
         var title = $.trim($("#exercise_name").val());
         if(title.length == 0){
             alert("测验标题不能为空");
-        } else if($.trim($("#exercise_publish_time").val()) =="") {
-            alert("发布时间不能为空");
         } else if($.trim($("#exercise_end_time").val()) =="") {
             alert("截止时间不能为空");
-        } else if($.trim($("#exercise_time").val()) =="") {
-            alert("考试时长不能为空");
-        } else if(Date.parse($("#exercise_end_time").val()) <= Date.parse($("#exercise_publish_time").val())) {
-            alert("截止时间必须大于发布时间");
+        } else if(Date.parse($("#exercise_end_time").val()) < Date.now()) {
+            alert("截止时间不能小于当前时间");
         }
         else {
             doc.parent().parent().parent().submit();
@@ -162,33 +158,35 @@
     }
 </script>
 <div class="homepageRight mt0 ml10">
-<div class="resources">
-  <!-- 头部 -->
-  <div id="polls_head_show"  style="display: none;">
-    <%= render :partial => 'show_head', :locals => {:exercise => @exercise}%>
-  </div>
-  <div id="polls_head_edit">
-    <%= render :partial => 'edit_head', :locals => {:exercise => @exercise}%>
-  </div>
-  <% current_score = get_current_score @exercise %>
-  <div class="mb5" style="display: <%= current_score == 0 ? "none" : "" %>" id="current_score_div">目前试卷总分：<span class="c_red" id="current_score"><%=current_score %>分</span></div>
-  <!-- 问题 -->
-  <div id="poll_content">
-    <%= render :partial => 'exercise_content', :locals => {:exercise => @exercise}%>
-  </div>
+  <div class="resources">
+    <!-- 头部 -->
+    <div id="polls_head_show" style="display: none;">
+      <%= render :partial => 'show_head', :locals => {:exercise => @exercise} %>
+    </div>
+    <div id="polls_head_edit">
+      <%= render :partial => 'edit_head', :locals => {:exercise => @exercise} %>
+    </div>
+    <% current_score = get_current_score @exercise %>
+    <div class="mb5" style="display: <%= current_score == 0 ? "none" : "" %>" id="current_score_div">目前试卷总分：<span class="c_red" id="current_score"><%= current_score %>
+      分</span></div>
+    <!-- 问题 -->
+    <div id="poll_content">
+      <%= render :partial => 'exercise_content', :locals => {:exercise => @exercise} %>
+    </div>
 
-  <div class="testQuestion" id="new_exercise_question">
-    <%= render :partial => 'new_question', :locals => {:exercise => @exercise} %>
-  </div><!--选项 end-->
+    <div class="testQuestion" id="new_exercise_question">
+      <%= render :partial => 'new_question', :locals => {:exercise => @exercise} %>
+    </div>
+    <!--选项 end-->
 
-  <!-- 新增问题 -->
-  <div id="new_poll_question">
-  </div>
+    <!-- 新增问题 -->
+    <div id="new_poll_question">
+    </div>
 
-  <div id="exercise_submit">
-    <%= render :partial => 'exercise_submit', :locals => {:exercise => @exercise} %>
+    <div id="exercise_submit">
+      <%= render :partial => 'exercise_submit', :locals => {:exercise => @exercise} %>
+    </div>
+    <div class="cl"></div>
+    <!--contentbox end-->
   </div>
-  <div class="cl"></div>
-  <!--contentbox end-->
-</div>
 </div><!--编辑end-->
diff --git a/app/views/exercise/_exercise_teacher.html.erb b/app/views/exercise/_exercise_teacher.html.erb
index a3f6380cf..0a96b782b 100644
--- a/app/views/exercise/_exercise_teacher.html.erb
+++ b/app/views/exercise/_exercise_teacher.html.erb
@@ -10,9 +10,13 @@
     <div class="testStatus"><!--头部显示 start-->
       <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
       <div class="fontGrey2">
-        <span class="mr130">发布时间：<%=format_time(exercise.publish_time.to_s) %></span>
+        <% unless exercise.publish_time.nil? %>
+            <span class="mr130">发布时间：<%=format_time(exercise.publish_time.to_s) %></span>
+        <% end %>
         <span class="mr130">截止时间：<%=format_time(exercise.end_time.to_s) %></span>
-        <span class="fr">测验时长：<%=exercise.time %>分钟</span>
+        <% if exercise.time != -1 %>
+            <span class="fr">测验时长：<%=exercise.time %>分钟</span>
+        <% end %>
       </div>
       <div class="testDesEdit mt5"><%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%></div>
       <div class="cl"></div>
diff --git a/app/views/exercise/_show_head.html.erb b/app/views/exercise/_show_head.html.erb
index ac7c1c162..16a572583 100644
--- a/app/views/exercise/_show_head.html.erb
+++ b/app/views/exercise/_show_head.html.erb
@@ -3,9 +3,14 @@
   <!--  <a class='ur_icon_add' title='导入' id="import_btn" onclick="importPoll();"></a> -->
   <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
   <div class="fontGrey2">
-    <span class="mr100">发布时间：<%=Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.publish_time%></span>
+    <% unless exercise.publish_time.nil? %>
+        <span class="mr100">发布时间：<%=Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.publish_time%></span>
+    <% end %>
     <span class="mr100">截止时间：<%=Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.end_time %></span>
-    <span>测验时长：<%= exercise.time %>分钟</span></div>
+    <% if exercise.time != -1 %>
+        <span>测验时长：<%= exercise.time %>分钟</span>
+    <% end %>
+  </div>
   <div class="testDesEdit mt5"><%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%></div>
   <div class="cl"></div>
   <div class="cl"></div>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 5ff34a4e1..b7a742994 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1156,7 +1156,7 @@ a:hover.btn_cancel{ color:#666;}
 .mr118 {margin-right:118px !important;}
 .questionContainer {width:698px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;}
 .questionTitle{ width:644px; height:30px; border:1px solid #cbcbcb; padding-left:5px; background:#fff;}
-.examTime {width:40px; border:1px solid #cbcbcb; outline:none; height:28px; text-align:center; padding-left:0px; }
+.examTime {width:90px; border:1px solid #cbcbcb; outline:none; height:28px; text-align:center; padding-left:0px; }
 .testStatus{width:698px; border:1px solid #cbcbcb; padding:10px; margin-bottom:10px; background:#ffffff; position:relative; color:#767676;}
 .testEdit{ background:url(images/icons.png) 0px -272px no-repeat; width:16px; height:27px; display:block;float:right; bottom:10px; right:10px; position:absolute;}
 a:hover.testEdit{ background:url(images/icons.png) -21px -272px  no-repeat;}

From ec42cd2d7fcddede22495b556e0b699575917636 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Wed, 25 Nov 2015 10:12:20 +0800
Subject: [PATCH 05/21] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/schema.rb | 3556 ++++++++++++++++++++++++++------------------------
 1 file changed, 1870 insertions(+), 1686 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 6aa6da41d..97c566feb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,1686 +1,1870 @@
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20150826061843) do
-
-  create_table "activities", :force => true do |t|
-    t.integer  "act_id",                                  :null => false
-    t.string   "act_type",                                :null => false
-    t.integer  "user_id",                                 :null => false
-    t.integer  "activity_container_id"
-    t.string   "activity_container_type", :default => ""
-    t.datetime "created_at"
-  end
-
-  add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type"
-  add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
-  add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
-
-  create_table "activity_notifies", :force => true do |t|
-    t.integer  "activity_container_id"
-    t.string   "activity_container_type"
-    t.integer  "activity_id"
-    t.string   "activity_type"
-    t.integer  "notify_to"
-    t.datetime "created_on"
-    t.integer  "is_read"
-  end
-
-  add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id"
-  add_index "activity_notifies", ["created_on"], :name => "index_an_created_on"
-  add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to"
-
-  create_table "api_keys", :force => true do |t|
-    t.string   "access_token"
-    t.datetime "expires_at"
-    t.integer  "user_id"
-    t.boolean  "active",       :default => true
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-  end
-
-  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
-  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
-
-  create_table "applied_projects", :force => true do |t|
-    t.integer "project_id", :null => false
-    t.integer "user_id",    :null => false
-  end
-
-  create_table "apply_project_masters", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "apply_type"
-    t.integer  "apply_id"
-    t.integer  "status"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "attachments", :force => true do |t|
-    t.integer  "container_id"
-    t.string   "container_type", :limit => 30
-    t.string   "filename",                     :default => "", :null => false
-    t.string   "disk_filename",                :default => "", :null => false
-    t.integer  "filesize",                     :default => 0,  :null => false
-    t.string   "content_type",                 :default => ""
-    t.string   "digest",         :limit => 40, :default => "", :null => false
-    t.integer  "downloads",                    :default => 0,  :null => false
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.datetime "created_on"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype",                   :default => 1
-    t.integer  "is_public",                    :default => 1
-    t.integer  "copy_from"
-    t.integer  "quotes"
-  end
-
-  add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
-  add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type"
-  add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on"
-
-  create_table "attachmentstypes", :force => true do |t|
-    t.integer "typeId",                 :null => false
-    t.string  "typeName", :limit => 50
-  end
-
-  create_table "auth_sources", :force => true do |t|
-    t.string  "type",              :limit => 30, :default => "",    :null => false
-    t.string  "name",              :limit => 60, :default => "",    :null => false
-    t.string  "host",              :limit => 60
-    t.integer "port"
-    t.string  "account"
-    t.string  "account_password",                :default => ""
-    t.string  "base_dn"
-    t.string  "attr_login",        :limit => 30
-    t.string  "attr_firstname",    :limit => 30
-    t.string  "attr_lastname",     :limit => 30
-    t.string  "attr_mail",         :limit => 30
-    t.boolean "onthefly_register",               :default => false, :null => false
-    t.boolean "tls",                             :default => false, :null => false
-    t.string  "filter"
-    t.integer "timeout"
-  end
-
-  add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type"
-
-  create_table "biding_projects", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "bid_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 "bids", :force => true do |t|
-    t.string   "name"
-    t.string   "budget",                                    :null => false
-    t.integer  "author_id"
-    t.date     "deadline"
-    t.text     "description"
-    t.datetime "created_on",                                :null => false
-    t.datetime "updated_on",                                :null => false
-    t.integer  "commit"
-    t.integer  "reward_type"
-    t.integer  "homework_type"
-    t.integer  "parent_id"
-    t.string   "password"
-    t.integer  "is_evaluation"
-    t.integer  "proportion",                :default => 60
-    t.integer  "comment_status",            :default => 0
-    t.integer  "evaluation_num",            :default => 3
-    t.integer  "open_anonymous_evaluation", :default => 1
-  end
-
-  create_table "boards", :force => true do |t|
-    t.integer "project_id",                      :null => false
-    t.string  "name",            :default => "", :null => false
-    t.string  "description"
-    t.integer "position",        :default => 1
-    t.integer "topics_count",    :default => 0,  :null => false
-    t.integer "messages_count",  :default => 0,  :null => false
-    t.integer "last_message_id"
-    t.integer "parent_id"
-    t.integer "course_id"
-  end
-
-  add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
-  add_index "boards", ["project_id"], :name => "boards_project_id"
-
-  create_table "bug_to_osps", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "relative_memo_id"
-    t.string   "description"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "changes", :force => true do |t|
-    t.integer "changeset_id",                               :null => false
-    t.string  "action",        :limit => 1, :default => "", :null => false
-    t.text    "path",                                       :null => false
-    t.text    "from_path"
-    t.string  "from_revision"
-    t.string  "revision"
-    t.string  "branch"
-  end
-
-  add_index "changes", ["changeset_id"], :name => "changesets_changeset_id"
-
-  create_table "changeset_parents", :id => false, :force => true do |t|
-    t.integer "changeset_id", :null => false
-    t.integer "parent_id",    :null => false
-  end
-
-  add_index "changeset_parents", ["changeset_id"], :name => "changeset_parents_changeset_ids"
-  add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids"
-
-  create_table "changesets", :force => true do |t|
-    t.integer  "repository_id", :null => false
-    t.string   "revision",      :null => false
-    t.string   "committer"
-    t.datetime "committed_on",  :null => false
-    t.text     "comments"
-    t.date     "commit_date"
-    t.string   "scmid"
-    t.integer  "user_id"
-  end
-
-  add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
-  add_index "changesets", ["repository_id", "revision"], :name => "changesets_repos_rev", :unique => true
-  add_index "changesets", ["repository_id", "scmid"], :name => "changesets_repos_scmid"
-  add_index "changesets", ["repository_id"], :name => "index_changesets_on_repository_id"
-  add_index "changesets", ["user_id"], :name => "index_changesets_on_user_id"
-
-  create_table "changesets_issues", :id => false, :force => true do |t|
-    t.integer "changeset_id", :null => false
-    t.integer "issue_id",     :null => false
-  end
-
-  add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
-
-  create_table "code_review_assignments", :force => true do |t|
-    t.integer "issue_id"
-    t.integer "change_id"
-    t.integer "attachment_id"
-    t.string  "file_path"
-    t.string  "rev"
-    t.string  "rev_to"
-    t.string  "action_type"
-    t.integer "changeset_id"
-  end
-
-  create_table "code_review_project_settings", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "tracker_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "updated_by"
-    t.boolean  "hide_code_review_tab",     :default => false
-    t.integer  "auto_relation",            :default => 1
-    t.integer  "assignment_tracker_id"
-    t.text     "auto_assign"
-    t.integer  "lock_version",             :default => 0,     :null => false
-    t.boolean  "tracker_in_review_dialog", :default => false
-  end
-
-  create_table "code_review_user_settings", :force => true do |t|
-    t.integer  "user_id",           :default => 0, :null => false
-    t.integer  "mail_notification", :default => 0, :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "code_reviews", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "change_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "line"
-    t.integer  "updated_by_id"
-    t.integer  "lock_version",        :default => 0, :null => false
-    t.integer  "status_changed_from"
-    t.integer  "status_changed_to"
-    t.integer  "issue_id"
-    t.string   "action_type"
-    t.string   "file_path"
-    t.string   "rev"
-    t.string   "rev_to"
-    t.integer  "attachment_id"
-    t.integer  "file_count",          :default => 0, :null => false
-    t.boolean  "diff_all"
-  end
-
-  create_table "comments", :force => true do |t|
-    t.string   "commented_type", :limit => 30, :default => "", :null => false
-    t.integer  "commented_id",                 :default => 0,  :null => false
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.text     "comments"
-    t.datetime "created_on",                                   :null => false
-    t.datetime "updated_on",                                   :null => false
-  end
-
-  add_index "comments", ["author_id"], :name => "index_comments_on_author_id"
-  add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type"
-
-  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 "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.string   "name"
-    t.string   "budget",      :default => ""
-    t.integer  "author_id"
-    t.date     "deadline"
-    t.string   "description"
-    t.integer  "commit"
-    t.string   "password"
-    t.datetime "created_on",                  :null => false
-    t.datetime "updated_on",                  :null => false
-  end
-
-  create_table "course_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "course_id"
-    t.integer  "course_act_id"
-    t.string   "course_act_type"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "course_attachments", :force => true do |t|
-    t.string   "filename"
-    t.string   "disk_filename"
-    t.integer  "filesize"
-    t.string   "content_type"
-    t.string   "digest"
-    t.integer  "downloads"
-    t.string   "author_id"
-    t.string   "integer"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype"
-    t.integer  "is_public"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "container_id",   :default => 0
-  end
-
-  create_table "course_groups", :force => true do |t|
-    t.string   "name"
-    t.integer  "course_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "course_infos", :force => true do |t|
-    t.integer  "course_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "course_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "course_id"
-    t.integer  "course_message_id"
-    t.string   "course_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
-    t.string   "content"
-    t.integer  "status"
-  end
-
-  create_table "course_statuses", :force => true do |t|
-    t.integer  "changesets_count"
-    t.integer  "watchers_count"
-    t.integer  "course_id"
-    t.float    "grade",            :default => 0.0
-    t.integer  "course_ac_para",   :default => 0
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-  end
-
-  create_table "courses", :force => true do |t|
-    t.integer  "tea_id"
-    t.string   "name"
-    t.integer  "state"
-    t.string   "code"
-    t.integer  "time"
-    t.string   "extra"
-    t.datetime "created_at",                                  :null => false
-    t.datetime "updated_at",                                  :null => false
-    t.string   "location"
-    t.string   "term"
-    t.string   "string"
-    t.string   "password"
-    t.string   "setup_time"
-    t.string   "endup_time"
-    t.string   "class_period"
-    t.integer  "school_id"
-    t.text     "description"
-    t.integer  "status",                       :default => 1
-    t.integer  "attachmenttype",               :default => 2
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.integer  "is_public",       :limit => 1, :default => 1
-    t.integer  "inherit_members", :limit => 1, :default => 1
-    t.integer  "open_student",                 :default => 0
-  end
-
-  create_table "custom_fields", :force => true do |t|
-    t.string  "type",            :limit => 30, :default => "",    :null => false
-    t.string  "name",            :limit => 30, :default => "",    :null => false
-    t.string  "field_format",    :limit => 30, :default => "",    :null => false
-    t.text    "possible_values"
-    t.string  "regexp",                        :default => ""
-    t.integer "min_length",                    :default => 0,     :null => false
-    t.integer "max_length",                    :default => 0,     :null => false
-    t.boolean "is_required",                   :default => false, :null => false
-    t.boolean "is_for_all",                    :default => false, :null => false
-    t.boolean "is_filter",                     :default => false, :null => false
-    t.integer "position",                      :default => 1
-    t.boolean "searchable",                    :default => false
-    t.text    "default_value"
-    t.boolean "editable",                      :default => true
-    t.boolean "visible",                       :default => true,  :null => false
-    t.boolean "multiple",                      :default => false
-  end
-
-  add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type"
-
-  create_table "custom_fields_projects", :id => false, :force => true do |t|
-    t.integer "custom_field_id", :default => 0, :null => false
-    t.integer "project_id",      :default => 0, :null => false
-  end
-
-  add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true
-
-  create_table "custom_fields_trackers", :id => false, :force => true do |t|
-    t.integer "custom_field_id", :default => 0, :null => false
-    t.integer "tracker_id",      :default => 0, :null => false
-  end
-
-  add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true
-
-  create_table "custom_values", :force => true do |t|
-    t.string  "customized_type", :limit => 30, :default => "", :null => false
-    t.integer "customized_id",                 :default => 0,  :null => false
-    t.integer "custom_field_id",               :default => 0,  :null => false
-    t.text    "value"
-  end
-
-  add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id"
-  add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized"
-
-  create_table "delayed_jobs", :force => true do |t|
-    t.integer  "priority",   :default => 0, :null => false
-    t.integer  "attempts",   :default => 0, :null => false
-    t.text     "handler",                   :null => false
-    t.text     "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by"
-    t.string   "queue"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
-
-  create_table "discuss_demos", :force => true do |t|
-    t.string   "title"
-    t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "documents", :force => true do |t|
-    t.integer  "project_id",                :default => 0,  :null => false
-    t.integer  "category_id",               :default => 0,  :null => false
-    t.string   "title",       :limit => 60, :default => "", :null => false
-    t.text     "description"
-    t.datetime "created_on"
-    t.integer  "user_id",                   :default => 0
-    t.integer  "is_public",                 :default => 1
-  end
-
-  add_index "documents", ["category_id"], :name => "index_documents_on_category_id"
-  add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
-  add_index "documents", ["project_id"], :name => "documents_project_id"
-
-  create_table "dts", :force => true do |t|
-    t.string   "IPLineCode"
-    t.string   "Description"
-    t.string   "Num"
-    t.string   "Variable"
-    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",    :null => false
-    t.datetime "updated_at",    :null => false
-  end
-
-  create_table "enabled_modules", :force => true do |t|
-    t.integer "project_id"
-    t.string  "name",       :null => false
-    t.integer "course_id"
-  end
-
-  add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id"
-
-  create_table "enumerations", :force => true do |t|
-    t.string  "name",          :limit => 30, :default => "",    :null => false
-    t.integer "position",                    :default => 1
-    t.boolean "is_default",                  :default => false, :null => false
-    t.string  "type"
-    t.boolean "active",                      :default => true,  :null => false
-    t.integer "project_id"
-    t.integer "parent_id"
-    t.string  "position_name", :limit => 30
-  end
-
-  add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
-  add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
-
-  create_table "first_pages", :force => true do |t|
-    t.string   "web_title"
-    t.string   "title"
-    t.text     "description"
-    t.string   "page_type"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "sort_type"
-    t.integer  "image_width",  :default => 107
-    t.integer  "image_height", :default => 63
-    t.integer  "show_course",  :default => 1
-    t.integer  "show_contest", :default => 1
-  end
-
-  create_table "forge_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "project_id"
-    t.integer  "forge_act_id"
-    t.string   "forge_act_type"
-    t.integer  "org_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id"
-
-  create_table "forge_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "project_id"
-    t.integer  "forge_message_id"
-    t.string   "forge_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "forums", :force => true do |t|
-    t.string   "name",                        :null => false
-    t.text     "description"
-    t.integer  "topic_count",  :default => 0
-    t.integer  "memo_count",   :default => 0
-    t.integer  "last_memo_id", :default => 0
-    t.integer  "creator_id",                  :null => false
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-    t.integer  "sticky"
-    t.integer  "locked"
-  end
-
-  create_table "groups_users", :id => false, :force => true do |t|
-    t.integer "group_id", :null => false
-    t.integer "user_id",  :null => false
-  end
-
-  add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true
-
-  create_table "homework_attaches", :force => true do |t|
-    t.integer  "bid_id"
-    t.integer  "user_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-    t.string   "reward"
-    t.string   "name"
-    t.text     "description"
-    t.integer  "state"
-    t.integer  "project_id",       :default => 0
-    t.float    "score",            :default => 0.0
-    t.integer  "is_teacher_score", :default => 0
-  end
-
-  add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id"
-
-  create_table "homework_commons", :force => true do |t|
-    t.string   "name"
-    t.integer  "user_id"
-    t.text     "description"
-    t.date     "publish_time"
-    t.date     "end_time"
-    t.integer  "homework_type", :default => 1
-    t.string   "late_penalty"
-    t.integer  "course_id"
-    t.datetime "created_at",                   :null => false
-    t.datetime "updated_at",                   :null => false
-  end
-
-  create_table "homework_detail_manuals", :force => true do |t|
-    t.float    "ta_proportion"
-    t.integer  "comment_status"
-    t.date     "evaluation_start"
-    t.date     "evaluation_end"
-    t.integer  "evaluation_num"
-    t.integer  "absence_penalty",    :default => 1
-    t.integer  "homework_common_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-  end
-
-  create_table "homework_detail_programings", :force => true do |t|
-    t.string   "language"
-    t.text     "standard_code",      :limit => 2147483647
-    t.integer  "homework_common_id"
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.float    "ta_proportion",                            :default => 0.1
-    t.integer  "question_id"
-  end
-
-  create_table "homework_evaluations", :force => true do |t|
-    t.string   "user_id"
-    t.string   "homework_attach_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "homework_for_courses", :force => true do |t|
-    t.integer "course_id"
-    t.integer "bid_id"
-  end
-
-  add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id"
-  add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id"
-
-  create_table "homework_tests", :force => true do |t|
-    t.text     "input"
-    t.text     "output"
-    t.integer  "homework_common_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.integer  "result"
-    t.text     "error_msg"
-  end
-
-  create_table "homework_users", :force => true do |t|
-    t.string   "homework_attach_id"
-    t.string   "user_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "invite_lists", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "issue_categories", :force => true do |t|
-    t.integer "project_id",                   :default => 0,  :null => false
-    t.string  "name",           :limit => 30, :default => "", :null => false
-    t.integer "assigned_to_id"
-  end
-
-  add_index "issue_categories", ["assigned_to_id"], :name => "index_issue_categories_on_assigned_to_id"
-  add_index "issue_categories", ["project_id"], :name => "issue_categories_project_id"
-
-  create_table "issue_relations", :force => true do |t|
-    t.integer "issue_from_id",                 :null => false
-    t.integer "issue_to_id",                   :null => false
-    t.string  "relation_type", :default => "", :null => false
-    t.integer "delay"
-  end
-
-  add_index "issue_relations", ["issue_from_id", "issue_to_id"], :name => "index_issue_relations_on_issue_from_id_and_issue_to_id", :unique => true
-  add_index "issue_relations", ["issue_from_id"], :name => "index_issue_relations_on_issue_from_id"
-  add_index "issue_relations", ["issue_to_id"], :name => "index_issue_relations_on_issue_to_id"
-
-  create_table "issue_statuses", :force => true do |t|
-    t.string  "name",               :limit => 30, :default => "",    :null => false
-    t.boolean "is_closed",                        :default => false, :null => false
-    t.boolean "is_default",                       :default => false, :null => false
-    t.integer "position",                         :default => 1
-    t.integer "default_done_ratio"
-  end
-
-  add_index "issue_statuses", ["is_closed"], :name => "index_issue_statuses_on_is_closed"
-  add_index "issue_statuses", ["is_default"], :name => "index_issue_statuses_on_is_default"
-  add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position"
-
-  create_table "issues", :force => true do |t|
-    t.integer  "tracker_id",                              :null => false
-    t.integer  "project_id",                              :null => false
-    t.string   "subject",              :default => "",    :null => false
-    t.text     "description"
-    t.date     "due_date"
-    t.integer  "category_id"
-    t.integer  "status_id",                               :null => false
-    t.integer  "assigned_to_id"
-    t.integer  "priority_id",                             :null => false
-    t.integer  "fixed_version_id"
-    t.integer  "author_id",                               :null => false
-    t.integer  "lock_version",         :default => 0,     :null => false
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.date     "start_date"
-    t.integer  "done_ratio",           :default => 0,     :null => false
-    t.float    "estimated_hours"
-    t.integer  "parent_id"
-    t.integer  "root_id"
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.boolean  "is_private",           :default => false, :null => false
-    t.datetime "closed_on"
-    t.integer  "project_issues_index"
-  end
-
-  add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id"
-  add_index "issues", ["author_id"], :name => "index_issues_on_author_id"
-  add_index "issues", ["category_id"], :name => "index_issues_on_category_id"
-  add_index "issues", ["created_on"], :name => "index_issues_on_created_on"
-  add_index "issues", ["fixed_version_id"], :name => "index_issues_on_fixed_version_id"
-  add_index "issues", ["priority_id"], :name => "index_issues_on_priority_id"
-  add_index "issues", ["project_id"], :name => "issues_project_id"
-  add_index "issues", ["root_id", "lft", "rgt"], :name => "index_issues_on_root_id_and_lft_and_rgt"
-  add_index "issues", ["status_id"], :name => "index_issues_on_status_id"
-  add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id"
-
-  create_table "join_in_competitions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "competition_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  create_table "join_in_contests", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "bid_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "journal_details", :force => true do |t|
-    t.integer "journal_id",               :default => 0,  :null => false
-    t.string  "property",   :limit => 30, :default => "", :null => false
-    t.string  "prop_key",   :limit => 30, :default => "", :null => false
-    t.text    "old_value"
-    t.text    "value"
-  end
-
-  add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
-
-  create_table "journal_replies", :id => false, :force => true do |t|
-    t.integer "journal_id"
-    t.integer "user_id"
-    t.integer "reply_id"
-  end
-
-  add_index "journal_replies", ["journal_id"], :name => "index_journal_replies_on_journal_id"
-  add_index "journal_replies", ["reply_id"], :name => "index_journal_replies_on_reply_id"
-  add_index "journal_replies", ["user_id"], :name => "index_journal_replies_on_user_id"
-
-  create_table "journals", :force => true do |t|
-    t.integer  "journalized_id",                 :default => 0,     :null => false
-    t.string   "journalized_type", :limit => 30, :default => "",    :null => false
-    t.integer  "user_id",                        :default => 0,     :null => false
-    t.text     "notes"
-    t.datetime "created_on",                                        :null => false
-    t.boolean  "private_notes",                  :default => false, :null => false
-  end
-
-  add_index "journals", ["created_on"], :name => "index_journals_on_created_on"
-  add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id"
-  add_index "journals", ["journalized_id"], :name => "index_journals_on_journalized_id"
-  add_index "journals", ["user_id"], :name => "index_journals_on_user_id"
-
-  create_table "journals_for_messages", :force => true do |t|
-    t.integer  "jour_id"
-    t.string   "jour_type"
-    t.integer  "user_id"
-    t.text     "notes"
-    t.integer  "status"
-    t.integer  "reply_id"
-    t.datetime "created_on",                  :null => false
-    t.datetime "updated_on",                  :null => false
-    t.string   "m_parent_id"
-    t.boolean  "is_readed"
-    t.integer  "m_reply_count"
-    t.integer  "m_reply_id"
-    t.integer  "is_comprehensive_evaluation"
-  end
-
-  create_table "kindeditor_assets", :force => true do |t|
-    t.string   "asset"
-    t.integer  "file_size"
-    t.string   "file_type"
-    t.integer  "owner_id"
-    t.string   "asset_type"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-    t.integer  "owner_type", :default => 0
-  end
-
-  create_table "member_roles", :force => true do |t|
-    t.integer "member_id",      :null => false
-    t.integer "role_id",        :null => false
-    t.integer "inherited_from"
-  end
-
-  add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id"
-  add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id"
-
-  create_table "members", :force => true do |t|
-    t.integer  "user_id",           :default => 0,     :null => false
-    t.integer  "project_id",        :default => 0
-    t.datetime "created_on"
-    t.boolean  "mail_notification", :default => false, :null => false
-    t.integer  "course_id",         :default => -1
-    t.integer  "course_group_id",   :default => 0
-  end
-
-  add_index "members", ["project_id"], :name => "index_members_on_project_id"
-  add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
-  add_index "members", ["user_id"], :name => "index_members_on_user_id"
-
-  create_table "memo_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "forum_id"
-    t.integer  "memo_id"
-    t.string   "memo_type"
-    t.integer  "viewed"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "memos", :force => true do |t|
-    t.integer  "forum_id",                         :null => false
-    t.integer  "parent_id"
-    t.string   "subject",                          :null => false
-    t.text     "content",                          :null => false
-    t.integer  "author_id",                        :null => false
-    t.integer  "replies_count", :default => 0
-    t.integer  "last_reply_id"
-    t.boolean  "lock",          :default => false
-    t.boolean  "sticky",        :default => false
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "viewed_count",  :default => 0
-  end
-
-  create_table "message_alls", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "message_id"
-    t.string   "message_type"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  create_table "messages", :force => true do |t|
-    t.integer  "board_id",                         :null => false
-    t.integer  "parent_id"
-    t.string   "subject",       :default => "",    :null => false
-    t.text     "content"
-    t.integer  "author_id"
-    t.integer  "replies_count", :default => 0,     :null => false
-    t.integer  "last_reply_id"
-    t.datetime "created_on",                       :null => false
-    t.datetime "updated_on",                       :null => false
-    t.boolean  "locked",        :default => false
-    t.integer  "sticky",        :default => 0
-  end
-
-  add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
-  add_index "messages", ["board_id"], :name => "messages_board_id"
-  add_index "messages", ["created_on"], :name => "index_messages_on_created_on"
-  add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
-  add_index "messages", ["parent_id"], :name => "messages_parent_id"
-
-  create_table "news", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "title",          :limit => 60, :default => "", :null => false
-    t.string   "summary",                      :default => ""
-    t.text     "description"
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.datetime "created_on"
-    t.integer  "comments_count",               :default => 0,  :null => false
-    t.integer  "course_id"
-  end
-
-  add_index "news", ["author_id"], :name => "index_news_on_author_id"
-  add_index "news", ["created_on"], :name => "index_news_on_created_on"
-  add_index "news", ["project_id"], :name => "news_project_id"
-
-  create_table "no_uses", :force => true do |t|
-    t.integer  "user_id",     :null => false
-    t.string   "no_use_type"
-    t.integer  "no_use_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "notificationcomments", :force => true do |t|
-    t.string   "notificationcommented_type"
-    t.integer  "notificationcommented_id"
-    t.integer  "author_id"
-    t.text     "notificationcomments"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-  end
-
-  create_table "open_id_authentication_associations", :force => true do |t|
-    t.integer "issued"
-    t.integer "lifetime"
-    t.string  "handle"
-    t.string  "assoc_type"
-    t.binary  "server_url"
-    t.binary  "secret"
-  end
-
-  create_table "open_id_authentication_nonces", :force => true do |t|
-    t.integer "timestamp",  :null => false
-    t.string  "server_url"
-    t.string  "salt",       :null => false
-  end
-
-  create_table "open_source_projects", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "commit_count",     :default => 0
-    t.integer  "code_line",        :default => 0
-    t.integer  "users_count",      :default => 0
-    t.date     "last_commit_time"
-    t.string   "url"
-    t.date     "date_collected"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
-  end
-
-  create_table "option_numbers", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "memo"
-    t.integer  "messages_for_issues"
-    t.integer  "issues_status"
-    t.integer  "replay_for_message"
-    t.integer  "replay_for_memo"
-    t.integer  "follow"
-    t.integer  "tread"
-    t.integer  "praise_by_one"
-    t.integer  "praise_by_two"
-    t.integer  "praise_by_three"
-    t.integer  "tread_by_one"
-    t.integer  "tread_by_two"
-    t.integer  "tread_by_three"
-    t.integer  "changeset"
-    t.integer  "document"
-    t.integer  "attachment"
-    t.integer  "issue_done_ratio"
-    t.integer  "post_issue"
-    t.integer  "score_type"
-    t.integer  "total_score"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
-    t.integer  "project_id"
-  end
-
-  create_table "organizations", :force => true do |t|
-    t.string   "name"
-    t.string   "logo_link"
-    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"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "poll_answers", :force => true do |t|
-    t.integer  "poll_question_id"
-    t.text     "answer_text"
-    t.integer  "answer_position"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "poll_questions", :force => true do |t|
-    t.string   "question_title"
-    t.integer  "question_type"
-    t.integer  "is_necessary"
-    t.integer  "poll_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-    t.integer  "question_number"
-  end
-
-  create_table "poll_users", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "poll_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "poll_votes", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "poll_question_id"
-    t.integer  "poll_answer_id"
-    t.text     "vote_text"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "polls", :force => true do |t|
-    t.string   "polls_name"
-    t.string   "polls_type"
-    t.integer  "polls_group_id"
-    t.integer  "polls_status"
-    t.integer  "user_id"
-    t.datetime "published_at"
-    t.datetime "closed_at"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.text     "polls_description"
-    t.integer  "show_result",       :default => 1
-  end
-
-  create_table "praise_tread_caches", :force => true do |t|
-    t.integer  "object_id",   :null => false
-    t.string   "object_type"
-    t.integer  "praise_num"
-    t.integer  "tread_num"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "praise_treads", :force => true do |t|
-    t.integer  "user_id",                  :null => false
-    t.integer  "praise_tread_object_id"
-    t.string   "praise_tread_object_type"
-    t.integer  "praise_or_tread"
-    t.datetime "created_at",               :null => false
-    t.datetime "updated_at",               :null => false
-  end
-
-  create_table "project_infos", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "project_scores", :force => true do |t|
-    t.string   "project_id"
-    t.integer  "score"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "issue_num",         :default => 0
-    t.integer  "issue_journal_num", :default => 0
-    t.integer  "news_num",          :default => 0
-    t.integer  "documents_num",     :default => 0
-    t.integer  "changeset_num",     :default => 0
-    t.integer  "board_message_num", :default => 0
-  end
-
-  create_table "project_statuses", :force => true do |t|
-    t.integer "changesets_count"
-    t.integer "watchers_count"
-    t.integer "project_id"
-    t.integer "project_type"
-    t.float   "grade",            :default => 0.0
-    t.integer "course_ac_para",   :default => 0
-  end
-
-  add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade"
-
-  create_table "projecting_softapplictions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "softapplication_id"
-    t.integer  "project_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "projects", :force => true do |t|
-    t.string   "name",             :default => "",    :null => false
-    t.text     "description"
-    t.string   "homepage",         :default => ""
-    t.boolean  "is_public",        :default => true,  :null => false
-    t.integer  "parent_id"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "identifier"
-    t.integer  "status",           :default => 1,     :null => false
-    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"
-  end
-
-  add_index "projects", ["lft"], :name => "index_projects_on_lft"
-  add_index "projects", ["rgt"], :name => "index_projects_on_rgt"
-
-  create_table "projects_trackers", :id => false, :force => true do |t|
-    t.integer "project_id", :default => 0, :null => false
-    t.integer "tracker_id", :default => 0, :null => false
-  end
-
-  add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
-  add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
-
-  create_table "queries", :force => true do |t|
-    t.integer "project_id"
-    t.string  "name",          :default => "",    :null => false
-    t.text    "filters"
-    t.integer "user_id",       :default => 0,     :null => false
-    t.boolean "is_public",     :default => false, :null => false
-    t.text    "column_names"
-    t.text    "sort_criteria"
-    t.string  "group_by"
-    t.string  "type"
-  end
-
-  add_index "queries", ["project_id"], :name => "index_queries_on_project_id"
-  add_index "queries", ["user_id"], :name => "index_queries_on_user_id"
-
-  create_table "relative_memo_to_open_source_projects", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "relative_memo_id"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "relative_memos", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "parent_id"
-    t.string   "subject",                                                   :null => false
-    t.text     "content",            :limit => 16777215,                    :null => false
-    t.integer  "author_id"
-    t.integer  "replies_count",                          :default => 0
-    t.integer  "last_reply_id"
-    t.boolean  "lock",                                   :default => false
-    t.boolean  "sticky",                                 :default => false
-    t.boolean  "is_quote",                               :default => false
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.integer  "viewed_count_crawl",                     :default => 0
-    t.integer  "viewed_count_local",                     :default => 0
-    t.string   "url"
-    t.string   "username"
-    t.string   "userhomeurl"
-    t.date     "date_collected"
-    t.string   "topic_resource"
-  end
-
-  create_table "repositories", :force => true do |t|
-    t.integer "project_id",                  :default => 0,     :null => false
-    t.string  "url",                         :default => "",    :null => false
-    t.string  "login",         :limit => 60, :default => ""
-    t.string  "password",                    :default => ""
-    t.string  "root_url",                    :default => ""
-    t.string  "type"
-    t.string  "path_encoding", :limit => 64
-    t.string  "log_encoding",  :limit => 64
-    t.text    "extra_info"
-    t.string  "identifier"
-    t.boolean "is_default",                  :default => false
-    t.boolean "hidden",                      :default => false
-  end
-
-  add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
-
-  create_table "rich_rich_files", :force => true do |t|
-    t.datetime "created_at",                                 :null => false
-    t.datetime "updated_at",                                 :null => false
-    t.string   "rich_file_file_name"
-    t.string   "rich_file_content_type"
-    t.integer  "rich_file_file_size"
-    t.datetime "rich_file_updated_at"
-    t.string   "owner_type"
-    t.integer  "owner_id"
-    t.text     "uri_cache"
-    t.string   "simplified_type",        :default => "file"
-  end
-
-  create_table "roles", :force => true do |t|
-    t.string  "name",              :limit => 30, :default => "",        :null => false
-    t.integer "position",                        :default => 1
-    t.boolean "assignable",                      :default => true
-    t.integer "builtin",                         :default => 0,         :null => false
-    t.text    "permissions"
-    t.string  "issues_visibility", :limit => 30, :default => "default", :null => false
-  end
-
-  create_table "schools", :force => true do |t|
-    t.string   "name"
-    t.string   "province"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-    t.string   "logo_link"
-  end
-
-  create_table "seems_rateable_cached_ratings", :force => true do |t|
-    t.integer  "cacheable_id",   :limit => 8
-    t.string   "cacheable_type"
-    t.float    "avg",                         :null => false
-    t.integer  "cnt",                         :null => false
-    t.string   "dimension"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-  create_table "seems_rateable_rates", :force => true do |t|
-    t.integer  "rater_id",         :limit => 8
-    t.integer  "rateable_id"
-    t.string   "rateable_type"
-    t.float    "stars",                                        :null => false
-    t.string   "dimension"
-    t.datetime "created_at",                                   :null => false
-    t.datetime "updated_at",                                   :null => false
-    t.integer  "is_teacher_score",              :default => 0
-  end
-
-  create_table "settings", :force => true do |t|
-    t.string   "name",       :default => "", :null => false
-    t.text     "value"
-    t.datetime "updated_on"
-  end
-
-  add_index "settings", ["name"], :name => "index_settings_on_name"
-
-  create_table "shares", :force => true do |t|
-    t.date     "created_on"
-    t.string   "url"
-    t.string   "title"
-    t.integer  "share_type"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.string   "description"
-  end
-
-  create_table "softapplications", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "app_type_id"
-    t.string   "app_type_name"
-    t.string   "android_min_version_available"
-    t.integer  "user_id"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "contest_id"
-    t.integer  "softapplication_id"
-    t.integer  "is_public"
-    t.string   "application_developers"
-    t.string   "deposit_project_url"
-    t.string   "deposit_project"
-    t.integer  "project_id"
-  end
-
-  create_table "student_work_tests", :force => true do |t|
-    t.integer  "student_work_id"
-    t.integer  "homework_test_id"
-    t.integer  "result"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-    t.text     "error_msg"
-  end
-
-  create_table "student_works", :force => true do |t|
-    t.string   "name"
-    t.text     "description",             :limit => 2147483647
-    t.integer  "homework_common_id"
-    t.integer  "user_id"
-    t.float    "final_score"
-    t.float    "teacher_score"
-    t.float    "student_score"
-    t.float    "teaching_asistant_score"
-    t.integer  "project_id",                                    :default => 0
-    t.datetime "created_at",                                                   :null => false
-    t.datetime "updated_at",                                                   :null => false
-    t.integer  "late_penalty",                                  :default => 0
-    t.integer  "absence_penalty",                               :default => 0
-    t.integer  "system_score"
-  end
-
-  create_table "student_works_evaluation_distributions", :force => true do |t|
-    t.integer  "student_work_id"
-    t.integer  "user_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "student_works_scores", :force => true do |t|
-    t.integer  "student_work_id"
-    t.integer  "user_id"
-    t.integer  "score"
-    t.text     "comment"
-    t.integer  "reviewer_role"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "students_for_courses", :force => true do |t|
-    t.integer  "student_id"
-    t.integer  "course_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id"
-  add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id"
-
-  create_table "taggings", :force => true do |t|
-    t.integer  "tag_id"
-    t.integer  "taggable_id"
-    t.string   "taggable_type"
-    t.integer  "tagger_id"
-    t.string   "tagger_type"
-    t.string   "context",       :limit => 128
-    t.datetime "created_at"
-  end
-
-  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
-  add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
-  add_index "taggings", ["taggable_type"], :name => "index_taggings_on_taggable_type"
-
-  create_table "tags", :force => true do |t|
-    t.string "name"
-  end
-
-  create_table "teachers", :force => true do |t|
-    t.string   "tea_name"
-    t.string   "location"
-    t.integer  "couurse_time"
-    t.integer  "course_code"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-    t.string   "extra"
-  end
-
-  create_table "time_entries", :force => true do |t|
-    t.integer  "project_id",  :null => false
-    t.integer  "user_id",     :null => false
-    t.integer  "issue_id"
-    t.float    "hours",       :null => false
-    t.string   "comments"
-    t.integer  "activity_id", :null => false
-    t.date     "spent_on",    :null => false
-    t.integer  "tyear",       :null => false
-    t.integer  "tmonth",      :null => false
-    t.integer  "tweek",       :null => false
-    t.datetime "created_on",  :null => false
-    t.datetime "updated_on",  :null => false
-  end
-
-  add_index "time_entries", ["activity_id"], :name => "index_time_entries_on_activity_id"
-  add_index "time_entries", ["created_on"], :name => "index_time_entries_on_created_on"
-  add_index "time_entries", ["issue_id"], :name => "time_entries_issue_id"
-  add_index "time_entries", ["project_id"], :name => "time_entries_project_id"
-  add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id"
-
-  create_table "tokens", :force => true do |t|
-    t.integer  "user_id",                  :default => 0,  :null => false
-    t.string   "action",     :limit => 30, :default => "", :null => false
-    t.string   "value",      :limit => 40, :default => "", :null => false
-    t.datetime "created_on",                               :null => false
-  end
-
-  add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id"
-  add_index "tokens", ["value"], :name => "tokens_value", :unique => true
-
-  create_table "trackers", :force => true do |t|
-    t.string  "name",          :limit => 30, :default => "",    :null => false
-    t.boolean "is_in_chlog",                 :default => false, :null => false
-    t.integer "position",                    :default => 1
-    t.boolean "is_in_roadmap",               :default => true,  :null => false
-    t.integer "fields_bits",                 :default => 0
-  end
-
-  create_table "user_activities", :force => true do |t|
-    t.string   "act_type"
-    t.integer  "act_id"
-    t.string   "container_type"
-    t.integer  "container_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  create_table "user_extensions", :force => true do |t|
-    t.integer  "user_id",                            :null => false
-    t.date     "birthday"
-    t.string   "brief_introduction"
-    t.integer  "gender"
-    t.string   "location"
-    t.string   "occupation"
-    t.integer  "work_experience"
-    t.integer  "zip_code"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.string   "technical_title"
-    t.integer  "identity"
-    t.string   "student_id"
-    t.string   "teacher_realname"
-    t.string   "student_realname"
-    t.string   "location_city"
-    t.integer  "school_id"
-    t.string   "description",        :default => ""
-  end
-
-  create_table "user_feedback_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "journals_for_message_id"
-    t.string   "journals_for_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  create_table "user_grades", :force => true do |t|
-    t.integer  "user_id",                     :null => false
-    t.integer  "project_id",                  :null => false
-    t.float    "grade",      :default => 0.0
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-  add_index "user_grades", ["grade"], :name => "index_user_grades_on_grade"
-  add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id"
-  add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id"
-
-  create_table "user_levels", :force => true do |t|
-    t.integer "user_id"
-    t.integer "level"
-  end
-
-  create_table "user_preferences", :force => true do |t|
-    t.integer "user_id",   :default => 0,     :null => false
-    t.text    "others"
-    t.boolean "hide_mail", :default => false
-    t.string  "time_zone"
-  end
-
-  add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id"
-
-  create_table "user_score_details", :force => true do |t|
-    t.integer  "current_user_id"
-    t.integer  "target_user_id"
-    t.string   "score_type"
-    t.string   "score_action"
-    t.integer  "user_id"
-    t.integer  "old_score"
-    t.integer  "new_score"
-    t.integer  "current_user_level"
-    t.integer  "target_user_level"
-    t.integer  "score_changeable_obj_id"
-    t.string   "score_changeable_obj_type"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  create_table "user_scores", :force => true do |t|
-    t.integer  "user_id",       :null => false
-    t.integer  "collaboration"
-    t.integer  "influence"
-    t.integer  "skill"
-    t.integer  "active"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
-  end
-
-  create_table "user_statuses", :force => true do |t|
-    t.integer  "changesets_count"
-    t.integer  "watchers_count"
-    t.integer  "user_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-    t.float    "grade",            :default => 0.0
-  end
-
-  add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count"
-  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 "users", :force => true do |t|
-    t.string   "login",                           :default => "",    :null => false
-    t.string   "hashed_password",   :limit => 40, :default => "",    :null => false
-    t.string   "firstname",         :limit => 30, :default => "",    :null => false
-    t.string   "lastname",                        :default => "",    :null => false
-    t.string   "mail",              :limit => 60, :default => "",    :null => false
-    t.boolean  "admin",                           :default => false, :null => false
-    t.integer  "status",                          :default => 1,     :null => false
-    t.datetime "last_login_on"
-    t.string   "language",          :limit => 5,  :default => ""
-    t.integer  "auth_source_id"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "type"
-    t.string   "identity_url"
-    t.string   "mail_notification",               :default => "",    :null => false
-    t.string   "salt",              :limit => 64
-  end
-
-  add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
-  add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
-  add_index "users", ["type"], :name => "index_users_on_type"
-
-  create_table "versions", :force => true do |t|
-    t.integer  "project_id",      :default => 0,      :null => false
-    t.string   "name",            :default => "",     :null => false
-    t.string   "description",     :default => ""
-    t.date     "effective_date"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "wiki_page_title"
-    t.string   "status",          :default => "open"
-    t.string   "sharing",         :default => "none", :null => false
-  end
-
-  add_index "versions", ["project_id"], :name => "versions_project_id"
-  add_index "versions", ["sharing"], :name => "index_versions_on_sharing"
-
-  create_table "visitors", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "master_id"
-    t.datetime "updated_on"
-    t.datetime "created_on"
-  end
-
-  add_index "visitors", ["master_id"], :name => "index_visitors_master_id"
-  add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on"
-  add_index "visitors", ["user_id"], :name => "index_visitors_user_id"
-
-  create_table "watchers", :force => true do |t|
-    t.string  "watchable_type", :default => "", :null => false
-    t.integer "watchable_id",   :default => 0,  :null => false
-    t.integer "user_id"
-  end
-
-  add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type"
-  add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id"
-  add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type"
-
-  create_table "web_footer_companies", :force => true do |t|
-    t.string   "name"
-    t.string   "logo_size"
-    t.string   "url"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "web_footer_oranizers", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_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
-    t.integer  "author_id"
-    t.binary   "data",            :limit => 2147483647
-    t.string   "compression",     :limit => 6,          :default => ""
-    t.string   "comments",                              :default => ""
-    t.datetime "updated_on",                                            :null => false
-    t.integer  "version",                                               :null => false
-  end
-
-  add_index "wiki_content_versions", ["updated_on"], :name => "index_wiki_content_versions_on_updated_on"
-  add_index "wiki_content_versions", ["wiki_content_id"], :name => "wiki_content_versions_wcid"
-
-  create_table "wiki_contents", :force => true do |t|
-    t.integer  "page_id",                                          :null => false
-    t.integer  "author_id"
-    t.text     "text",       :limit => 2147483647
-    t.string   "comments",                         :default => ""
-    t.datetime "updated_on",                                       :null => false
-    t.integer  "version",                                          :null => false
-  end
-
-  add_index "wiki_contents", ["author_id"], :name => "index_wiki_contents_on_author_id"
-  add_index "wiki_contents", ["page_id"], :name => "wiki_contents_page_id"
-
-  create_table "wiki_pages", :force => true do |t|
-    t.integer  "wiki_id",                       :null => false
-    t.string   "title",                         :null => false
-    t.datetime "created_on",                    :null => false
-    t.boolean  "protected",  :default => false, :null => false
-    t.integer  "parent_id"
-  end
-
-  add_index "wiki_pages", ["parent_id"], :name => "index_wiki_pages_on_parent_id"
-  add_index "wiki_pages", ["wiki_id", "title"], :name => "wiki_pages_wiki_id_title"
-  add_index "wiki_pages", ["wiki_id"], :name => "index_wiki_pages_on_wiki_id"
-
-  create_table "wiki_redirects", :force => true do |t|
-    t.integer  "wiki_id",      :null => false
-    t.string   "title"
-    t.string   "redirects_to"
-    t.datetime "created_on",   :null => false
-  end
-
-  add_index "wiki_redirects", ["wiki_id", "title"], :name => "wiki_redirects_wiki_id_title"
-  add_index "wiki_redirects", ["wiki_id"], :name => "index_wiki_redirects_on_wiki_id"
-
-  create_table "wikis", :force => true do |t|
-    t.integer "project_id",                :null => false
-    t.string  "start_page",                :null => false
-    t.integer "status",     :default => 1, :null => false
-  end
-
-  add_index "wikis", ["project_id"], :name => "wikis_project_id"
-
-  create_table "workflows", :force => true do |t|
-    t.integer "tracker_id",                  :default => 0,     :null => false
-    t.integer "old_status_id",               :default => 0,     :null => false
-    t.integer "new_status_id",               :default => 0,     :null => false
-    t.integer "role_id",                     :default => 0,     :null => false
-    t.boolean "assignee",                    :default => false, :null => false
-    t.boolean "author",                      :default => false, :null => false
-    t.string  "type",          :limit => 30
-    t.string  "field_name",    :limit => 30
-    t.string  "rule",          :limit => 30
-  end
-
-  add_index "workflows", ["new_status_id"], :name => "index_workflows_on_new_status_id"
-  add_index "workflows", ["old_status_id"], :name => "index_workflows_on_old_status_id"
-  add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status"
-  add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id"
-
-  create_table "works_categories", :force => true do |t|
-    t.string   "category"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "zip_packs", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "homework_id"
-    t.string   "file_digest"
-    t.string   "file_path"
-    t.integer  "pack_times",   :default => 1
-    t.integer  "pack_size",    :default => 0
-    t.text     "file_digests"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-end
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20151124032319) do
+
+  create_table "activities", :force => true do |t|
+    t.integer  "act_id",                                  :null => false
+    t.string   "act_type",                                :null => false
+    t.integer  "user_id",                                 :null => false
+    t.integer  "activity_container_id"
+    t.string   "activity_container_type", :default => ""
+    t.datetime "created_at"
+  end
+
+  add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type"
+  add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
+  add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
+
+  create_table "activity_notifies", :force => true do |t|
+    t.integer  "activity_container_id"
+    t.string   "activity_container_type"
+    t.integer  "activity_id"
+    t.string   "activity_type"
+    t.integer  "notify_to"
+    t.datetime "created_on"
+    t.integer  "is_read"
+  end
+
+  add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id"
+  add_index "activity_notifies", ["created_on"], :name => "index_an_created_on"
+  add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to"
+
+  create_table "api_keys", :force => true do |t|
+    t.string   "access_token"
+    t.datetime "expires_at"
+    t.integer  "user_id"
+    t.boolean  "active",       :default => true
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+  end
+
+  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
+  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
+
+  create_table "applied_projects", :force => true do |t|
+    t.integer "project_id", :null => false
+    t.integer "user_id",    :null => false
+  end
+
+  create_table "apply_project_masters", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "apply_type"
+    t.integer  "apply_id"
+    t.integer  "status"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "attachments", :force => true do |t|
+    t.integer  "container_id"
+    t.string   "container_type", :limit => 30
+    t.string   "filename",                     :default => "", :null => false
+    t.string   "disk_filename",                :default => "", :null => false
+    t.integer  "filesize",                     :default => 0,  :null => false
+    t.string   "content_type",                 :default => ""
+    t.string   "digest",         :limit => 40, :default => "", :null => false
+    t.integer  "downloads",                    :default => 0,  :null => false
+    t.integer  "author_id",                    :default => 0,  :null => false
+    t.datetime "created_on"
+    t.string   "description"
+    t.string   "disk_directory"
+    t.integer  "attachtype",                   :default => 1
+    t.integer  "is_public",                    :default => 1
+    t.integer  "copy_from"
+    t.integer  "quotes"
+  end
+
+  add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
+  add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type"
+  add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on"
+
+  create_table "attachmentstypes", :force => true do |t|
+    t.integer "typeId",                 :null => false
+    t.string  "typeName", :limit => 50
+  end
+
+  create_table "auth_sources", :force => true do |t|
+    t.string  "type",              :limit => 30, :default => "",    :null => false
+    t.string  "name",              :limit => 60, :default => "",    :null => false
+    t.string  "host",              :limit => 60
+    t.integer "port"
+    t.string  "account"
+    t.string  "account_password",                :default => ""
+    t.string  "base_dn"
+    t.string  "attr_login",        :limit => 30
+    t.string  "attr_firstname",    :limit => 30
+    t.string  "attr_lastname",     :limit => 30
+    t.string  "attr_mail",         :limit => 30
+    t.boolean "onthefly_register",               :default => false, :null => false
+    t.boolean "tls",                             :default => false, :null => false
+    t.string  "filter"
+    t.integer "timeout"
+  end
+
+  add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type"
+
+  create_table "biding_projects", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "bid_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 "bids", :force => true do |t|
+    t.string   "name"
+    t.string   "budget",                                    :null => false
+    t.integer  "author_id"
+    t.date     "deadline"
+    t.text     "description"
+    t.datetime "created_on",                                :null => false
+    t.datetime "updated_on",                                :null => false
+    t.integer  "commit"
+    t.integer  "reward_type"
+    t.integer  "homework_type"
+    t.integer  "parent_id"
+    t.string   "password"
+    t.integer  "is_evaluation"
+    t.integer  "proportion",                :default => 60
+    t.integer  "comment_status",            :default => 0
+    t.integer  "evaluation_num",            :default => 3
+    t.integer  "open_anonymous_evaluation", :default => 1
+  end
+
+  create_table "blog_comments", :force => true do |t|
+    t.integer  "blog_id",                            :null => false
+    t.integer  "parent_id"
+    t.string   "title",           :default => "",    :null => false
+    t.text     "content"
+    t.integer  "author_id"
+    t.integer  "comments_count",  :default => 0,     :null => false
+    t.integer  "last_comment_id"
+    t.datetime "created_on",                         :null => false
+    t.datetime "updated_on",                         :null => false
+    t.boolean  "locked",          :default => false
+    t.integer  "sticky",          :default => 0
+    t.integer  "reply_id"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+  end
+
+  create_table "blogs", :force => true do |t|
+    t.string   "name",             :default => "", :null => false
+    t.text     "description"
+    t.integer  "position",         :default => 1
+    t.integer  "article_count",    :default => 0,  :null => false
+    t.integer  "comments_count",   :default => 0,  :null => false
+    t.integer  "last_comments_id"
+    t.integer  "parent_id"
+    t.integer  "author_id"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+  end
+
+  create_table "boards", :force => true do |t|
+    t.integer "project_id",                      :null => false
+    t.string  "name",            :default => "", :null => false
+    t.string  "description"
+    t.integer "position",        :default => 1
+    t.integer "topics_count",    :default => 0,  :null => false
+    t.integer "messages_count",  :default => 0,  :null => false
+    t.integer "last_message_id"
+    t.integer "parent_id"
+    t.integer "course_id"
+  end
+
+  add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
+  add_index "boards", ["project_id"], :name => "boards_project_id"
+
+  create_table "bug_to_osps", :force => true do |t|
+    t.integer  "osp_id"
+    t.integer  "relative_memo_id"
+    t.string   "description"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "changes", :force => true do |t|
+    t.integer "changeset_id",                               :null => false
+    t.string  "action",        :limit => 1, :default => "", :null => false
+    t.text    "path",                                       :null => false
+    t.text    "from_path"
+    t.string  "from_revision"
+    t.string  "revision"
+    t.string  "branch"
+  end
+
+  add_index "changes", ["changeset_id"], :name => "changesets_changeset_id"
+
+  create_table "changeset_parents", :id => false, :force => true do |t|
+    t.integer "changeset_id", :null => false
+    t.integer "parent_id",    :null => false
+  end
+
+  add_index "changeset_parents", ["changeset_id"], :name => "changeset_parents_changeset_ids"
+  add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids"
+
+  create_table "changesets", :force => true do |t|
+    t.integer  "repository_id", :null => false
+    t.string   "revision",      :null => false
+    t.string   "committer"
+    t.datetime "committed_on",  :null => false
+    t.text     "comments"
+    t.date     "commit_date"
+    t.string   "scmid"
+    t.integer  "user_id"
+  end
+
+  add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
+  add_index "changesets", ["repository_id", "revision"], :name => "changesets_repos_rev", :unique => true
+  add_index "changesets", ["repository_id", "scmid"], :name => "changesets_repos_scmid"
+  add_index "changesets", ["repository_id"], :name => "index_changesets_on_repository_id"
+  add_index "changesets", ["user_id"], :name => "index_changesets_on_user_id"
+
+  create_table "changesets_issues", :id => false, :force => true do |t|
+    t.integer "changeset_id", :null => false
+    t.integer "issue_id",     :null => false
+  end
+
+  add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
+
+  create_table "code_review_assignments", :force => true do |t|
+    t.integer "issue_id"
+    t.integer "change_id"
+    t.integer "attachment_id"
+    t.string  "file_path"
+    t.string  "rev"
+    t.string  "rev_to"
+    t.string  "action_type"
+    t.integer "changeset_id"
+  end
+
+  create_table "code_review_project_settings", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "tracker_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "updated_by"
+    t.boolean  "hide_code_review_tab",     :default => false
+    t.integer  "auto_relation",            :default => 1
+    t.integer  "assignment_tracker_id"
+    t.text     "auto_assign"
+    t.integer  "lock_version",             :default => 0,     :null => false
+    t.boolean  "tracker_in_review_dialog", :default => false
+  end
+
+  create_table "code_review_user_settings", :force => true do |t|
+    t.integer  "user_id",           :default => 0, :null => false
+    t.integer  "mail_notification", :default => 0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "code_reviews", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "change_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "line"
+    t.integer  "updated_by_id"
+    t.integer  "lock_version",        :default => 0, :null => false
+    t.integer  "status_changed_from"
+    t.integer  "status_changed_to"
+    t.integer  "issue_id"
+    t.string   "action_type"
+    t.string   "file_path"
+    t.string   "rev"
+    t.string   "rev_to"
+    t.integer  "attachment_id"
+    t.integer  "file_count",          :default => 0, :null => false
+    t.boolean  "diff_all"
+  end
+
+  create_table "comments", :force => true do |t|
+    t.string   "commented_type", :limit => 30, :default => "", :null => false
+    t.integer  "commented_id",                 :default => 0,  :null => false
+    t.integer  "author_id",                    :default => 0,  :null => false
+    t.text     "comments"
+    t.datetime "created_on",                                   :null => false
+    t.datetime "updated_on",                                   :null => false
+  end
+
+  add_index "comments", ["author_id"], :name => "index_comments_on_author_id"
+  add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type"
+
+  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 "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.string   "name"
+    t.string   "budget",      :default => ""
+    t.integer  "author_id"
+    t.date     "deadline"
+    t.string   "description"
+    t.integer  "commit"
+    t.string   "password"
+    t.datetime "created_on",                  :null => false
+    t.datetime "updated_on",                  :null => false
+  end
+
+  create_table "course_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "course_id"
+    t.integer  "course_act_id"
+    t.string   "course_act_type"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "course_attachments", :force => true do |t|
+    t.string   "filename"
+    t.string   "disk_filename"
+    t.integer  "filesize"
+    t.string   "content_type"
+    t.string   "digest"
+    t.integer  "downloads"
+    t.string   "author_id"
+    t.string   "integer"
+    t.string   "description"
+    t.string   "disk_directory"
+    t.integer  "attachtype"
+    t.integer  "is_public"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "container_id",   :default => 0
+  end
+
+  create_table "course_groups", :force => true do |t|
+    t.string   "name"
+    t.integer  "course_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "course_infos", :force => true do |t|
+    t.integer  "course_id"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "course_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "course_id"
+    t.integer  "course_message_id"
+    t.string   "course_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+    t.string   "content"
+    t.integer  "status"
+  end
+
+  create_table "course_statuses", :force => true do |t|
+    t.integer  "changesets_count"
+    t.integer  "watchers_count"
+    t.integer  "course_id"
+    t.float    "grade",            :default => 0.0
+    t.integer  "course_ac_para",   :default => 0
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+  end
+
+  create_table "courses", :force => true do |t|
+    t.integer  "tea_id"
+    t.string   "name"
+    t.integer  "state"
+    t.string   "code"
+    t.integer  "time"
+    t.string   "extra"
+    t.datetime "created_at",                                   :null => false
+    t.datetime "updated_at",                                   :null => false
+    t.string   "location"
+    t.string   "term"
+    t.string   "string"
+    t.string   "password"
+    t.string   "setup_time"
+    t.string   "endup_time"
+    t.string   "class_period"
+    t.integer  "school_id"
+    t.text     "description"
+    t.integer  "status",                        :default => 1
+    t.integer  "attachmenttype",                :default => 2
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.integer  "is_public",        :limit => 1, :default => 1
+    t.integer  "inherit_members",  :limit => 1, :default => 1
+    t.integer  "open_student",                  :default => 0
+    t.integer  "outline",                       :default => 0
+    t.integer  "publish_resource",              :default => 0
+  end
+
+  create_table "custom_fields", :force => true do |t|
+    t.string  "type",            :limit => 30, :default => "",    :null => false
+    t.string  "name",            :limit => 30, :default => "",    :null => false
+    t.string  "field_format",    :limit => 30, :default => "",    :null => false
+    t.text    "possible_values"
+    t.string  "regexp",                        :default => ""
+    t.integer "min_length",                    :default => 0,     :null => false
+    t.integer "max_length",                    :default => 0,     :null => false
+    t.boolean "is_required",                   :default => false, :null => false
+    t.boolean "is_for_all",                    :default => false, :null => false
+    t.boolean "is_filter",                     :default => false, :null => false
+    t.integer "position",                      :default => 1
+    t.boolean "searchable",                    :default => false
+    t.text    "default_value"
+    t.boolean "editable",                      :default => true
+    t.boolean "visible",                       :default => true,  :null => false
+    t.boolean "multiple",                      :default => false
+  end
+
+  add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type"
+
+  create_table "custom_fields_projects", :id => false, :force => true do |t|
+    t.integer "custom_field_id", :default => 0, :null => false
+    t.integer "project_id",      :default => 0, :null => false
+  end
+
+  add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true
+
+  create_table "custom_fields_trackers", :id => false, :force => true do |t|
+    t.integer "custom_field_id", :default => 0, :null => false
+    t.integer "tracker_id",      :default => 0, :null => false
+  end
+
+  add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true
+
+  create_table "custom_values", :force => true do |t|
+    t.string  "customized_type", :limit => 30, :default => "", :null => false
+    t.integer "customized_id",                 :default => 0,  :null => false
+    t.integer "custom_field_id",               :default => 0,  :null => false
+    t.text    "value"
+  end
+
+  add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id"
+  add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized"
+
+  create_table "delayed_jobs", :force => true do |t|
+    t.integer  "priority",   :default => 0, :null => false
+    t.integer  "attempts",   :default => 0, :null => false
+    t.text     "handler",                   :null => false
+    t.text     "last_error"
+    t.datetime "run_at"
+    t.datetime "locked_at"
+    t.datetime "failed_at"
+    t.string   "locked_by"
+    t.string   "queue"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
+
+  create_table "discuss_demos", :force => true do |t|
+    t.string   "title"
+    t.text     "body"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "documents", :force => true do |t|
+    t.integer  "project_id",                :default => 0,  :null => false
+    t.integer  "category_id",               :default => 0,  :null => false
+    t.string   "title",       :limit => 60, :default => "", :null => false
+    t.text     "description"
+    t.datetime "created_on"
+    t.integer  "user_id",                   :default => 0
+    t.integer  "is_public",                 :default => 1
+  end
+
+  add_index "documents", ["category_id"], :name => "index_documents_on_category_id"
+  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|
+    t.string   "Defect",        :limit => 50
+    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.text     "TraceInfo",     :limit => 2147483647
+    t.text     "Code",          :limit => 2147483647
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "id",                                  :null => false
+  end
+
+  create_table "enabled_modules", :force => true do |t|
+    t.integer "project_id"
+    t.string  "name",       :null => false
+    t.integer "course_id"
+  end
+
+  add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id"
+
+  create_table "enumerations", :force => true do |t|
+    t.string  "name",          :limit => 30, :default => "",    :null => false
+    t.integer "position",                    :default => 1
+    t.boolean "is_default",                  :default => false, :null => false
+    t.string  "type"
+    t.boolean "active",                      :default => true,  :null => false
+    t.integer "project_id"
+    t.integer "parent_id"
+    t.string  "position_name", :limit => 30
+  end
+
+  add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
+  add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
+
+  create_table "exercise_answers", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "exercise_question_id"
+    t.integer  "exercise_choice_id"
+    t.text     "answer_text"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  create_table "exercise_choices", :force => true do |t|
+    t.integer  "exercise_question_id"
+    t.text     "choice_text"
+    t.integer  "choice_position"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  create_table "exercise_questions", :force => true do |t|
+    t.string   "question_title"
+    t.integer  "question_type"
+    t.integer  "question_number"
+    t.integer  "exercise_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.integer  "question_score"
+  end
+
+  create_table "exercise_standard_answers", :force => true do |t|
+    t.integer  "exercise_question_id"
+    t.integer  "exercise_choice_id"
+    t.text     "answer_text"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  create_table "exercise_users", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "exercise_id"
+    t.integer  "score"
+    t.datetime "start_at"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.datetime "end_at"
+    t.integer  "status"
+  end
+
+  create_table "exercises", :force => true do |t|
+    t.string   "exercise_name"
+    t.text     "exercise_description"
+    t.integer  "course_id"
+    t.integer  "exercise_status"
+    t.integer  "user_id"
+    t.integer  "time"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+    t.datetime "publish_time"
+    t.datetime "end_time"
+    t.integer  "show_result"
+  end
+
+  create_table "first_pages", :force => true do |t|
+    t.string   "web_title"
+    t.string   "title"
+    t.text     "description"
+    t.string   "page_type"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "sort_type"
+    t.integer  "image_width",  :default => 107
+    t.integer  "image_height", :default => 63
+    t.integer  "show_course",  :default => 1
+    t.integer  "show_contest", :default => 1
+  end
+
+  create_table "forge_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "project_id"
+    t.integer  "forge_act_id"
+    t.string   "forge_act_type"
+    t.integer  "org_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id"
+
+  create_table "forge_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "project_id"
+    t.integer  "forge_message_id"
+    t.string   "forge_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.string   "secret_key"
+    t.integer  "status"
+  end
+
+  create_table "forums", :force => true do |t|
+    t.string   "name",                        :null => false
+    t.text     "description"
+    t.integer  "topic_count",  :default => 0
+    t.integer  "memo_count",   :default => 0
+    t.integer  "last_memo_id", :default => 0
+    t.integer  "creator_id",                  :null => false
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+    t.integer  "sticky"
+    t.integer  "locked"
+  end
+
+  create_table "groups_users", :id => false, :force => true do |t|
+    t.integer "group_id", :null => false
+    t.integer "user_id",  :null => false
+  end
+
+  add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true
+
+  create_table "homework_attaches", :force => true do |t|
+    t.integer  "bid_id"
+    t.integer  "user_id"
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+    t.string   "reward"
+    t.string   "name"
+    t.text     "description"
+    t.integer  "state"
+    t.integer  "project_id",       :default => 0
+    t.float    "score",            :default => 0.0
+    t.integer  "is_teacher_score", :default => 0
+  end
+
+  add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id"
+
+  create_table "homework_commons", :force => true do |t|
+    t.string   "name"
+    t.integer  "user_id"
+    t.text     "description"
+    t.date     "publish_time"
+    t.date     "end_time"
+    t.integer  "homework_type",     :default => 1
+    t.string   "late_penalty"
+    t.integer  "course_id"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "teacher_priority",  :default => 1
+    t.integer  "anonymous_comment", :default => 0
+  end
+
+  create_table "homework_detail_manuals", :force => true do |t|
+    t.float    "ta_proportion"
+    t.integer  "comment_status"
+    t.date     "evaluation_start"
+    t.date     "evaluation_end"
+    t.integer  "evaluation_num"
+    t.integer  "absence_penalty",    :default => 1
+    t.integer  "homework_common_id"
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+  end
+
+  create_table "homework_detail_programings", :force => true do |t|
+    t.string   "language"
+    t.text     "standard_code",      :limit => 2147483647
+    t.integer  "homework_common_id"
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
+    t.float    "ta_proportion",                            :default => 0.1
+    t.integer  "question_id"
+  end
+
+  create_table "homework_evaluations", :force => true do |t|
+    t.string   "user_id"
+    t.string   "homework_attach_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "homework_for_courses", :force => true do |t|
+    t.integer "course_id"
+    t.integer "bid_id"
+  end
+
+  add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id"
+  add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id"
+
+  create_table "homework_tests", :force => true do |t|
+    t.text     "input"
+    t.text     "output"
+    t.integer  "homework_common_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.integer  "result"
+    t.text     "error_msg"
+  end
+
+  create_table "homework_users", :force => true do |t|
+    t.string   "homework_attach_id"
+    t.string   "user_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "invite_lists", :force => true do |t|
+    t.integer  "project_id"
+    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|
+    t.integer "project_id",                   :default => 0,  :null => false
+    t.string  "name",           :limit => 30, :default => "", :null => false
+    t.integer "assigned_to_id"
+  end
+
+  add_index "issue_categories", ["assigned_to_id"], :name => "index_issue_categories_on_assigned_to_id"
+  add_index "issue_categories", ["project_id"], :name => "issue_categories_project_id"
+
+  create_table "issue_relations", :force => true do |t|
+    t.integer "issue_from_id",                 :null => false
+    t.integer "issue_to_id",                   :null => false
+    t.string  "relation_type", :default => "", :null => false
+    t.integer "delay"
+  end
+
+  add_index "issue_relations", ["issue_from_id", "issue_to_id"], :name => "index_issue_relations_on_issue_from_id_and_issue_to_id", :unique => true
+  add_index "issue_relations", ["issue_from_id"], :name => "index_issue_relations_on_issue_from_id"
+  add_index "issue_relations", ["issue_to_id"], :name => "index_issue_relations_on_issue_to_id"
+
+  create_table "issue_statuses", :force => true do |t|
+    t.string  "name",               :limit => 30, :default => "",    :null => false
+    t.boolean "is_closed",                        :default => false, :null => false
+    t.boolean "is_default",                       :default => false, :null => false
+    t.integer "position",                         :default => 1
+    t.integer "default_done_ratio"
+  end
+
+  add_index "issue_statuses", ["is_closed"], :name => "index_issue_statuses_on_is_closed"
+  add_index "issue_statuses", ["is_default"], :name => "index_issue_statuses_on_is_default"
+  add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position"
+
+  create_table "issues", :force => true do |t|
+    t.integer  "tracker_id",                              :null => false
+    t.integer  "project_id",                              :null => false
+    t.string   "subject",              :default => "",    :null => false
+    t.text     "description"
+    t.date     "due_date"
+    t.integer  "category_id"
+    t.integer  "status_id",                               :null => false
+    t.integer  "assigned_to_id"
+    t.integer  "priority_id",                             :null => false
+    t.integer  "fixed_version_id"
+    t.integer  "author_id",                               :null => false
+    t.integer  "lock_version",         :default => 0,     :null => false
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.date     "start_date"
+    t.integer  "done_ratio",           :default => 0,     :null => false
+    t.float    "estimated_hours"
+    t.integer  "parent_id"
+    t.integer  "root_id"
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.boolean  "is_private",           :default => false, :null => false
+    t.datetime "closed_on"
+    t.integer  "project_issues_index"
+  end
+
+  add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id"
+  add_index "issues", ["author_id"], :name => "index_issues_on_author_id"
+  add_index "issues", ["category_id"], :name => "index_issues_on_category_id"
+  add_index "issues", ["created_on"], :name => "index_issues_on_created_on"
+  add_index "issues", ["fixed_version_id"], :name => "index_issues_on_fixed_version_id"
+  add_index "issues", ["priority_id"], :name => "index_issues_on_priority_id"
+  add_index "issues", ["project_id"], :name => "issues_project_id"
+  add_index "issues", ["root_id", "lft", "rgt"], :name => "index_issues_on_root_id_and_lft_and_rgt"
+  add_index "issues", ["status_id"], :name => "index_issues_on_status_id"
+  add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id"
+
+  create_table "join_in_competitions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "competition_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  create_table "join_in_contests", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "bid_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "journal_details", :force => true do |t|
+    t.integer "journal_id",               :default => 0,  :null => false
+    t.string  "property",   :limit => 30, :default => "", :null => false
+    t.string  "prop_key",   :limit => 30, :default => "", :null => false
+    t.text    "old_value"
+    t.text    "value"
+  end
+
+  add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
+
+  create_table "journal_replies", :id => false, :force => true do |t|
+    t.integer "journal_id"
+    t.integer "user_id"
+    t.integer "reply_id"
+  end
+
+  add_index "journal_replies", ["journal_id"], :name => "index_journal_replies_on_journal_id"
+  add_index "journal_replies", ["reply_id"], :name => "index_journal_replies_on_reply_id"
+  add_index "journal_replies", ["user_id"], :name => "index_journal_replies_on_user_id"
+
+  create_table "journals", :force => true do |t|
+    t.integer  "journalized_id",                 :default => 0,     :null => false
+    t.string   "journalized_type", :limit => 30, :default => "",    :null => false
+    t.integer  "user_id",                        :default => 0,     :null => false
+    t.text     "notes"
+    t.datetime "created_on",                                        :null => false
+    t.boolean  "private_notes",                  :default => false, :null => false
+  end
+
+  add_index "journals", ["created_on"], :name => "index_journals_on_created_on"
+  add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id"
+  add_index "journals", ["journalized_id"], :name => "index_journals_on_journalized_id"
+  add_index "journals", ["user_id"], :name => "index_journals_on_user_id"
+
+  create_table "journals_for_messages", :force => true do |t|
+    t.integer  "jour_id"
+    t.string   "jour_type"
+    t.integer  "user_id"
+    t.text     "notes"
+    t.integer  "status"
+    t.integer  "reply_id"
+    t.datetime "created_on",                  :null => false
+    t.datetime "updated_on",                  :null => false
+    t.string   "m_parent_id"
+    t.boolean  "is_readed"
+    t.integer  "m_reply_count"
+    t.integer  "m_reply_id"
+    t.integer  "is_comprehensive_evaluation"
+  end
+
+  create_table "kindeditor_assets", :force => true do |t|
+    t.string   "asset"
+    t.integer  "file_size"
+    t.string   "file_type"
+    t.integer  "owner_id"
+    t.string   "asset_type"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+    t.integer  "owner_type", :default => 0
+  end
+
+  create_table "member_roles", :force => true do |t|
+    t.integer "member_id",      :null => false
+    t.integer "role_id",        :null => false
+    t.integer "inherited_from"
+  end
+
+  add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id"
+  add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id"
+
+  create_table "members", :force => true do |t|
+    t.integer  "user_id",           :default => 0,     :null => false
+    t.integer  "project_id",        :default => 0
+    t.datetime "created_on"
+    t.boolean  "mail_notification", :default => false, :null => false
+    t.integer  "course_id",         :default => -1
+    t.integer  "course_group_id",   :default => 0
+  end
+
+  add_index "members", ["project_id"], :name => "index_members_on_project_id"
+  add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
+  add_index "members", ["user_id"], :name => "index_members_on_user_id"
+
+  create_table "memo_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "forum_id"
+    t.integer  "memo_id"
+    t.string   "memo_type"
+    t.integer  "viewed"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "memos", :force => true do |t|
+    t.integer  "forum_id",                         :null => false
+    t.integer  "parent_id"
+    t.string   "subject",                          :null => false
+    t.text     "content",                          :null => false
+    t.integer  "author_id",                        :null => false
+    t.integer  "replies_count", :default => 0
+    t.integer  "last_reply_id"
+    t.boolean  "lock",          :default => false
+    t.boolean  "sticky",        :default => false
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "viewed_count",  :default => 0
+  end
+
+  create_table "message_alls", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "message_id"
+    t.string   "message_type"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  create_table "messages", :force => true do |t|
+    t.integer  "board_id",                         :null => false
+    t.integer  "parent_id"
+    t.string   "subject",       :default => "",    :null => false
+    t.text     "content"
+    t.integer  "author_id"
+    t.integer  "replies_count", :default => 0,     :null => false
+    t.integer  "last_reply_id"
+    t.datetime "created_on",                       :null => false
+    t.datetime "updated_on",                       :null => false
+    t.boolean  "locked",        :default => false
+    t.integer  "sticky",        :default => 0
+    t.integer  "reply_id"
+  end
+
+  add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
+  add_index "messages", ["board_id"], :name => "messages_board_id"
+  add_index "messages", ["created_on"], :name => "index_messages_on_created_on"
+  add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
+  add_index "messages", ["parent_id"], :name => "messages_parent_id"
+
+  create_table "news", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "title",          :limit => 60, :default => "", :null => false
+    t.string   "summary",                      :default => ""
+    t.text     "description"
+    t.integer  "author_id",                    :default => 0,  :null => false
+    t.datetime "created_on"
+    t.integer  "comments_count",               :default => 0,  :null => false
+    t.integer  "course_id"
+    t.integer  "sticky",                       :default => 0
+  end
+
+  add_index "news", ["author_id"], :name => "index_news_on_author_id"
+  add_index "news", ["created_on"], :name => "index_news_on_created_on"
+  add_index "news", ["project_id"], :name => "news_project_id"
+
+  create_table "no_uses", :force => true do |t|
+    t.integer  "user_id",     :null => false
+    t.string   "no_use_type"
+    t.integer  "no_use_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "notificationcomments", :force => true do |t|
+    t.string   "notificationcommented_type"
+    t.integer  "notificationcommented_id"
+    t.integer  "author_id"
+    t.text     "notificationcomments"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+  end
+
+  create_table "onclick_times", :force => true do |t|
+    t.integer  "user_id"
+    t.datetime "onclick_time"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  create_table "open_id_authentication_associations", :force => true do |t|
+    t.integer "issued"
+    t.integer "lifetime"
+    t.string  "handle"
+    t.string  "assoc_type"
+    t.binary  "server_url"
+    t.binary  "secret"
+  end
+
+  create_table "open_id_authentication_nonces", :force => true do |t|
+    t.integer "timestamp",  :null => false
+    t.string  "server_url"
+    t.string  "salt",       :null => false
+  end
+
+  create_table "open_source_projects", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "commit_count",     :default => 0
+    t.integer  "code_line",        :default => 0
+    t.integer  "users_count",      :default => 0
+    t.date     "last_commit_time"
+    t.string   "url"
+    t.date     "date_collected"
+    t.datetime "created_at",                      :null => false
+    t.datetime "updated_at",                      :null => false
+  end
+
+  create_table "option_numbers", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "memo"
+    t.integer  "messages_for_issues"
+    t.integer  "issues_status"
+    t.integer  "replay_for_message"
+    t.integer  "replay_for_memo"
+    t.integer  "follow"
+    t.integer  "tread"
+    t.integer  "praise_by_one"
+    t.integer  "praise_by_two"
+    t.integer  "praise_by_three"
+    t.integer  "tread_by_one"
+    t.integer  "tread_by_two"
+    t.integer  "tread_by_three"
+    t.integer  "changeset"
+    t.integer  "document"
+    t.integer  "attachment"
+    t.integer  "issue_done_ratio"
+    t.integer  "post_issue"
+    t.integer  "score_type"
+    t.integer  "total_score"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+    t.integer  "project_id"
+  end
+
+  create_table "org_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "org_act_id"
+    t.string   "org_act_type"
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  create_table "org_courses", :force => true do |t|
+    t.integer  "organization_id"
+    t.integer  "course_id"
+    t.datetime "created_at"
+  end
+
+  create_table "org_document_comments", :force => true do |t|
+    t.text     "title"
+    t.text     "content"
+    t.integer  "organization_id"
+    t.integer  "creator_id"
+    t.integer  "parent_id"
+    t.integer  "reply_id"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+    t.boolean  "locked",          :default => false
+    t.integer  "sticky",          :default => 0
+  end
+
+  create_table "org_member_roles", :force => true do |t|
+    t.integer "org_member_id"
+    t.integer "role_id"
+  end
+
+  create_table "org_members", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "organization_id"
+    t.string   "role"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "org_projects", :force => true do |t|
+    t.integer  "organization_id"
+    t.integer  "project_id"
+    t.datetime "created_at"
+  end
+
+  create_table "organizations", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "creator_id"
+    t.integer  "home_id"
+    t.string   "domain"
+    t.boolean  "is_public"
+    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"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "poll_answers", :force => true do |t|
+    t.integer  "poll_question_id"
+    t.text     "answer_text"
+    t.integer  "answer_position"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "poll_questions", :force => true do |t|
+    t.string   "question_title"
+    t.integer  "question_type"
+    t.integer  "is_necessary"
+    t.integer  "poll_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.integer  "question_number"
+  end
+
+  create_table "poll_users", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "poll_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "poll_votes", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "poll_question_id"
+    t.integer  "poll_answer_id"
+    t.text     "vote_text"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "polls", :force => true do |t|
+    t.string   "polls_name"
+    t.string   "polls_type"
+    t.integer  "polls_group_id"
+    t.integer  "polls_status"
+    t.integer  "user_id"
+    t.datetime "published_at"
+    t.datetime "closed_at"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.text     "polls_description"
+    t.integer  "show_result",       :default => 1
+  end
+
+  create_table "praise_tread_caches", :force => true do |t|
+    t.integer  "object_id",   :null => false
+    t.string   "object_type"
+    t.integer  "praise_num"
+    t.integer  "tread_num"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "praise_treads", :force => true do |t|
+    t.integer  "user_id",                  :null => false
+    t.integer  "praise_tread_object_id"
+    t.string   "praise_tread_object_type"
+    t.integer  "praise_or_tread"
+    t.datetime "created_at",               :null => false
+    t.datetime "updated_at",               :null => false
+  end
+
+  create_table "principal_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "principal_id"
+    t.integer  "principal_act_id"
+    t.string   "principal_act_type"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "project_infos", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "project_scores", :force => true do |t|
+    t.string   "project_id"
+    t.integer  "score"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "issue_num",         :default => 0
+    t.integer  "issue_journal_num", :default => 0
+    t.integer  "news_num",          :default => 0
+    t.integer  "documents_num",     :default => 0
+    t.integer  "changeset_num",     :default => 0
+    t.integer  "board_message_num", :default => 0
+  end
+
+  create_table "project_statuses", :force => true do |t|
+    t.integer "changesets_count"
+    t.integer "watchers_count"
+    t.integer "project_id"
+    t.integer "project_type"
+    t.float   "grade",            :default => 0.0
+    t.integer "course_ac_para",   :default => 0
+  end
+
+  add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade"
+
+  create_table "projecting_softapplictions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "softapplication_id"
+    t.integer  "project_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "projects", :force => true do |t|
+    t.string   "name",             :default => "",    :null => false
+    t.text     "description"
+    t.string   "homepage",         :default => ""
+    t.boolean  "is_public",        :default => true,  :null => false
+    t.integer  "parent_id"
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.string   "identifier"
+    t.integer  "status",           :default => 1,     :null => false
+    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"
+  end
+
+  add_index "projects", ["lft"], :name => "index_projects_on_lft"
+  add_index "projects", ["rgt"], :name => "index_projects_on_rgt"
+
+  create_table "projects_trackers", :id => false, :force => true do |t|
+    t.integer "project_id", :default => 0, :null => false
+    t.integer "tracker_id", :default => 0, :null => false
+  end
+
+  add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
+  add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
+
+  create_table "queries", :force => true do |t|
+    t.integer "project_id"
+    t.string  "name",          :default => "",    :null => false
+    t.text    "filters"
+    t.integer "user_id",       :default => 0,     :null => false
+    t.boolean "is_public",     :default => false, :null => false
+    t.text    "column_names"
+    t.text    "sort_criteria"
+    t.string  "group_by"
+    t.string  "type"
+  end
+
+  add_index "queries", ["project_id"], :name => "index_queries_on_project_id"
+  add_index "queries", ["user_id"], :name => "index_queries_on_user_id"
+
+  create_table "relative_memo_to_open_source_projects", :force => true do |t|
+    t.integer  "osp_id"
+    t.integer  "relative_memo_id"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "relative_memos", :force => true do |t|
+    t.integer  "osp_id"
+    t.integer  "parent_id"
+    t.string   "subject",                                                   :null => false
+    t.text     "content",            :limit => 16777215,                    :null => false
+    t.integer  "author_id"
+    t.integer  "replies_count",                          :default => 0
+    t.integer  "last_reply_id"
+    t.boolean  "lock",                                   :default => false
+    t.boolean  "sticky",                                 :default => false
+    t.boolean  "is_quote",                               :default => false
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
+    t.integer  "viewed_count_crawl",                     :default => 0
+    t.integer  "viewed_count_local",                     :default => 0
+    t.string   "url"
+    t.string   "username"
+    t.string   "userhomeurl"
+    t.date     "date_collected"
+    t.string   "topic_resource"
+  end
+
+  create_table "repositories", :force => true do |t|
+    t.integer "project_id",                  :default => 0,     :null => false
+    t.string  "url",                         :default => "",    :null => false
+    t.string  "login",         :limit => 60, :default => ""
+    t.string  "password",                    :default => ""
+    t.string  "root_url",                    :default => ""
+    t.string  "type"
+    t.string  "path_encoding", :limit => 64
+    t.string  "log_encoding",  :limit => 64
+    t.text    "extra_info"
+    t.string  "identifier"
+    t.boolean "is_default",                  :default => false
+    t.boolean "hidden",                      :default => false
+  end
+
+  add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
+
+  create_table "rich_rich_files", :force => true do |t|
+    t.datetime "created_at",                                 :null => false
+    t.datetime "updated_at",                                 :null => false
+    t.string   "rich_file_file_name"
+    t.string   "rich_file_content_type"
+    t.integer  "rich_file_file_size"
+    t.datetime "rich_file_updated_at"
+    t.string   "owner_type"
+    t.integer  "owner_id"
+    t.text     "uri_cache"
+    t.string   "simplified_type",        :default => "file"
+  end
+
+  create_table "roles", :force => true do |t|
+    t.string  "name",              :limit => 30, :default => "",        :null => false
+    t.integer "position",                        :default => 1
+    t.boolean "assignable",                      :default => true
+    t.integer "builtin",                         :default => 0,         :null => false
+    t.text    "permissions"
+    t.string  "issues_visibility", :limit => 30, :default => "default", :null => false
+  end
+
+  create_table "schools", :force => true do |t|
+    t.string   "name"
+    t.string   "province"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+    t.string   "logo_link"
+    t.string   "pinyin"
+  end
+
+  create_table "seems_rateable_cached_ratings", :force => true do |t|
+    t.integer  "cacheable_id",   :limit => 8
+    t.string   "cacheable_type"
+    t.float    "avg",                         :null => false
+    t.integer  "cnt",                         :null => false
+    t.string   "dimension"
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+  end
+
+  create_table "seems_rateable_rates", :force => true do |t|
+    t.integer  "rater_id",         :limit => 8
+    t.integer  "rateable_id"
+    t.string   "rateable_type"
+    t.float    "stars",                                        :null => false
+    t.string   "dimension"
+    t.datetime "created_at",                                   :null => false
+    t.datetime "updated_at",                                   :null => false
+    t.integer  "is_teacher_score",              :default => 0
+  end
+
+  create_table "settings", :force => true do |t|
+    t.string   "name",       :default => "", :null => false
+    t.text     "value"
+    t.datetime "updated_on"
+  end
+
+  add_index "settings", ["name"], :name => "index_settings_on_name"
+
+  create_table "shares", :force => true do |t|
+    t.date     "created_on"
+    t.string   "url"
+    t.string   "title"
+    t.integer  "share_type"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.string   "description"
+  end
+
+  create_table "softapplications", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "app_type_id"
+    t.string   "app_type_name"
+    t.string   "android_min_version_available"
+    t.integer  "user_id"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "contest_id"
+    t.integer  "softapplication_id"
+    t.integer  "is_public"
+    t.string   "application_developers"
+    t.string   "deposit_project_url"
+    t.string   "deposit_project"
+    t.integer  "project_id"
+  end
+
+  create_table "student_work_tests", :force => true do |t|
+    t.integer  "student_work_id"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "status",          :default => 9
+    t.text     "results"
+    t.text     "src"
+  end
+
+  create_table "student_works", :force => true do |t|
+    t.string   "name"
+    t.text     "description",             :limit => 2147483647
+    t.integer  "homework_common_id"
+    t.integer  "user_id"
+    t.float    "final_score"
+    t.float    "teacher_score"
+    t.float    "student_score"
+    t.float    "teaching_asistant_score"
+    t.integer  "project_id",                                    :default => 0
+    t.datetime "created_at",                                                       :null => false
+    t.datetime "updated_at",                                                       :null => false
+    t.integer  "late_penalty",                                  :default => 0
+    t.integer  "absence_penalty",                               :default => 0
+    t.float    "system_score",                                  :default => 0.0
+    t.boolean  "is_test",                                       :default => false
+  end
+
+  create_table "student_works_evaluation_distributions", :force => true do |t|
+    t.integer  "student_work_id"
+    t.integer  "user_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "student_works_scores", :force => true do |t|
+    t.integer  "student_work_id"
+    t.integer  "user_id"
+    t.integer  "score"
+    t.text     "comment"
+    t.integer  "reviewer_role"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "students_for_courses", :force => true do |t|
+    t.integer  "student_id"
+    t.integer  "course_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id"
+  add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id"
+
+  create_table "system_messages", :force => true do |t|
+    t.integer  "user_id"
+    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|
+    t.integer  "tag_id"
+    t.integer  "taggable_id"
+    t.string   "taggable_type"
+    t.integer  "tagger_id"
+    t.string   "tagger_type"
+    t.string   "context",       :limit => 128
+    t.datetime "created_at"
+  end
+
+  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
+  add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
+  add_index "taggings", ["taggable_type"], :name => "index_taggings_on_taggable_type"
+
+  create_table "tags", :force => true do |t|
+    t.string "name"
+  end
+
+  create_table "teachers", :force => true do |t|
+    t.string   "tea_name"
+    t.string   "location"
+    t.integer  "couurse_time"
+    t.integer  "course_code"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+    t.string   "extra"
+  end
+
+  create_table "time_entries", :force => true do |t|
+    t.integer  "project_id",  :null => false
+    t.integer  "user_id",     :null => false
+    t.integer  "issue_id"
+    t.float    "hours",       :null => false
+    t.string   "comments"
+    t.integer  "activity_id", :null => false
+    t.date     "spent_on",    :null => false
+    t.integer  "tyear",       :null => false
+    t.integer  "tmonth",      :null => false
+    t.integer  "tweek",       :null => false
+    t.datetime "created_on",  :null => false
+    t.datetime "updated_on",  :null => false
+  end
+
+  add_index "time_entries", ["activity_id"], :name => "index_time_entries_on_activity_id"
+  add_index "time_entries", ["created_on"], :name => "index_time_entries_on_created_on"
+  add_index "time_entries", ["issue_id"], :name => "time_entries_issue_id"
+  add_index "time_entries", ["project_id"], :name => "time_entries_project_id"
+  add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id"
+
+  create_table "tokens", :force => true do |t|
+    t.integer  "user_id",                  :default => 0,  :null => false
+    t.string   "action",     :limit => 30, :default => "", :null => false
+    t.string   "value",      :limit => 40, :default => "", :null => false
+    t.datetime "created_on",                               :null => false
+  end
+
+  add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id"
+  add_index "tokens", ["value"], :name => "tokens_value", :unique => true
+
+  create_table "trackers", :force => true do |t|
+    t.string  "name",          :limit => 30, :default => "",    :null => false
+    t.boolean "is_in_chlog",                 :default => false, :null => false
+    t.integer "position",                    :default => 1
+    t.boolean "is_in_roadmap",               :default => true,  :null => false
+    t.integer "fields_bits",                 :default => 0
+  end
+
+  create_table "user_activities", :force => true do |t|
+    t.string   "act_type"
+    t.integer  "act_id"
+    t.string   "container_type"
+    t.integer  "container_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+    t.integer  "user_id"
+  end
+
+  create_table "user_extensions", :force => true do |t|
+    t.integer  "user_id",                            :null => false
+    t.date     "birthday"
+    t.string   "brief_introduction"
+    t.integer  "gender"
+    t.string   "location"
+    t.string   "occupation"
+    t.integer  "work_experience"
+    t.integer  "zip_code"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+    t.string   "technical_title"
+    t.integer  "identity"
+    t.string   "student_id"
+    t.string   "teacher_realname"
+    t.string   "student_realname"
+    t.string   "location_city"
+    t.integer  "school_id"
+    t.string   "description",        :default => ""
+  end
+
+  create_table "user_feedback_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "journals_for_message_id"
+    t.string   "journals_for_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
+  create_table "user_grades", :force => true do |t|
+    t.integer  "user_id",                     :null => false
+    t.integer  "project_id",                  :null => false
+    t.float    "grade",      :default => 0.0
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+  end
+
+  add_index "user_grades", ["grade"], :name => "index_user_grades_on_grade"
+  add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id"
+  add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id"
+
+  create_table "user_levels", :force => true do |t|
+    t.integer "user_id"
+    t.integer "level"
+  end
+
+  create_table "user_preferences", :force => true do |t|
+    t.integer "user_id",   :default => 0,     :null => false
+    t.text    "others"
+    t.boolean "hide_mail", :default => false
+    t.string  "time_zone"
+  end
+
+  add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id"
+
+  create_table "user_score_details", :force => true do |t|
+    t.integer  "current_user_id"
+    t.integer  "target_user_id"
+    t.string   "score_type"
+    t.string   "score_action"
+    t.integer  "user_id"
+    t.integer  "old_score"
+    t.integer  "new_score"
+    t.integer  "current_user_level"
+    t.integer  "target_user_level"
+    t.integer  "score_changeable_obj_id"
+    t.string   "score_changeable_obj_type"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
+  create_table "user_scores", :force => true do |t|
+    t.integer  "user_id",       :null => false
+    t.integer  "collaboration"
+    t.integer  "influence"
+    t.integer  "skill"
+    t.integer  "active"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
+  end
+
+  create_table "user_statuses", :force => true do |t|
+    t.integer  "changesets_count"
+    t.integer  "watchers_count"
+    t.integer  "user_id"
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+    t.float    "grade",            :default => 0.0
+  end
+
+  add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count"
+  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 "users", :force => true do |t|
+    t.string   "login",                           :default => "",    :null => false
+    t.string   "hashed_password",   :limit => 40, :default => "",    :null => false
+    t.string   "firstname",         :limit => 30, :default => "",    :null => false
+    t.string   "lastname",                        :default => "",    :null => false
+    t.string   "mail",              :limit => 60, :default => "",    :null => false
+    t.boolean  "admin",                           :default => false, :null => false
+    t.integer  "status",                          :default => 1,     :null => false
+    t.datetime "last_login_on"
+    t.string   "language",          :limit => 5,  :default => ""
+    t.integer  "auth_source_id"
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.string   "type"
+    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"
+  add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
+  add_index "users", ["type"], :name => "index_users_on_type"
+
+  create_table "versions", :force => true do |t|
+    t.integer  "project_id",      :default => 0,      :null => false
+    t.string   "name",            :default => "",     :null => false
+    t.string   "description",     :default => ""
+    t.date     "effective_date"
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.string   "wiki_page_title"
+    t.string   "status",          :default => "open"
+    t.string   "sharing",         :default => "none", :null => false
+  end
+
+  add_index "versions", ["project_id"], :name => "versions_project_id"
+  add_index "versions", ["sharing"], :name => "index_versions_on_sharing"
+
+  create_table "visitors", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "master_id"
+    t.datetime "updated_on"
+    t.datetime "created_on"
+  end
+
+  add_index "visitors", ["master_id"], :name => "index_visitors_master_id"
+  add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on"
+  add_index "visitors", ["user_id"], :name => "index_visitors_user_id"
+
+  create_table "watchers", :force => true do |t|
+    t.string  "watchable_type", :default => "", :null => false
+    t.integer "watchable_id",   :default => 0,  :null => false
+    t.integer "user_id"
+  end
+
+  add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type"
+  add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id"
+  add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type"
+
+  create_table "web_footer_companies", :force => true do |t|
+    t.string   "name"
+    t.string   "logo_size"
+    t.string   "url"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "web_footer_oranizers", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_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
+    t.integer  "author_id"
+    t.binary   "data",            :limit => 2147483647
+    t.string   "compression",     :limit => 6,          :default => ""
+    t.string   "comments",                              :default => ""
+    t.datetime "updated_on",                                            :null => false
+    t.integer  "version",                                               :null => false
+  end
+
+  add_index "wiki_content_versions", ["updated_on"], :name => "index_wiki_content_versions_on_updated_on"
+  add_index "wiki_content_versions", ["wiki_content_id"], :name => "wiki_content_versions_wcid"
+
+  create_table "wiki_contents", :force => true do |t|
+    t.integer  "page_id",                                          :null => false
+    t.integer  "author_id"
+    t.text     "text",       :limit => 2147483647
+    t.string   "comments",                         :default => ""
+    t.datetime "updated_on",                                       :null => false
+    t.integer  "version",                                          :null => false
+  end
+
+  add_index "wiki_contents", ["author_id"], :name => "index_wiki_contents_on_author_id"
+  add_index "wiki_contents", ["page_id"], :name => "wiki_contents_page_id"
+
+  create_table "wiki_pages", :force => true do |t|
+    t.integer  "wiki_id",                       :null => false
+    t.string   "title",                         :null => false
+    t.datetime "created_on",                    :null => false
+    t.boolean  "protected",  :default => false, :null => false
+    t.integer  "parent_id"
+  end
+
+  add_index "wiki_pages", ["parent_id"], :name => "index_wiki_pages_on_parent_id"
+  add_index "wiki_pages", ["wiki_id", "title"], :name => "wiki_pages_wiki_id_title"
+  add_index "wiki_pages", ["wiki_id"], :name => "index_wiki_pages_on_wiki_id"
+
+  create_table "wiki_redirects", :force => true do |t|
+    t.integer  "wiki_id",      :null => false
+    t.string   "title"
+    t.string   "redirects_to"
+    t.datetime "created_on",   :null => false
+  end
+
+  add_index "wiki_redirects", ["wiki_id", "title"], :name => "wiki_redirects_wiki_id_title"
+  add_index "wiki_redirects", ["wiki_id"], :name => "index_wiki_redirects_on_wiki_id"
+
+  create_table "wikis", :force => true do |t|
+    t.integer "project_id",                :null => false
+    t.string  "start_page",                :null => false
+    t.integer "status",     :default => 1, :null => false
+  end
+
+  add_index "wikis", ["project_id"], :name => "wikis_project_id"
+
+  create_table "workflows", :force => true do |t|
+    t.integer "tracker_id",                  :default => 0,     :null => false
+    t.integer "old_status_id",               :default => 0,     :null => false
+    t.integer "new_status_id",               :default => 0,     :null => false
+    t.integer "role_id",                     :default => 0,     :null => false
+    t.boolean "assignee",                    :default => false, :null => false
+    t.boolean "author",                      :default => false, :null => false
+    t.string  "type",          :limit => 30
+    t.string  "field_name",    :limit => 30
+    t.string  "rule",          :limit => 30
+  end
+
+  add_index "workflows", ["new_status_id"], :name => "index_workflows_on_new_status_id"
+  add_index "workflows", ["old_status_id"], :name => "index_workflows_on_old_status_id"
+  add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status"
+  add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id"
+
+  create_table "works_categories", :force => true do |t|
+    t.string   "category"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "zip_packs", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "homework_id"
+    t.string   "file_digest"
+    t.string   "file_path"
+    t.integer  "pack_times",   :default => 1
+    t.integer  "pack_size",    :default => 0
+    t.text     "file_digests"
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+  end
+
+end

From 3e0609afe3a0e8f85d0dc7779dd5e41bc41203b1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 25 Nov 2015 10:24:46 +0800
Subject: [PATCH 06/21] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E6=97=B6=E9=95=BF?=
 =?UTF-8?q?=E5=92=8C=E9=A2=98=E7=9B=AE=E5=88=86=E6=95=B0=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_exercise_form.html.erb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index cabd0b5e4..6b8e93bd0 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -87,6 +87,8 @@
         var standard_ans = $.trim($("#question_standard_ans").val());
         if(title.length == 0 || score.length == 0){
             alert("题目标题/分数不能为空");
+        }else if(!/^[1-9][0-9]*$/.test(score)) {
+            alert("分数必须是非零开头的数字");
         }else if(quest_type !=3 && standard_ans.length == 0) {
             alert("标准答案不能为空");
         }else{
@@ -100,6 +102,8 @@
         var standard_ans = $.trim($("#poll_question_standard_answer_" + id).val());
         if(title.length == 0 || score.length == 0){
             alert("题目标题/分数不能为空");
+        }else if(!/^[1-9][0-9]*$/.test(score)) {
+            alert("分数必须是非零开头的数字");
         }else if(quest_type !=3 && standard_ans.length == 0) {
             alert("标准答案不能为空");
         }else{
@@ -116,6 +120,8 @@
             alert("截止时间不能为空");
         } else if(Date.parse($("#exercise_end_time").val()) < Date.now()) {
             alert("截止时间不能小于当前时间");
+        } else if($.trim($("#exercise_time").val()) !="" && !/^[1-9][0-9]*$/.test($.trim($("#exercise_time").val()))) {
+            alert("测验时长必须为非零开头的数字");
         }
         else {
             doc.parent().parent().parent().submit();

From 7fb78e48162f0e7bba877f54a019379f371438fb Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 25 Nov 2015 10:38:43 +0800
Subject: [PATCH 07/21] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=B5=8B=E9=AA=8C?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E7=AD=89=E5=86=85=E5=AE=B9=E6=97=B6=20?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8F=96=E6=B6=88=E5=BA=94=E8=BF=98=E5=8E=9F?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A1=86=E4=B8=AD=E7=9A=84=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_edit_head.html.erb | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/views/exercise/_edit_head.html.erb b/app/views/exercise/_edit_head.html.erb
index 6c357130c..c8ba0c4d7 100644
--- a/app/views/exercise/_edit_head.html.erb
+++ b/app/views/exercise/_edit_head.html.erb
@@ -3,9 +3,6 @@
       <div>
         <input name="exercise[exercise_name]" maxlength="100" id="exercise_name" class="testTitle mb10" type="text" placeholder="测验标题" value="<%=@exercise.exercise_name%>" />
       </div>
-      <%# if edit_mode %>
-      <!--<label class="fl c_grey f14" style="margin-top: 4px;">发布日期(可选)：</label>-->
-      <%# end %>
       <label class="fl c_grey f14" style="margin-top: 4px;">截止时间：</label>
       <div class="calendar_div fl">
         <input  type="text" name="exercise[end_time]" id="exercise_end_time" placeholder="截止时间" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d") if exercise.end_time %>"/>
@@ -23,10 +20,20 @@
         <a class="btn_submit c_white" data-button="ok" onclick="pollsSubmit($(this));">
           保存
         </a>
-        <a class="btn_cancel" data-button="cancel" onclick="pollsCancel();">
+        <a class="btn_cancel" data-button="cancel" onclick="resetHead();pollsCancel();">
           <%= l(:button_cancel)%>
         </a>
       </div>
       <div class="cl"></div>
     </div>
-<% end %>
\ No newline at end of file
+<% end %>
+<script type="text/javascript">
+    function resetHead()
+    {
+        $("#exercise_name").val("<%=@exercise.exercise_name%>");
+        $("#exercise_end_time").val("<%= Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d") if exercise.end_time %>");
+        $("#exercise_time").val("<%=exercise.time if exercise.time!= -1 %>");
+        $("#exercise_publish_time").val("<%= Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d") if !exercise.publish_time.nil?%>");
+        $("#exercise_description").val("<%=exercise.exercise_description %>");
+    }
+</script>
\ No newline at end of file

From bd7ee66e77f4227c6b4588482462dc78ce9e5e8f Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Wed, 25 Nov 2015 15:02:32 +0800
Subject: [PATCH 08/21] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=B5=8B=E9=AA=8C?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_exercise.html.erb       | 122 +++++++++---------
 app/views/exercise/_exercises_list.html.erb |  48 ++++----
 app/views/exercise/index.html.erb           | 129 ++++++++++----------
 3 files changed, 153 insertions(+), 146 deletions(-)

diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb
index f5896c5e3..40654d327 100644
--- a/app/views/exercise/_exercise.html.erb
+++ b/app/views/exercise/_exercise.html.erb
@@ -1,61 +1,63 @@
-<%# has_commit = has_commit_poll?(poll.id ,User.current)%>
-<% exercise_name = exercise.exercise_name.empty? ? l(:label_poll_new) : exercise.exercise_name%>
-<% if @is_teacher%>
-    <li title="<%= exercise.exercise_name %>">
-      <div style="width: 310px;float: left;">
-        <%# if has_commit %>
-            <%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%>
-        <%# else %>
-            <%#= link_to poll_name, exercise_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %>
-        <%# end %>
-        <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %>
-      </div>
-    </li>
-
-    <% if exercise.exercise_status == 1%>
-        <li class="pollsbtn fl ml10 pollsbtn_grey">统计结果</li>
-    <% else %>
-        <li><%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fl ml10"%></li>
-    <% end%>
-
-    <% if exercise.exercise_status == 1 %>
-        <li><a href="javascript:" class="pollsbtn btn_pu fl ml5" onclick="exercise_submit(<%= exercise.id%>,<%= exercise.exercise_name.length %>);">发布试卷</a></li>
-    <% elsif exercise.exercise_status == 2%>
-        <li><a href="javascript:" class="pollsbtn btn_de fl ml5" onclick="republish_exercise(<%= exercise.id%>);">取消发布</a></li>
-    <% else%>
-        <li class="pollsbtn fl ml10 pollsbtn_grey" style="margin-left: 5px;" >发布试卷</li>
-    <% end%>
-
-    <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10")  %>
-
-    <% if exercise.exercise_status == 1 %>
-        <li><%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml5"%></li>
-    <% else%>
-        <li class="polls_de_grey fr ml5" title="未发布的试卷才能进行编辑">编辑</li>
-    <% end%>
-
-    <%# if exercise.exercise_status == 2 %>
-        <!--<li><a class="polls_de fr ml5" onclick="" href="javascript:">关闭</a></li>-->
-    <%# else %>
-        <!--<li class="polls_de_grey fr ml5" title="发布的问卷才能进行关闭">关闭</li>-->
-    <%# end%>
-
-    <%# if exercise.exercise_status == 1%>
-        <!--<li class="polls_de_grey fr ml5">导出</li>-->
-    <%# elsif exercise.exercise_status == 2 || exercise.exercise_status == 3 %>
-        <!--<li><%#= link_to "导出", export_exercise_exercise_path(exercise.id,:format => "xls"), :class => "polls_de fr ml5"%></li>-->
-    <%# end%>
-
-
-    <li class="polls_date fr"><%= format_date exercise.created_at.to_date%></li>
-<% else%>
-    <% if exercise.exercise_status == 2%>
-        <%# if has_commit%>
-            <!--li><%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_st fl c_dblue" %></li>
-            <li class="pollsbtn_tip fl ml5">已答</li-->
-        <%#else%>
-            <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%>
-        <%#end%>
-    <% end%>
-    <li class="polls_date fr mr10"><%= format_date exercise.created_at.to_date%></li>
+<%# has_commit = has_commit_poll?(poll.id ,User.current)%>
+<% exercise_name = exercise.exercise_name.empty? ? l(:label_poll_new) : exercise.exercise_name%>
+<% if @is_teacher%>
+    <li title="<%= exercise.exercise_name %>">
+      <div style="width: 310px;float: left;">
+        <%# if has_commit %>
+            <%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%>
+        <%# else %>
+            <%#= link_to poll_name, exercise_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %>
+        <%# end %>
+        <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %>
+      </div>
+    </li>
+
+    <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10")  %>
+
+    <% if exercise.exercise_status == 1 %>
+        <li><%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml5"%></li>
+    <% else%>
+        <li class="polls_de_grey fr ml5" title="未发布的试卷才能进行编辑">编辑</li>
+    <% end%>
+
+    <%# if exercise.exercise_status == 2 %>
+        <!--<li><a class="polls_de fr ml5" onclick="" href="javascript:">关闭</a></li>-->
+    <%# else %>
+        <!--<li class="polls_de_grey fr ml5" title="发布的问卷才能进行关闭">关闭</li>-->
+    <%# end%>
+
+    <%# if exercise.exercise_status == 1%>
+        <!--<li class="polls_de_grey fr ml5">导出</li>-->
+    <%# elsif exercise.exercise_status == 2 || exercise.exercise_status == 3 %>
+        <!--<li><%#= link_to "导出", export_exercise_exercise_path(exercise.id,:format => "xls"), :class => "polls_de fr ml5"%></li>-->
+    <%# end%>
+
+
+    <li class="polls_date fr"><%= format_date exercise.created_at.to_date%></li>
+
+
+    <% if exercise.exercise_status == 1 %>
+        <li><a href="javascript:" class="pollsbtn btn_pu fr mr5" onclick="exercise_submit(<%= exercise.id%>,<%= exercise.exercise_name.length %>);">发布试卷</a></li>
+    <% elsif exercise.exercise_status == 2%>
+        <li><a href="javascript:" class="pollsbtn btn_de fr mr5" onclick="republish_exercise(<%= exercise.id%>);">取消发布</a></li>
+    <% else%>
+        <li class="pollsbtn fr mr10 pollsbtn_grey" style="margin-left: 5px;" >发布试卷</li>
+    <% end%>
+
+    <% if exercise.exercise_status == 1%>
+        <li class="pollsbtn fr mr10 pollsbtn_grey">统计结果</li>
+    <% else %>
+        <li><%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fr mr10"%></li>
+    <% end%>
+
+<% else%>
+    <% if exercise.exercise_status == 2%>
+        <%# if has_commit%>
+            <!--li><%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_st fl c_dblue" %></li>
+            <li class="pollsbtn_tip fl ml5">已答</li-->
+        <%#else%>
+            <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%>
+        <%#end%>
+    <% end%>
+    <li class="polls_date fr mr10"><%= format_date exercise.created_at.to_date%></li>
 <% end%>
\ No newline at end of file
diff --git a/app/views/exercise/_exercises_list.html.erb b/app/views/exercise/_exercises_list.html.erb
index d1774f637..f277ebdf5 100644
--- a/app/views/exercise/_exercises_list.html.erb
+++ b/app/views/exercise/_exercises_list.html.erb
@@ -1,25 +1,25 @@
-<div class="polls_head">
-  <h2>所有试卷
-    <span>（<%= @obj_count%>）</span>
-  </h2>
-  <% if @is_teacher%>
-      <%#= link_to "导入", other_poll_poll_index_path(:polls_group_id => @course.id), :remote=>true,:class => "newbtn"%>
-      <%= link_to "新建试卷 ", new_exercise_path(:course_id => @course.id), :class => "newbtn" %>
-  <% end%>
-</div>
-<div class="cl"></div>
-<div id="polls_list" class="polls_list">
-
-  <% @exercises.each do |exercise|%>
-      <ul id="exercises_<%= exercise.id %>" class="polls_list_ul">
-        <%= render :partial => 'exercise', :locals => {:exercise => exercise} %>
-      </ul>
-      <div class="cl"></div>
-  <% end%>
-
-  <ul class="wlist">
-    <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-  </ul>
-
-  <div class="cl"></div>
+<div class="polls_head" style="width:730px;">
+  <h2>所有试卷
+    <span>（<%= @obj_count%>）</span>
+  </h2>
+  <% if @is_teacher%>
+      <%#= link_to "导入", other_poll_poll_index_path(:polls_group_id => @course.id), :remote=>true,:class => "newbtn"%>
+      <%= link_to "新建试卷 ", new_exercise_path(:course_id => @course.id), :class => "newbtn" %>
+  <% end%>
+</div>
+<div class="cl"></div>
+<div id="polls_list" class="polls_list">
+
+  <% @exercises.each do |exercise|%>
+      <ul id="exercises_<%= exercise.id %>" class="polls_list_ul">
+        <%= render :partial => 'exercise', :locals => {:exercise => exercise} %>
+      </ul>
+      <div class="cl"></div>
+  <% end%>
+
+  <ul class="wlist">
+    <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+  </ul>
+
+  <div class="cl"></div>
 </div><!--列表end-->
\ No newline at end of file
diff --git a/app/views/exercise/index.html.erb b/app/views/exercise/index.html.erb
index 3cff84e1c..aacc79950 100644
--- a/app/views/exercise/index.html.erb
+++ b/app/views/exercise/index.html.erb
@@ -1,63 +1,68 @@
-<%= stylesheet_link_tag  'polls', :media => 'all' %>
-<script type="text/javascript">
-    function republish_exercise(exercise_id)
-    {
-        $('#ajax-modal').html("<div id='popbox02'>" +
-                "<div class='upload_con'>" +
-                "<div class='upload_box'>" +
-                "<p class='polls_box_p'>取消发布后学生答题将会被清空<br />是否确定取消发布该测验？</p>" +
-                "<div class='polls_btn_box'>" +
-                "<a href='/exercise/"+ exercise_id +"/republish_exercise' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
-                "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
-                "</div>" +
-                "<div class='cl'></div>" +
-                "</div>" +
-                "</div>" +
-                "</div>");
-        showModal('ajax-modal', '310px');
-        $('#ajax-modal').css('height','120px');
-        $('#ajax-modal').siblings().remove();
-        $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-                "<a onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-        $('#ajax-modal').parent().removeClass("alert_praise");
-        $('#ajax-modal').parent().css("top","").css("left","");
-        $('#ajax-modal').parent().addClass("popbox_polls");
-    }
-
-    function clickCanel(){hideModal("#popbox02");}
-
-    function exercise_submit(exercise_id,exercise_name)
-    {
-        if(exercise_name == 0)
-        {
-            alert("试卷标题不能为空");
-        }
-        else
-        {
-            $('#ajax-modal').html("<div id='popbox02'>" +
-                    "<div class='upload_con'>" +
-                    "<div class='upload_box'>" +
-                    "<p class='polls_box_p'>测验发布后将不能对测验进行修改，<br />是否确定发布该测验？</p>" +
-                    "<div class='polls_btn_box'>" +
-                    "<a href='/exercise/"+ exercise_id +"/publish_exercise' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
-                    "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
-                    "</div>" +
-                    "<div class='cl'></div>" +
-                    "</div>" +
-                    "</div>" +
-                    "</div>");
-            showModal('ajax-modal', '310px');
-            $('#ajax-modal').css('height','120px');
-            $('#ajax-modal').siblings().remove();
-            $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-                    "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-            $('#ajax-modal').parent().removeClass("alert_praise");
-            $('#ajax-modal').parent().css("top","").css("left","");
-            $('#ajax-modal').parent().addClass("popbox_polls");
-        }
-    }
-
-</script>
-<div class="polls_content02" id="exercise">
-  <%= render :partial => 'exercises_list'%>
+<%= stylesheet_link_tag  'polls', :media => 'all' %>
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").css("width","730px");
+        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
+        $("#Container").css("width","1000px");
+    });
+    function republish_exercise(exercise_id)
+    {
+        $('#ajax-modal').html("<div id='popbox02'>" +
+                "<div class='upload_con'>" +
+                "<div class='upload_box'>" +
+                "<p class='polls_box_p'>取消发布后学生答题将会被清空<br />是否确定取消发布该测验？</p>" +
+                "<div class='polls_btn_box'>" +
+                "<a href='/exercise/"+ exercise_id +"/republish_exercise' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
+                "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
+                "</div>" +
+                "<div class='cl'></div>" +
+                "</div>" +
+                "</div>" +
+                "</div>");
+        showModal('ajax-modal', '310px');
+        $('#ajax-modal').css('height','120px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+                "<a onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+        $('#ajax-modal').parent().removeClass("alert_praise");
+        $('#ajax-modal').parent().css("top","").css("left","");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+
+    function clickCanel(){hideModal("#popbox02");}
+
+    function exercise_submit(exercise_id,exercise_name)
+    {
+        if(exercise_name == 0)
+        {
+            alert("试卷标题不能为空");
+        }
+        else
+        {
+            $('#ajax-modal').html("<div id='popbox02'>" +
+                    "<div class='upload_con'>" +
+                    "<div class='upload_box'>" +
+                    "<p class='polls_box_p'>测验发布后将不能对测验进行修改，<br />是否确定发布该测验？</p>" +
+                    "<div class='polls_btn_box'>" +
+                    "<a href='/exercise/"+ exercise_id +"/publish_exercise' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
+                    "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
+                    "</div>" +
+                    "<div class='cl'></div>" +
+                    "</div>" +
+                    "</div>" +
+                    "</div>");
+            showModal('ajax-modal', '310px');
+            $('#ajax-modal').css('height','120px');
+            $('#ajax-modal').siblings().remove();
+            $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+                    "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+            $('#ajax-modal').parent().removeClass("alert_praise");
+            $('#ajax-modal').parent().css("top","").css("left","");
+            $('#ajax-modal').parent().addClass("popbox_polls");
+        }
+    }
+
+</script>
+<div class="polls_content02" id="exercise" style="width: 730px;">
+  <%= render :partial => 'exercises_list'%>
 </div><!--问卷内容end-->
\ No newline at end of file

From c7cf34500ca8d3401c5ea6d35a60d7ec5ddd4723 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 25 Nov 2015 16:05:02 +0800
Subject: [PATCH 09/21] =?UTF-8?q?=E8=80=81=E5=B8=88=E8=8B=A5=E6=9C=AA?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=B5=8B=E9=AA=8C=E7=9A=84=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=88=99=E6=8F=90=E4=BA=A4=E5=90=8E=E7=AB=8B?=
 =?UTF-8?q?=E5=8D=B3=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb            | 11 +++++++++++
 app/views/exercise/_exercise_form.html.erb        |  7 +++++--
 app/views/exercise/_exercise_submit_info.html.erb |  9 ++-------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index 6fcbb0c6c..2c1ad31c1 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -446,6 +446,17 @@ class ExerciseController < ApplicationController
   def commit_exercise
     # 老师不需要提交
     if User.current.allowed_to?(:as_teacher,@course)
+      if @exercise.publish_time.nil?
+        @exercise.update_attributes(:show_result => params[:show_result])
+        @exercise.update_attributes(:exercise_status => 2)
+        @exercise.update_attributes(:publish_time => Time.now)
+        redirect_to exercise_url(@exercise)
+        return
+      elsif Time.parse(@exercise.publish_time.to_s).strftime("%Y-%m-%d-%H-%M-%S") > Time.now.strftime("%Y-%m-%d-%H-%M-%S")
+        @exercise.update_attributes(:show_result => params[:show_result])
+        redirect_to exercise_url(@exercise)
+        return
+      end
       @exercise.update_attributes(:show_result => params[:show_result])
       redirect_to exercise_url(@exercise)
       # REDO: 提示提交成功
diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index 6b8e93bd0..66558936a 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -122,8 +122,11 @@
             alert("截止时间不能小于当前时间");
         } else if($.trim($("#exercise_time").val()) !="" && !/^[1-9][0-9]*$/.test($.trim($("#exercise_time").val()))) {
             alert("测验时长必须为非零开头的数字");
-        }
-        else {
+        } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_publish_time").val()) < Date.now()) {
+            alert("发布时间不能小于当前时间");
+        } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_end_time").val()) <= Date.parse($("#exercise_publish_time").val())) {
+            alert("截止时间必须大于发布时间");
+        } else {
             doc.parent().parent().parent().submit();
         }
     }
diff --git a/app/views/exercise/_exercise_submit_info.html.erb b/app/views/exercise/_exercise_submit_info.html.erb
index 0d7e8928c..0744b4fd1 100644
--- a/app/views/exercise/_exercise_submit_info.html.erb
+++ b/app/views/exercise/_exercise_submit_info.html.erb
@@ -19,14 +19,9 @@
       <% mc_count = exercise.exercise_questions.where("question_type=1").count %>
       <% mcq_count = exercise.exercise_questions.where("question_type=2").count %>
       <% single_count = exercise.exercise_questions.where("question_type=3").count %>
-      <p class="f14">当前测验
-        <% if question_count > 0 %>共有<%= question_count %>道题，其中<% end %>
-        <% if mc_count > 0 %><%= mc_count %>道单选、<% end %>
-        <% if mcq_count > 0 %><%= mcq_count %>道多选、<% end %>
-        <% if single_count > 0%><%= single_count %>道填空,<% end %>
-        总分为<span class="c_red"><%=current_score %></span>分。
+      <p class="f14">当前测验<%if question_count >0%>共有<%= question_count %>道题，其中<%end%><%if mc_count > 0%><%=mc_count %>道单选、<%end%><%if mcq_count > 0%><%=mcq_count %>道多选、<%end%><%if single_count > 0%><%=single_count %>道填空，<%end%>总分为<span class="c_red"><%=current_score %></span>分。
         <br /><br />
-        是否确定提交该测验？
+        <% if exercise.publish_time.nil? %>点击提交后测验将立即发布，<% end %>是否确定提交该测验？
       </p>
       <div class="polls_btn_box">
         <a class="upload_btn" onclick="exercise_submit();">

From 6f4b6a6b67aa397877c9fe86229fe6752e729f67 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 26 Nov 2015 10:03:12 +0800
Subject: [PATCH 10/21] =?UTF-8?q?=E5=A1=AB=E7=A9=BA=E9=A2=98=E7=9A=84?=
 =?UTF-8?q?=E5=80=99=E9=80=89=E7=AD=94=E6=A1=88=E4=B8=8D=E8=83=BD=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=EF=BC=8C=E9=80=89=E6=8B=A9=E9=A2=98=E5=92=8C=E5=A1=AB?=
 =?UTF-8?q?=E7=A9=BA=E9=A2=98=E8=87=B3=E5=B0=91=E5=BE=97=E6=9C=89=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E9=80=89=E9=A1=B9=E6=88=96=E4=B8=80=E4=B8=AA=E5=80=99?=
 =?UTF-8?q?=E9=80=89=E7=AD=94=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_edit_single.html.erb   |  6 +--
 app/views/exercise/_exercise_form.html.erb | 20 +++++++-
 app/views/exercise/_new_MC.html.erb        | 56 +++++++++++-----------
 app/views/exercise/_new_MCQ.html.erb       | 56 +++++++++++-----------
 app/views/exercise/_new_single.html.erb    | 44 +++++++++--------
 app/views/exercise/_show_MC.html.erb       |  4 +-
 app/views/exercise/_show_MCQ.html.erb      |  4 +-
 app/views/exercise/_show_single.html.erb   | 12 ++---
 8 files changed, 113 insertions(+), 89 deletions(-)

diff --git a/app/views/exercise/_edit_single.html.erb b/app/views/exercise/_edit_single.html.erb
index d2e4a6f2c..0ce2f0943 100644
--- a/app/views/exercise/_edit_single.html.erb
+++ b/app/views/exercise/_edit_single.html.erb
@@ -8,7 +8,7 @@
             $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %>" +
                     "<li class='ur_item'>" +
                     "<label>候选答案<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
-                    "<input  name='exercise_choice[<%=exercise_choice.id %>]' placeholder='请输入候选答案' type='text' value='<%=exercise_choice.answer_text %>'/>" +
+                    "<input class='candiate_answer' name='exercise_choice[<%=exercise_choice.id %>]' placeholder='请输入候选答案' type='text' value='<%=exercise_choice.answer_text %>'/>" +
 
                     "<a class='icon_add' title='向下插入选项' onclick='add_candidate_answer($(this));'></a>" +
                     "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
@@ -24,7 +24,7 @@
         <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
         <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text" value="<%=exercise_question.question_title %>">
       </div>
-      <div class="ur_editor_content">
+      <div class="ur_editor_content" id="edit_single">
         <ul>
           <li class="ur_item">
             <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
@@ -35,7 +35,7 @@
             <% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %>
                 <li class="ur_item">
                   <label>候选答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-                  <input  name="exercise_choice[<%=exercise_choice.id %>]" placeholder="请输入候选答案" type="text" value="<%=exercise_choice.answer_text %>"/>
+                  <input class="candiate_answer" name="exercise_choice[<%=exercise_choice.id %>]" placeholder="请输入候选答案" type="text" value="<%=exercise_choice.answer_text %>"/>
                   <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
                   <a class="icon_remove" title="删除" onclick="remove_single_answer($(this));"></a>
                 </li>
diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index 66558936a..f73c15eca 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -106,6 +106,24 @@
             alert("分数必须是非零开头的数字");
         }else if(quest_type !=3 && standard_ans.length == 0) {
             alert("标准答案不能为空");
+        }else if(quest_type ==3) {
+            var div = $("#poll_answers_" + id);
+            var candiate_answer = $(".candiate_answer",div);
+            if(candiate_answer.length > 0) {
+                for(i=0;i<candiate_answer.length;i++) {
+                    if(i<candiate_answer.length-1 && $.trim($(candiate_answer[i]).val()) == "") {
+                        continue;
+                    } else if(i == (candiate_answer.length-1) && $.trim($(candiate_answer[i]).val()) == "") {
+                        alert("候选答案不能为空");
+                    } else if($.trim($(candiate_answer[i]).val()) != ""){
+                        doc.parent().parent().parent().submit();
+                        break;
+                    }
+
+                }
+            } else{
+                alert("候选答案不能为空");
+            }
         }else{
             doc.parent().parent().parent().submit();}
     }
@@ -158,7 +176,7 @@
     {
         if(doc.parent().siblings("li").length == 0)
         {
-            alert("选择题至少有一个选项");
+            alert("至少有一个选项或一个候选答案");
         }
         else
         {
diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb
index d65e01ca7..4e9376214 100644
--- a/app/views/exercise/_new_MC.html.erb
+++ b/app/views/exercise/_new_MC.html.erb
@@ -16,33 +16,35 @@
          <input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
       </li>
       <div class="cl"></div>
-      <li class="ur_item">
-        <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
-        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      </li>
-      <div class="cl"></div>
-      <li class="ur_item">
-        <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
-        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      </li>
-      <div class="cl"></div>
-      <li class="ur_item">
-        <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'/>
-        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      </li>
-      <div class="cl"></div>
-      <li class="ur_item">
-        <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'/>
-        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      </li>
+      <div>
+          <li class="ur_item">
+            <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+          <div class="cl"></div>
+          <li class="ur_item">
+            <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+          <div class="cl"></div>
+          <li class="ur_item">
+            <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'/>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+          <div class="cl"></div>
+          <li class="ur_item">
+            <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'/>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+      </div>
       <div class="cl"></div>
       <li class="ur_item">
         <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb
index 0555b997c..c5ae81fd6 100644
--- a/app/views/exercise/_new_MCQ.html.erb
+++ b/app/views/exercise/_new_MCQ.html.erb
@@ -16,33 +16,35 @@
         <input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
       </li>
       <div class="cl"></div>
-      <li class="ur_item">
-        <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
-        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      </li>
-      <div class="cl"></div>
-      <li class="ur_item">
-        <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
-        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      </li>
-      <div class="cl"></div>
-      <li class="ur_item">
-        <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'>
-        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      </li>
-      <div class="cl"></div>
-      <li class="ur_item">
-        <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'>
-        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      </li>
+      <div>
+          <li class="ur_item">
+            <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+          <div class="cl"></div>
+          <li class="ur_item">
+            <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+          <div class="cl"></div>
+          <li class="ur_item">
+            <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+          <div class="cl"></div>
+          <li class="ur_item">
+            <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+      </div>
       <div class="cl"></div>
       <li class="ur_item">
         <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
diff --git a/app/views/exercise/_new_single.html.erb b/app/views/exercise/_new_single.html.erb
index 08b31087a..061b053fd 100644
--- a/app/views/exercise/_new_single.html.erb
+++ b/app/views/exercise/_new_single.html.erb
@@ -8,7 +8,7 @@
     <input name="question_type" value="3" type="hidden">
     <input maxlength="250" class="questionTitle" name="question_title" id="poll_questions_title" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text">
   </div>
-  <div class="ur_editor_content">
+  <div class="ur_editor_content" id="new_single">
     <ul>
       <li class="ur_item">
         <% score = exercise.exercise_questions.where("question_type=3").last.nil? ? "": exercise.exercise_questions.where("question_type=3").last.question_score %>
@@ -16,26 +16,28 @@
         <input id="question_score" value="<%= score%>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
       </li>
       <div class="cl"></div>
-      <li class="ur_item">
-        <label>候选答案一<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input  name="exercise_choice[0]" placeholder="请输入候选答案一" type="text">
-        <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      </li>
-      <div class="cl"></div>
-      <li class="ur_item">
-        <label>候选答案二<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input  name="exercise_choice[1]" placeholder="请输入候选答案二（选填）" type="text">
-        <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      </li>
-      <div class="cl"></div>
-      <li class="ur_item">
-        <label>候选答案三<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input  name="exercise_choice[2]" placeholder="请输入候选答案三（选填）" type="text">
-        <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
-        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-      </li>
+      <div>
+          <li class="ur_item">
+            <label>候选答案一<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input  class="candiate_answer" name="exercise_choice[0]" placeholder="请输入候选答案一" type="text">
+            <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+          <div class="cl"></div>
+          <li class="ur_item">
+            <label>候选答案二<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input  class="candiate_answer" name="exercise_choice[1]" placeholder="请输入候选答案二（选填）" type="text">
+            <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+          <div class="cl"></div>
+          <li class="ur_item">
+            <label>候选答案三<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input  class="candiate_answer" name="exercise_choice[2]" placeholder="请输入候选答案三（选填）" type="text">
+            <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+      </div>
       <div class="cl"></div>
     </ul>
   </div>
diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb
index f6ee29266..28015a15c 100644
--- a/app/views/exercise/_show_MC.html.erb
+++ b/app/views/exercise/_show_MC.html.erb
@@ -53,7 +53,7 @@
                                 '<li class="ur_item">'+
                                 '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input value="<%=score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
-                                '</li>'+
+                                '</li><div>'+
                                 '<li class="ur_item">'+
                                 '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
@@ -80,7 +80,7 @@
                                 '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
-                                '</li>'+
+                                '</li></div>'+
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
                                 '<label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb
index d7a7c2b6d..8135abc51 100644
--- a/app/views/exercise/_show_MCQ.html.erb
+++ b/app/views/exercise/_show_MCQ.html.erb
@@ -52,7 +52,7 @@
                                 '<li class="ur_item">'+
                                 '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input value="<%= score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
-                                '</li>'+
+                                '</li><div>'+
                                 '<li class="ur_item">'+
                                 '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
@@ -79,7 +79,7 @@
                                 '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
-                                '</li>'+
+                                '</li></div>'+
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
                                 '<label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
diff --git a/app/views/exercise/_show_single.html.erb b/app/views/exercise/_show_single.html.erb
index a6bb5afe9..d12af23ec 100644
--- a/app/views/exercise/_show_single.html.erb
+++ b/app/views/exercise/_show_single.html.erb
@@ -35,32 +35,32 @@
                                 '<input type="hidden" name="question_type" value="3"/>'+
                                 '<input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text"/>'+
                                 '</div>'+
-                                '<div class="ur_editor_content">'+
+                                '<div class="ur_editor_content" id="new_single">'+
                                 '<ul>'+
                                 '<li class="ur_item">'+
                                 '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input value="<%= score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
-                                '</li>'+
+                                '</li><div>'+
                                 '<li class="ur_item">'+
                                 '<label>候选答案一<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input type="text" name="exercise_choice[0]" placeholder="请输入候选答案一"/>'+
+                                '<input class="candiate_answer" type="text" name="exercise_choice[0]" placeholder="请输入候选答案一"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>'+
                                 '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
                                 '</li>'+
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
                                 '<label>候选答案二<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input type="text" name="exercise_choice[1]" placeholder="请输入候选答案二（选填）"/>'+
+                                '<input class="candiate_answer" type="text" name="exercise_choice[1]" placeholder="请输入候选答案二（选填）"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>'+
                                 '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
                                 '</li>'+
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
                                 '<label>候选答案三<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input maxlength="200" type="text" name="exercise_choice[2]" placeholder="请输入候选答案三（选填）"/>'+
+                                '<input class="candiate_answer" type="text" name="exercise_choice[2]" placeholder="请输入候选答案三（选填）"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>'+
                                 '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
-                                '</li>'+
+                                '</li></div>'+
                                 '<div class="cl"></div>'+
                                 '</ul>'+
                                 '</div>'+

From 6513c0afee89d65b88dcb575d84a8456cfdc4144 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 26 Nov 2015 10:11:54 +0800
Subject: [PATCH 11/21] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E9=A2=98=E7=9B=AE?=
 =?UTF-8?q?=E7=9A=84=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_show_MC.html.erb     | 2 +-
 app/views/exercise/_show_MCQ.html.erb    | 2 +-
 app/views/exercise/_show_single.html.erb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb
index 28015a15c..7c13bbd84 100644
--- a/app/views/exercise/_show_MC.html.erb
+++ b/app/views/exercise/_show_MC.html.erb
@@ -5,7 +5,7 @@
   </div>
 
   <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
-              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de",:title => "删除")  %>
   <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
   <a class='ur_icon_add' title='向下插入' id="add_mc_<%=exercise_question.id%>" onclick="dismiss('mc',<%=exercise_question.id%>);insert_MC('mc',<%=exercise_question.question_number%>,<%=exercise_question.id%>);"></a>
   <div class="cl"></div>
diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb
index 8135abc51..72fd049a6 100644
--- a/app/views/exercise/_show_MCQ.html.erb
+++ b/app/views/exercise/_show_MCQ.html.erb
@@ -4,7 +4,7 @@
     <span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span>
   </div>
   <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
-              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de",:title => "删除")  %>
   <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
   <a class='ur_icon_add' title='向下插入' id="add_mcq_<%=exercise_question.id%>" onclick="dismiss('mcq',<%=exercise_question.id%>);insert_MCQ('mcq',<%=exercise_question.question_number%>,<%=exercise_question.id%>);"></a>
   <div class="cl"></div>
diff --git a/app/views/exercise/_show_single.html.erb b/app/views/exercise/_show_single.html.erb
index d12af23ec..2772e43ed 100644
--- a/app/views/exercise/_show_single.html.erb
+++ b/app/views/exercise/_show_single.html.erb
@@ -3,7 +3,7 @@
     <%= exercise_question.question_title %>
   </div>
   <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
-              method: :delete, :confirm => l(:text_are_you_sure), :remote => true,  :class => "ur_icon_de") %>
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true,  :class => "ur_icon_de",:title => "删除") %>
   <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
   <a class='ur_icon_add' title='向下插入' id="add_single_<%=exercise_question.id%>" onclick="dismiss('single',<%=exercise_question.id%>);insert_SINGLE('single',<%=exercise_question.question_number%>,<%=exercise_question.id%>);"></a>
   <div class="cl"></div>

From a0c73a5a546ed5fbe594d94a107e2f167d825bde Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 26 Nov 2015 10:27:32 +0800
Subject: [PATCH 12/21] =?UTF-8?q?=E5=8D=95=E9=80=89=E9=A2=98=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_edit_MC.html.erb | 123 ++++++++-------
 app/views/exercise/_new_MC.html.erb  | 122 +++++++--------
 app/views/exercise/_show_MC.html.erb | 220 +++++++++++++--------------
 public/stylesheets/polls.css         |   2 +-
 4 files changed, 233 insertions(+), 234 deletions(-)

diff --git a/app/views/exercise/_edit_MC.html.erb b/app/views/exercise/_edit_MC.html.erb
index 008c95c24..adc955dee 100644
--- a/app/views/exercise/_edit_MC.html.erb
+++ b/app/views/exercise/_edit_MC.html.erb
@@ -1,63 +1,62 @@
-<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%>
-    <!--编辑单选start-->
-    <script type="text/javascript">
-        function resetQuestion<%=exercise_question.id%>()
-        {
-            $("#poll_questions_title_<%=exercise_question.id%>").val("<%= exercise_question.question_title%>")
-            $("#poll_question_score_<%=exercise_question.id %>").val("<%= exercise_question.question_score%>")
-            $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>")
-            $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" +
-                    "<li class='ur_item'>" +
-                    "<label>选项<%=convert_to_char (index+1).to_s %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
-                    "<input maxlength='200' type='text' name='question_answer[<%=exercise_choice.id %>]' placeholder='输入选项内容' value='<%=exercise_choice.choice_text %>'/>" +
-                    "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
-                    "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
-                    "</li>" +
-                    "<div class='cl'></div>" +
-                    "<% end%>");
-        }
-    </script>
-
-    <div class="questionContainer" style="width: 680px;">
-      <div class="ur_editor_title">
-        <label>问题：&nbsp;&nbsp;</label>
-        <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
-        <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入单选题题目" type="text" value="<%=exercise_question.question_title %>">
-      </div>
-      <div class="ur_editor_content">
-        <ul>
-          <li class="ur_item">
-            <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input type="text" id="poll_question_score_<%=exercise_question.id %>" name="question_score" style="width:40px; text-align:center; padding-left:0px;" value="<%= exercise_question.question_score %>">分
-          </li>
-          <div class="cl"></div>
-          <div id="poll_answers_<%=exercise_question.id%>">
-              <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
-                  <li class="ur_item">
-                    <label>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-                    <input maxlength="200" type='text' name='question_answer[<%=exercise_choice.id %>]' placeholder='输入选项内容' value="<%=exercise_choice.choice_text %>">
-                    <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-                    <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-                  </li>
-                  <div class="cl"></div>
-              <% end %>
-          </div>
-          <li class="ur_item">
-            <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input id="poll_question_standard_answer_<%=exercise_question.id %>" name="exercise_choice" placeholder="若标准答案为A，在此输入A即可" type="text" value="<%=convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>">
-          </li>
-          <div class="cl"></div>
-        </ul>
-      </div>
-      <div class="ur_editor_footer">
-        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= exercise_question.id %>,1);">
-          保存
-        </a>
-        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=exercise_question.id%>();pollQuestionCancel(<%= exercise_question.id%>);">
-          <%= l(:button_cancel)%>
-        </a>
-      </div>
-      <div class="cl"></div>
-    </div>
-    <!--编辑单选 end-->
+<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%>
+    <!--编辑单选start-->
+    <script type="text/javascript">
+        function resetQuestion<%=exercise_question.id%>()
+        {
+            $("#poll_questions_title_<%=exercise_question.id%>").val("<%= exercise_question.question_title%>")
+            $("#poll_question_score_<%=exercise_question.id %>").val("<%= exercise_question.question_score%>")
+            $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>")
+            $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" +
+                    "<li class='ur_item'>" +
+                    "<input type='radio' style='width: 15px;' />"+
+                    "<label>选项<%=convert_to_char (index+1).to_s %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
+                    "<input maxlength='200' type='text' name='question_answer[<%=exercise_choice.id %>]' placeholder='输入选项内容' value='<%=exercise_choice.choice_text %>'/>" +
+                    "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
+                    "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
+                    "</li>" +
+                    "<div class='cl'></div>" +
+                    "<% end%>");
+        }
+    </script>
+
+    <div class="questionContainer" style="width: 680px;">
+      <div class="ur_editor_title">
+        <label>问题：&nbsp;&nbsp;</label>
+        <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
+        <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入单选题题目" type="text" value="<%=exercise_question.question_title %>">
+      </div>
+      <div class="ur_editor_content">
+        <ul>
+          <li class="ur_item">
+            <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" id="poll_question_score_<%=exercise_question.id %>" name="question_score" style="width:40px; text-align:center; padding-left:0px;" value="<%= exercise_question.question_score %>">分
+            <span class="ml10">标准答案：请点击正确选项前面单选按钮</span>
+          </li>
+          <div class="cl"></div>
+          <div id="poll_answers_<%=exercise_question.id%>">
+              <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+                  <li class="ur_item">
+                    <label>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+                    <input type="radio" style="width: 15px;" />
+                    <input maxlength="200" type='text' name='question_answer[<%=exercise_choice.id %>]' placeholder='输入选项内容' value="<%=exercise_choice.choice_text %>">
+                    <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+                    <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+                  </li>
+                  <div class="cl"></div>
+              <% end %>
+          </div>
+          <div class="cl"></div>
+        </ul>
+      </div>
+      <div class="ur_editor_footer">
+        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= exercise_question.id %>,1);">
+          保存
+        </a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=exercise_question.id%>();pollQuestionCancel(<%= exercise_question.id%>);">
+          <%= l(:button_cancel)%>
+        </a>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <!--编辑单选 end-->
 <% end%>
\ No newline at end of file
diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb
index 4e9376214..c0a53b2e9 100644
--- a/app/views/exercise/_new_MC.html.erb
+++ b/app/views/exercise/_new_MC.html.erb
@@ -1,62 +1,62 @@
-<%= form_for(ExerciseQuestion.new,
-             :html => { :multipart => true },
-             :url=>create_exercise_question_exercise_path(exercise.id),
-             :remote=>true ) do |f| %>
-<div class="questionContainer">
-  <div class="ur_editor_title">
-    <label>问题：&nbsp;&nbsp;</label>
-    <input name="question_type" value="1" type="hidden">
-    <input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入单选题题目" type="text">
-  </div>
-  <div class="ur_editor_content">
-    <ul>
-      <li class="ur_item">
-        <% score = exercise.exercise_questions.where("question_type=1").last.nil? ? "": exercise.exercise_questions.where("question_type=1").last.question_score %>
-         <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-         <input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
-      </li>
-      <div class="cl"></div>
-      <div>
-          <li class="ur_item">
-            <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
-            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-          </li>
-          <div class="cl"></div>
-          <li class="ur_item">
-            <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
-            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-          </li>
-          <div class="cl"></div>
-          <li class="ur_item">
-            <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'/>
-            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-          </li>
-          <div class="cl"></div>
-          <li class="ur_item">
-            <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'/>
-            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-          </li>
-      </div>
-      <div class="cl"></div>
-      <li class="ur_item">
-        <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input id="question_standard_ans" name="exercise_choice" placeholder="若标准答案为A，在此输入A即可" type="text">
-      </li>
-      <div class="cl"></div>
-    </ul>
-  </div>
-  <div class="ur_editor_footer">
-    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),1);"> 保存 </a>
-    <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
-  </div>
-  <div class="cl"></div>
-</div>
+<%= form_for(ExerciseQuestion.new,
+             :html => { :multipart => true },
+             :url=>create_exercise_question_exercise_path(exercise.id),
+             :remote=>true ) do |f| %>
+<div class="questionContainer">
+  <div class="ur_editor_title">
+    <label>问题：&nbsp;&nbsp;</label>
+    <input name="question_type" value="1" type="hidden">
+    <input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入单选题题目" type="text">
+  </div>
+  <div class="ur_editor_content">
+    <ul>
+      <li class="ur_item">
+        <% score = exercise.exercise_questions.where("question_type=1").last.nil? ? "": exercise.exercise_questions.where("question_type=1").last.question_score %>
+         <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+         <input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
+         <span class="ml15">标准答案：请选择</span>
+      </li>
+      <div class="cl"></div>
+      <div>
+          <li class="ur_item">
+            <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="radio" style="width: 15px;" />
+            <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+          <div class="cl"></div>
+          <li class="ur_item">
+            <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="radio" style="width: 15px;" />
+            <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+          <div class="cl"></div>
+          <li class="ur_item">
+            <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="radio" style="width: 15px;" />
+            <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'/>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+          <div class="cl"></div>
+          <li class="ur_item">
+            <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="radio" style="width: 15px;" />
+            <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'/>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+      </div>
+      <div class="cl"></div>
+    </ul>
+  </div>
+  <div class="ur_editor_footer">
+    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),1);"> 保存 </a>
+    <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
+  </div>
+  <div class="cl"></div>
+</div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb
index 28015a15c..c301e0fc4 100644
--- a/app/views/exercise/_show_MC.html.erb
+++ b/app/views/exercise/_show_MC.html.erb
@@ -1,111 +1,111 @@
-<div>
-  <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
-    <%= exercise_question.question_title %>
-    <span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span>
-  </div>
-
-  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
-              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
-  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
-  <a class='ur_icon_add' title='向下插入' id="add_mc_<%=exercise_question.id%>" onclick="dismiss('mc',<%=exercise_question.id%>);insert_MC('mc',<%=exercise_question.question_number%>,<%=exercise_question.id%>);"></a>
-  <div class="cl"></div>
-  <div class="ur_inputs">
-    <table class="ur_table"  style="width:675px;">
-      <tbody>
-      <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
-          <tr>
-            <td>
-              <label>
-                <input class="ur_radio" type="radio" name="<%= exercise_question %>" value="<%= exercise_choice.choice_text%>" >
-                <%= convert_to_char((index+1).to_s)%>&nbsp;&nbsp;<%= exercise_choice.choice_text%>
-              </label>
-            </td>
-          </tr>
-      <% end %>
-      </tbody>
-    </table>
-  </div>
-</div><!--单选题显示 end-->
-<!-- 新增问题 -->
-<div id="insert_new_poll_question_mc_<%=exercise_question.id%>">
-</div>
-
-<script type="text/javascript">
-    function insert_MC(quest_type,quest_num,quest_id){
-        var forms = $("form.new_exercise_question");
-        if($.trim($("#insert_new_poll_question_"+quest_type+"_"+quest_id).html()) == "") {
-            if(forms.length > 0){
-                alert("请先保存正在编辑的题目再新建。");
-            } else{
-                <% score =exercise_question.question_score %>
-                $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
-                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.exercise.id),:remote=>true) do |f|%>'+
-                                ' <div class="questionContainer" style="width: 680px;"> '+
-                                '<div class="ur_editor_title"> '+
-                                '<label>问题：&nbsp;&nbsp;</label>'+
-                                '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
-                                '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
-                                '<input type="hidden" name="question_type" value="1"/>'+
-                                '<input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入单选题题目" type="text"/>'+
-                                '</div>'+
-                                '<div class="ur_editor_content">'+
-                                '<ul>'+
-                                '<li class="ur_item">'+
-                                '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input value="<%=score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
-                                '</li><div>'+
-                                '<li class="ur_item">'+
-                                '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
-                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
-                                '</li>'+
-                                '<div class="cl"></div>'+
-                                '<li class="ur_item">'+
-                                '<label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
-                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
-                                '</li>'+
-                                '<div class="cl"></div>'+
-                                '<li class="ur_item">'+
-                                '<label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
-                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
-                                '</li>'+
-                                '<div class="cl"></div>'+
-                                '<li class="ur_item">'+
-                                '<label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
-                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
-                                '</li></div>'+
-                                '<div class="cl"></div>'+
-                                '<li class="ur_item">'+
-                                '<label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input name="exercise_choice" id="question_standard_ans" placeholder="若标准答案为A，在此输入A即可" type="text">'+
-                                '</li>'+
-                                '<div class="cl"></div>'+
-                                '</ul>'+
-                                '</div>'+
-                                '<div class="ur_editor_footer">'+
-                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),1);">'+
-                                '保存'+
-                                '</a>'+
-                                '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
-                                '<%= l(:button_cancel)%>'+
-                                '</a>'+
-                                '</div>'+
-                                '<div class="cl"></div>'+
-                                '</div>'+
-                                '<% end%>'
-                );
-                $("#poll_questions_title").focus();
-                }
-       }
-        else {
-            $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
-        }
-    }
+<div>
+  <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
+    <%= exercise_question.question_title %>
+    <span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span>
+  </div>
+
+  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
+  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
+  <a class='ur_icon_add' title='向下插入' id="add_mc_<%=exercise_question.id%>" onclick="dismiss('mc',<%=exercise_question.id%>);insert_MC('mc',<%=exercise_question.question_number%>,<%=exercise_question.id%>);"></a>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <table class="ur_table"  style="width:675px;">
+      <tbody>
+      <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+          <tr>
+            <td>
+              <label>
+                <input class="ur_radio" type="radio" name="<%= exercise_question %>" value="<%= exercise_choice.choice_text%>" >
+                <%= convert_to_char((index+1).to_s)%>&nbsp;&nbsp;<%= exercise_choice.choice_text%>
+              </label>
+            </td>
+          </tr>
+      <% end %>
+      </tbody>
+    </table>
+  </div>
+</div><!--单选题显示 end-->
+<!-- 新增问题 -->
+<div id="insert_new_poll_question_mc_<%=exercise_question.id%>">
+</div>
+
+<script type="text/javascript">
+    function insert_MC(quest_type,quest_num,quest_id){
+        var forms = $("form.new_exercise_question");
+        if($.trim($("#insert_new_poll_question_"+quest_type+"_"+quest_id).html()) == "") {
+            if(forms.length > 0){
+                alert("请先保存正在编辑的题目再新建。");
+            } else{
+                <% score =exercise_question.question_score %>
+                $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
+                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.exercise.id),:remote=>true) do |f|%>'+
+                                ' <div class="questionContainer" style="width: 680px;"> '+
+                                '<div class="ur_editor_title"> '+
+                                '<label>问题：&nbsp;&nbsp;</label>'+
+                                '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
+                                '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
+                                '<input type="hidden" name="question_type" value="1"/>'+
+                                '<input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入单选题题目" type="text"/>'+
+                                '</div>'+
+                                '<div class="ur_editor_content">'+
+                                '<ul>'+
+                                '<li class="ur_item">'+
+                                '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input value="<%=score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
+                                '<span class="ml15">标准答案：请选择</span>'+
+                                '</li><div>'+
+                                '<li class="ur_item">'+
+                                '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input type="radio" style="width: 15px;" />'+
+                                '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input type="radio" style="width: 15px;" />'+
+                                '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input type="radio" style="width: 15px;" />'+
+                                '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input type="radio" style="width: 15px;" />'+
+                                '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li></div>'+
+                                '<div class="cl"></div>'+
+                                '</ul>'+
+                                '</div>'+
+                                '<div class="ur_editor_footer">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),1);">'+
+                                '保存'+
+                                '</a>'+
+                                '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
+                                '<%= l(:button_cancel)%>'+
+                                '</a>'+
+                                '</div>'+
+                                '<div class="cl"></div>'+
+                                '</div>'+
+                                '<% end%>'
+                );
+                $("#poll_questions_title").focus();
+                }
+       }
+        else {
+            $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
+        }
+    }
 </script>
\ No newline at end of file
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 9f7b2d021..cfc3b1b4a 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -89,7 +89,7 @@ a:hover.btn_cancel{ color:#666;}
 .ur_question_title{ width:534px; height:30px; border:1px solid #cbcbcb; padding-left:5px; margin-right:10px; background:#fff;}
 .ur_editor_title{ margin-bottom:10px;}
 .ur_editor_content{ }
-.ur_item{ margin-bottom:5px; height:32px; }
+.ur_item{ margin-bottom:5px; height:32px; line-height: 32px; vertical-align: middle; }
 .ur_item input{ width:324px; height:30px;border:1px solid #cbcbcb; padding-left:5px; float:left; margin-right:10px; background:#fff;}
 .ur_item label{ float:left;}
 .icon_add{ background:url(images/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;}

From 2a73751fd910560df911a52a05cb5fe9d57849e9 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 26 Nov 2015 10:56:24 +0800
Subject: [PATCH 13/21] =?UTF-8?q?=E5=A4=9A=E9=80=89=E9=A2=98=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_edit_MC.html.erb       |   2 +-
 app/views/exercise/_edit_MCQ.html.erb      | 121 +++---
 app/views/exercise/_exercise_form.html.erb | 438 ++++++++++-----------
 app/views/exercise/_new_MCQ.html.erb       | 122 +++---
 app/views/exercise/_show_MCQ.html.erb      |  10 +-
 5 files changed, 345 insertions(+), 348 deletions(-)

diff --git a/app/views/exercise/_edit_MC.html.erb b/app/views/exercise/_edit_MC.html.erb
index adc955dee..fee35824b 100644
--- a/app/views/exercise/_edit_MC.html.erb
+++ b/app/views/exercise/_edit_MC.html.erb
@@ -30,7 +30,7 @@
           <li class="ur_item">
             <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
             <input type="text" id="poll_question_score_<%=exercise_question.id %>" name="question_score" style="width:40px; text-align:center; padding-left:0px;" value="<%= exercise_question.question_score %>">分
-            <span class="ml10">标准答案：请点击正确选项前面单选按钮</span>
+            <span class="ml10">标准答案：请选择</span>
           </li>
           <div class="cl"></div>
           <div id="poll_answers_<%=exercise_question.id%>">
diff --git a/app/views/exercise/_edit_MCQ.html.erb b/app/views/exercise/_edit_MCQ.html.erb
index 2b900d648..66bbe8a6f 100644
--- a/app/views/exercise/_edit_MCQ.html.erb
+++ b/app/views/exercise/_edit_MCQ.html.erb
@@ -1,63 +1,60 @@
-<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%>
-    <!--编辑单选start-->
-    <script type="text/javascript">
-        function resetQuestion<%=exercise_question.id%>()
-        {
-            $("#poll_questions_title_<%=exercise_question.id%>").val("<%= exercise_question.question_title%>")
-            $("#poll_question_score_<%=exercise_question.id %>").val("<%= exercise_question.question_score%>")
-            $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>")
-            $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" +
-                    "<li class='ur_item'>" +
-                    "<label>选项<%=convert_to_char (index+1).to_s %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
-                    "<input maxlength='200' type='text' name='question_answer[<%= exercise_choice.id %>]' placeholder='输入选项内容' value='<%=exercise_choice.choice_text %>'/>" +
-                    "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
-                    "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
-                    "</li>" +
-                    "<div class='cl'></div>" +
-                    "<% end%>");
-        }
-    </script>
-
-    <div class="questionContainer" style="width: 680px;">
-      <div class="ur_editor_title">
-        <label>问题：&nbsp;&nbsp;</label>
-        <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
-        <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入多选题题目" type="text" value="<%=exercise_question.question_title %>">
-      </div>
-      <div class="ur_editor_content">
-        <ul>
-          <li class="ur_item">
-            <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input type="text" id="poll_question_score_<%=exercise_question.id %>" name="question_score" style="width:40px; text-align:center; padding-left:0px;" value="<%= exercise_question.question_score %>">分
-          </li>
-          <div class="cl"></div>
-          <div id="poll_answers_<%=exercise_question.id%>">
-            <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
-                <li class="ur_item">
-                  <label>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-                  <input maxlength="200" type='text' name='question_answer[<%= exercise_choice.id %>]' placeholder='输入选项内容' value="<%=exercise_choice.choice_text %>">
-                  <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-                  <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-                </li>
-                <div class="cl"></div>
-            <% end %>
-          </div>
-          <li class="ur_item">
-            <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input id="poll_question_standard_answer_<%=exercise_question.id %>" name="exercise_choice" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text" value="<%=convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>">
-          </li>
-          <div class="cl"></div>
-        </ul>
-      </div>
-      <div class="ur_editor_footer">
-        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= exercise_question.id %>,2);">
-          保存
-        </a>
-        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=exercise_question.id%>();pollQuestionCancel(<%= exercise_question.id%>);">
-          <%= l(:button_cancel)%>
-        </a>
-      </div>
-      <div class="cl"></div>
-    </div>
-    <!--编辑单选 end-->
+<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%>
+    <!--编辑单选start-->
+    <script type="text/javascript">
+        function resetQuestion<%=exercise_question.id%>()
+        {
+            $("#poll_questions_title_<%=exercise_question.id%>").val("<%= exercise_question.question_title%>")
+            $("#poll_question_score_<%=exercise_question.id %>").val("<%= exercise_question.question_score%>")
+            $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>")
+            $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" +
+                    "<li class='ur_item'>" +
+                    "<label>选项<%=convert_to_char (index+1).to_s %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
+                    "<input maxlength='200' type='text' name='question_answer[<%= exercise_choice.id %>]' placeholder='输入选项内容' value='<%=exercise_choice.choice_text %>'/>" +
+                    "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
+                    "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
+                    "</li>" +
+                    "<div class='cl'></div>" +
+                    "<% end%>");
+        }
+    </script>
+
+    <div class="questionContainer" style="width: 680px;">
+      <div class="ur_editor_title">
+        <label>问题：&nbsp;&nbsp;</label>
+        <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
+        <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入多选题题目" type="text" value="<%=exercise_question.question_title %>">
+      </div>
+      <div class="ur_editor_content">
+        <ul>
+          <li class="ur_item">
+            <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" id="poll_question_score_<%=exercise_question.id %>" name="question_score" style="width:40px; text-align:center; padding-left:0px;" value="<%= exercise_question.question_score %>">分
+            <span class="ml10">标准答案：请选择</span>
+          </li>
+          <div class="cl"></div>
+          <div id="poll_answers_<%=exercise_question.id%>">
+            <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+                <li class="ur_item">
+                  <label>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+                  <input type="checkbox" style="width: 15px;" />
+                  <input maxlength="200" type='text' name='question_answer[<%= exercise_choice.id %>]' placeholder='输入选项内容' value="<%=exercise_choice.choice_text %>">
+                  <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+                  <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+                </li>
+                <div class="cl"></div>
+            <% end %>
+          </div>
+        </ul>
+      </div>
+      <div class="ur_editor_footer">
+        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= exercise_question.id %>,2);">
+          保存
+        </a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=exercise_question.id%>();pollQuestionCancel(<%= exercise_question.id%>);">
+          <%= l(:button_cancel)%>
+        </a>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <!--编辑单选 end-->
 <% end%>
\ No newline at end of file
diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index f73c15eca..40e68ad61 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -1,219 +1,219 @@
-<%= stylesheet_link_tag  'polls', :media => 'all' %>
-<script type="text/javascript">
-    $(function(){
-        $("#RSide").removeAttr("id");
-        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
-        $("#Container").css("width","1000px");
-    });
-    //编辑问卷描述之后
-    var popWindow ; //弹出框的引用
-    var importPollPopWindow; //选择导入的弹出框引用
-    function edit_head(){
-        $("#polls_description").val($("#polls_description_div").html());
-    }
-    $(function(){
-        //点击空白处
-        $(document).bind('click',function(e){
-            //弹出框非空 不是a标签 点击的不是弹出框 ，那么弹出框就会隐藏
-            if(popWindow && e.target.nodeName != 'A' && !popWindow.is(e.target) && popWindow.has(e.target).length === 0){ // Mark 1
-                popWindow.css('display', 'none');
-            }
-            if(importPollPopWindow && e.target.nodeName != 'A' && !importPollPopWindow.is(e.target) && importPollPopWindow.has(e.target).length === 0){
-                importPollPopWindow.css('display', 'none');
-            }
-        });
-    })
-
-    function dismiss(quest_type,quest_id){
-        popWindow = $("#div_"+quest_type+"_"+quest_id);
-        if(popWindow){
-            popWindow.css('display', 'none');
-        }
-    }
-
-    function chooseQuestionType(quest_type,quest_id){
-        //quest_type 分为 mc mcq single multi
-        //quest_id 是quetion的id  下同
-        if(popWindow){
-            popWindow.css('display', 'none');
-        }
-        popWindow = $("#div_"+quest_type+"_"+quest_id);
-        $("#div_"+quest_type+"_"+quest_id).click(function(e){
-            e.stopPropagation(); //组织冒泡到document.body中去
-        });
-        $("#div_"+quest_type+"_"+quest_id).css("position", "absolute");
-
-        $("#div_"+quest_type+"_"+quest_id).css("top", $("#add_"+quest_type+"_"+quest_id).offset().top+30);
-
-        $("#div_"+quest_type+"_"+quest_id).css("left", $("#add_"+quest_type+"_"+quest_id).offset().left-10);
-        if( $("#div_"+quest_type+"_"+quest_id).css('display') == 'block') {
-            $("#div_"+quest_type+"_"+quest_id).css('display', 'none');
-        }
-        else{
-            $("#div_"+quest_type+"_"+quest_id).css('display', 'block');
-        }
-    }
-
-    //选择导入调查问卷
-    function importPoll(){
-        importPollPopWindow = $("#import_poll");
-        $("#import_poll").css("position", "absolute");
-
-        $("#import_poll").css("top", $("#import_btn").offset().top+30);
-
-        $("#import_poll").css("left", $("#import_btn").offset().left-65);
-        $("#import_poll").css("display","block")
-    }
-
-    function remote_import(){
-        importPollPopWindow.css('display', 'none');
-        if($("#import_poll").val() === 0){
-            return;
-        }else{
-            if(confirm("确认导入问卷"+$("#import_poll").find("option:selected").text()+"?")){
-                $("#import_form").submit();
-            }else{
-                return;
-            }
-        }
-
-    }
-
-    //添加标题时确定按钮
-    function add_poll_question(doc,quest_type)
-    {
-        var title = $.trim($("#poll_questions_title").val());
-        var score = $.trim($("#question_score").val());
-        var standard_ans = $.trim($("#question_standard_ans").val());
-        if(title.length == 0 || score.length == 0){
-            alert("题目标题/分数不能为空");
-        }else if(!/^[1-9][0-9]*$/.test(score)) {
-            alert("分数必须是非零开头的数字");
-        }else if(quest_type !=3 && standard_ans.length == 0) {
-            alert("标准答案不能为空");
-        }else{
-            doc.parent().parent().parent().submit();}
-    }
-    //修改标题时确定按钮
-    function edit_poll_question(doc,id,quest_type)
-    {
-        var title = $.trim($("#poll_questions_title_" + id).val());
-        var score = $.trim($("#poll_question_score_"+ id).val());
-        var standard_ans = $.trim($("#poll_question_standard_answer_" + id).val());
-        if(title.length == 0 || score.length == 0){
-            alert("题目标题/分数不能为空");
-        }else if(!/^[1-9][0-9]*$/.test(score)) {
-            alert("分数必须是非零开头的数字");
-        }else if(quest_type !=3 && standard_ans.length == 0) {
-            alert("标准答案不能为空");
-        }else if(quest_type ==3) {
-            var div = $("#poll_answers_" + id);
-            var candiate_answer = $(".candiate_answer",div);
-            if(candiate_answer.length > 0) {
-                for(i=0;i<candiate_answer.length;i++) {
-                    if(i<candiate_answer.length-1 && $.trim($(candiate_answer[i]).val()) == "") {
-                        continue;
-                    } else if(i == (candiate_answer.length-1) && $.trim($(candiate_answer[i]).val()) == "") {
-                        alert("候选答案不能为空");
-                    } else if($.trim($(candiate_answer[i]).val()) != ""){
-                        doc.parent().parent().parent().submit();
-                        break;
-                    }
-
-                }
-            } else{
-                alert("候选答案不能为空");
-            }
-        }else{
-            doc.parent().parent().parent().submit();}
-    }
-
-    //问卷头
-    function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
-    function pollsSubmit(doc){
-        var title = $.trim($("#exercise_name").val());
-        if(title.length == 0){
-            alert("测验标题不能为空");
-        } else if($.trim($("#exercise_end_time").val()) =="") {
-            alert("截止时间不能为空");
-        } else if(Date.parse($("#exercise_end_time").val()) < Date.now()) {
-            alert("截止时间不能小于当前时间");
-        } else if($.trim($("#exercise_time").val()) !="" && !/^[1-9][0-9]*$/.test($.trim($("#exercise_time").val()))) {
-            alert("测验时长必须为非零开头的数字");
-        } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_publish_time").val()) < Date.now()) {
-            alert("发布时间不能小于当前时间");
-        } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_end_time").val()) <= Date.parse($("#exercise_publish_time").val())) {
-            alert("截止时间必须大于发布时间");
-        } else {
-            doc.parent().parent().parent().submit();
-        }
-    }
-    function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
-    //
-    function pollQuestionCancel(question_id){
-        $("#show_poll_questions_"+question_id).show();
-        $("#edit_poll_questions_"+question_id).hide();
-    }
-    function pollQuestionEdit(question_id){
-        $("#show_poll_questions_"+question_id).hide();
-        $("#edit_poll_questions_"+question_id).show();
-        $("#poll_questions_title_"+question_id).focus();
-    }
-    //单选题
-    function add_single_answer(doc)
-    {
-        doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='question_answer["+new Date().getTime()+"]' placeholder='输入选项内容'/>" +
-                "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
-                "</li><div class='cl'></div>");
-    }
-    function add_candidate_answer(doc)
-    {
-        doc.parent().after("<li class='ur_item'><label>候选答案<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='exercise_choice["+new Date().getTime()+"]' placeholder='请输入候选答案（选填）'/>" +
-                "<a class='icon_add' title='向下插入选项' onclick='add_candidate_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
-                "</li><div class='cl'></div>");
-    }
-    function remove_single_answer(doc)
-    {
-        if(doc.parent().siblings("li").length == 0)
-        {
-            alert("至少有一个选项或一个候选答案");
-        }
-        else
-        {
-            doc.parent().remove();
-        }
-    }
-</script>
-<div class="homepageRight mt0 ml10">
-  <div class="resources">
-    <!-- 头部 -->
-    <div id="polls_head_show" style="display: none;">
-      <%= render :partial => 'show_head', :locals => {:exercise => @exercise} %>
-    </div>
-    <div id="polls_head_edit">
-      <%= render :partial => 'edit_head', :locals => {:exercise => @exercise} %>
-    </div>
-    <% current_score = get_current_score @exercise %>
-    <div class="mb5" style="display: <%= current_score == 0 ? "none" : "" %>" id="current_score_div">目前试卷总分：<span class="c_red" id="current_score"><%= current_score %>
-      分</span></div>
-    <!-- 问题 -->
-    <div id="poll_content">
-      <%= render :partial => 'exercise_content', :locals => {:exercise => @exercise} %>
-    </div>
-
-    <div class="testQuestion" id="new_exercise_question">
-      <%= render :partial => 'new_question', :locals => {:exercise => @exercise} %>
-    </div>
-    <!--选项 end-->
-
-    <!-- 新增问题 -->
-    <div id="new_poll_question">
-    </div>
-
-    <div id="exercise_submit">
-      <%= render :partial => 'exercise_submit', :locals => {:exercise => @exercise} %>
-    </div>
-    <div class="cl"></div>
-    <!--contentbox end-->
-  </div>
-</div><!--编辑end-->
+<%= stylesheet_link_tag  'polls', :media => 'all' %>
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
+        $("#Container").css("width","1000px");
+    });
+    //编辑问卷描述之后
+    var popWindow ; //弹出框的引用
+    var importPollPopWindow; //选择导入的弹出框引用
+    function edit_head(){
+        $("#polls_description").val($("#polls_description_div").html());
+    }
+    $(function(){
+        //点击空白处
+        $(document).bind('click',function(e){
+            //弹出框非空 不是a标签 点击的不是弹出框 ，那么弹出框就会隐藏
+            if(popWindow && e.target.nodeName != 'A' && !popWindow.is(e.target) && popWindow.has(e.target).length === 0){ // Mark 1
+                popWindow.css('display', 'none');
+            }
+            if(importPollPopWindow && e.target.nodeName != 'A' && !importPollPopWindow.is(e.target) && importPollPopWindow.has(e.target).length === 0){
+                importPollPopWindow.css('display', 'none');
+            }
+        });
+    })
+
+    function dismiss(quest_type,quest_id){
+        popWindow = $("#div_"+quest_type+"_"+quest_id);
+        if(popWindow){
+            popWindow.css('display', 'none');
+        }
+    }
+
+    function chooseQuestionType(quest_type,quest_id){
+        //quest_type 分为 mc mcq single multi
+        //quest_id 是quetion的id  下同
+        if(popWindow){
+            popWindow.css('display', 'none');
+        }
+        popWindow = $("#div_"+quest_type+"_"+quest_id);
+        $("#div_"+quest_type+"_"+quest_id).click(function(e){
+            e.stopPropagation(); //组织冒泡到document.body中去
+        });
+        $("#div_"+quest_type+"_"+quest_id).css("position", "absolute");
+
+        $("#div_"+quest_type+"_"+quest_id).css("top", $("#add_"+quest_type+"_"+quest_id).offset().top+30);
+
+        $("#div_"+quest_type+"_"+quest_id).css("left", $("#add_"+quest_type+"_"+quest_id).offset().left-10);
+        if( $("#div_"+quest_type+"_"+quest_id).css('display') == 'block') {
+            $("#div_"+quest_type+"_"+quest_id).css('display', 'none');
+        }
+        else{
+            $("#div_"+quest_type+"_"+quest_id).css('display', 'block');
+        }
+    }
+
+    //选择导入调查问卷
+    function importPoll(){
+        importPollPopWindow = $("#import_poll");
+        $("#import_poll").css("position", "absolute");
+
+        $("#import_poll").css("top", $("#import_btn").offset().top+30);
+
+        $("#import_poll").css("left", $("#import_btn").offset().left-65);
+        $("#import_poll").css("display","block")
+    }
+
+    function remote_import(){
+        importPollPopWindow.css('display', 'none');
+        if($("#import_poll").val() === 0){
+            return;
+        }else{
+            if(confirm("确认导入问卷"+$("#import_poll").find("option:selected").text()+"?")){
+                $("#import_form").submit();
+            }else{
+                return;
+            }
+        }
+
+    }
+
+    //添加标题时确定按钮
+    function add_poll_question(doc,quest_type)
+    {
+        var title = $.trim($("#poll_questions_title").val());
+        var score = $.trim($("#question_score").val());
+        var standard_ans = $.trim($("#question_standard_ans").val());
+        if(title.length == 0 || score.length == 0){
+            alert("题目标题/分数不能为空");
+        }else if(!/^[1-9][0-9]*$/.test(score)) {
+            alert("分数必须是非零开头的数字");
+        }else if(quest_type !=3 && standard_ans.length == 0) {
+            alert("标准答案不能为空");
+        }else{
+            doc.parent().parent().parent().submit();}
+    }
+    //修改标题时确定按钮
+    function edit_poll_question(doc,id,quest_type)
+    {
+        var title = $.trim($("#poll_questions_title_" + id).val());
+        var score = $.trim($("#poll_question_score_"+ id).val());
+        var standard_ans = $.trim($("#poll_question_standard_answer_" + id).val());
+        if(title.length == 0 || score.length == 0){
+            alert("题目标题/分数不能为空");
+        }else if(!/^[1-9][0-9]*$/.test(score)) {
+            alert("分数必须是非零开头的数字");
+        }else if(quest_type !=3 && standard_ans.length == 0) {
+            alert("标准答案不能为空");
+        }else if(quest_type ==3) {
+            var div = $("#poll_answers_" + id);
+            var candiate_answer = $(".candiate_answer",div);
+            if(candiate_answer.length > 0) {
+                for(i=0;i<candiate_answer.length;i++) {
+                    if(i<candiate_answer.length-1 && $.trim($(candiate_answer[i]).val()) == "") {
+                        continue;
+                    } else if(i == (candiate_answer.length-1) && $.trim($(candiate_answer[i]).val()) == "") {
+                        alert("候选答案不能为空");
+                    } else if($.trim($(candiate_answer[i]).val()) != ""){
+                        doc.parent().parent().parent().submit();
+                        break;
+                    }
+
+                }
+            } else{
+                alert("候选答案不能为空");
+            }
+        }else{
+            doc.parent().parent().parent().submit();}
+    }
+
+    //问卷头
+    function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
+    function pollsSubmit(doc){
+        var title = $.trim($("#exercise_name").val());
+        if(title.length == 0){
+            alert("测验标题不能为空");
+        } else if($.trim($("#exercise_end_time").val()) =="") {
+            alert("截止时间不能为空");
+        } else if(Date.parse($("#exercise_end_time").val()) < Date.now()) {
+            alert("截止时间不能小于当前时间");
+        } else if($.trim($("#exercise_time").val()) !="" && !/^[1-9][0-9]*$/.test($.trim($("#exercise_time").val()))) {
+            alert("测验时长必须为非零开头的数字");
+        } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_publish_time").val()) < Date.now()) {
+            alert("发布时间不能小于当前时间");
+        } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_end_time").val()) <= Date.parse($("#exercise_publish_time").val())) {
+            alert("截止时间必须大于发布时间");
+        } else {
+            doc.parent().parent().parent().submit();
+        }
+    }
+    function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
+    //
+    function pollQuestionCancel(question_id){
+        $("#show_poll_questions_"+question_id).show();
+        $("#edit_poll_questions_"+question_id).hide();
+    }
+    function pollQuestionEdit(question_id){
+        $("#show_poll_questions_"+question_id).hide();
+        $("#edit_poll_questions_"+question_id).show();
+        $("#poll_questions_title_"+question_id).focus();
+    }
+    //单选题
+    function add_single_answer(doc)
+    {
+        doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input type='radio' style='width: 15px;' /><input maxlength='200' type='text' name='question_answer["+new Date().getTime()+"]' placeholder='输入选项内容'/>" +
+                "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
+                "</li><div class='cl'></div>");
+    }
+    function add_candidate_answer(doc)
+    {
+        doc.parent().after("<li class='ur_item'><label>候选答案<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='exercise_choice["+new Date().getTime()+"]' placeholder='请输入候选答案（选填）'/>" +
+                "<a class='icon_add' title='向下插入选项' onclick='add_candidate_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
+                "</li><div class='cl'></div>");
+    }
+    function remove_single_answer(doc)
+    {
+        if(doc.parent().siblings("li").length == 0)
+        {
+            alert("至少有一个选项或一个候选答案");
+        }
+        else
+        {
+            doc.parent().remove();
+        }
+    }
+</script>
+<div class="homepageRight mt0 ml10">
+  <div class="resources">
+    <!-- 头部 -->
+    <div id="polls_head_show" style="display: none;">
+      <%= render :partial => 'show_head', :locals => {:exercise => @exercise} %>
+    </div>
+    <div id="polls_head_edit">
+      <%= render :partial => 'edit_head', :locals => {:exercise => @exercise} %>
+    </div>
+    <% current_score = get_current_score @exercise %>
+    <div class="mb5" style="display: <%= current_score == 0 ? "none" : "" %>" id="current_score_div">目前试卷总分：<span class="c_red" id="current_score"><%= current_score %>
+      分</span></div>
+    <!-- 问题 -->
+    <div id="poll_content">
+      <%= render :partial => 'exercise_content', :locals => {:exercise => @exercise} %>
+    </div>
+
+    <div class="testQuestion" id="new_exercise_question">
+      <%= render :partial => 'new_question', :locals => {:exercise => @exercise} %>
+    </div>
+    <!--选项 end-->
+
+    <!-- 新增问题 -->
+    <div id="new_poll_question">
+    </div>
+
+    <div id="exercise_submit">
+      <%= render :partial => 'exercise_submit', :locals => {:exercise => @exercise} %>
+    </div>
+    <div class="cl"></div>
+    <!--contentbox end-->
+  </div>
+</div><!--编辑end-->
diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb
index c5ae81fd6..eaf618c56 100644
--- a/app/views/exercise/_new_MCQ.html.erb
+++ b/app/views/exercise/_new_MCQ.html.erb
@@ -1,62 +1,62 @@
-<%= form_for(ExerciseQuestion.new,
-             :html => { :multipart => true },
-             :url=>create_exercise_question_exercise_path(exercise.id),
-             :remote=>true ) do |f| %>
-<div class="questionContainer">
-  <div class="ur_editor_title">
-    <label>问题：&nbsp;&nbsp;</label>
-    <input name="question_type" value="2" type="hidden">
-    <input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入多选题题目" type="text">
-  </div>
-  <div class="ur_editor_content">
-    <ul>
-      <li class="ur_item">
-        <% score = exercise.exercise_questions.where("question_type=2").last.nil? ? "": exercise.exercise_questions.where("question_type=2").last.question_score %>
-        <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
-      </li>
-      <div class="cl"></div>
-      <div>
-          <li class="ur_item">
-            <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
-            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-          </li>
-          <div class="cl"></div>
-          <li class="ur_item">
-            <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
-            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-          </li>
-          <div class="cl"></div>
-          <li class="ur_item">
-            <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'>
-            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-          </li>
-          <div class="cl"></div>
-          <li class="ur_item">
-            <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'>
-            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-          </li>
-      </div>
-      <div class="cl"></div>
-      <li class="ur_item">
-        <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input id="question_standard_ans" name="exercise_choice" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text">
-      </li>
-      <div class="cl"></div>
-    </ul>
-  </div>
-  <div class="ur_editor_footer">
-    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),2);"> 保存 </a>
-    <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
-  </div>
-  <div class="cl"></div>
-</div>
+<%= form_for(ExerciseQuestion.new,
+             :html => { :multipart => true },
+             :url=>create_exercise_question_exercise_path(exercise.id),
+             :remote=>true ) do |f| %>
+<div class="questionContainer">
+  <div class="ur_editor_title">
+    <label>问题：&nbsp;&nbsp;</label>
+    <input name="question_type" value="2" type="hidden">
+    <input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入多选题题目" type="text">
+  </div>
+  <div class="ur_editor_content">
+    <ul>
+      <li class="ur_item">
+        <% score = exercise.exercise_questions.where("question_type=2").last.nil? ? "": exercise.exercise_questions.where("question_type=2").last.question_score %>
+        <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
+        <span class="ml10">标准答案：请选择</span>
+      </li>
+      <div class="cl"></div>
+      <div>
+          <li class="ur_item">
+            <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="checkbox" style="width: 15px;" />
+            <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+          <div class="cl"></div>
+          <li class="ur_item">
+            <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="checkbox" style="width: 15px;" />
+            <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+          <div class="cl"></div>
+          <li class="ur_item">
+            <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="checkbox" style="width: 15px;" />
+            <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+          <div class="cl"></div>
+          <li class="ur_item">
+            <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="checkbox" style="width: 15px;" />
+            <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+      </div>
+      <div class="cl"></div>
+    </ul>
+  </div>
+  <div class="ur_editor_footer">
+    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),2);"> 保存 </a>
+    <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
+  </div>
+  <div class="cl"></div>
+</div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb
index a477303d7..3413007ae 100644
--- a/app/views/exercise/_show_MCQ.html.erb
+++ b/app/views/exercise/_show_MCQ.html.erb
@@ -52,9 +52,11 @@
                                 '<li class="ur_item">'+
                                 '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input value="<%= score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
+                                '<span class="ml10">标准答案：请选择</span>'+
                                 '</li><div>'+
                                 '<li class="ur_item">'+
                                 '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input type="checkbox" style="width: 15px;" />'+
                                 '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
@@ -62,6 +64,7 @@
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
                                 '<label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input type="checkbox" style="width: 15px;" />'+
                                 '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
@@ -69,6 +72,7 @@
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
                                 '<label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input type="checkbox" style="width: 15px;" />'+
                                 '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
@@ -76,16 +80,12 @@
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
                                 '<label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input type="checkbox" style="width: 15px;" />'+
                                 '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
                                 '</li></div>'+
                                 '<div class="cl"></div>'+
-                                '<li class="ur_item">'+
-                                '<label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input name="exercise_choice" id="question_standard_ans" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text">'+
-                                '</li>'+
-                                '<div class="cl"></div>'+
                                 '</ul>'+
                                 '</div>'+
                                 '<div class="ur_editor_footer">'+

From 09e0e5e93dd23b06d60ee842583b11069cfaeb6b Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 26 Nov 2015 11:10:17 +0800
Subject: [PATCH 14/21] =?UTF-8?q?=E5=8D=95=E9=80=89=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_edit_MC.html.erb       |  7 ++++---
 app/views/exercise/_edit_MCQ.html.erb      |  7 +++++--
 app/views/exercise/_exercise_form.html.erb |  2 +-
 app/views/exercise/_new_MC.html.erb        | 10 +++++-----
 app/views/exercise/_new_MCQ.html.erb       | 10 +++++-----
 app/views/exercise/_show_MC.html.erb       | 13 ++++++-------
 app/views/exercise/_show_MCQ.html.erb      | 10 +++++-----
 7 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/app/views/exercise/_edit_MC.html.erb b/app/views/exercise/_edit_MC.html.erb
index fee35824b..f4ececf8f 100644
--- a/app/views/exercise/_edit_MC.html.erb
+++ b/app/views/exercise/_edit_MC.html.erb
@@ -8,7 +8,6 @@
             $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>")
             $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" +
                     "<li class='ur_item'>" +
-                    "<input type='radio' style='width: 15px;' />"+
                     "<label>选项<%=convert_to_char (index+1).to_s %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
                     "<input maxlength='200' type='text' name='question_answer[<%=exercise_choice.id %>]' placeholder='输入选项内容' value='<%=exercise_choice.choice_text %>'/>" +
                     "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
@@ -30,14 +29,12 @@
           <li class="ur_item">
             <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
             <input type="text" id="poll_question_score_<%=exercise_question.id %>" name="question_score" style="width:40px; text-align:center; padding-left:0px;" value="<%= exercise_question.question_score %>">分
-            <span class="ml10">标准答案：请选择</span>
           </li>
           <div class="cl"></div>
           <div id="poll_answers_<%=exercise_question.id%>">
               <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
                   <li class="ur_item">
                     <label>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-                    <input type="radio" style="width: 15px;" />
                     <input maxlength="200" type='text' name='question_answer[<%=exercise_choice.id %>]' placeholder='输入选项内容' value="<%=exercise_choice.choice_text %>">
                     <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
                     <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
@@ -45,6 +42,10 @@
                   <div class="cl"></div>
               <% end %>
           </div>
+          <li class="ur_item">
+            <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input id="poll_question_standard_answer_<%=exercise_question.id %>" name="exercise_choice" placeholder="若标准答案为A，在此输入A即可" type="text" value="<%=convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>">
+          </li>
           <div class="cl"></div>
         </ul>
       </div>
diff --git a/app/views/exercise/_edit_MCQ.html.erb b/app/views/exercise/_edit_MCQ.html.erb
index 66bbe8a6f..18ae79d1c 100644
--- a/app/views/exercise/_edit_MCQ.html.erb
+++ b/app/views/exercise/_edit_MCQ.html.erb
@@ -29,14 +29,12 @@
           <li class="ur_item">
             <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
             <input type="text" id="poll_question_score_<%=exercise_question.id %>" name="question_score" style="width:40px; text-align:center; padding-left:0px;" value="<%= exercise_question.question_score %>">分
-            <span class="ml10">标准答案：请选择</span>
           </li>
           <div class="cl"></div>
           <div id="poll_answers_<%=exercise_question.id%>">
             <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
                 <li class="ur_item">
                   <label>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-                  <input type="checkbox" style="width: 15px;" />
                   <input maxlength="200" type='text' name='question_answer[<%= exercise_choice.id %>]' placeholder='输入选项内容' value="<%=exercise_choice.choice_text %>">
                   <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
                   <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
@@ -44,6 +42,11 @@
                 <div class="cl"></div>
             <% end %>
           </div>
+          <li class="ur_item">
+            <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input id="poll_question_standard_answer_<%=exercise_question.id %>" name="exercise_choice" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text" value="<%=convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>">
+          </li>
+          <div class="cl"></div>
         </ul>
       </div>
       <div class="ur_editor_footer">
diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index 40e68ad61..8de4dac38 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -162,7 +162,7 @@
     //单选题
     function add_single_answer(doc)
     {
-        doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input type='radio' style='width: 15px;' /><input maxlength='200' type='text' name='question_answer["+new Date().getTime()+"]' placeholder='输入选项内容'/>" +
+        doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='question_answer["+new Date().getTime()+"]' placeholder='输入选项内容'/>" +
                 "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
                 "</li><div class='cl'></div>");
     }
diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb
index c0a53b2e9..0d7350570 100644
--- a/app/views/exercise/_new_MC.html.erb
+++ b/app/views/exercise/_new_MC.html.erb
@@ -14,13 +14,11 @@
         <% score = exercise.exercise_questions.where("question_type=1").last.nil? ? "": exercise.exercise_questions.where("question_type=1").last.question_score %>
          <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
          <input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
-         <span class="ml15">标准答案：请选择</span>
       </li>
       <div class="cl"></div>
       <div>
           <li class="ur_item">
             <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input type="radio" style="width: 15px;" />
             <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
@@ -28,7 +26,6 @@
           <div class="cl"></div>
           <li class="ur_item">
             <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input type="radio" style="width: 15px;" />
             <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
@@ -36,7 +33,6 @@
           <div class="cl"></div>
           <li class="ur_item">
             <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input type="radio" style="width: 15px;" />
             <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'/>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
@@ -44,13 +40,17 @@
           <div class="cl"></div>
           <li class="ur_item">
             <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input type="radio" style="width: 15px;" />
             <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'/>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
           </li>
       </div>
       <div class="cl"></div>
+      <li class="ur_item">
+        <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input id="question_standard_ans" name="exercise_choice" placeholder="若标准答案为A，在此输入A即可" type="text">
+      </li>
+      <div class="cl"></div>
     </ul>
   </div>
   <div class="ur_editor_footer">
diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb
index eaf618c56..3ea198d8f 100644
--- a/app/views/exercise/_new_MCQ.html.erb
+++ b/app/views/exercise/_new_MCQ.html.erb
@@ -14,13 +14,11 @@
         <% score = exercise.exercise_questions.where("question_type=2").last.nil? ? "": exercise.exercise_questions.where("question_type=2").last.question_score %>
         <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
         <input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
-        <span class="ml10">标准答案：请选择</span>
       </li>
       <div class="cl"></div>
       <div>
           <li class="ur_item">
             <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input type="checkbox" style="width: 15px;" />
             <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
@@ -28,7 +26,6 @@
           <div class="cl"></div>
           <li class="ur_item">
             <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input type="checkbox" style="width: 15px;" />
             <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
@@ -36,7 +33,6 @@
           <div class="cl"></div>
           <li class="ur_item">
             <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input type="checkbox" style="width: 15px;" />
             <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
@@ -44,13 +40,17 @@
           <div class="cl"></div>
           <li class="ur_item">
             <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input type="checkbox" style="width: 15px;" />
             <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
           </li>
       </div>
       <div class="cl"></div>
+      <li class="ur_item">
+        <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input id="question_standard_ans" name="exercise_choice" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text">
+      </li>
+      <div class="cl"></div>
     </ul>
   </div>
   <div class="ur_editor_footer">
diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb
index 4c382deb9..d052bd6da 100644
--- a/app/views/exercise/_show_MC.html.erb
+++ b/app/views/exercise/_show_MC.html.erb
@@ -5,8 +5,7 @@
   </div>
 
   <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
-
-              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de",:title => "删除")  %>
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
   <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
   <a class='ur_icon_add' title='向下插入' id="add_mc_<%=exercise_question.id%>" onclick="dismiss('mc',<%=exercise_question.id%>);insert_MC('mc',<%=exercise_question.question_number%>,<%=exercise_question.id%>);"></a>
   <div class="cl"></div>
@@ -54,11 +53,9 @@
                                 '<li class="ur_item">'+
                                 '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input value="<%=score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
-                                '<span class="ml15">标准答案：请选择</span>'+
                                 '</li><div>'+
                                 '<li class="ur_item">'+
                                 '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input type="radio" style="width: 15px;" />'+
                                 '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
@@ -66,7 +63,6 @@
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
                                 '<label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input type="radio" style="width: 15px;" />'+
                                 '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
@@ -74,7 +70,6 @@
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
                                 '<label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input type="radio" style="width: 15px;" />'+
                                 '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
@@ -82,12 +77,16 @@
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
                                 '<label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input type="radio" style="width: 15px;" />'+
                                 '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
                                 '</li></div>'+
                                 '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input name="exercise_choice" id="question_standard_ans" placeholder="若标准答案为A，在此输入A即可" type="text">'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
                                 '</ul>'+
                                 '</div>'+
                                 '<div class="ur_editor_footer">'+
diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb
index 3413007ae..a477303d7 100644
--- a/app/views/exercise/_show_MCQ.html.erb
+++ b/app/views/exercise/_show_MCQ.html.erb
@@ -52,11 +52,9 @@
                                 '<li class="ur_item">'+
                                 '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input value="<%= score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
-                                '<span class="ml10">标准答案：请选择</span>'+
                                 '</li><div>'+
                                 '<li class="ur_item">'+
                                 '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input type="checkbox" style="width: 15px;" />'+
                                 '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
@@ -64,7 +62,6 @@
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
                                 '<label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input type="checkbox" style="width: 15px;" />'+
                                 '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
@@ -72,7 +69,6 @@
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
                                 '<label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input type="checkbox" style="width: 15px;" />'+
                                 '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
@@ -80,12 +76,16 @@
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
                                 '<label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input type="checkbox" style="width: 15px;" />'+
                                 '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
                                 '</li></div>'+
                                 '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input name="exercise_choice" id="question_standard_ans" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text">'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
                                 '</ul>'+
                                 '</div>'+
                                 '<div class="ur_editor_footer">'+

From 6b72b4bb175530011fdd2b72882e800e4232d572 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 26 Nov 2015 11:22:42 +0800
Subject: [PATCH 15/21] =?UTF-8?q?=E9=9D=9E=E8=AF=BE=E7=A8=8B=E5=8F=82?=
 =?UTF-8?q?=E4=B8=8E=E4=BA=BA=E5=91=98=E6=97=A0=E6=B3=95=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E7=A7=81=E6=9C=89=E8=AF=BE=E7=A8=8B=E7=9A=84=E6=B5=8B=E9=AA=8C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index 2c1ad31c1..d1df22dff 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -5,8 +5,11 @@ class ExerciseController < ApplicationController
   before_filter :find_course, :only => [:index,:new,:create,:student_exercise_list]
   include ExerciseHelper
 
-  include ExerciseHelper
   def index
+    if @course.is_public == 0 && !User.current.member_of_course?(@course)
+      render_403
+      return
+    end
     remove_invalid_exercise(@course)
     @is_teacher = User.current.allowed_to?(:as_teacher,@course)
     if @is_teacher

From f1bb1bb8c251acd5f1ad906d1589d23562adca30 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 26 Nov 2015 14:36:19 +0800
Subject: [PATCH 16/21] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=EF=BC=8C=E6=AF=8F=E4=B8=AA?=
 =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E5=90=8D=E5=AD=97=E5=89=8D=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=B7=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb      |  4 ++--
 app/views/exercise/_exercise.html.erb       | 11 ++++-------
 app/views/exercise/_exercises_list.html.erb |  4 ++--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index d1df22dff..0b1a035c1 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -13,9 +13,9 @@ class ExerciseController < ApplicationController
     remove_invalid_exercise(@course)
     @is_teacher = User.current.allowed_to?(:as_teacher,@course)
     if @is_teacher
-      exercises = @course.exercises
+      exercises = @course.exercises.order("created_at asc")
     else
-      exercises = @course.exercises.where(:exercise_status => 2)
+      exercises = @course.exercises.where(:exercise_status => 2).order("created_at asc")
     end
     @exercises = paginateHelper exercises,20 #分页
     respond_to do |format|
diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb
index 40654d327..d7a457047 100644
--- a/app/views/exercise/_exercise.html.erb
+++ b/app/views/exercise/_exercise.html.erb
@@ -8,7 +8,7 @@
         <%# else %>
             <%#= link_to poll_name, exercise_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %>
         <%# end %>
-        <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %>
+        <%= link_to (index+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %>
       </div>
     </li>
 
@@ -16,8 +16,10 @@
 
     <% if exercise.exercise_status == 1 %>
         <li><%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml5"%></li>
+        <li class="polls_date fr"><%=exercise.publish_time.nil? ? "未发布" : "将于"+format_time(exercise.publish_time.to_s)+"发布"%></li>
     <% else%>
         <li class="polls_de_grey fr ml5" title="未发布的试卷才能进行编辑">编辑</li>
+        <li class="polls_date fr">已发布</li>
     <% end%>
 
     <%# if exercise.exercise_status == 2 %>
@@ -31,11 +33,6 @@
     <%# elsif exercise.exercise_status == 2 || exercise.exercise_status == 3 %>
         <!--<li><%#= link_to "导出", export_exercise_exercise_path(exercise.id,:format => "xls"), :class => "polls_de fr ml5"%></li>-->
     <%# end%>
-
-
-    <li class="polls_date fr"><%= format_date exercise.created_at.to_date%></li>
-
-
     <% if exercise.exercise_status == 1 %>
         <li><a href="javascript:" class="pollsbtn btn_pu fr mr5" onclick="exercise_submit(<%= exercise.id%>,<%= exercise.exercise_name.length %>);">发布试卷</a></li>
     <% elsif exercise.exercise_status == 2%>
@@ -59,5 +56,5 @@
             <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%>
         <%#end%>
     <% end%>
-    <li class="polls_date fr mr10"><%= format_date exercise.created_at.to_date%></li>
+    <li class="polls_date fr mr10">截止时间：<%= format_time(exercise.end_time.to_s)%></li>
 <% end%>
\ No newline at end of file
diff --git a/app/views/exercise/_exercises_list.html.erb b/app/views/exercise/_exercises_list.html.erb
index f277ebdf5..89964f032 100644
--- a/app/views/exercise/_exercises_list.html.erb
+++ b/app/views/exercise/_exercises_list.html.erb
@@ -10,9 +10,9 @@
 <div class="cl"></div>
 <div id="polls_list" class="polls_list">
 
-  <% @exercises.each do |exercise|%>
+  <% @exercises.each_with_index do |exercise,index|%>
       <ul id="exercises_<%= exercise.id %>" class="polls_list_ul">
-        <%= render :partial => 'exercise', :locals => {:exercise => exercise} %>
+        <%= render :partial => 'exercise', :locals => {:exercise => exercise,:index => index} %>
       </ul>
       <div class="cl"></div>
   <% end%>

From 5bdcdc607f1424a2e1064db32f3ccbbb34a5f214 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 26 Nov 2015 14:45:35 +0800
Subject: [PATCH 17/21] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_exercise.html.erb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb
index d7a457047..ba82fbf82 100644
--- a/app/views/exercise/_exercise.html.erb
+++ b/app/views/exercise/_exercise.html.erb
@@ -12,16 +12,6 @@
       </div>
     </li>
 
-    <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10")  %>
-
-    <% if exercise.exercise_status == 1 %>
-        <li><%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml5"%></li>
-        <li class="polls_date fr"><%=exercise.publish_time.nil? ? "未发布" : "将于"+format_time(exercise.publish_time.to_s)+"发布"%></li>
-    <% else%>
-        <li class="polls_de_grey fr ml5" title="未发布的试卷才能进行编辑">编辑</li>
-        <li class="polls_date fr">已发布</li>
-    <% end%>
-
     <%# if exercise.exercise_status == 2 %>
         <!--<li><a class="polls_de fr ml5" onclick="" href="javascript:">关闭</a></li>-->
     <%# else %>
@@ -47,6 +37,16 @@
         <li><%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fr mr10"%></li>
     <% end%>
 
+    <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10")  %>
+
+    <% if exercise.exercise_status == 1 %>
+        <li><%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml10"%></li>
+        <li class="polls_date fr"><%=exercise.publish_time.nil? ? "未发布" : "将于"+format_time(exercise.publish_time.to_s)+"发布"%></li>
+    <% else%>
+        <li class="polls_de_grey fr ml10" title="未发布的试卷才能进行编辑">编辑</li>
+        <li class="polls_date fr">已发布</li>
+    <% end%>
+
 <% else%>
     <% if exercise.exercise_status == 2%>
         <%# if has_commit%>

From b602e1c85d82af3774e6c4a6adf45d4d56976cae Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 26 Nov 2015 14:47:52 +0800
Subject: [PATCH 18/21] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=AD=94=E9=A2=98?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E8=AF=95=E5=8D=B7=E6=88=AA?=
 =?UTF-8?q?=E6=AD=A2=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_exercise_student.html.erb        | 5 ++++-
 app/views/exercise/_exercise_student_result.html.erb | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb
index 45d6ccf70..20b8a3d8c 100644
--- a/app/views/exercise/_exercise_student.html.erb
+++ b/app/views/exercise/_exercise_student.html.erb
@@ -42,7 +42,10 @@
       <div id="start_time" style="display: none"><%=exercise_user.start_at %></div>
       <div class="fontGrey2">
         <span class="mr130">开始时间：<%=format_time(exercise_user.start_at.to_s)%></span>
-        <span class="mr130">测验时长：<%=exercise.time %>分钟</span>
+        <span class="mr130">截止时间：<%=format_time(exercise.end_time.to_s)%></span>
+        <% unless exercise.time == -1 %>
+            <span class="fr">测验时长：<%=exercise.time %>分钟</span>
+        <% end %>
 <!--
         <span class="fr">剩余时长：<span class="c_red" id="rest_hours"></span>&nbsp;小时&nbsp;<span class="c_red" id="rest_minutes"></span>&nbsp;分钟&nbsp;<span class="c_red" id="rest_seconds"></span>&nbsp;秒</span>
 -->
diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb
index b9306b0d2..8f6ac0e54 100644
--- a/app/views/exercise/_exercise_student_result.html.erb
+++ b/app/views/exercise/_exercise_student_result.html.erb
@@ -11,7 +11,10 @@
       <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
       <div class="fontGrey2">
         <span class="mr130">开始时间：<%=format_time(exercise_user.start_at.to_s) %></span>
-        <span class="mr130">测验时长：<%=exercise.time %>分钟</span>
+        <span class="mr130">截止时间：<%=format_time(exercise.end_time.to_s)%></span>
+        <% unless exercise.time == -1 %>
+            <span class="fr">测验时长：<%=exercise.time %>分钟</span>
+        <% end %>
         <%# time = exercise_user.end_at - exercise_user.start_at %>
         </div>
       <div class="testDesEdit mt5"><%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%></div>

From ed9cef486febc212888880a8ec569e72e9298a84 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 26 Nov 2015 15:21:46 +0800
Subject: [PATCH 19/21] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=8C=89=E9=92=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb       | 3 +++
 app/views/exercise/_exercise.html.erb        | 6 +++---
 app/views/exercise/index.html.erb            | 8 ++++----
 app/views/exercise/publish_exercise.js.erb   | 2 +-
 app/views/exercise/republish_exercise.js.erb | 2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index 0b1a035c1..6066ef3d0 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -302,6 +302,7 @@ class ExerciseController < ApplicationController
   # 发布试卷
   def publish_exercise
     @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    @index = params[:index]
     @exercise.exercise_status = 2
     @exercise.publish_time = Time.now
     if @exercise.save
@@ -316,11 +317,13 @@ class ExerciseController < ApplicationController
   # 重新发布的时候会删除所有的答题
   def republish_exercise
     @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    @index = params[:index]
     @exercise.exercise_questions.each do |exercise_question|
       exercise_question.exercise_answers.destroy_all
     end
     @exercise.exercise_users.destroy_all
     @exercise.exercise_status = 1
+    @exercise.publish_time = nil
     @exercise.save
     respond_to do |format|
       format.js
diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb
index ba82fbf82..91af83aee 100644
--- a/app/views/exercise/_exercise.html.erb
+++ b/app/views/exercise/_exercise.html.erb
@@ -8,7 +8,7 @@
         <%# else %>
             <%#= link_to poll_name, exercise_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %>
         <%# end %>
-        <%= link_to (index+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %>
+        <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %>
       </div>
     </li>
 
@@ -24,9 +24,9 @@
         <!--<li><%#= link_to "导出", export_exercise_exercise_path(exercise.id,:format => "xls"), :class => "polls_de fr ml5"%></li>-->
     <%# end%>
     <% if exercise.exercise_status == 1 %>
-        <li><a href="javascript:" class="pollsbtn btn_pu fr mr5" onclick="exercise_submit(<%= exercise.id%>,<%= exercise.exercise_name.length %>);">发布试卷</a></li>
+        <li><a href="javascript:" class="pollsbtn btn_pu fr mr5" onclick="exercise_submit(<%= exercise.id%>,<%= exercise.exercise_name.length %>,<%=index.to_i %>);">发布试卷</a></li>
     <% elsif exercise.exercise_status == 2%>
-        <li><a href="javascript:" class="pollsbtn btn_de fr mr5" onclick="republish_exercise(<%= exercise.id%>);">取消发布</a></li>
+        <li><a href="javascript:" class="pollsbtn btn_de fr mr5" onclick="republish_exercise(<%= exercise.id%>,<%=index.to_i %>);">取消发布</a></li>
     <% else%>
         <li class="pollsbtn fr mr10 pollsbtn_grey" style="margin-left: 5px;" >发布试卷</li>
     <% end%>
diff --git a/app/views/exercise/index.html.erb b/app/views/exercise/index.html.erb
index aacc79950..9b6961e6c 100644
--- a/app/views/exercise/index.html.erb
+++ b/app/views/exercise/index.html.erb
@@ -5,14 +5,14 @@
         $("#homework_page_right").css("min-height",$("#LSide").height()-30);
         $("#Container").css("width","1000px");
     });
-    function republish_exercise(exercise_id)
+    function republish_exercise(exercise_id,index)
     {
         $('#ajax-modal').html("<div id='popbox02'>" +
                 "<div class='upload_con'>" +
                 "<div class='upload_box'>" +
                 "<p class='polls_box_p'>取消发布后学生答题将会被清空<br />是否确定取消发布该测验？</p>" +
                 "<div class='polls_btn_box'>" +
-                "<a href='/exercise/"+ exercise_id +"/republish_exercise' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
+                "<a href='/exercise/"+ exercise_id +"/republish_exercise?index="+index+"' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
                 "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
                 "</div>" +
                 "<div class='cl'></div>" +
@@ -31,7 +31,7 @@
 
     function clickCanel(){hideModal("#popbox02");}
 
-    function exercise_submit(exercise_id,exercise_name)
+    function exercise_submit(exercise_id,exercise_name,index)
     {
         if(exercise_name == 0)
         {
@@ -44,7 +44,7 @@
                     "<div class='upload_box'>" +
                     "<p class='polls_box_p'>测验发布后将不能对测验进行修改，<br />是否确定发布该测验？</p>" +
                     "<div class='polls_btn_box'>" +
-                    "<a href='/exercise/"+ exercise_id +"/publish_exercise' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
+                    "<a href='/exercise/"+ exercise_id +"/publish_exercise?index="+index+"' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
                     "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
                     "</div>" +
                     "<div class='cl'></div>" +
diff --git a/app/views/exercise/publish_exercise.js.erb b/app/views/exercise/publish_exercise.js.erb
index ac2899402..c1c4a4fd5 100644
--- a/app/views/exercise/publish_exercise.js.erb
+++ b/app/views/exercise/publish_exercise.js.erb
@@ -1,4 +1,4 @@
-$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise}) %>");
+$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise,:index =>@index}) %>");
 $('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_memo_create_succ)}) %>");
 showModal('ajax-modal', '250px');
 //$('#ajax-modal').css('height','111px');
diff --git a/app/views/exercise/republish_exercise.js.erb b/app/views/exercise/republish_exercise.js.erb
index b7172fe9e..2b4e67606 100644
--- a/app/views/exercise/republish_exercise.js.erb
+++ b/app/views/exercise/republish_exercise.js.erb
@@ -1,4 +1,4 @@
-$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise}) %>");
+$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise,:index => @index}) %>");
 $('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_poll_republish_success)}) %>");
 showModal('ajax-modal', '250px');
 //$('#ajax-modal').css('height','80px');

From f8621cac76b3e00baeadc30843019d54723373cf Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 26 Nov 2015 16:57:51 +0800
Subject: [PATCH 20/21] =?UTF-8?q?=E6=9C=AA=E8=AE=BE=E7=BD=AE=E8=80=83?=
 =?UTF-8?q?=E8=AF=95=E6=97=B6=E9=95=BF=E6=97=B6=EF=BC=8C=E5=8F=AA=E8=A6=81?=
 =?UTF-8?q?=E8=BF=98=E6=9C=AA=E5=88=B0=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=B0=B1=E5=8F=AF=E4=BB=A5=E4=B8=80=E7=9B=B4=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E8=AF=95=E5=8D=B7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb        | 19 ++++++++++-----
 app/views/exercise/_commit_alert.html.erb     |  5 +++-
 app/views/exercise/_exercise.html.erb         |  2 +-
 app/views/exercise/_exercise_form.html.erb    |  6 ++---
 app/views/exercise/_exercise_student.html.erb | 23 ++++++++++++-------
 .../_exercise_student_result.html.erb         | 10 ++++----
 app/views/exercise/_exercise_teacher.html.erb |  4 ++--
 app/views/exercise/_show_head.html.erb        |  4 ++--
 app/views/exercise/commit_exercise.js.erb     |  2 +-
 public/stylesheets/courses.css                |  1 +
 10 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index 6066ef3d0..d4050da18 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -34,17 +34,24 @@ class ExerciseController < ApplicationController
       render_403
       return
     end
-    @can_edit_excercise = (!has_commit_exercise?(@exercise.id,User.current.id)) || User.current.admin?
+    exercise_end = Time.parse(format_time(@exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") > Time.now.strftime("%Y-%m-%d %H:%M:%S")
+    if @exercise.time == -1
+      @can_edit_excercise = exercise_end
+    else
+      @can_edit_excercise = (!has_commit_exercise?(@exercise.id,User.current.id)&& exercise_end) || User.current.admin?
+    end
     @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first
       # 学生点击的时候即创建关联,自动保存
       #eu = ExerciseUser.create(:user_id => User.current, :exercise_id => @exercise.id, :start_at => Time.now, :status => false)
 
     # 已提交问卷的用户不能再访问该界面
+=begin
     if has_commit_exercise?(@exercise.id, User.current.id) && (!User.current.admin?)
       respond_to do |format|
         format.html {render :layout => 'base_courses'}
       end
     else
+=end
       if !@is_teacher && !has_click_exercise?(@exercise.id, User.current.id)
         eu = ExerciseUser.create(:user_id => User.current.id, :exercise_id => @exercise.id, :start_at => Time.now, :status => false)
         @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first
@@ -55,7 +62,7 @@ class ExerciseController < ApplicationController
       respond_to do |format|
         format.html {render :layout => 'base_courses'}
       end
-    end
+    #end
   end
 
   def new
@@ -82,7 +89,7 @@ class ExerciseController < ApplicationController
       exercise ||= Exercise.new
       exercise.exercise_name = params[:exercise][:exercise_name]
       exercise.exercise_description = params[:exercise][:exercise_description]
-      exercise.end_time = params[:exercise][:end_time]
+      exercise.end_time = Time.at(params[:exercise][:end_time].to_time.to_i + 16*60*60 -1)
       exercise.publish_time = params[:exercise][:publish_time]
       exercise.user_id = User.current.id
       exercise.time = params[:exercise][:time]
@@ -107,7 +114,7 @@ class ExerciseController < ApplicationController
     @exercise.exercise_name = params[:exercise][:exercise_name]
     @exercise.exercise_description = params[:exercise][:exercise_description]
     @exercise.time =  params[:exercise][:time].blank? ? -1 : params[:exercise][:time]
-    @exercise.end_time = params[:exercise][:end_time]
+    @exercise.end_time = Time.at(params[:exercise][:end_time].to_time.to_i + 16*60*60 -1)
     @exercise.publish_time = params[:exercise][:publish_time]
     @exercise.show_result = params[:exercise][:show_result].blank? ? 1 : params[:exercise][:show_result]
     if @exercise.save
@@ -351,8 +358,8 @@ class ExerciseController < ApplicationController
   # 学生提交答卷，选中答案的过程中提交
   def commit_answer
     eq = ExerciseQuestion.find(params[:exercise_question_id])
-    # 已提交过的则不允许答题
-    if has_commit_exercise?(@exercise.id,User.current.id) && (!User.current.admin?)
+    # 已提交过的且是限时的则不允许答题
+    if has_commit_exercise?(@exercise.id,User.current.id) && (!User.current.admin?) && @exercise.time != -1
       render :json => {:text => "failure"}
       return
     end
diff --git a/app/views/exercise/_commit_alert.html.erb b/app/views/exercise/_commit_alert.html.erb
index d92ca51fb..a21dbd2a7 100644
--- a/app/views/exercise/_commit_alert.html.erb
+++ b/app/views/exercise/_commit_alert.html.erb
@@ -1,7 +1,10 @@
 <div id="popbox" style="text-align: center;margin-top: 25px">
-  <% if status == 0 %>
+  <% if status == 0 && exercise.time != -1 %>
       <h3 style="font-weight: normal;color: green">提交成功!您的分数是：<%=@score %>分。</h3>
       <%= link_to "确定", exercise_path(),:class => 'commit'%>
+  <% elsif status == 0 && Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") > Time.now.strftime("%Y-%m-%d %H:%M:%S") %>
+      <h3 style="font-weight: normal;color: green">提交成功!</h3>
+      <%= link_to "确定", exercise_index_path(:course_id => @course.id),:class => 'commit'%>
   <% elsif status == 1 %>
       <h3 style="font-weight: normal;color: red">您还有尚未作答的题目请完成后再提交!</h3>
       <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:class => 'commit'%>
diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb
index 91af83aee..db412672c 100644
--- a/app/views/exercise/_exercise.html.erb
+++ b/app/views/exercise/_exercise.html.erb
@@ -53,7 +53,7 @@
             <!--li><%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_st fl c_dblue" %></li>
             <li class="pollsbtn_tip fl ml5">已答</li-->
         <%#else%>
-            <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%>
+            <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%>
         <%#end%>
     <% end%>
     <li class="polls_date fr mr10">截止时间：<%= format_time(exercise.end_time.to_s)%></li>
diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index 8de4dac38..e283f8b0c 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -136,14 +136,14 @@
             alert("测验标题不能为空");
         } else if($.trim($("#exercise_end_time").val()) =="") {
             alert("截止时间不能为空");
-        } else if(Date.parse($("#exercise_end_time").val()) < Date.now()) {
+        } else if((Date.parse($("#exercise_end_time").val())+(24*60*60-1)*1000) < Date.now()) {
             alert("截止时间不能小于当前时间");
         } else if($.trim($("#exercise_time").val()) !="" && !/^[1-9][0-9]*$/.test($.trim($("#exercise_time").val()))) {
             alert("测验时长必须为非零开头的数字");
         } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_publish_time").val()) < Date.now()) {
             alert("发布时间不能小于当前时间");
-        } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_end_time").val()) <= Date.parse($("#exercise_publish_time").val())) {
-            alert("截止时间必须大于发布时间");
+        } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_end_time").val()) < Date.parse($("#exercise_publish_time").val())) {
+            alert("截止时间不能小于发布时间");
         } else {
             doc.parent().parent().parent().submit();
         }
diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb
index 20b8a3d8c..7010407ce 100644
--- a/app/views/exercise/_exercise_student.html.erb
+++ b/app/views/exercise/_exercise_student.html.erb
@@ -3,6 +3,8 @@
         $("#RSide").removeAttr("id");
         $("#homework_page_right").css("min-height",$("#LSide").height()-30);
         $("#Container").css("width","1000px");
+        end_time = <%=exercise.end_time.to_i%>
+        getTime(end_time);
         /*start_time = new Date();
         start_time.setFullYear(<%#=exercise_user.start_at.year%>);
         start_time.setMonth(<%#=exercise_user.start_at.month%>);
@@ -17,11 +19,16 @@
     function getTime(end_time) {
         //alert(end_time);
         now = new Date();
-        var total_seconds = (now.getTime() - end_time)/1000;
+        var total_seconds = now.getTime()/1000 - end_time;
+        if (total_seconds < 0) {
+            $("#exercise_submit_btn").click();
+            return;
+        }
+        setTimeout("getTime("+end_time+");", 1000);
         //start = new Date(start_time);
         //end_time = start_time;
         //var total_seconds = total_seconds - 1;
-        var hours = total_seconds / 60 / 60;
+        /*var hours = total_seconds / 60 / 60;
         var hoursRound = Math.floor(hours);
         var minutes = total_seconds /60 - (60 * hoursRound);
         var minutesRound = Math.floor(minutes);
@@ -29,9 +36,9 @@
         var secondsRound = Math.round(seconds);
         $("#rest_hours").html(hoursRound);
         $("#rest_minutes").html(minutesRound);
-        $("#rest_seconds").html(secondsRound);
+        $("#rest_seconds").html(secondsRound);*/
         //if(total_seconds >0) {
-            setTimeout("getTime("+end_time+");", 1000);
+            //setTimeout("getTime("+end_time+");", 1000);
         //}
     }
 </script>
@@ -41,8 +48,8 @@
       <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
       <div id="start_time" style="display: none"><%=exercise_user.start_at %></div>
       <div class="fontGrey2">
-        <span class="mr130">开始时间：<%=format_time(exercise_user.start_at.to_s)%></span>
-        <span class="mr130">截止时间：<%=format_time(exercise.end_time.to_s)%></span>
+        <span class="mr100">开始时间：<%=Time.parse(h(exercise_user.start_at)).strftime("%Y-%m-%d %H:%M:%S")%></span>
+        <span class="mr100">截止时间：<%=Time.parse(h(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S")%></span>
         <% unless exercise.time == -1 %>
             <span class="fr">测验时长：<%=exercise.time %>分钟</span>
         <% end %>
@@ -194,7 +201,7 @@
 
                       }
                   </script>
-                  <input class="fillInput" placeholder="在此填入答案" type="text" value="" onblur="onblur_<%= exercise_question.id %>(this);" <%= @can_edit_excercise?"":"disabled=disabled" %>>
+                  <input class="fillInput" placeholder="在此填入答案" type="text" value="<%= get_anwser_vote_text(exercise_question.id,User.current.id).html_safe %>" onblur="onblur_<%= exercise_question.id %>(this);" <%= @can_edit_excercise?"":"disabled=disabled" %>>
                 </div>
               </div>
             </div>
@@ -202,7 +209,7 @@
       <% end %>
     </div>
     <div class="ur_buttons">
-      <%= link_to l(:button_submit),commit_exercise_exercise_path(exercise), :method => :post,:class => "ur_button_submit",:style => "margin-left:80px;",:format => 'js',:remote=>true %>
+      <%= link_to l(:button_submit),commit_exercise_exercise_path(exercise),:id=>"exercise_submit_btn", :method => :post,:class => "ur_button_submit",:style => "margin-left:80px;",:format => 'js',:remote=>true %>
     </div>
     <div class="cl"></div>
     <!--contentbox end-->
diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb
index 8f6ac0e54..3445d6986 100644
--- a/app/views/exercise/_exercise_student_result.html.erb
+++ b/app/views/exercise/_exercise_student_result.html.erb
@@ -10,8 +10,8 @@
     <div class="testStatus"><!--头部显示 start-->
       <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
       <div class="fontGrey2">
-        <span class="mr130">开始时间：<%=format_time(exercise_user.start_at.to_s) %></span>
-        <span class="mr130">截止时间：<%=format_time(exercise.end_time.to_s)%></span>
+        <span class="mr100">开始时间：<%=Time.parse(h(exercise_user.start_at)).strftime("%Y-%m-%d %H:%M:%S") %></span>
+        <span class="mr100">截止时间：<%=Time.parse(h(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S")%></span>
         <% unless exercise.time == -1 %>
             <span class="fr">测验时长：<%=exercise.time %>分钟</span>
         <% end %>
@@ -34,7 +34,7 @@
                   <span class="ml15 c_red">
                     <% answer = get_user_answer(exercise_question, User.current)%>
                     <% standard_answer = get_user_standard_answer(exercise_question, User.current)%>
-                    <% if answer.first.exercise_choice.choice_position == standard_answer.first.exercise_choice_id %>
+                    <% if !answer.empty? && !standard_answer.empty? && answer.first.exercise_choice.choice_position == standard_answer.first.exercise_choice_id %>
                         √
                     <% else %>
                         ×
@@ -73,7 +73,7 @@
                   <span class="ml15 c_red">
                     <% answer = get_user_answer(exercise_question, User.current)%>
                     <% standard_answer = get_user_standard_answer(exercise_question, User.current)%>
-                    <% if get_mulscore(exercise_question, User.current).to_i == standard_answer.first.exercise_choice_id %>
+                    <% if !standard_answer.empty? && get_mulscore(exercise_question, User.current).to_i == standard_answer.first.exercise_choice_id %>
                         √
                     <% else %>
                         ×
@@ -112,7 +112,7 @@
                   <span class="ml15 c_red">
                     <% answer = get_user_answer(exercise_question, User.current)%>
                     <% standard_answer = get_user_standard_answer(exercise_question, User.current)%>
-                    <% if standard_answer.include?(answer.first.answer_text) %>
+                    <% if !answer.empty? && !standard_answer.empty? && standard_answer.include?(answer.first.answer_text) %>
                         √
                     <% else %>
                         ×
diff --git a/app/views/exercise/_exercise_teacher.html.erb b/app/views/exercise/_exercise_teacher.html.erb
index 0a96b782b..6e00fc41d 100644
--- a/app/views/exercise/_exercise_teacher.html.erb
+++ b/app/views/exercise/_exercise_teacher.html.erb
@@ -11,9 +11,9 @@
       <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
       <div class="fontGrey2">
         <% unless exercise.publish_time.nil? %>
-            <span class="mr130">发布时间：<%=format_time(exercise.publish_time.to_s) %></span>
+            <span class="mr100">发布时间：<%=Time.parse(h(exercise.publish_time)).strftime("%Y-%m-%d %H:%M:%S") %></span>
         <% end %>
-        <span class="mr130">截止时间：<%=format_time(exercise.end_time.to_s) %></span>
+        <span class="mr100">截止时间：<%=Time.parse(h(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") %></span>
         <% if exercise.time != -1 %>
             <span class="fr">测验时长：<%=exercise.time %>分钟</span>
         <% end %>
diff --git a/app/views/exercise/_show_head.html.erb b/app/views/exercise/_show_head.html.erb
index 16a572583..f385e58b8 100644
--- a/app/views/exercise/_show_head.html.erb
+++ b/app/views/exercise/_show_head.html.erb
@@ -4,9 +4,9 @@
   <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
   <div class="fontGrey2">
     <% unless exercise.publish_time.nil? %>
-        <span class="mr100">发布时间：<%=Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.publish_time%></span>
+        <span class="mr100">发布时间：<%=Time.parse(h(exercise.publish_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.publish_time%></span>
     <% end %>
-    <span class="mr100">截止时间：<%=Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.end_time %></span>
+    <span class="mr100">截止时间：<%=Time.parse(h(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.end_time %></span>
     <% if exercise.time != -1 %>
         <span>测验时长：<%= exercise.time %>分钟</span>
     <% end %>
diff --git a/app/views/exercise/commit_exercise.js.erb b/app/views/exercise/commit_exercise.js.erb
index 2a40df2a5..5ede8a951 100644
--- a/app/views/exercise/commit_exercise.js.erb
+++ b/app/views/exercise/commit_exercise.js.erb
@@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'commit_alert',:locals => {:status => @status}) %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'commit_alert',:locals => {:status => @status,:exercise =>@exercise}) %>');
 showModal('ajax-modal', '270px');
 $('#ajax-modal').css('height','110px');
 $('#ajax-modal').siblings().remove();
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index b7a742994..17ed37e05 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1166,4 +1166,5 @@ a:hover.testEdit{ background:url(images/icons.png) -21px -272px  no-repeat;}
 .questionEditContainer {border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px; margin-top:10px;}
 .fillInput {border:1px solid #cbcbcb; padding-left:5px; background-color:#ffffff; width:693px; height:30px; color:#888888;}
 .mr130 {margin-right:130px;}
+.mr100 {margin-right:100px;}
 .ur_button_submit{ display:block; width:106px; height:31px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:4px; margin-bottom:10px; }
\ No newline at end of file

From dec5980443be5de596bf04892dcc57908afd8593 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 26 Nov 2015 17:20:17 +0800
Subject: [PATCH 21/21] =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E4=B8=80=E5=88=B0=E7=AB=8B=E5=8D=B3=E6=8F=90=E4=BA=A4=E8=AF=95?=
 =?UTF-8?q?=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_commit_alert.html.erb            | 7 +++++--
 app/views/exercise/_exercise_student.html.erb        | 2 +-
 app/views/exercise/_exercise_student_result.html.erb | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/views/exercise/_commit_alert.html.erb b/app/views/exercise/_commit_alert.html.erb
index a21dbd2a7..23aee5a90 100644
--- a/app/views/exercise/_commit_alert.html.erb
+++ b/app/views/exercise/_commit_alert.html.erb
@@ -1,5 +1,5 @@
 <div id="popbox" style="text-align: center;margin-top: 25px">
-  <% if status == 0 && exercise.time != -1 %>
+  <% if status == 0 && exercise.time != -1%>
       <h3 style="font-weight: normal;color: green">提交成功!您的分数是：<%=@score %>分。</h3>
       <%= link_to "确定", exercise_path(),:class => 'commit'%>
   <% elsif status == 0 && Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") > Time.now.strftime("%Y-%m-%d %H:%M:%S") %>
@@ -8,8 +8,11 @@
   <% elsif status == 1 %>
       <h3 style="font-weight: normal;color: red">您还有尚未作答的题目请完成后再提交!</h3>
       <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:class => 'commit'%>
-  <% else %>
+  <% elsif status == 2 %>
       <h3 style="font-weight: normal;color: red">发生未知错误，请检查您的网络。</h3>
       <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:class => 'commit'%>
+  <% else %>
+      <h3 style="font-weight: normal;color: green">时间已到!您的分数是：<%=@score %>分。</h3>
+      <%= link_to "确定", exercise_path(),:class => 'commit'%>
   <% end %>
 </div>
diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb
index 7010407ce..a5c0f2a46 100644
--- a/app/views/exercise/_exercise_student.html.erb
+++ b/app/views/exercise/_exercise_student.html.erb
@@ -20,7 +20,7 @@
         //alert(end_time);
         now = new Date();
         var total_seconds = now.getTime()/1000 - end_time;
-        if (total_seconds < 0) {
+        if (total_seconds > 0) {
             $("#exercise_submit_btn").click();
             return;
         }
diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb
index 3445d6986..93e52b0a1 100644
--- a/app/views/exercise/_exercise_student_result.html.erb
+++ b/app/views/exercise/_exercise_student_result.html.erb
@@ -39,7 +39,7 @@
                     <% else %>
                         ×
                     <% end %></span><br />
-                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
+                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) if exercise_question.exercise_standard_answers.first %>
                 </div>
                 <div class="cl"></div>
                 <div class="ur_inputs">
@@ -117,7 +117,7 @@
                     <% else %>
                         ×
                     <% end %></span><br />
-                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
+                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) if exercise_question.exercise_standard_answers.first %>
                 </div>
                 <div class="cl"></div>
                 <div>