From c60515ac500983b630c688abc7878b250b60a2ce Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 14 Apr 2015 19:24:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=BD=9C=E4=B8=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8C=89=E5=AD=A6=E7=94=9F=E7=9C=9F=E5=AE=9E=E5=A7=93?= =?UTF-8?q?=E5=90=8D=E3=80=81=E6=98=B5=E7=A7=B0=E3=80=81=E5=AD=A6=E5=8F=B7?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_attach_controller.rb | 15 +++++ app/views/bids/_homework.html.erb | 59 ++++--------------- .../homework_attach/_homeworks_list.html.erb | 10 +++- public/stylesheets/css.css | 15 ++++- 4 files changed, 46 insertions(+), 53 deletions(-) diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb index ba7e92467..ae4e66d1c 100644 --- a/app/controllers/homework_attach_controller.rb +++ b/app/controllers/homework_attach_controller.rb @@ -22,6 +22,7 @@ class HomeworkAttachController < ApplicationController #获取未批作业列表 def get_not_batch_homework @not_batch_homework = true + @search_name = params[:name] sort, direction = params[:sort] || "s_socre", params[:direction] || "desc" get_not_batch_homework_list sort,direction, @bid.id @cur_page = params[:page] || 1 @@ -39,6 +40,7 @@ class HomeworkAttachController < ApplicationController #获取已评作业列表 def get_batch_homeworks + @search_name = params[:name] sort, direction = params[:sort] || "s_socre", params[:direction] || "desc" @is_batch_homeworks = true if sort == 't_socre' @@ -54,6 +56,7 @@ class HomeworkAttachController < ApplicationController FROM homework_attaches WHERE bid_id = #{@bid.id} ORDER BY #{order_by}) AS table1 WHERE table1.t_score IS NOT NULL") + all_homework_list = search_homework_member(all_homework_list,@search_name.to_s.downcase) if @search_name @cur_page = params[:page] || 1 @cur_type = 2 @homework_list = paginateHelper all_homework_list,10 @@ -72,6 +75,7 @@ class HomeworkAttachController < ApplicationController #获取所有作业列表 def get_homeworks @is_all_homeworks = true + @search_name = params[:name] sort, direction = params[:sort] || "s_socre", params[:direction] || "desc" if sort == 't_socre' order_by = "t_score #{direction}" @@ -85,6 +89,8 @@ class HomeworkAttachController < ApplicationController (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score FROM homework_attaches WHERE bid_id = #{@bid.id} ORDER BY #{order_by}") + + all_homework_list = search_homework_member(all_homework_list,@search_name.to_s.downcase) if @search_name @cur_page = params[:page] || 1 @cur_type = 3 @homework_list = paginateHelper all_homework_list,10 @@ -538,6 +544,14 @@ class HomeworkAttachController < ApplicationController end private + #根据条件过滤作业结果 + def search_homework_member homeworks,name + select_homework = homeworks.select{ |homework| + homework.user[:login].to_s.downcase.include?(name) || homework.user.user_extensions[:student_id].to_s.downcase.include?(name) || (homework.user[:lastname].to_s.downcase + homework.user[:firstname].to_s.downcase).include?(name) + } + select_homework + end + #验证是否显示课程 def can_show_course @first_page = FirstPage.find_by_page_type('project') @@ -597,6 +611,7 @@ class HomeworkAttachController < ApplicationController FROM homework_attaches WHERE bid_id = #{bid_id} ORDER BY #{order_by}) AS table1 WHERE table1.t_score IS NULL") + @all_homework_list = search_homework_member(@all_homework_list,@search_name.to_s.downcase) if @search_name @homework_list = paginateHelper @all_homework_list,10 end diff --git a/app/views/bids/_homework.html.erb b/app/views/bids/_homework.html.erb index 05bec9874..a7a703c05 100644 --- a/app/views/bids/_homework.html.erb +++ b/app/views/bids/_homework.html.erb @@ -58,54 +58,17 @@ function hidden_homework_atert_form(cur_page,cur_type) { hideModal($("#popbox")); - // 评了分的则刷新列表 -// switch (cur_type) -// { -// case 1: -// $.ajax({ -// type: "GET", -// url: "<%#= get_not_batch_homework_homework_attach_index_path(:bid_id => @bid.id)%>&page=" + cur_page, -// data: 'text', -// success: function (data) { -// -// } -// }); -// break; -// case 2: -// $.ajax({ -// type: "GET", -// url: "<%#= get_batch_homeworks_homework_attach_index_path(:bid_id => @bid.id)%>&page=" + cur_page, -// data: 'text', -// success: function (data) { -// -// } -// }); -// break; -// case 3: -// $.ajax({ -// type: "GET", -// url: "<%#= get_homeworks_homework_attach_index_path(:bid_id => @bid.id)%>&page=" + cur_page, -// data: 'text', -// success: function (data) { -// -// } -// }); -// break; -// case 4: -// $.ajax({ -// type: "GET", -// url: "<%#= get_student_batch_homework_homework_attach_index_path(:bid_id => @bid.id)%>&page=" + cur_page, -// data: 'text', -// success: function (data) { -// -// } -// }); -// break; -// case 5: -// break; -// default : -// break; -// } + } + + function search_homework_member(url) + { + $.get( + url, + { name: $.trim($("#homework_member_search").val()) }, + function (data) { + + } + ); } diff --git a/app/views/homework_attach/_homeworks_list.html.erb b/app/views/homework_attach/_homeworks_list.html.erb index bf6d3d8e0..d2121c85f 100644 --- a/app/views/homework_attach/_homeworks_list.html.erb +++ b/app/views/homework_attach/_homeworks_list.html.erb @@ -11,11 +11,17 @@ ( <%= homework_count%> ) + <% + url= get_batch_homeworks_homework_attach_index_path(:bid_id => @bid.id) if is_batch_homeworks + url= get_not_batch_homework_homework_attach_index_path(:bid_id => @bid.id) if not_batch_homework + url= get_homeworks_homework_attach_index_path(:bid_id => @bid.id) if is_all_homeworks + %> + <%= link_to l(:label_export_excel), get_batch_homeworks_homework_attach_index_path(:bid_id => @bid.id,:format => 'xls'),:class=>'xls' if is_batch_homeworks%> <%= link_to l(:label_export_excel), get_not_batch_homework_homework_attach_index_path(:bid_id => @bid.id,:format => 'xls'),:class=>'xls' if not_batch_homework%> <%= link_to l(:label_export_excel), get_homeworks_homework_attach_index_path(:bid_id => @bid.id,:format => 'xls'),:class=>'xls' if is_all_homeworks%> - - + + 搜索 按  diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index 87b17823e..6d2113d4b 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -169,11 +169,20 @@ a:hover.tijiao{ background:#0f99a9 !important;} /*新增*/ .min_search { width: 150px; - height: 20px; + height: 15px; border: 1px solid #d0d0d0 !important; color: #666; - background: url(../images/course/public_icon.png) 135px -193px no-repeat; - cursor: pointer; + /*background: url(../images/course/public_icon.png) 135px -193px no-repeat;*/ + /*cursor: pointer;*/ +} +a.member_search { + width: 43px; + height: 22px; + background: #15bccf; + color: #fff; + text-align: center; + padding: 4px 6px; + text-decoration: none; }