From ac82910aa5f30c6084270b75d8df2cf04cb033a3 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 29 Oct 2015 11:53:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E7=BA=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb         | 21 +++++++++++++++
 app/models/blog_comment.rb                    |  9 +++++++
 .../courses/_course_outlines_list.html.erb    | 27 +++++++++++--------
 app/views/courses/course_outline.js.erb       |  2 +-
 app/views/courses/set_course_outline.js.erb   |  1 +
 app/views/layouts/base_courses.html.erb       | 27 ++++++++++++++++---
 config/routes.rb                              |  1 +
 7 files changed, 73 insertions(+), 15 deletions(-)
 create mode 100644 app/views/courses/set_course_outline.js.erb

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 1113de159..1216599a1 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -713,7 +713,28 @@ class CoursesController < ApplicationController
 
   #从课程创建的老师那里选择课程大纲
   def course_outline
+      @teacher = User.find(@course.tea_id)
+      @blog_articles = @teacher.blog.articles
+      respond_to do |format|
+        format.js
+      end
+  end
 
+  #根据关键字搜索，查找方法一样的，但返回内容不一样
+  def search_course_outline
+     @article_title = params[:title]
+     @teacher = User.find(@course.tea_id)
+     @blog_articles = @teacher.blog.articles.like(@article_title)
+     render :json=>@blog_articles.to_json
+  end
+
+  #设置或者更改课程的大纲
+  def set_course_outline
+    @course.outline = params[:outline_id]
+    @course.save
+    respond_to do |format|
+      format.js
+    end
   end
 
   #删除课程
diff --git a/app/models/blog_comment.rb b/app/models/blog_comment.rb
index 9bb28ddd8..27da33121 100644
--- a/app/models/blog_comment.rb
+++ b/app/models/blog_comment.rb
@@ -19,6 +19,15 @@ class BlogComment < ActiveRecord::Base
   after_save :add_user_activity
   before_destroy :destroy_user_activity
 
+  scope :like, lambda {|arg|
+    if arg.blank?
+      where(nil)
+    else
+      pattern = "%#{arg.to_s.strip.downcase}%"
+      where(" LOWER(title) LIKE :p ", :p => pattern)
+    end
+  }
+
   #在个人动态里面增加当前动态
   def add_user_activity
     if self.parent_id.nil? #只有发博文才插入动态
diff --git a/app/views/courses/_course_outlines_list.html.erb b/app/views/courses/_course_outlines_list.html.erb
index cb7c52cfb..b8a8bfd2a 100644
--- a/app/views/courses/_course_outlines_list.html.erb
+++ b/app/views/courses/_course_outlines_list.html.erb
@@ -8,19 +8,24 @@
       <!--<input class="searchIconPopup" name="commit" onfocus="this.blur();" style="border-style:none" type="submit" value="">-->
     </form>
   </div>
-  <span class="f12 c_red fl mb8" name="course_outline_hint" style="display: none">未搜索到对应大纲，请重新输入</span>
+  <span class="f12 c_red fl mb8" id="course_outline_hint" style="display: none">未搜索到对应大纲，请重新输入</span>
+ <%= form_tag(url_for(:controller=>'courses',:action=>'set_course_outline',:id=>course.id),:method=>'post',:remote=>'true')  do %>
   <div class="blogBlock fl" id="course_outline_list" >
-    <ul class="blogRow">
-      <li class="fl">
-        <input name="checkMenu" type="radio" class="courseSendCheckbox"/>
-      </li>
-      <li class="blogTitle fl">博客一</li>
-    </ul>
-    <div class="homeworkPublishTime">发布时间：2015-05-11</div>
-
+    <% unless articles.blank? %>
+        <% articles.each do |article|%>
+            <ul class="blogRow">
+              <li class="fl">
+                <input name="outline_id" type="radio" value="<%= article.id%>" class="courseSendCheckbox"/>
+              </li>
+              <li class="blogTitle fl"><%= article.title%></li>
+            </ul>
+            <div class="homeworkPublishTime">发布时间：<%= format_date(article.created_at)%></div>
+        <% end %>
+    <% end %>
   </div>
   <div>
-    <div class="courseSendSubmit"><a href="javascript:void(0);" class="sendSourceText">确定</a></div>
-    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText">取消</a></div>
+    <div class="courseSendSubmit"><a href="javascript:void(0);" class="sendSourceText" onclick="$(this).parent().parent().submit();">确定</a></div>
+    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
   </div>
   <div class="cl"></div>
+<% end %>
diff --git a/app/views/courses/course_outline.js.erb b/app/views/courses/course_outline.js.erb
index 300ba6466..f747661b8 100644
--- a/app/views/courses/course_outline.js.erb
+++ b/app/views/courses/course_outline.js.erb
@@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'course_outlines_list') %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'course_outlines_list',:locals => {:articles=>@blog_articles,:course=>@course}) %>');
 showModal('ajax-modal', '300px');
 //$('#ajax-modal').css('height','250px');
 $('#ajax-modal').css('padding-top','0px');
diff --git a/app/views/courses/set_course_outline.js.erb b/app/views/courses/set_course_outline.js.erb
new file mode 100644
index 000000000..ad3b78189
--- /dev/null
+++ b/app/views/courses/set_course_outline.js.erb
@@ -0,0 +1 @@
+hideModal();
\ No newline at end of file
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 4e9868efe..43f754097 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -63,7 +63,7 @@
                   <%= l(:field_is_private)%>
                 </span>
           <% end %>
-          <%if @course.tea_id == User.current.id && @course.outline == 0%>
+          <%if @course.tea_id == User.current.id %>
             <span>
               <a href="javascript:void(0)" onclick="course_outline('<%= @course.id%>');">设置大纲</a>
             </span>
@@ -172,6 +172,7 @@
 <%= call_hook :view_layouts_base_body_bottom %>
 </body>
 <script>
+    var blog_artile_list_html = '';
     $(function(){
         $(document).on('input','input[name="course_outline_search"]',function(e){
             throttle(course_outline_search,window,e);
@@ -180,14 +181,34 @@
             clearTimeout(method.tId);
             method.tId=setTimeout(function(){
                 method.call(context,e);
-            },300);
+            },500);
         }
         function course_outline_search(e){
+//            if($(e.target).val().trim() == ''){
+//                return;
+//            }
+            $("#course_outline_hint").hide();
             $.ajax({
-                url:'',
+                url:'<%=search_course_outline_course_path(@course) %>'+"?&title="+ e.target.value,
                 type:'post',
                 success:function(data){
 
+                    if(data.length != 0 ){
+                        $("#course_outline_list").html('');
+                        for(var i =0;i<data.length;i++){
+                            var html = ' <ul class="blogRow"> '+
+                                     ' <li class="fl"> '+
+                                    '<input name="outline_id" type="radio" value="'+data[i].blog_comment.id+'" class="courseSendCheckbox"/>'+
+                                    '</li>'+
+                            '<li class="blogTitle fl">'+data[i].blog_comment.title+'</li>'+
+                            '</ul>'+
+                            '<div class="homeworkPublishTime">发布时间：'+data[i].blog_comment.created_at.match(/(\S*)T/)[1]+'</div>';
+                            $("#course_outline_list").append(html)
+                        }
+
+                    }else{
+                          $("#course_outline_hint").show();
+                    }
                 }
             })
         }
diff --git a/config/routes.rb b/config/routes.rb
index bdbdea619..3811bd43f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -791,6 +791,7 @@ RedmineApp::Application.routes.draw do
       match 'course_activity', :to => 'courses#course_activity',  :via => :get, :as => "course_activity"
       get 'course_outline'
       post 'search_course_outline'
+      post 'set_course_outline'
     end
     collection do
       match 'join_private_courses', :via => [:get, :post]