Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh

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

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

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?
+    # if !params[:query_id].blank?
-      cond = "project_id IS NULL"
+    #   cond = "project_id IS NULL"
-      cond << " OR project_id = #{@project.id}" if @project
+    #   cond << " OR project_id = #{@project.id}" if @project
-      @query = IssueQuery.find(params[:query_id], :conditions => cond)
+    #   @query = IssueQuery.find(params[:query_id], :conditions => cond)
-      raise ::Unauthorized unless @query.visible?
+    #   raise ::Unauthorized unless @query.visible?
-      @query.project = @project
+    #   @query.project = @project
-      session[:query] = {:id => @query.id, :project_id => @query.project_id}
+    #   session[:query] = {:id => @query.id, :project_id => @query.project_id}
-      sort_clear
+    #   sort_clear
-    elsif api_request? || params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
+    # 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
+    # else
-      # retrieve from session
+    #   # retrieve from session
-      @query = IssueQuery.find_by_id(session[:query][:id]) if session[:query][:id]
+    #   @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 ||= IssueQuery.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
-      @query.project = @project
+    #   @query.project = @project
-    end
+    # end
   end
 
   def retrieve_query_from_session

app/views/bids/_homework.html.erb

@@ -59,6 +59,55 @@
                 }
             );
         }
+
+//        $(window).scroll(function(){
+//            //获取窗口的滚动条的垂直位置
+//            var s = $(window).scrollTop();
+//            //当窗口的滚动条的垂直位置大于页面的最小高度时，让返回顶部元素渐现，否则渐隐
+//            if( s > 600){
+//                $("#gotoTop").fadeIn(100);
+//            }else{
+//                $("#gotoTop").fadeOut(200);
+//            };
+//        });
+        $(function(){goTopEx();});
+
+        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);
+                }
+            }
+        }
 	</script>
 </div>
 <div id='bidding_project_list'>

app/views/homework_attach/_homeworks_list.html.erb

@@ -34,7 +34,11 @@
       </span>
     </div>
 <% end %>
+<div class="cl"></div>
 
+<div class="to_top" id="goTopBtn" style="display: none;">
+    返<br/>回<br/>顶<br/>部
+</div>
 <div class="cl"></div>
 
 <% unless homeworks.nil? %>

public/stylesheets/css.css

@@ -175,6 +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;}