kevinli
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

在线课堂首页筛选修改

This commit is contained in:
cxt 2017-09-06 16:08:56 +08:00
parent 7263d20a70
commit 5678fbfccb
4 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/courses_controller.rb
View File

@ -44,30 +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 # 是否归档
@is_over = params[:is_over] # 是否是新建课程页面跳转的查看归档
@syllabuses_num = Course.where("is_end = #{@is_end} and is_delete = 0").count
@syllabuses_num = Course.where("is_end = 0 and is_delete = 0").count
#@syllabus_count = all_syllabuses.count
# 我创建的课堂
create_syllabuses = Course.where(:tea_id => @user.id)
# 我参与的课堂
join_syllabuses = @user.courses.where("is_delete = 0 and tea_id != #{@user.id}")
@join_syllabuses_count = join_syllabuses.where(:is_end => @is_end, :is_delete => 0).count
@create_syllabuses_count = create_syllabuses.where(:is_end => @is_end, :is_delete => 0).count
@join_syllabuses_count = join_syllabuses.where(:is_end => 0, :is_delete => 0).count
@create_syllabuses_count = create_syllabuses.where(:is_end => 0, :is_delete => 0).count
# 页面筛选的课程
if @select == "create"
@syllabuses = create_syllabuses.where("is_end = #{@is_end} and is_delete = 0 and name like '%#{@search}%'")
@syllabuses = create_syllabuses.where("is_end = 0 and is_delete = 0 and name like '%#{@search}%'")
elsif @select == "join"
@syllabuses = join_syllabuses.where("is_end = #{@is_end} and is_delete = 0 and tea_id != #{@user.id} and name like '%#{@search}%'")
@syllabuses = join_syllabuses.where("is_end = 0 and is_delete = 0 and tea_id != #{@user.id} and name like '%#{@search}%'")
elsif @select == "end"
# 归档的课堂
end_syllabuses = Course.where("is_end = #{@is_end} and name like '%#{@search}%'")
end_syllabuses = Course.where("is_end = 1 and name like '%#{@search}%'")
@syllabuses = end_syllabuses
else
# 全部课堂
all_syllabuses = Course.where("is_end = #{@is_end} and is_delete = 0 and name like '%#{@search}%'")
all_syllabuses = Course.where("is_end = 0 and is_delete = 0 and name like '%#{@search}%'")
@syllabuses = all_syllabuses
end

2
app/views/courses/_course_index_search.html.erb
View File

@ -1,4 +1,4 @@
<form action="<%= courses_path(:select => @select, :is_end => @is_end) %>" data-remote="true" class="fr ml15" id="search_syllabuses_name" >
<form action="<%= courses_path(:select => @select) %>" data-remote="true" class="fr ml15" id="search_syllabuses_name" >
<div class="searchFor fr" style="margin-top: -3px">
<div class="searchCon">
<input type="text" class="searchinput" name="search" value="<%= @search %>" placeholder="请输入实训名称的关键字进行搜索" style="background: none;"/>

15
app/views/courses/index.html.erb
View File

@ -13,10 +13,10 @@
</ul>
</div>
<div class="clearfix mb15 fl" style="width:100%;">
<a href="<%= courses_path(:select => "all", :is_end => @is_end,:search => @search) %>" id="courses_index_syllabuses_1" class="course_filtrate fl course_filtrate_bg" data-tab="all" data-remote="true">全部课堂</a>
<a href="<%= courses_path(:select => "create", :is_end => @is_end, :search => @search) %>" id="courses_index_syllabuses_2" class="course_filtrate fl" data-tab="create" data-remote="true">我管理的</a>
<a href="<%= courses_path(:select => "join", :is_end => @is_end, :search => @search) %>" id="courses_index_syllabuses_3" class="course_filtrate fl" data-tab="join" data-remote="true">我参与的</a>
<a href="<%= courses_path(:select => "end", :is_end => 1) %>" id="courses_index_syllabuses_4" class="course_filtrate fl" data-tab="end" data-remote="true">查看归档</a>
<a href="<%= courses_path(:select => "all",:search => @search) %>" id="courses_index_syllabuses_1" class="edu-filter-cir-grey mr20 active fl" data-tab="all" data-remote="true">全部课堂</a>
<a href="<%= courses_path(:select => "create", :search => @search) %>" id="courses_index_syllabuses_2" class="edu-filter-cir-grey mr20 fl" data-tab="create" data-remote="true">我管理的</a>
<a href="<%= courses_path(:select => "join", :search => @search) %>" id="courses_index_syllabuses_3" class="edu-filter-cir-grey mr20 fl" data-tab="join" data-remote="true">我参与的</a>
<a href="<%= courses_path(:select => "end") %>" id="courses_index_syllabuses_4" class="edu-filter-cir-grey fl" data-tab="end" data-remote="true">查看归档</a>
<!-- <li class="edu-dropdown fl ml15 mr5" id="thirdly_select" style="width: 100px">
<a href="javascript:void(0);" class="edu-dropdown-toggle" id="all_syllabuses" >所有课程<i class="fa fa-caret-down ml20"></i></a>
@ -43,10 +43,15 @@
$(function(){
<% unless @is_over.blank? %>
$.ajax({
url: '<%= courses_path(:select => "end", :is_end => 1) %>',
url: '<%= courses_path(:select => "end") %>',
dataType: 'script'
});
<% end %>
$(".edu-filter-cir-grey").live("click", function(){
$(this).addClass("active");
$(this).siblings().removeClass("active");
});
});
/* ------------------- 添加或取消收藏 ---------------------- */

13
app/views/courses/index.js.erb
View File

@ -1,14 +1,3 @@
$("#intelligence_course_list").html("<%= j(render :partial => "courses/courseList") %>");
$("#courses_index_syllabuses_1").attr('href', '<%= courses_path(:select => "all", :is_end => @is_end, :search => @search) %>');
$("#courses_index_syllabuses_2").attr('href', '<%= courses_path(:select => "create", :is_end => @is_end, :search => @search) %>');
$("#courses_index_syllabuses_3").attr('href', '<%= courses_path(:select => "join", :is_end => @is_end, :search => @search) %>');
<% if params[:select] == "end" %>
// $("#courses_index_syllabuses_4").hide();
// $("#courses_index_syllabuses_5").show();
<% elsif params[:select] == "return" %>
// $("#courses_index_syllabuses_4").show();
// $("#courses_index_syllabuses_5").hide();
<% end %>
$("#all_syllabuses").html("<%= @syllabuses_num %>");
$("#my_syllabuses").html("<%= @join_syllabuses_count + @create_syllabuses_count %>");
$("#search_syllabuses_name").replaceWith("<%= j(render :partial => 'course_index_search') %>");