From 65331b99f5901ddcc9fd7fd2ca2cd02c3d0a0745 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 17 Jul 2017 16:14:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AE=9E=E8=AE=AD=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E2=80=9C=E6=9F=A5=E7=9C=8B=E5=BD=92=E6=A1=A3?= =?UTF-8?q?=E2=80=9D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 19 ++++++++----- app/views/courses/index.html.erb | 39 ++++++++++++++++++++------- app/views/courses/index.js.erb | 16 ++++++++--- 3 files changed, 54 insertions(+), 20 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index a230ea47e..53a03715c 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -44,22 +44,29 @@ class CoursesController < ApplicationController @user = User.current @search = params[:search].nil? ? '' : params[:search] @select = params[:select].nil? ? '' : params[:select] - # 全部课堂 + @is_end = params[:is_end].nil? ? 0 : params[:is_end].to_i #是否归档 + @syllabuses_num = Course.where("is_end = 0 and is_delete = 0").count - all_syllabuses = Course.where("is_end = 0 and is_delete = 0 and name like '%#{@search}%'").order("created_at desc") - # 我参与的课堂 - join_syllabuses = @user.courses.where("is_end = 0 and is_delete = 0 and tea_id != #{@user.id} and name like '%#{@search}%'").order("created_at desc") + #@syllabus_count = all_syllabuses.count # 我创建的课堂 - create_syllabuses = Course.where(:tea_id => @user.id).where("is_end = 0 and is_delete = 0 and name like '%#{@search}%'").order("created_at desc") - @syllabus_count = all_syllabuses.count + create_syllabuses = Course.where(:tea_id => @user.id).where("is_end = #{@is_end} and is_delete = 0 and name like '%#{@search}%'") + # 我参与的课堂 + join_syllabuses = @user.courses.where("is_end = #{@is_end} and is_delete = 0 and tea_id != #{@user.id} and name like '%#{@search}%'") @join_syllabuses_count = join_syllabuses.count @create_syllabuses_count = create_syllabuses.count + # 页面筛选的课程 if @select == "create" @syllabuses = create_syllabuses elsif @select == "join" @syllabuses = join_syllabuses + elsif @select == "end" + # 归档的课堂 + end_syllabuses = Course.where("is_end = #{@is_end} and name like '%#{@search}%'") + @syllabuses = end_syllabuses else + # 全部课堂 + all_syllabuses = Course.where("is_end = #{@is_end} and is_delete = 0 and name like '%#{@search}%'") @syllabuses = all_syllabuses end diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb index 82d6a1405..db5dd17a8 100644 --- a/app/views/courses/index.html.erb +++ b/app/views/courses/index.html.erb @@ -8,15 +8,16 @@
- @search) %>" class="course_filtrate fl course_filtrate_bg" data-tab="all" data-remote="true">全部课堂 - @search) %>" class="course_filtrate fl" data-tab="create" data-remote="true">我管理的 - @search) %>" class="course_filtrate fl" data-tab="join" data-remote="true">我参与的 + @is_end,:search => @search) %>" id="courses_index_syllabuses_1" class="course_filtrate fl course_filtrate_bg" data-tab="all" data-remote="true">全部课堂 + @is_end, :search => @search) %>" id="courses_index_syllabuses_2" class="course_filtrate fl" data-tab="create" data-remote="true">我管理的 + @is_end, :search => @search) %>" id="courses_index_syllabuses_3" class="course_filtrate fl" data-tab="join" data-remote="true">我参与的 -