From 5ca8d4cd66cd77c5fa6d99c30f0c3a2ba6acace8 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 14 Dec 2015 10:54:37 +0800
Subject: [PATCH 01/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9http=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8D=A2=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_footer_public.html.erb | 4 ++--
 app/views/layouts/_footer.html.erb             | 2 +-
 app/views/layouts/_logined_header.html.erb     | 2 +-
 app/views/layouts/_unlogin_header.html.erb     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/layouts/_base_footer_public.html.erb b/app/views/layouts/_base_footer_public.html.erb
index dba26f1f6..eb2e83ba2 100644
--- a/app/views/layouts/_base_footer_public.html.erb
+++ b/app/views/layouts/_base_footer_public.html.erb
@@ -2,9 +2,9 @@
   <div class="footerAboutContainer">
     <ul class="footerAbout">
       <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
-      <li class="fl"><a href="http://forge.trustie.net/projects/2/feedback" class="f_grey mw20" target="_blank"><%= l(:label_contact_us)%></a>|</li>
+      <li class="fl"><a href="https://forge.trustie.net/projects/2/feedback" class="f_grey mw20" target="_blank"><%= l(:label_contact_us)%></a>|</li>
       <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_recruitment_information)%></a>|</li>
-      <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank"><%= l(:label_surpport_group)%></a>|</li>
+      <li class="fl"><%= link_to l(:label_surpport_group), "https://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
       <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_forums)%></a>|</li>
       <li class="fl"><a href="javascript:void:(0);" class="f_grey ml20" target="_blank"><%= l(:label_language)%></a>
         <select class="languageBox">
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 752853c60..13730fd96 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -4,7 +4,7 @@
       <li class="fl"><a href="<%= about_us_path %>" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
       <li class="fl"><a href="<%= agreement_path %>" class="f_grey mw20" target="_blank">服务协议</a>|</li>
       <li class="fl" style="display: none"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li>
-      <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank"><%= l(:label_surpport_group)%></a>|</li>
+      <li class="fl"><%= link_to l(:label_surpport_group), "https://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
       <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank" ><%= l(:label_forums)%></a></li>
 
     </ul>
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index d100e79a5..bdd35ebd4 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -13,7 +13,7 @@
         <%= link_to "作业",  user_homeworks_user_path(User.current.id), :class => "c_white f16 db p10"%>
       </li>
       <li class="navHomepageMenu fl mr30">
-        <a href="http://forge.trustie.net/forums/1/memos/1168" class="c_white f16 db p10">帮助中心</a>
+        <%= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>
       </li>
     </ul>
   </div>
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index 162f59ed4..b16a78921 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -5,7 +5,7 @@
   <div class="fl">
     <ul>
       <li class="navHomepageMenu fl mr40">
-        <a href="http://forge.trustie.net/forums/1/memos/1168" class="c_white f16 p10">帮助中心</a>
+        <%= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>
       </li>
     </ul>
   </div>

From 086cfa38676d04e568e8192e484218aca4884fdb Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 15 Dec 2015 16:51:21 +0800
Subject: [PATCH 02/23] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/exercise/_student_exercise.html.erb b/app/views/exercise/_student_exercise.html.erb
index 9b07e0626..6555cfc61 100644
--- a/app/views/exercise/_student_exercise.html.erb
+++ b/app/views/exercise/_student_exercise.html.erb
@@ -35,9 +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").on('click',show_result);
+                $("#show_student_result_div_<%= exercise.id%>").on('click',show_result);
             <% else %>
-                $("#show_student_result_div").attr("title","截止日期未到，暂不能查看学生答题结果");
+                $("#show_student_result_div_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
                 $("#student_name_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
                 $("#student_id_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
                 $("#student_class_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
@@ -53,7 +53,7 @@
           <li class="hworkPortrait mt15 mr10">
             <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40"),user_activities_path(exercise.user)) %>
           </li>
-          <div id="show_student_result_div" style="cursor: pointer;" class="student_work_<%= exercise.id%>">
+          <div id="show_student_result_div_<%= exercise.id%>" style="cursor: pointer;" class="student_work_<%= exercise.id%>">
             <li>
               <ul class="mt10 fl">
                 <li class="hworkStName mr15 mt16" title="姓名" id="student_name_<%= exercise.id%>">

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 03/23] =?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 04/23] =?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 05/23] =?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 06/23] =?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 07/23] =?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 08/23] =?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 09/23] =?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 10/23] =?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 11/23] =?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

From bfde278340fa21daffcea250234c7e22f0246ea9 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 16 Dec 2015 11:02:52 +0800
Subject: [PATCH 12/23] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=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

---
 public/stylesheets/courses.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 25d0d6a32..77c839f8d 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -41,7 +41,7 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 .pingBoxTit{ float:left; width:625px; margin-left:10px;}
 .pingText{border:1px solid #CCCCCC; margin:5px; padding:5px; width:610px; height:20px; }
 .pingBackTit{ float:left; width:573px; margin-left:10px; }
-.hworkUl{ height:30px; border-bottom:1px solid #eaeaea; line-height:30px; vertical-align:middle; background-color: #f6f6f6;}
+.hworkUl{ height:30px;width:720px; border-bottom:1px solid #eaeaea; line-height:30px; vertical-align:middle; background-color: #f6f6f6;}
 .hworkH30 {height:30px !important; line-height:30px !important;}
 .hworkListRow {height:65px; border-bottom:1px dashed #eaeaea; line-height:65px; vertical-align:middle; position: relative;}
 .hworkListRow:hover {background-color:#f6f6f7;}
@@ -1229,4 +1229,4 @@ div.disable_link {background-color: #c1c1c1 !important;}
 
 /*新课程资源库*/
 .reCon{ margin:5px; width:710px;}
-.reTop{width:710px; height:40px; background:#eaeaea; padding:5px;}
+.reTop{width:710px; height:40px; background:#eaeaea; padding:5px;}

From 5cf88a287b3e343a793adb74adfa126ac5cfa8d7 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 16 Dec 2015 11:37:59 +0800
Subject: [PATCH 13/23] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_group_attr.html.erb | 2 +-
 db/schema.rb                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_group_attr.html.erb b/app/views/users/_user_group_attr.html.erb
index aa8166a04..652cb723a 100644
--- a/app/views/users/_user_group_attr.html.erb
+++ b/app/views/users/_user_group_attr.html.erb
@@ -11,7 +11,7 @@
 <div class="mb10 mt10">
   <label>
     <input type="checkbox" class="mr5" name="base_on_project" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.base_on_project : 0 %>" id="base_on_project"/>
-    <span class="f14 fontGrey3 mr10">是否基于项目实施</span>
+    <span class="f14 fontGrey3 mr10">基于项目实施</span>
   </label>
   <p class="c_red">提醒：勾选后各小组必须在Trustie平台创建项目，教师可随时观察平台对各小组最新进展的实时统计。</p>
 </div>
diff --git a/db/schema.rb b/db/schema.rb
index 5f53dd5cf..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 => 20151215070238) do
+ActiveRecord::Schema.define(:version => 20151215112107) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false

From dc0f004021426fafd8b5c8864f8fe4289269abaf Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 16 Dec 2015 15:47:30 +0800
Subject: [PATCH 14/23] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_homework.html.erb     | 27 ++++++++++++++-----
 .../users/_user_homework_detail.html.erb      | 26 +++++++++++++-----
 public/stylesheets/courses.css                |  1 +
 public/stylesheets/new_user.css               |  2 ++
 4 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index a3aa5d5b1..fe02d9882 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -104,14 +104,29 @@
           已关联项目：
         </div>
         <% activity.student_work_projects.where("is_leader = 1").each do |pro| %>
-            <div class="mr10 mb10 fl">
-              <% project = Project.find pro.project_id %>
-              <% if project.is_public || User.current.member_of?(project) || User.current.admin?%>
-                <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:alt =>"项目头像" %>
+            <% project = Project.find pro.project_id %>
+            <script type="text/javascript">
+                $(document).ready(function(){
+                    $("#project_img_<%=project.id %>").mouseover(function(){
+                        $("#relatePInfo_<%=project.id %>").css("display","block");
+                    }).mouseout(function(){
+                        $("#relatePInfo_<%=project.id %>").css("display","none");
+                    })
+                });
+            </script>
+            <div class="mr20 mb10 fl">
+              <% if project.is_public || User.current.member_of?(project) || User.current.admin? %>
+                  <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s,:alt =>"项目头像" %>
               <% else %>
-                <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius") %>
+                  <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s,:alt =>"项目头像") %>
               <% end %>
-              <p class="c_red tac" title="综合评分"><%=project.project_score.score.to_i %></p>
+              <div class="relatePInfo" id="relatePInfo_<%=project.id %>">
+                项目名称：<%=project.name %><br />
+                创建者：<%=(User.find project.user_id).show_name %><br />
+                <% time=project.updated_on %>
+                <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
+                更新时间：<%=time_from_now time %>
+              </div>
             </div>
         <% end %>
       </div>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 4217cf1a9..536a9deb6 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -102,18 +102,32 @@
       <% if homework_common.homework_type == 3 && !homework_common.student_work_projects.empty?  && homework_common.homework_detail_group.base_on_project == 1 %>
           <div class="mt10">
             <div class="fl mr5 fontGrey3">
-              <!--<img src="/images/course/proRelated.png" width="25" height="25" class="borderRadius mt7 ml7" title="已关联项目" />-->
               已关联项目：
             </div>
             <% homework_common.student_work_projects.where("is_leader = 1").each do |pro| %>
-                <div class="mr10 mb10 fl">
-                  <% project = Project.find pro.project_id %>
+                <% project = Project.find pro.project_id %>
+                <script type="text/javascript">
+                    $(document).ready(function(){
+                        $("#project_img_<%=project.id %>").mouseover(function(){
+                            $("#relatePInfo_<%=project.id %>").css("display","block");
+                        }).mouseout(function(){
+                            $("#relatePInfo_<%=project.id %>").css("display","none");
+                        })
+                    });
+                </script>
+                <div class="mr20 mb10 fl">
                   <% if project.is_public || User.current.member_of?(project) || User.current.admin? %>
-                      <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:alt =>"项目头像" %>
+                      <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s,:alt =>"项目头像" %>
                   <% else %>
-                      <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius") %>
+                      <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s,:alt =>"项目头像") %>
                   <% end %>
-                  <p class="c_red tac" title="综合评分"><%=project.project_score.score.to_i %></p>
+                  <div class="relatePInfo" id="relatePInfo_<%=project.id %>">
+                    项目名称：<%=project.name %><br />
+                    创建者：<%=(User.find project.user_id).show_name %><br />
+                    <% time=project.updated_on %>
+                    <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
+                    更新时间：<%=time_from_now time %>
+                  </div>
                 </div>
             <% end %>
           </div>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 77c839f8d..6a6c3a7e7 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1209,6 +1209,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 .proHelp {background:url(/images/course/hwork_icon.png) -5px -124px no-repeat; display:inline-block; width:15px; height:15px; display:inline-block;}
 .hworkPrName {width:110px; max-width:110px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;}
 .mr150 {margin-right:150px;}
+.relatePInfo {position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;}
 
 /*上传资源弹窗*/
 .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 0ed4df627..5a98211ab 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1381,3 +1381,5 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 .proHelp {background:url(/images/course/hwork_icon.png) -5px -124px no-repeat; display:inline-block; width:15px; height:15px; display:inline-block;}
 .hworkPrName {width:110px; max-width:110px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;}
 .mr150 {margin-right:150px;}
+.relatePInfo {position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;}
+

From ab96bf8e5e2d06b756fd1f42589ffeda10b57f95 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 16 Dec 2015 16:00:25 +0800
Subject: [PATCH 15/23] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E6=9C=AA=E5=8F=82=E4=B8=8E=E5=8C=BF=E8=AF=84=E7=9A=84?=
 =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=98=BE=E7=A4=BA=E2=80=9C=E6=9C=AA=E5=8F=82?=
 =?UTF-8?q?=E4=B8=8E=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_evaluation_un_work.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index 641405fe4..0a4ab044a 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -57,7 +57,7 @@
 
   <% if @homework.anonymous_comment == 0%>
     <li class="hworkList50 <%= score_color student_work.student_score%> student_score_info">
-    <%= student_work.student_score.nil? ? "--" : format("%.1f",student_work.student_score)%>
+    <%= student_work.student_score.nil? ? "未参与" : format("%.1f",student_work.student_score)%>
     <% unless student_work.student_score.nil?%>
         <span class="linkBlue">
           (<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>)
@@ -84,7 +84,7 @@
           缺评扣分
           <span class="c_red">&nbsp;<%= student_work.absence_penalty%>&nbsp;</span>分，
           最终成绩为
-          <span class="c_red">&nbsp;<%= format("%.1f",score)%>&nbsp;</span>分。
+          <span class="c_red">&nbsp;<%= format("%.1f",score<0 ? 0 : score)%>&nbsp;</span>分。
         </div>
     <% end%>
   </li>

From a8c8dc3cc6a913967f0b2dc29997afc08430b89a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 16 Dec 2015 17:38:28 +0800
Subject: [PATCH 16/23] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../student_work/_relate_project.html.erb     |  2 +-
 app/views/users/_course_homework.html.erb     | 24 +++++++++++------
 .../users/_user_homework_detail.html.erb      | 26 ++++++++++++++-----
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/app/views/student_work/_relate_project.html.erb b/app/views/student_work/_relate_project.html.erb
index 43f59c9c9..9a1fcead5 100644
--- a/app/views/student_work/_relate_project.html.erb
+++ b/app/views/student_work/_relate_project.html.erb
@@ -4,7 +4,7 @@
   <%=form_tag url_for(:controller=>'student_work',:action=>'student_work_project',:homework=>@homework.id,:user_activity_id=>@user_activity_id,:is_in_course=>@is_in_course,:course_activity =>@course_activity),:id =>'student_work_relate_project',:class=>'resourcesSearchBox',:remote => true do %>
       <input type="text" name="project" placeholder="输入项目名称进行搜索" class="searchResourcePopup mb10" />
       <div class="cl"></div>
-      <p id="no_search_result" class="c_red" style="width:220px;display: none">您当前尚未参与任何项目，请先加入项目再关联。</p>
+      <p id="no_search_result" class="c_red" style="width:220px;display: none">您当前尚未创建任何项目，请先创建项目再关联。</p>
       <ul id="search_project_list" class="maxHeight100"></ul>
       <p id="notes" class="c_red"></p>
       <div class="courseSendSubmit mt10"><a href="javascript:void(0);" class="sendSourceText" onclick="clickOK();">确定</a></div>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index fe02d9882..8112bc521 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -13,7 +13,7 @@
         <% end %> TO <!--+"(课程名称)" -->
         <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
       </div>
-      <div class="homepagePostTitle hidden m_w505 fl"> <!--+"(作业名称)"-->
+      <div class="homepagePostTitle hidden fl m_w505"> <!--+"(作业名称)"-->
         <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id,:host=> Setting.host_course), :class => "postGrey"%>
       </div>
       <% if activity.homework_detail_manual%>
@@ -56,7 +56,7 @@
             <% works = cur_user_works_for_homework activity %>
             <% if works.nil? && projects.nil? %>
                 <div class="homepagePostSubmit">
-                  <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => activity.id,:is_in_course=>-1,:user_activity_id=>user_activity_id,:course_activity=>course_activity),remote: true,:class=> 'c_blue', :title=> '请选择分组作业关联的项目' %>
+                  <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => activity.id,:is_in_course=>-1,:user_activity_id=>user_activity_id,:course_activity=>course_activity),remote: true,:class=> 'c_blue', :title=> '请各组长关联作业项目' %>
                   <%#= relate_project(activity,is_teacher,-1,user_activity_id,course_activity) %>
                 </div>
             <% elsif works.nil? %>
@@ -81,7 +81,6 @@
               <%= activity.language_name%>
             </div>
         <% end %>
-
         <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %>&nbsp;23:59</div>
       </div>
       <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
@@ -93,17 +92,26 @@
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
       <div class="cl"></div>
+      <div class="mt5">
+        <div class="homepagePostDeadline">
+          匿评开启时间：<%= activity.homework_detail_manual.evaluation_start%>&nbsp;00:00
+        </div>
+        <div class="homepagePostDeadline ml15">
+          匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end%>&nbsp;23:59
+        </div>
+      </div>
+      <div class="cl"></div>
       <div>
         <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %>
         <div class="cl"></div>
       </div>
-      <% if activity.homework_type == 3 && !activity.student_work_projects.empty? && activity.homework_detail_group.base_on_project == 1 %>
+      <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
       <div class="mt10">
+        <% projects = activity.student_work_projects.where("is_leader = 1") %>
         <div class="fl mr5 fontGrey3">
-          <!--<img src="/images/course/proRelated.png" width="25" height="25" class="borderRadius mt7 ml7" title="已关联项目" />-->
-          已关联项目：
+          已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %>
         </div>
-        <% activity.student_work_projects.where("is_leader = 1").each do |pro| %>
+        <% projects.each do |pro| %>
             <% project = Project.find pro.project_id %>
             <script type="text/javascript">
                 $(document).ready(function(){
@@ -122,7 +130,7 @@
               <% end %>
               <div class="relatePInfo" id="relatePInfo_<%=project.id %>">
                 项目名称：<%=project.name %><br />
-                创建者：<%=(User.find project.user_id).show_name %><br />
+                创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
                 <% time=project.updated_on %>
                 <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
                 更新时间：<%=time_from_now time %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 536a9deb6..97e9652da 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -10,7 +10,7 @@
         TO
         <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%>
       </div>
-          <span class="homepagePostTitle hidden m_w505 fl">
+          <span class="homepagePostTitle hidden fl m_w505">
             <%= link_to homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
           </span>
 
@@ -45,8 +45,10 @@
           <% end%>
       <% end%>
       <div class="cl"></div>
-      <% if homework_common.homework_type == 3%>
+      <% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1%>
           <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"c_red",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
+      <% elsif homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 0%>
+          <span class="c_red">系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！</span>
       <% end %>
       <div class="homepagePostSubmitContainer">
         <% if homework_common.homework_type == 3 && !is_teacher && homework_common.homework_detail_group.base_on_project == 1 && User.current.member_of_course?(homework_common.course) %>
@@ -54,7 +56,7 @@
             <% works = cur_user_works_for_homework homework_common %>
             <% if works.nil? && projects.nil? %>
                 <div class="homepagePostSubmit">
-                  <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => homework_common.id,:is_in_course=>is_in_course,:user_activity_id=>-1,:course_activity=>-1),remote: true,:class=> 'c_blue', :title=> '请选择分组作业关联的项目' %>
+                  <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => homework_common.id,:is_in_course=>is_in_course,:user_activity_id=>-1,:course_activity=>-1),remote: true,:class=> 'c_blue', :title=> '请各组长关联作业项目' %>
                   <%#= relate_project(activity,is_teacher,-1,user_activity_id,course_activity) %>
                 </div>
             <% elsif works.nil? %>
@@ -95,16 +97,26 @@
       <div id="intro_content_show_<%= homework_common.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= homework_common.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
       <div class="cl"></div>
+      <div class="mt5">
+        <div class="homepagePostDeadline">
+          匿评开启时间：<%= homework_common.homework_detail_manual.evaluation_start%>&nbsp;00:00
+        </div>
+        <div class="homepagePostDeadline ml15">
+          匿评关闭时间：<%= homework_common.homework_detail_manual.evaluation_end%>&nbsp;23:59
+        </div>
+      </div>
+      <div class="cl"></div>
       <div>
         <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %>
         <div class="cl"></div>
       </div>
-      <% if homework_common.homework_type == 3 && !homework_common.student_work_projects.empty?  && homework_common.homework_detail_group.base_on_project == 1 %>
+      <% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1 %>
           <div class="mt10">
+            <% projects = homework_common.student_work_projects.where("is_leader = 1") %>
             <div class="fl mr5 fontGrey3">
-              已关联项目：
+              已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %>
             </div>
-            <% homework_common.student_work_projects.where("is_leader = 1").each do |pro| %>
+            <% projects.each do |pro| %>
                 <% project = Project.find pro.project_id %>
                 <script type="text/javascript">
                     $(document).ready(function(){
@@ -123,7 +135,7 @@
                   <% end %>
                   <div class="relatePInfo" id="relatePInfo_<%=project.id %>">
                     项目名称：<%=project.name %><br />
-                    创建者：<%=(User.find project.user_id).show_name %><br />
+                    创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
                     <% time=project.updated_on %>
                     <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
                     更新时间：<%=time_from_now time %>

From ff579afd45fc3c8a0bf05d270c104d28356fc4ea Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 17 Dec 2015 09:27:51 +0800
Subject: [PATCH 17/23] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=88=86=E7=BB=84=E4=BA=BA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_homework.html.erb      | 5 +++++
 app/views/users/_user_homework_detail.html.erb | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 8112bc521..60b8e6728 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -81,6 +81,11 @@
               <%= activity.language_name%>
             </div>
         <% end %>
+        <% if activity.homework_type == 3 && activity.homework_detail_group%>
+            <div class="homepagePostDeadline mr15">
+              分组人数：<%=activity.homework_detail_group.min_num %>-<%=activity.homework_detail_group.max_num %> 人
+            </div>
+        <% end %>
         <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %>&nbsp;23:59</div>
       </div>
       <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 97e9652da..d9421f5ea 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -79,6 +79,11 @@
               <%= homework_common.language_name%>
             </div>
         <% end %>
+        <% if homework_common.homework_type == 3 && homework_common.homework_detail_group%>
+            <div class="homepagePostDeadline mr15">
+              分组人数：<%=homework_common.homework_detail_group.min_num %>-<%=homework_common.homework_detail_group.max_num %> 人
+            </div>
+        <% end %>
         <div class="homepagePostDeadline">
           <%= l(:label_end_time)%>：<%= homework_common.end_time%>&nbsp;23:59
         </div>

From fa0f9c675193d330527174f1d98c6aa919ee834d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 17 Dec 2015 10:16:29 +0800
Subject: [PATCH 18/23] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E7=BC=96=E8=BE=91=EF=BC=8C=E8=8B=A5=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=B7=B2=E6=8F=90=E4=BA=A4=E4=BA=86=E4=BD=9C?=
 =?UTF-8?q?=E5=93=81=E5=88=99=E4=B8=8D=E5=8F=AF=E5=86=8D=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 11 +++++++++++
 app/helpers/projects_helper.rb                |  1 +
 app/views/users/_user_homework_form.html.erb  |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index a8d6dfe8f..a83534ad7 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -84,9 +84,20 @@ class HomeworkCommonController < ApplicationController
           end
       end
 
+      #分组作业
+      if @homework.homework_type == 3
+        @homework.homework_detail_group ||= HomeworkDetailGroup.new
+        @homework_detail_group = @homework.homework_detail_group
+        @homework_detail_group.min_num = params[:min_num].to_i
+        @homework_detail_group.max_num = params[:max_num].to_i
+        @homework_detail_group.base_on_project = params[:base_on_project].to_i
+      end
+
       if @homework.save
         @homework_detail_manual.save if @homework_detail_manual
         @homework_detail_programing.save if @homework_detail_programing
+        @homework_detail_group.save if @homework_detail_group
+
         if params[:is_in_course] == "1"
           redirect_to homework_common_index_path(:course => @course.id)
         elsif params[:is_in_course] == "0"
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 51d1846d8..afc6cb1d9 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -19,6 +19,7 @@
 
 include AvatarHelper
 include StudentWorkHelper
+include ApiHelper
 module ProjectsHelper
   def link_to_version(version, options = {})
     return '' unless version && version.is_a?(Version)
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 464baf213..0a09ce709 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -58,7 +58,7 @@
 
     <div id="homework_attachments">
       <!-- 编辑作业 && 作业类型为匿评作业   时没有编程选项-->
-      <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework, :has_program=>!(edit_mode && homework.homework_type != 2), :has_group=>!(edit_mode && homework.homework_type != 3)} %>
+      <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework, :has_program=>!(edit_mode && homework.homework_type != 2), :has_group=>(!(edit_mode && homework.homework_type != 3))&& homework.student_works.empty?,:show_member => true} %>
     </div>
 
 

From 51e082a55154ad4577f5a4eaec1b7f3130ba2bea Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 17 Dec 2015 10:17:13 +0800
Subject: [PATCH 19/23] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=92=8C=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E4=BD=9C=E5=93=81=E6=97=B6=E7=9A=84=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=92=8C=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/edit.html.erb               |  2 +-
 app/views/student_work/new.html.erb                |  2 +-
 app/views/users/_user_homework_attachment.html.erb | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb
index bfdf8c316..6ca609502 100644
--- a/app/views/student_work/edit.html.erb
+++ b/app/views/student_work/edit.html.erb
@@ -7,7 +7,7 @@
 
   <div class="HomeWorkBox">
     <div class="">
-      <div class="homepagePostTitle fl">
+      <div class="homepagePostTitle fl m_w530 hidden">
         <%= @homework.name%>（作业名称）
       </div>
       <span class="fr c_grey">
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index c3a61d4c8..a71120d55 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -83,7 +83,7 @@
 
   <div class="HomeWorkBox">
     <div class="">
-      <div class="homepagePostTitle fl">
+      <div class="homepagePostTitle fl m_w530 hidden">
         <%= @homework.name%>（作业名称）
       </div>
       <span class="fr c_grey">
diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb
index bba7627b1..5f4cb4a8e 100644
--- a/app/views/users/_user_homework_attachment.html.erb
+++ b/app/views/users/_user_homework_attachment.html.erb
@@ -48,10 +48,12 @@
   <span class="fl fontGrey2" id="group_members"></span>
   <div class="cl"></div>
   <% if @homework && @homework.homework_type == 3 %>
-    <sapn class="fl fontGrey2" id="group_members_show">
-      合作成员：<%=User.current.show_name %>(组长)
-    </sapn>
-    <span id="student_work_group_textarea" class="ml10 c_red fl"></span>
+    <% unless defined?(show_member) && show_member %>
+        <sapn class="fl fontGrey2" id="group_members_show">
+          合作成员：<%=User.current.show_name %>(组长)
+        </sapn>
+        <span id="student_work_group_textarea" class="ml10 c_red fl"></span>
+    <% end %>
   <% end %>
   <div class="cl"></div>
   <span class="fl fontGrey2" id="relate_project_show">

From 89d3d3821c5f8f4b65c86ae49822b006159df4d5 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 17 Dec 2015 10:38:14 +0800
Subject: [PATCH 20/23] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb         | 9 +++++++++
 app/views/users/user_select_homework.js.erb | 6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b6d336547..02676978f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -415,6 +415,7 @@ class UsersController < ApplicationController
   def user_select_homework
     homework = HomeworkCommon.find_by_id params[:checkMenu]
     homework_detail_programing = homework.homework_detail_programing
+    homework_detail_group = homework.homework_detail_group
     @homework = HomeworkCommon.new
     @select_course = params[:select_course] || 0
     if homework
@@ -444,6 +445,14 @@ class UsersController < ApplicationController
           )
         end
       end
+
+      if homework_detail_group
+        @homework.homework_detail_group = HomeworkDetailGroup.new
+        @homework_detail_group = @homework.homework_detail_group
+        @homework_detail_group.min_num = homework_detail_group.min_num
+        @homework_detail_group.max_num = homework_detail_group.max_num
+        @homework_detail_group.base_on_project = homework_detail_group.base_on_project
+      end
     end
     respond_to do |format|
       format.js
diff --git a/app/views/users/user_select_homework.js.erb b/app/views/users/user_select_homework.js.erb
index cd94a6816..9b4b43b33 100644
--- a/app/views/users/user_select_homework.js.erb
+++ b/app/views/users/user_select_homework.js.erb
@@ -5,9 +5,13 @@ $("#homework_end_time").val("<%= @homework.end_time%>");
 <% if @select_course == "0"%>
     $("#course_id").val("<%= @homework.course_id%>");
 <% end%>
-$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework,:has_program => true,:has_group => true })%>");
+$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework,:has_program => true,:has_group => true,:show_member=>true})%>");
 homework_description_editor.html("<%= escape_javascript(@homework.description.html_safe)%>");
+<% if @homework_detail_group %>
+    $('span.group_detail_info').text('分组人数：<%=@homework_detail_group.min_num %>-<%=@homework_detail_group.max_num %> 人');
+<% end %>
 $("#BluePopupBox").html("<%=escape_javascript( render :partial => 'users/user_programing_attr', :locals => {:edit_mode => true, :homework => @homework})%>");
+$("#GroupPopupBox").html("<%=escape_javascript( render :partial => 'users/user_group_attr', :locals => {:edit_mode => true, :homework => @homework})%>");
 //$("input[name='homework_type']").val("<%#= @homework.homework_type%>");
 $("#homework_editor").show();
 $("#BluePopupBox a.BlueCirBtn").click();

From a2ebaa072969bdb27f4f2b805f7f51820ea05396 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 17 Dec 2015 15:28:28 +0800
Subject: [PATCH 21/23] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E5=93=81=E6=97=B6=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E4=BA=86=E9=A1=B9=E7=9B=AE=E5=88=99=E4=BB=8E?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98=E4=B8=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E6=88=90=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb           | 7 ++++++-
 app/views/student_work/_choose_group_member.html.erb | 2 +-
 app/views/student_work/new.html.erb                  | 5 +++++
 app/views/student_work/search_course_students.js.erb | 6 +++++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index b79adda2d..650d97555 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -689,7 +689,12 @@ class StudentWorkController < ApplicationController
     unless params[:name].nil?
       name = params[:name]
     end
-    all_student_ids = "(" + @homework.course.student.map{|student| student.student_id}.join(",") + ")"
+    if @homework.homework_detail_group.base_on_project == 0
+      all_student_ids = "(" + @homework.course.student.map{|student| student.student_id}.join(",") + ")"
+    else
+      pro = Project.find @homework.student_work_projects.where("user_id=?",User.current.id).first.project_id
+      all_student_ids = "(" + pro.members.map{|member| member.user_id}.join(",") + ")"
+    end
     all_students = User.where("id in #{all_student_ids}")
     @commit_student_ids = @homework.student_work_projects.map{|student| student.user_id}
     @users = searchstudent_by_name all_students,name
diff --git a/app/views/student_work/_choose_group_member.html.erb b/app/views/student_work/_choose_group_member.html.erb
index 1ec8ed0fa..f94250d23 100644
--- a/app/views/student_work/_choose_group_member.html.erb
+++ b/app/views/student_work/_choose_group_member.html.erb
@@ -1,6 +1,6 @@
 <div id="popbox02">
   <div>
-    <div class="relateText fl">请添加小组成员</div>
+    <div class="relateText fl">请从<%= @homework.homework_detail_group.base_on_project == 1 ? '项目成员':'课程成员' %>中添加小组成员</div>
   </div>
   <div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="clickCanel();"></a></div>
   <div class="cl"></div>
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index a71120d55..bd13fb7c1 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -11,6 +11,11 @@
         $('#ajax-modal').parent().addClass("anonymos_work");
     });
   <% end%>
+  <% if @homework.homework_detail_group %>
+      $(function(){
+          $('span.group_detail_info').text('分组人数：<%=@homework.homework_detail_group.min_num %>-<%=@homework.homework_detail_group.max_num %> 人');
+      });
+  <% end %>
 
   //快速创建项目的弹框
   function new_project(){
diff --git a/app/views/student_work/search_course_students.js.erb b/app/views/student_work/search_course_students.js.erb
index 1cea9f27e..c7aa982b9 100644
--- a/app/views/student_work/search_course_students.js.erb
+++ b/app/views/student_work/search_course_students.js.erb
@@ -18,7 +18,7 @@ $("#all_students_list").empty();
         }
     }
 }
-    <% if user.id.to_i != User.current.id.to_i && (@commit_student_ids.find{|e| e.to_i == user.id.to_i}).nil? %>
+    <% if user.id.to_i != User.current.id.to_i && (@commit_student_ids.find{|e| e.to_i == user.id.to_i}).nil? && user.member_of_course?(@course) %>
         if (str.indexOf(<%=user.id.to_s %>) < 0) {
             $("#student_<%=user.id %>").one("click",function choose_student() {
                 var li = "<li id='choose_student_<%=user.id %>'";
@@ -29,6 +29,10 @@ $("#all_students_list").empty();
                 $("#choose_students_list").append(li);
             });
         }
+    <% elsif !user.member_of_course?(@course) %>
+        if (str.indexOf(<%=user.id.to_s %>) < 0) {
+            $("#student_<%=user.id %>").attr("title","该项目成员不是本课程的学生");
+        }
     <% else %>
         if (str.indexOf(<%=user.id.to_s %>) < 0) {
             $("#student_<%=user.id %>").attr("title","该学生已加入其它分组");

From c7f321475a0b4f8d546eff718034ea9b7b03f987 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 17 Dec 2015 19:05:22 +0800
Subject: [PATCH 22/23] =?UTF-8?q?=E5=A4=9A=E9=80=89=E9=A2=98=E9=94=99?=
 =?UTF-8?q?=E5=88=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/exercise_helper.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/helpers/exercise_helper.rb b/app/helpers/exercise_helper.rb
index b0d0118e5..aba2fb58e 100644
--- a/app/helpers/exercise_helper.rb
+++ b/app/helpers/exercise_helper.rb
@@ -43,8 +43,9 @@ module ExerciseHelper
     ecs.each do |ec|
       arr << ec.exercise_choice.choice_position
     end
-    arr.sort
-    arr = arr.join("")
+    #arr = arr.sort
+    str = arr.sort.join("")
+    return str
   end
 
   # 判断用户是否已经提交了问卷

From 3b25616f0c05fde0bb1d5243bb006a060c22b560 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 17 Dec 2015 19:06:10 +0800
Subject: [PATCH 23/23] =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E6=97=B6=E5=8F=AF=E7=BC=96=E8=BE=91=E5=88=86=E7=BB=84=E6=88=90?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb    | 28 +++++++---
 .../_choose_group_member.html.erb             | 12 +++++
 app/views/student_work/edit.html.erb          | 52 ++++++++++++++++---
 public/javascripts/new_user.js                | 11 +++-
 4 files changed, 87 insertions(+), 16 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 650d97555..5cb646c8e 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -215,7 +215,6 @@ class StudentWorkController < ApplicationController
       student_work ||= StudentWork.new
       student_work.name = params[:student_work][:name]
       student_work.description = params[:student_work][:description]
-      student_work.project_id = params[:student_work][:project_id]
       student_work.homework_common_id = @homework.id
       student_work.user_id = User.current.id
       student_work.save_attachments(params[:attachments])
@@ -305,15 +304,28 @@ class StudentWorkController < ApplicationController
       @work.save_attachments(params[:attachments])
       render_attachment_warning_if_needed(@work)
       if @work.save
+        if @homework.homework_type == 3
+          @student_work_project = @homework.student_work_projects.where("user_id=?",User.current.id).first
+          student_work_projects = @homework.student_work_projects.where("student_work_id=? and is_leader =?",@work.id,0)
+          student_work_projects.delete_all
+          members = params[:group_member_ids].split(',')
+          for i in 1 .. members.count-1
+            stu_project = StudentWorkProject.new
+            stu_project.homework_common_id = @homework.id
+            stu_project.student_work_id = @work.id
+            if @homework.homework_detail_group.base_on_project == 1
+              stu_project.project_id = @student_work_project.project_id
+            else @homework.homework_detail_group.base_on_project == 0
+              stu_project.project_id = -1
+            end
+            stu_project.user_id = members[i].to_i
+            stu_project.is_leader = 0
+            stu_project.save
+          end
+        end
+
         course_message = CourseMessage.new(:user_id =>User.current.id,:content=>"edit",:course_message_id=>@work.id,:course_id => @course.id,:course_message_type=>"StudentWork", :status => 9) #作品提交记录
         course_message.save
-=begin
-        respond_to do |format|
-          format.html {
-            flash[:notice] = l(:notice_successful_edit)
-            redirect_to student_work_index_url(:homework => @homework.id)
-          }
-=end
         @student_work = @work
         respond_to do |format|
           format.js
diff --git a/app/views/student_work/_choose_group_member.html.erb b/app/views/student_work/_choose_group_member.html.erb
index f94250d23..dc650cfa8 100644
--- a/app/views/student_work/_choose_group_member.html.erb
+++ b/app/views/student_work/_choose_group_member.html.erb
@@ -92,5 +92,17 @@
             url: '<%= url_for(:controller => 'student_work', :action => 'search_course_students') %>'+'?homework='+<%=@homework.id %>,
             type:'get'
         });
+        <% if defined?(edit_mode) && edit_mode %>
+            <% pro = @homework.student_work_projects.where("user_id = ?",User.current.id).first.project_id.to_i %>
+            <% members = @homework.student_work_projects.where("project_id = ? and is_leader =?",pro,0) %>
+            <% members.each do |member| %>
+                var link = "<li id='choose_student_<%=member.user_id%>' onclick='delete_student(<%=member.user_id %>);'><%=member.user.show_name %>";
+                <% unless member.user.user_extensions.student_id == "" %>
+                link += "(<%=member.user.user_extensions.student_id %>)";
+                <% end %>
+                link += "</li>";
+                $("#choose_students_list").append(link);
+            <% end %>
+        <% end %>
     });
 </script>
\ No newline at end of file
diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb
index 6ca609502..c7c572cff 100644
--- a/app/views/student_work/edit.html.erb
+++ b/app/views/student_work/edit.html.erb
@@ -31,7 +31,11 @@
           提示：作品名称和描述中不要出现真实的姓名信息
         </div>
         <div class="cl"></div>
-
+        <% if @homework.homework_type == 3 %>
+            <span id="min_num_member" style="display: none"><%=@homework.homework_detail_group.min_num %></span>
+            <span id="max_num_member" style="display: none"><%=@homework.homework_detail_group.max_num %></span>
+            <%=hidden_field_tag 'group_member_ids', params[:group_member_ids], :value=>User.current.id %>
+        <% end %>
         <div>
           <input type="text" name="student_work[name]" id="student_work_name" placeholder="请简洁的概括作品的功能或特性" class="InputBox  W700" maxlength="200" onkeyup="regexStudentWorkName();" value="<%= @work.name%>">
           <div class="cl"></div>
@@ -51,6 +55,12 @@
           <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @work, :has_program=>false,:has_group=>false} %>
         </div>
 
+        <% if @homework.homework_type == 3 %>
+            <div class="mt5 fl">
+              <a href="javascript:void(0);" class="memberBtn fl mt3 mr15" title="请添加小组的其他成员" onclick="show_group_member();">合作成员</a>
+            </div>
+        <% end %>
+
         <div class="mt5">
           <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="popupRegex();edit_student_work(<%= @work.id%>);">确定</a>
           <span class="fr mr10 mt3">或</span>
@@ -61,14 +71,44 @@
   </div><!----HomeWorkCon end-->
 </div>
 <script type="text/javascript">
+    <% if @homework.homework_detail_group %>
+    $(function(){
+        <%members = @work.student_work_projects.where("is_leader =?",0) %>
+        var str = $('#group_members_show').html();
+        <% members.each do |member| %>
+            str += '、<%= (User.find member.user_id).show_name %>';
+        <% end %>
+        $('#group_members_show').html(str);
+        $('span.group_detail_info').text('分组人数：<%=@homework.homework_detail_group.min_num %>-<%=@homework.homework_detail_group.max_num %> 人');
+    });
+    <% end %>
+    // 添加组成员
+    function show_group_member() {
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/choose_group_member',:locals => {:homework=>@homework,:edit_mode => true}) %>');
+        showModal('ajax-modal', '528px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').parent().css("top","").css("left","");
+        $('#ajax-modal').parent().addClass("addMemberCP");
+    }
+
     function popupRegex(){
         if(regexStudentWorkName()&&regexStudentWorkDescription())
         {
-            $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-            showModal('ajax-modal', '500px');
-            $('#ajax-modal').siblings().remove();
-            $('#ajax-modal').parent().css("top","").css("left","");
-            $('#ajax-modal').parent().addClass("anonymos");
+            if($("#group_member_ids").length > 0) {
+                if(regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())))) {
+                    $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+                    showModal('ajax-modal', '500px');
+                    $('#ajax-modal').siblings().remove();
+                    $('#ajax-modal').parent().css("top","").css("left","");
+                    $('#ajax-modal').parent().addClass("anonymos");
+                }
+            } else {
+                $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+                showModal('ajax-modal', '500px');
+                $('#ajax-modal').siblings().remove();
+                $('#ajax-modal').parent().css("top","").css("left","");
+                $('#ajax-modal').parent().addClass("anonymos");
+            }
         }
     }
 </script>
\ No newline at end of file
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index 67892fe0f..65741adc8 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -267,8 +267,15 @@ function edit_student_work(id)
 {
     if(regexStudentWorkName()&&regexStudentWorkDescription())
     {
-        $("#edit_student_work_" + id).submit();
-        $("#ajax-indicator").hide();
+        if($("#group_member_ids").length > 0) {
+            if(regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())))) {
+                $("#edit_student_work_" + id).submit();
+                $("#ajax-indicator").hide();
+            }
+        } else {
+            $("#edit_student_work_" + id).submit();
+            $("#ajax-indicator").hide();
+        }
     }
 }