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

作业列表添加搜索功能及过滤条件

This commit is contained in:
huang 2017-05-16 15:26:56 +08:00
parent 8bb03b8497
commit 7fbbafeab5
5 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/homework_common_controller.rb
View File

@ -19,19 +19,25 @@ class HomeworkCommonController < ApplicationController
# update_homework_time(@course.homework_commons)
#end
search = "%#{params[:search].to_s.strip.downcase}%"
@order = params[:order]
@new_homework = HomeworkCommon.new
@new_homework.homework_detail_manual = HomeworkDetailManual.new
@new_homework.course = @course
@page = params[:page] ? params[:page].to_i + 1 : 0
@is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
if @is_teacher
#@homeworks = @course.homework_commons.order("created_at desc").limit(10).offset(@page * 10)
@homework_commons = @course.homework_commons.where("name like '%#{search}%'").order("created_at desc")
if @order.blank?
@homework_commons = @course.homework_commons.where("name like '%#{search}%'").order("created_at desc")
else
@homework_commons = HomeworkCommon.find_by_sql("SELECT * FROM `homework_commons` hc, `homework_detail_manuals` hdm where hdm.homework_common_id = hc.id and hc.course_id=#{@course.id} and hc.name like '#{search}' and hdm.comment_status='#{@order}';")
end
else
#@homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc").limit(10).offset(@page * 10)
@homework_commons = @course.homework_commons.where("name like '%#{search}%' and publish_time <= '#{Time.now}'").order("created_at desc")
if @order.blank?
@homework_commons = @course.homework_commons.where("name like '%#{search}%' and publish_time <= '#{Time.now}'").order("created_at desc")
else
@homework_commons = HomeworkCommon.find_by_sql("SELECT * FROM `homework_commons` hc, `homework_detail_manuals` hdm where hdm.homework_common_id = hc.id and hc.course_id=#{@course.id} and hc.name like '#{search}' and hc.publish_time <= #{Time.now} and hdm.comment_status='#{@order}';")
end
end
#update_homework_time @homework_commons
@is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
@is_new = params[:is_new]

8
app/helpers/application_helper.rb
View File

@ -240,9 +240,15 @@ module ApplicationHelper
when 1
"提交中"
when 2
"匿评中"
"补交中"
when 3
"匿评中"
when 4
"申诉中"
when 5
"评阅中"
when 6
"已结束"
end
end

8
app/views/homework_common/_homework_search_form.html.erb
View File

@ -1,6 +1,4 @@
<%= form_tag( homework_common_index_url_in_org(course.id),
:remote=>true ,:method => 'get',:class=>'resourcesSearchloadBox',:id=>'resource_search_form') do %>
<input type="text" name="search" placeholder="输入作业名称进行搜索" class="searchResource" />
<%= submit_tag '',:class=>'homepageSearchIcon',:onfocus=>'this.blur();',:style=>'border-style:none' %>
<!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
<%= form_tag(homework_common_index_path(:course => @course.id, :order => @order), :remote => true , :method => 'get', :id => 'resource_search_form') do %>
<input type="text" name="search" placeholder="输入作业名称进行搜索" class="task-form-100 panel-box-sizing" />
<a href="javascript:void(0);" onfocus = 'this.blur();' onclick="$('#resource_search_form').submit();" class="edu-btn-search font-16 color-grey mt10"><i class="fa fa-search"></i></a>
<% end %>

21
app/views/homework_common/index.html.erb
View File

@ -9,18 +9,17 @@
<div class="edu-class-innner-conbox">
<div class="edu-con-top clearfix">
<p class="fl task-form-60 mt3 ml15">
<a href="#" class="edu-filter-cir-grey mr5 active">全部</a>
<a href="#" class="edu-filter-cir-grey mr5">挂起</a>
<a href="#" class="edu-filter-cir-grey mr5">提交中</a>
<a href="#" class="edu-filter-cir-grey mr5">补交中</a>
<a href="#" class="edu-filter-cir-grey mr5">匿评中</a>
<a href="#" class="edu-filter-cir-grey mr5">申诉中</a>
<a href="#" class="edu-filter-cir-grey mr5">评阅中</a>
<a href="#" class="edu-filter-cir-grey mr5">已结束</a>
<a href="<%= homework_common_index_path(:course => @course.id) %>" class="edu-filter-cir-grey mr5 active">全部</a>
<a href="<%= homework_common_index_path(:course => @course.id, :order => 0) %>" class="edu-filter-cir-grey mr5" data-remote="true">挂起</a>
<a href="<%= homework_common_index_path(:course => @course.id, :order => 1) %>" class="edu-filter-cir-grey mr5" data-remote="true">提交中</a>
<a href="<%= homework_common_index_path(:course => @course.id, :order => 2) %>" class="edu-filter-cir-grey mr5" data-remote="true">补交中</a>
<a href="<%= homework_common_index_path(:course => @course.id, :order => 3) %>" class="edu-filter-cir-grey mr5" data-remote="true">匿评中</a>
<a href="<%= homework_common_index_path(:course => @course.id, :order => 4) %>" class="edu-filter-cir-grey mr5" data-remote="true">申诉中</a>
<a href="<%= homework_common_index_path(:course => @course.id, :order => 5) %>" class="edu-filter-cir-grey mr5" data-remote="true">评阅中</a>
<a href="<%= homework_common_index_path(:course => @course.id, :order => 6) %>" class="edu-filter-cir-grey mr5" data-remote="true">已结束</a>
</p>
<div class=" edu-position fr task-form-30 mr15">
<input class="task-form-100 panel-box-sizing " placeholder="输入作业名称进行搜索" type="text">
<a href="javascript:void(0);" class="edu-btn-search font-16 color-grey mt15"><i class="fa fa-search"></i></a>
<div id="search_div" class="edu-position fr task-form-30 mr15">
<%= render :partial => 'homework_search_form', :locals => {:course => @course} %>
</div>
</div>
<div id="homework_index_list">

6
app/views/homework_common/index.js.erb
View File

@ -1,4 +1,2 @@
/*
$("#user_show_more_homework").replaceWith("<%#= escape_javascript( render :partial => 'users/user_homework_list',:locals => {:homework_commons => @homeworks, :page => @page, :is_in_course => 1,:course_id => @course.id} )%>");*/
$("#homework_index_list").html("<%=escape_javascript(render :partial => 'homework_common/homework_index_list', :locals => {:homework_commons => @homeworks,:course_id => @course.id}) %>");
$("#homework_index_list").html("<%=escape_javascript(render :partial => 'homework_common/homework_index_list', :locals => {:homework_commons => @homeworks, :course_id => @course.id, :order => @order}) %>");
$("#search_div").attr('href','<%= homework_common_index_path(:course => @course.id, :order => @order) %>');