From 2b1b1c34a6847895eb2dba7a97a7de674dc14011 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 7 May 2015 10:03:10 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AEissue=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=90=8E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/queries_helper.rb | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb index e1d8c3e12..d9d910a66 100644 --- a/app/helpers/queries_helper.rb +++ b/app/helpers/queries_helper.rb @@ -243,15 +243,15 @@ module QueriesHelper # Retrieve query from session or build a new query def retrieve_query - if !params[:query_id].blank? - cond = "project_id IS NULL" - cond << " OR project_id = #{@project.id}" if @project - @query = IssueQuery.find(params[:query_id], :conditions => cond) - raise ::Unauthorized unless @query.visible? - @query.project = @project - session[:query] = {:id => @query.id, :project_id => @query.project_id} - sort_clear - elsif api_request? || params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil) + # if !params[:query_id].blank? + # cond = "project_id IS NULL" + # cond << " OR project_id = #{@project.id}" if @project + # @query = IssueQuery.find(params[:query_id], :conditions => cond) + # raise ::Unauthorized unless @query.visible? + # @query.project = @project + # session[:query] = {:id => @query.id, :project_id => @query.project_id} + # sort_clear + # elsif api_request? || params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil) # Give it a name, required to be valid @query = IssueQuery.new(:name => "_") @query.project = @project @@ -268,12 +268,12 @@ module QueriesHelper 'assigned_to_id' => [params[:assigned_to_id]]} unless params[:status_id].nil? @query.build_from_params(params) #session[:query] = {:project_id => @query.project_id, :filters => @query.filters, :group_by => @query.group_by, :column_names => @query.column_names} - else - # retrieve from session - @query = IssueQuery.find_by_id(session[:query][:id]) if session[:query][:id] - @query ||= IssueQuery.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names]) - @query.project = @project - end + # else + # # retrieve from session + # @query = IssueQuery.find_by_id(session[:query][:id]) if session[:query][:id] + # @query ||= IssueQuery.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names]) + # @query.project = @project + # end end def retrieve_query_from_session From 628ffc67dd392cf50d667ac540ece8199561de21 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 7 May 2015 10:43:23 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E9=A1=B6=E9=83=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../homework_attach/_homeworks_list.html.erb | 4 ++++ db/schema.rb | 10 +++++++++- public/images/course/to_top.png | Bin 0 -> 2873 bytes public/stylesheets/css.css | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 public/images/course/to_top.png diff --git a/app/views/homework_attach/_homeworks_list.html.erb b/app/views/homework_attach/_homeworks_list.html.erb index 24ea2190c..689eaa08b 100644 --- a/app/views/homework_attach/_homeworks_list.html.erb +++ b/app/views/homework_attach/_homeworks_list.html.erb @@ -34,7 +34,11 @@ <% end %> +
+)13YbSTUx-} z5t&`_ylT9!!5speK%kRJQ%No4u=HmH`-{1M3uu2#KyvvO1QyScfxnP}CszVLye;v; zgMoGTVFBC+b7@VJ=>1*+K8w<&UeK7g}#LlIoM z009hKD1a@oqY~Kc(Sye$z*Pqi2DXmxj2W>VegoVFmJw|bp>>DX$(a(g*YVlba!C3! zS~y~Ok;?u#k(7kctBVMDJ^{}r;F<6xU^N5Np<`RFMI~@ej+PAkRs5@%8P~B|;HlvT zn7Owb!n0Om$-W^Hv>cXx%+yC^%uW(ZHY10s8-8tx1RPW{j~1-i@Gtz5fTt7iR05ua zZwYvd))X7F##Y`u@ZC~%HxF|Uc7t_drzZkW2{V9w!VrXIuEw;$E)ukxo8m<|#JaO_ zI}{yx@bxFmsg(~(FRsGNY!FhqPy*glG^+~u;y S4Wj25zca+q~z3_ByNJM!)yLh|iz5P8jxfEP>iH?U+b z0b9ebkoMrqR`8a9C&DY&oPbTRG1Cz133%;!1|B8>+aG@e^OCz_?%~&-33yUaO9WnU zK`24 TQa+UMEv1Vb^0OON_7G<<_kNO8-Q4>JY5pc5`=
ZPub5h;z%(Fp{+<6_19 z-I`-Yz_cY1@RE}~VRNGAGXT58^}tBJd63>4Jx&rZNe=(%%}A|iZsOf!5e;HX?c!+U zty*U6qg-jCR<0p^ZRD-oNXghj?X;a8ohlC`;PtczPb6TPzd3yKZwTAe-UQt1nSq_+ zhZB(M0r^@-zSdTX;-JqwDy3Gs8+)sk%i-(Kcw49d4nQISZ_lUso6GGy7WSum*A?*p zWOvWs1n`OS-2}XWfGs58rD=T#xKAAbkEox($IJbZbj=gn^3CCRu0H|yZQQ`eZu&{U zD>Dbf;q2>m2J9R^vVH;|y`hm-X{Yo3{usb1*S!&1Z1cwfK2Wv=Va2xk0oJH~mEApm z6TtgQRwKN`zRrPN>ML+e$tpyYIMh9G!l(5WcqJlB92+Gtzpv$+?j|IaqN}1A14oyv zKvb!7oddg80l!RA%6{3u-rgJY!2B4Lov~B?B@}*A*pg&Gf7&qc-s0uhTk4`0V1A85 zzFL!7kzOG+CvhAc4<~@*t91edB>%!m6`(?T1JI7tk<^LYc46SCB3DG0E~|Us#7ba( zPy8yW1Bv~&A?YSSbih+Tqvm!Ipga(Ra&{S%o$(uacFvDTdyt!63>;bPjF_v-YX_WA z9q?xatYqMxr0%j`0pFg);9LlfljG&MIsO_w>*DOFNZc-*InE#t$OCgl1t>f2Me0je z_h;aUA}1WUz7bI+&IIp-NcuVAiX*}c9T9ff0b!RM5PE4TLJF25_@X_6^6U|qXNSOC zI|Ss|Vox?nYm435CD@fk%CwPg{&j#~C-osQIKM)Djl{_p73ZQbG p^1Y{pjie4D6RX8 utFvK )jx{V~i3ya} nt}Bz<$uY~vsAc7ZC#T&tXpXY=d4TcqyeNiNpF$fAq^tE zM;c6e|2N{#`2YBtcS&!P_ Z Date: Thu, 7 May 2015 11:43:11 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=A1=B6=E9=83=A8?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_homework.html.erb | 11 +++++++++++ app/views/homework_attach/_homeworks_list.html.erb | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/views/bids/_homework.html.erb b/app/views/bids/_homework.html.erb index 0cb1ff7cc..0272f2c63 100644 --- a/app/views/bids/_homework.html.erb +++ b/app/views/bids/_homework.html.erb @@ -59,6 +59,17 @@ } ); } + + $(window).scroll(function(){ + //获取窗口的滚动条的垂直位置 + var s = $(window).scrollTop(); + //当窗口的滚动条的垂直位置大于页面的最小高度时,让返回顶部元素渐现,否则渐隐 + if( s > 600){ + $("#gotoTop").fadeIn(100); + }else{ + $("#gotoTop").fadeOut(200); + }; + }); diff --git a/app/views/homework_attach/_homeworks_list.html.erb b/app/views/homework_attach/_homeworks_list.html.erb index 689eaa08b..08ea9434d 100644 --- a/app/views/homework_attach/_homeworks_list.html.erb +++ b/app/views/homework_attach/_homeworks_list.html.erb @@ -36,7 +36,7 @@ <% end %> -+返From 0ec08f936113c5ad6baf8eac3c2cc65be4347939 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 7 May 2015 11:47:34 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=89=93=E9=9B=B6=E5=88=86=E4=BD=9C?= =?UTF-8?q?=E5=93=81=E4=BB=8D=E5=9C=A8=E6=9C=AA=E6=89=B9=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/bids_controller.rb | 2 +- app/controllers/homework_attach_controller.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb index b1cca68ed..c98df27d3 100644 --- a/app/controllers/bids_controller.rb +++ b/app/controllers/bids_controller.rb @@ -490,7 +490,7 @@ class BidsController < ApplicationController (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL ORDER BY updated_at DESC limit 0,1) AS t_score, (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 s_score DESC,created_at ASC) AS table1 - WHERE table1.t_score IS NULL OR table1.t_score = 0") + WHERE table1.t_score IS NULL") @not_batch_homework = true @cur_type = 1 else diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb index 523e430fb..f6b044c63 100644 --- a/app/controllers/homework_attach_controller.rb +++ b/app/controllers/homework_attach_controller.rb @@ -51,7 +51,7 @@ class HomeworkAttachController < ApplicationController order_by = "created_at #{direction}" end all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT * FROM (SELECT homework_attaches.*, - (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL AND stars > 0 ORDER BY updated_at DESC limit 0,1) AS t_score, + (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL ORDER BY updated_at DESC limit 0,1) AS t_score, (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}) AS table1 @@ -503,7 +503,7 @@ class HomeworkAttachController < ApplicationController get_not_batch_homework_list params[:cur_sort] || "s_socre",params[:cur_direction] || "desc",@homework.bid_id elsif @cur_type == "2" #老师已批列表 @result_homework = HomeworkAttach.find_by_sql("SELECT homework_attaches.*, - (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL AND stars > 0 ORDER BY updated_at DESC limit 0,1) AS t_score, + (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL ORDER BY updated_at DESC limit 0,1) AS t_score, (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 id = #{@homework.id}").first elsif @cur_type == "3" #全部作业列表 @@ -630,7 +630,7 @@ 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}) AS table1 - WHERE table1.t_score IS NULL OR table1.t_score = 0 ") + 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 @homework_list = @all_homework_list From 5f6f937fcb5b810507db5e5d440cb37ff623b309 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 7 May 2015 14:38:02 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=A1=B6=E9=83=A8?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=8D=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_homework.html.erb | 57 +++++++++++++++---- .../homework_attach/_homeworks_list.html.erb | 2 +- 2 files changed, 48 insertions(+), 11 deletions(-) diff --git a/app/views/bids/_homework.html.erb b/app/views/bids/_homework.html.erb index 0272f2c63..02a68a961 100644 --- a/app/views/bids/_homework.html.erb +++ b/app/views/bids/_homework.html.erb @@ -60,16 +60,53 @@ ); } - $(window).scroll(function(){ - //获取窗口的滚动条的垂直位置 - var s = $(window).scrollTop(); - //当窗口的滚动条的垂直位置大于页面的最小高度时,让返回顶部元素渐现,否则渐隐 - if( s > 600){ - $("#gotoTop").fadeIn(100); - }else{ - $("#gotoTop").fadeOut(200); - }; - }); +// $(window).scroll(function(){ +// //获取窗口的滚动条的垂直位置 +// var s = $(window).scrollTop(); +// //当窗口的滚动条的垂直位置大于页面的最小高度时,让返回顶部元素渐现,否则渐隐 +// if( s > 600){ +// $("#gotoTop").fadeIn(100); +// }else{ +// $("#gotoTop").fadeOut(200); +// }; +// }); + + var Sys = {}; + var ua = navigator.userAgent.toLowerCase(); + var s; + (s = ua.match(/msie ([\d.]+)/)) ? Sys.ie = s[1] : + (s = ua.match(/firefox\/([\d.]+)/)) ? Sys.firefox = s[1] : + (s = ua.match(/chrome\/([\d.]+)/)) ? Sys.chrome = s[1] : + (s = ua.match(/opera.([\d.]+)/)) ? Sys.opera = s[1] : + (s = ua.match(/version\/([\d.]+).*safari/)) ? Sys.safari = s[1] : 0; + + function goTopEx() { + var obj = document.getElementById("goTopBtn"); + var scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0; + function getScrollTop() { + var xsun = document.documentElement.scrollTop; + if (Sys.chrome) { + xsun=document.body.scrollTop; + } + return xsun; + } + function setScrollTop(value) { + if (Sys.chrome) { + document.body.scrollTop = value; + } + else { + document.documentElement.scrollTop = value; + } + } + window.onscroll = function () { getScrollTop() > 0 ? obj.style.display = "" : obj.style.display = "none"; }; + obj.onclick = function () { + var goTop = setInterval(scrollMove, 10); + function scrollMove() { + setScrollTop(getScrollTop() / 1.1); + if (getScrollTop() < 1) clearInterval(goTop); + } + } + }
回
顶
部diff --git a/app/views/homework_attach/_homeworks_list.html.erb b/app/views/homework_attach/_homeworks_list.html.erb index 08ea9434d..a2466d482 100644 --- a/app/views/homework_attach/_homeworks_list.html.erb +++ b/app/views/homework_attach/_homeworks_list.html.erb @@ -36,7 +36,7 @@ <% end %> -+返From 5ea295f8b55aee0b9a4cb5ea8343778d41293e2e Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 7 May 2015 15:58:41 +0800 Subject: [PATCH 6/6] =?UTF-8?q?1=E3=80=81=E7=AC=AC=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E8=BF=9B=E5=85=A5=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=20=E8=BF=94=E5=9B=9E=E9=A1=B6=E9=83=A8=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E4=B8=8D=E6=98=BE=E7=A4=BA=202=E3=80=81=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E7=82=B9=E5=87=BB=E8=BF=94=E5=9B=9E=E9=A1=B6?= =?UTF-8?q?=E9=83=A8=E6=8C=89=E9=92=AE=E6=97=A0=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_homework.html.erb | 1 + app/views/homework_attach/_homeworks_list.html.erb | 2 +- public/stylesheets/css.css | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/bids/_homework.html.erb b/app/views/bids/_homework.html.erb index 02a68a961..c3a6cc9d0 100644 --- a/app/views/bids/_homework.html.erb +++ b/app/views/bids/_homework.html.erb @@ -70,6 +70,7 @@ // $("#gotoTop").fadeOut(200); // }; // }); + $(function(){goTopEx();}); var Sys = {}; var ua = navigator.userAgent.toLowerCase(); diff --git a/app/views/homework_attach/_homeworks_list.html.erb b/app/views/homework_attach/_homeworks_list.html.erb index a2466d482..c82a729de 100644 --- a/app/views/homework_attach/_homeworks_list.html.erb +++ b/app/views/homework_attach/_homeworks_list.html.erb @@ -36,7 +36,7 @@ <% end %> -
回
顶
部+diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index 043faca46..ea42f7887 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -175,7 +175,7 @@ a.member_search {width: 43px;height: 22px;background: #15bccf;color: #fff;text-a /*上传图片处理*/ .upload_img img{max-width: 100%;} -.to_top{width: 19px;height: 74px;position: fixed;top: 50px;right: 1px;color: white;background: #15bccf; line-height: 1.2; padding-top: 10px;padding-left: 5px;font-size: 14px;cursor: pointer} +.to_top{width: 19px;height: 74px;position: fixed;top: 50px;right: 1px;color: white;background: #15bccf; line-height: 1.2; padding-top: 10px;padding-left: 5px;font-size: 14px;cursor: pointer;}