From f65a852bc872e9b5c467e0fe3b1fa226d526449a Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 30 Oct 2014 17:27:07 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5=EF=BC=8C?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=B0=81=E8=A3=85=E5=A5=BD=E7=9A=84=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=96=B9=E6=B3=95=202.=E4=BF=AE=E6=AD=A3=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E6=80=BB=E6=95=B0=E7=BB=9F=E8=AE=A1=203.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=95=99=E8=A8=80=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=204.=E4=BF=AE=E6=AD=A3=E7=82=B9=E5=87=BB=E5=90=84=E4=B8=AA?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A1=B5=E4=B9=8B=E5=90=8ETAB=E7=9A=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/bids_controller.rb | 16 ++++---- app/controllers/homework_attach_controller.rb | 37 ++++++++----------- app/views/bids/_homework.html.erb | 2 +- app/views/bids/_homework_list.html.erb | 10 ++--- .../homework_attach/_homework_jours.html.erb | 2 +- .../homework_attach/_homeworks_list.html.erb | 4 +- .../get_batch_homeworks.js.erb | 4 +- .../homework_attach/get_homework_jours.js.erb | 4 +- .../homework_attach/get_homeworks.js.erb | 4 +- .../get_not_batch_homework.js.erb | 4 +- public/stylesheets/css.css | 2 +- 11 files changed, 46 insertions(+), 43 deletions(-) diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb index 771e77136..a61cc7b79 100644 --- a/app/controllers/bids_controller.rb +++ b/app/controllers/bids_controller.rb @@ -506,15 +506,15 @@ class BidsController < ApplicationController teachers += member.user_id.to_s + "," end end - limit = 10 - start_item = params['page'].nil? ? 0 : (params['page'].to_i - 1) * limit - @homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*, - (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id in #{teachers}) AS t_score, - (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id not in #{teachers}) AS s_score - FROM homework_attaches WHERE bid_id = #{@bid.id} - ORDER BY s_score DESC,created_at ASC - limit #{start_item}, #{limit}") + all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT * FROM (SELECT homework_attaches.*, + (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN #{teachers}) AS t_score, + (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN #{teachers}) AS s_score + FROM homework_attaches WHERE bid_id = #{@bid.id} ORDER BY s_score DESC,created_at ASC) AS table1 + WHERE table1.t_score IS NULL") + @homework_list = paginateHelper all_homework_list,10 + + #limit = 10 #feedback_count = all_homework_list.count #@feedback_pages = Paginator.new feedback_count, limit, params['page'] #offset ||= @feedback_pages.offset diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb index b2ecf7cba..9bbe7bcca 100644 --- a/app/controllers/homework_attach_controller.rb +++ b/app/controllers/homework_attach_controller.rb @@ -12,14 +12,13 @@ class HomeworkAttachController < ApplicationController #获取未批作业列表 def get_not_batch_homework teachers = find_course_teachers @course - limit = 10 - start_item = params['page'].nil? ? 0 : (params['page'].to_i - 1) * limit - @homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*, - (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id in #{teachers}) AS t_score, - (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id not in #{teachers}) AS s_score - FROM homework_attaches WHERE bid_id = #{@bid.id} - ORDER BY s_score DESC,created_at ASC - limit #{start_item}, #{limit}") + all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT * FROM (SELECT homework_attaches.*, + (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN #{teachers}) AS t_score, + (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN #{teachers}) AS s_score + FROM homework_attaches WHERE bid_id = #{@bid.id} ORDER BY s_score DESC,created_at ASC) AS table1 + WHERE table1.t_score IS NULL") + + @homework_list = paginateHelper all_homework_list,10 respond_to do |format| format.js end @@ -28,14 +27,12 @@ class HomeworkAttachController < ApplicationController #获取已评作业列表 def get_batch_homeworks teachers = find_course_teachers @course - limit = 10 - start_item = params['page'].nil? ? 0 : (params['page'].to_i - 1) * limit - @homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*, - (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id in #{teachers}) AS t_score, - (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id not in #{teachers}) AS s_score - FROM homework_attaches WHERE bid_id = #{@bid.id} - ORDER BY s_score DESC,created_at ASC - limit #{start_item}, #{limit}") + all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT * FROM (SELECT homework_attaches.*, + (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN #{teachers} and stars IS NOT NULL) AS t_score, + (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN #{teachers}) AS s_score + FROM homework_attaches WHERE bid_id = #{@bid.id} ORDER BY s_score DESC,created_at ASC) AS table1 + WHERE table1.t_score IS NOT NULL") + @homework_list = paginateHelper all_homework_list,10 respond_to do |format| format.js end @@ -44,14 +41,12 @@ class HomeworkAttachController < ApplicationController #获取所有作业列表 def get_homeworks teachers = find_course_teachers @course - limit = 10 - start_item = params['page'].nil? ? 0 : (params['page'].to_i - 1) * limit - @homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*, + all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*, (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id in #{teachers}) AS t_score, (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id not in #{teachers}) AS s_score FROM homework_attaches WHERE bid_id = #{@bid.id} - ORDER BY s_score DESC,created_at ASC - limit #{start_item}, #{limit}") + ORDER BY s_score DESC,created_at ASC") + @homework_list = paginateHelper all_homework_list,10 respond_to do |format| format.js end diff --git a/app/views/bids/_homework.html.erb b/app/views/bids/_homework.html.erb index a118dbc43..99ce5ae06 100644 --- a/app/views/bids/_homework.html.erb +++ b/app/views/bids/_homework.html.erb @@ -36,5 +36,5 @@ <% end %>
- <%= render :partial => 'homework_list', :locals => {:homework => @homework_list} %> + <%= render :partial => 'homework_list' %>
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index 46bdf4b3d..4f2cfcfd9 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -13,17 +13,17 @@
diff --git a/app/views/homework_attach/_homework_jours.html.erb b/app/views/homework_attach/_homework_jours.html.erb index 1c48dfb3a..375f2fda4 100644 --- a/app/views/homework_attach/_homework_jours.html.erb +++ b/app/views/homework_attach/_homework_jours.html.erb @@ -1,6 +1,6 @@

留言内容

- + 取  消留  言
diff --git a/app/views/homework_attach/_homeworks_list.html.erb b/app/views/homework_attach/_homeworks_list.html.erb index ab981b83f..89b864c3c 100644 --- a/app/views/homework_attach/_homeworks_list.html.erb +++ b/app/views/homework_attach/_homeworks_list.html.erb @@ -3,7 +3,7 @@ <%= l(:label_homework_list)%> ( - <%= homeworks.count unless homeworks.nil?%> + <%= homework_count%> ) 按  @@ -40,7 +40,7 @@ <%= link_to homework_filename , homework_attach_path(homework), :title => homework_filename%>
  • - <%= link_to "#{homework.attachments.count.to_s}个附件", zipdown_download_user_homework_path(:homework => homework)%> + <%= link_to "(#{homework.attachments.count.to_s}个附件)", zipdown_download_user_homework_path(:homework => homework)%>
  • <%= l(:label_teacher_score)%>: diff --git a/app/views/homework_attach/get_batch_homeworks.js.erb b/app/views/homework_attach/get_batch_homeworks.js.erb index bcd6e9550..01abec99c 100644 --- a/app/views/homework_attach/get_batch_homeworks.js.erb +++ b/app/views/homework_attach/get_batch_homeworks.js.erb @@ -1 +1,3 @@ -$('#tbc_01').html('<%= escape_javascript(render(:partial => 'homeworks_list', :locals => {:homeworks => @homework_list} )) %>'); \ No newline at end of file +$('#tbc_01').html('<%= escape_javascript(render(:partial => 'homeworks_list', :locals => {:homeworks => @homework_list, :homework_count => @obj_count} )) %>'); +for(var i=1;i<=5;i++){$("#tb_"+i).removeClass().addClass("normaltab");} +$("#tb_2").removeClass().addClass("hovertab"); \ No newline at end of file diff --git a/app/views/homework_attach/get_homework_jours.js.erb b/app/views/homework_attach/get_homework_jours.js.erb index c2e9bc572..94c564612 100644 --- a/app/views/homework_attach/get_homework_jours.js.erb +++ b/app/views/homework_attach/get_homework_jours.js.erb @@ -1 +1,3 @@ -$('#tbc_01').html('<%= escape_javascript(render(:partial => 'homework_jours' )) %>'); \ No newline at end of file +$('#tbc_01').html('<%= escape_javascript(render(:partial => 'homework_jours' )) %>'); +for(var i=1;i<=5;i++){$("#tb_"+i).removeClass().addClass("normaltab");} +$("#tb_5").removeClass().addClass("hovertab"); \ No newline at end of file diff --git a/app/views/homework_attach/get_homeworks.js.erb b/app/views/homework_attach/get_homeworks.js.erb index 6ee4e9265..0a6637709 100644 --- a/app/views/homework_attach/get_homeworks.js.erb +++ b/app/views/homework_attach/get_homeworks.js.erb @@ -1,2 +1,4 @@ -$('#tbc_01').html('<%= escape_javascript(render(:partial => 'homeworks_list', :locals => {:homeworks => @homework_list} )) %>'); +$('#tbc_01').html('<%= escape_javascript(render(:partial => 'homeworks_list', :locals => {:homeworks => @homework_list, :homework_count => @obj_count} )) %>'); +for(var i=1;i<=5;i++){$("#tb_"+i).removeClass().addClass("normaltab");} +$("#tb_3").removeClass().addClass("hovertab"); diff --git a/app/views/homework_attach/get_not_batch_homework.js.erb b/app/views/homework_attach/get_not_batch_homework.js.erb index bcd6e9550..6ce1e5d96 100644 --- a/app/views/homework_attach/get_not_batch_homework.js.erb +++ b/app/views/homework_attach/get_not_batch_homework.js.erb @@ -1 +1,3 @@ -$('#tbc_01').html('<%= escape_javascript(render(:partial => 'homeworks_list', :locals => {:homeworks => @homework_list} )) %>'); \ No newline at end of file +$('#tbc_01').html('<%= escape_javascript(render(:partial => 'homeworks_list', :locals => {:homeworks => @homework_list, :homework_count => @obj_count} )) %>'); +for(var i=1;i<=5;i++){$("#tb_"+i).removeClass().addClass("normaltab");} +$("#tb_1").removeClass().addClass("hovertab"); \ No newline at end of file diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index 879871350..0adccd091 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -53,7 +53,7 @@ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; } .c_grey{ color:#999; font-weight:normal;} .msg_box{ width:693px; height:170px; border-bottom:1px dashed #CCC; padding-top:20px;} -.msg_box h4{ margin-left:15px;} +.msg_box h4{ margin-left:15px;border-style: none;} .msg_box textarea{width:660px;height:90px;padding:2px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 15px; color:#666; font-size:12px;} .msg_box a{ float:right; display:block; width:50px; height:22px; background:#15bccf; color:#fff; margin-right:10px; text-align:center; margin-top:5px; } .msg_box a:hover{ background-color:#03a1b3; text-decoration:none;}