From 45726576cf839c53eefa33da570c6c6b163f753f Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 15 Dec 2015 17:31:27 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=B5=8B=E9=AA=8C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_student_exercise.html.erb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/views/exercise/_student_exercise.html.erb b/app/views/exercise/_student_exercise.html.erb
index 6555cfc61..bbbe9026d 100644
--- a/app/views/exercise/_student_exercise.html.erb
+++ b/app/views/exercise/_student_exercise.html.erb
@@ -35,7 +35,9 @@
         });
         $(function(){
             <% if Time.parse(h(@exercise.end_time)).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S") %>
-                $("#show_student_result_div_<%= exercise.id%>").on('click',show_result);
+                $("#show_student_result_div_<%= exercise.id%>").on('click',function() {
+                    window.location.href = '<%=show_student_result_exercise_path(@exercise,:user_id => exercise.user_id) %>';
+                });
             <% else %>
                 $("#show_student_result_div_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
                 $("#student_name_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
@@ -43,9 +45,9 @@
                 $("#student_class_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
             <% end %>
         });
-        function show_result() {
-            window.location.href = '<%=show_student_result_exercise_path(@exercise,:user_id => exercise.user.id) %>';
-        }
+        /*function show_result(id) {
+            window.location.href = '<%#=show_student_result_exercise_path(@exercise,:user_id => exercise.user.id) %>';
+        }*/
     </script>
     <ul class="hworkListRow" id="student_work_<%= exercise.id%>">
       <li class="hworkList340 width530">

From 44ce4fe592f34529729ed505edcf2439c0768da7 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 15 Dec 2015 17:34:08 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E7=95=99=E8=A8=80=E4=B8=8D=E4=BC=9A=E9=87=8D=E5=A4=8D=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_courses_jours.html.erb | 100 +++++++++++-----------
 1 file changed, 48 insertions(+), 52 deletions(-)

diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb
index 7b6b44c69..ce775da4d 100644
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@@ -1,22 +1,18 @@
 <style type="text/css">
-  div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
-  span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
-  span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
-  div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
-  span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
-  span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
-  div.ke-toolbar .ke-outline{border:none;}
+    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
+    span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
+    span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
+    div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
+    span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
+    span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
+    div.ke-toolbar .ke-outline{border:none;}
 
-  div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
-  div.recall_con{width:570px;}
-  div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
-  /*.ke-container{height: 80px !important;}*/
+    div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
+    div.recall_con{width:570px;}
+    div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
+    /*.ke-container{height: 80px !important;}*/
 </style>
-<%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
-<% end %>
-
-
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor"  %>
 <script >
     init_KindEditor_data('',80);
 </script>
@@ -24,11 +20,11 @@
   <h4><%= l(:label_leave_message) %></h4>
 
   <% if !User.current.logged?%>
-    <div style="font-size: 14px;margin:20px;">
-      <%= l(:label_user_login_tips) %>
-      <%= link_to l(:label_user_login_new), signin_path %>
-      <hr/>
-    </div>
+      <div style="font-size: 14px;margin:20px;">
+        <%= l(:label_user_login_tips) %>
+        <%= link_to l(:label_user_login_new), signin_path %>
+        <hr/>
+      </div>
   <% else %>
       <div nhname='new_message_' style="display:none;">
         <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_course_message'}, :html=>{:id => "course_feedback_new"},:method => "post") do |f|%>
@@ -59,37 +55,37 @@
         $("#submit_feedback_course").one('click',function() {
             $("#course_feedback_new").submit();
         });
-    KindEditor.ready(function(K){
-      $("a[nhname='reply_btn']").live('click',function(){
-        var params = {};
-        params.kindutil = K;
-        params.container = $(this).parent('div').parent('div');
-        params.div_form = $(">.respond-form",params.container);
-        params.form = $("form",params.div_form);
-        params.textarea = $("textarea[name='user_notes']",params.div_form);
-        params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
-        params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
-        params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
-          params.height = 55;
-        if(params.textarea.data('init') == undefined){
-          params.editor = init_editor(params);
-          init_form(params);
-          params.cancel_btn.click(function(){
-            nh_reset_form(params);
-          });
-        }
-        params.cancel_btn.click();
-        toggleAndSettingWordsVal(params.div_form, params.textarea);
-        setTimeout(function(){
-          if(!params.div_form.is(':hidden')){
-            params.textarea.show();
-            params.textarea.focus();
-            params.textarea.hide();
-          }
-        },300);
-        params.textarea.data('init',1);
-      });
+        KindEditor.ready(function(K){
+            $("a[nhname='reply_btn']").live('click',function(){
+                var params = {};
+                params.kindutil = K;
+                params.container = $(this).parent('div').parent('div');
+                params.div_form = $(">.respond-form",params.container);
+                params.form = $("form",params.div_form);
+                params.textarea = $("textarea[name='user_notes']",params.div_form);
+                params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
+                params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
+                params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
+                params.height = 55;
+                if(params.textarea.data('init') == undefined){
+                    params.editor = init_editor(params);
+                    init_form(params);
+                    params.cancel_btn.click(function(){
+                        nh_reset_form(params);
+                    });
+                }
+                params.cancel_btn.click();
+                toggleAndSettingWordsVal(params.div_form, params.textarea);
+                setTimeout(function(){
+                    if(!params.div_form.is(':hidden')){
+                        params.textarea.show();
+                        params.textarea.focus();
+                        params.textarea.hide();
+                    }
+                },300);
+                params.textarea.data('init',1);
+            });
+        });
     });
-  });
 
 </script>

From dc4532145487e903367e0bbddf0ea1eedea89c7b Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 15 Dec 2015 17:34:40 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=9B=9E=E5=A4=8D=E4=BB=A3=E7=A0=81=E8=A2=AB?=
 =?UTF-8?q?=E8=A6=86=E7=9B=96=EF=BC=8C=E6=81=A2=E5=A4=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/org_document_comments/show.html.erb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index dfe27cde3..7a64e4514 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -1,8 +1,4 @@
-<%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
-<%= javascript_include_tag 'blog' %>
-<% end %>
-
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %>
 <script>
     $(function() {
         init_activity_KindEditor_data(<%= @document.id%>,null,"85%");

From fa4a2eb0ddb4cc0233dfd48d415ed4aaed5ce387 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 15 Dec 2015 18:37:00 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E6=9C=AA=E7=AD=94=E9=A2=98=E7=9A=84?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=B5=8B=E9=AA=8C=E5=88=86=E6=95=B0=E4=B8=BA?=
 =?UTF-8?q?0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index 75751e4f7..73da3b9c4 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -1,8 +1,10 @@
 class ExerciseController < ApplicationController
   layout "base_courses"
 
-  before_filter :find_exercise_and_course, :only => [:create_exercise_question, :edit, :update, :show, :destroy, :commit_exercise, :commit_answer,:publish_exercise,:republish_exercise,:show_student_result]
-  before_filter :find_course, :only => [:index,:new,:create,:student_exercise_list]
+  before_filter :find_exercise_and_course, :only => [:create_exercise_question, :edit, :update, :show, :destroy,
+                                                        :commit_exercise, :commit_answer,:publish_exercise,:republish_exercise,
+                                                        :show_student_result,:student_exercise_list]
+  before_filter :find_course, :only => [:index,:new,:create]
   include ExerciseHelper
 
   def index
@@ -354,8 +356,18 @@ class ExerciseController < ApplicationController
   end
 
   def student_exercise_list
+    if @exercise.end_time <= Time.now
+      @course.student.each do |student|
+        if ExerciseUser.where("user_id = ? && exercise_id = ?",student.student_id,@exercise.id).empty?
+          ExerciseUser.create(:user_id => student.student_id, :exercise_id => @exercise.id, :start_at => @exercise.end_time, :status => false,:score=>0)
+        end
+
+        s_score = calculate_student_score(@exercise, student.student)
+        exercise_user = ExerciseUser.where("user_id =? and exercise_id=?", student.student_id, @exercise.id).first
+        exercise_user.update_attributes(:score => s_score)
+      end
+    end
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
-    @exercise = Exercise.find params[:id]
     @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? && @exercise.end_time <= Time.now)
@@ -543,11 +555,11 @@ class ExerciseController < ApplicationController
   def show_student_result
     @user = User.find params[:user_id]
     @can_edit_excercise = false
-    @exercise_user = ExerciseUser.where("user_id =? and exercise_id=?", @user.id, @exercise.id).first
     @exercise_questions = @exercise.exercise_questions
     score = calculate_student_score(@exercise, @user)
     eu = get_exercise_user(@exercise.id, @user.id)
     eu.update_attributes(:score => score)
+    @exercise_user = ExerciseUser.where("user_id =? and exercise_id=?", @user.id, @exercise.id).first
     respond_to do |format|
       format.html {render :layout => 'base_courses'}
     end

From 699d0e22dd0fd978831a7f6f60e305cdd32bdd6d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 15 Dec 2015 19:05:19 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=9A=84=E6=B5=8B=E9=AA=8C=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20151215105425_delete_exercise_user.rb | 9 +++++++++
 db/schema.rb                                      | 4 +---
 2 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20151215105425_delete_exercise_user.rb

diff --git a/db/migrate/20151215105425_delete_exercise_user.rb b/db/migrate/20151215105425_delete_exercise_user.rb
new file mode 100644
index 000000000..781337454
--- /dev/null
+++ b/db/migrate/20151215105425_delete_exercise_user.rb
@@ -0,0 +1,9 @@
+class DeleteExerciseUser < ActiveRecord::Migration
+  def up
+    eus=ExerciseUser.where("score is null and status=?",0)
+    eus.delete_all
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 17e613acb..9926f2876 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 => 20151209085942) do
+ActiveRecord::Schema.define(:version => 20151215105425) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1161,7 +1161,6 @@ ActiveRecord::Schema.define(:version => 20151209085942) do
     t.datetime "updated_at",                         :null => false
     t.boolean  "locked",          :default => false
     t.integer  "sticky",          :default => 0
-    t.integer  "org_subfield_id"
   end
 
   create_table "org_member_roles", :force => true do |t|
@@ -1188,7 +1187,6 @@ ActiveRecord::Schema.define(:version => 20151209085942) do
     t.string   "name"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
-    t.string   "field_type"
   end
 
   create_table "organizations", :force => true do |t|

From 481b7b96eb0783a97d6a3cb6b51463b86ab212d2 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 15 Dec 2015 20:15:10 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=89=88=E6=8A=A5500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb        | 8 ++++----
 app/views/exercise/_exercise_teacher.html.erb | 4 ++--
 db/schema.rb                                  | 4 +++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index 73da3b9c4..3ed5886e7 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -359,7 +359,7 @@ class ExerciseController < ApplicationController
     if @exercise.end_time <= Time.now
       @course.student.each do |student|
         if ExerciseUser.where("user_id = ? && exercise_id = ?",student.student_id,@exercise.id).empty?
-          ExerciseUser.create(:user_id => student.student_id, :exercise_id => @exercise.id, :start_at => @exercise.end_time, :status => false,:score=>0)
+          ExerciseUser.create(:user_id => student.student_id, :exercise_id => @exercise.id, :start_at => @exercise.end_time, :status => true,:score=>0)
         end
 
         s_score = calculate_student_score(@exercise, student.student)
@@ -577,15 +577,15 @@ class ExerciseController < ApplicationController
       standard_answer = get_user_standard_answer(question, user)
       unless answer.empty?
         # 问答题有多个答案
-        if question.question_type == 3
+        if question.question_type == 3 && !standard_answer.empty?
           if standard_answer.include?(answer.first.answer_text)
             score1 = score1+ question.question_score unless question.question_score.nil?
           end
-        elsif question.question_type == 1
+        elsif question.question_type == 1 && !standard_answer.nil?
           if answer.first.exercise_choice.choice_position == standard_answer.exercise_choice_id
             score2 = score2 + question.question_score unless question.question_score.nil?
           end
-        else
+        elsif question.question_type == 2 && !standard_answer.nil?
           arr = get_mulscore(question, user)
           if arr.to_i == standard_answer.exercise_choice_id
             score3 = score3 + question.question_score unless question.question_score.nil?
diff --git a/app/views/exercise/_exercise_teacher.html.erb b/app/views/exercise/_exercise_teacher.html.erb
index 24687d28b..586c033a1 100644
--- a/app/views/exercise/_exercise_teacher.html.erb
+++ b/app/views/exercise/_exercise_teacher.html.erb
@@ -32,7 +32,7 @@
               <div>
                 <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
                   <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">
@@ -64,7 +64,7 @@
               <div>
                 <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
                   <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">
diff --git a/db/schema.rb b/db/schema.rb
index 9926f2876..51020f45d 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 => 20151215105425) do
+ActiveRecord::Schema.define(:version => 20151215112107) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1161,6 +1161,7 @@ ActiveRecord::Schema.define(:version => 20151215105425) do
     t.datetime "updated_at",                         :null => false
     t.boolean  "locked",          :default => false
     t.integer  "sticky",          :default => 0
+    t.integer  "org_subfield_id"
   end
 
   create_table "org_member_roles", :force => true do |t|
@@ -1187,6 +1188,7 @@ ActiveRecord::Schema.define(:version => 20151215105425) do
     t.string   "name"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
+    t.string   "field_type"
   end
 
   create_table "organizations", :force => true do |t|

From 097d0653bac1bf98313ed2f788e0993012b5fd26 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 15 Dec 2015 20:33:29 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E7=BB=99?=
 =?UTF-8?q?=E6=9C=AA=E7=AD=94=E9=A2=98=E7=9A=84=E5=AD=A6=E7=94=9F0?=
 =?UTF-8?q?=E5=88=86=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index 3ed5886e7..8fa90ea46 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -356,6 +356,7 @@ class ExerciseController < ApplicationController
   end
 
   def student_exercise_list
+=begin
     if @exercise.end_time <= Time.now
       @course.student.each do |student|
         if ExerciseUser.where("user_id = ? && exercise_id = ?",student.student_id,@exercise.id).empty?
@@ -367,6 +368,7 @@ class ExerciseController < ApplicationController
         exercise_user.update_attributes(:score => s_score)
       end
     end
+=end
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
     @all_exercises = @course.exercises.where("exercise_status > 1").order("created_at desc")
     @exercise_count = @exercise.exercise_users.where('score is not NULL').count

From 06e5784436cb6a4481972d43b9ac64a988c15c28 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 16 Dec 2015 10:00:10 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=8B=B1=E9=9B=84?=
 =?UTF-8?q?=E6=A6=9C=E4=B8=A4=E4=B8=AA=E7=94=A8=E6=88=B7=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84but?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/journals_for_message.rb                  |  2 +-
 ...1215070238_delete_validate_course_contributor.rb | 13 +++++++++++++
 db/schema.rb                                        |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20151215070238_delete_validate_course_contributor.rb

diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index ec6390408..96853d1c7 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -267,7 +267,7 @@ class JournalsForMessage < ActiveRecord::Base
 
   # 课程成员得分（英雄榜）
   def act_as_student_score
-    unless self.user.allowed_to?(:as_teacher, self.jour)
+    if !self.user.allowed_to?(:as_teacher, self.jour) 
       course_member_score(self.jour_id, self.user_id, "JournalForMessage")
     end
   end
diff --git a/db/migrate/20151215070238_delete_validate_course_contributor.rb b/db/migrate/20151215070238_delete_validate_course_contributor.rb
new file mode 100644
index 000000000..704ca893d
--- /dev/null
+++ b/db/migrate/20151215070238_delete_validate_course_contributor.rb
@@ -0,0 +1,13 @@
+class DeleteValidateCourseContributor < ActiveRecord::Migration
+  def up
+    course_contributors = CourseContributorScore.where("course_id>? and created_at<? ", 450, "2015-12-15 19:51:48")
+    course_contributors.delete_all
+    c170 = CourseContributorScore.where("course_id =?", 170)
+    c170.delete_all
+    c436 = CourseContributorScore.where("course_id =?", 436)
+    c436.delete_all
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 17e613acb..5f53dd5cf 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 => 20151209085942) do
+ActiveRecord::Schema.define(:version => 20151215070238) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false

From ac8aa9e0a68990e66f07351085df25742d9ea101 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 16 Dec 2015 10:03:51 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=95=99=E8=A8=80=E5=92=8C=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index 96853d1c7..396133c7a 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -267,7 +267,7 @@ class JournalsForMessage < ActiveRecord::Base
 
   # 课程成员得分（英雄榜）
   def act_as_student_score
-    if !self.user.allowed_to?(:as_teacher, self.jour) 
+    if !self.user.allowed_to?(:as_teacher, self.jour) && self.jour_type == "Course"
       course_member_score(self.jour_id, self.user_id, "JournalForMessage")
     end
   end