课程、项目列表更新时间取动态表中的

chenlw_dev
yuanke 9 years ago
parent d303a06377
commit 629591ad00

@ -2997,10 +2997,12 @@ class UsersController < ApplicationController
@c_sort = 2 @c_sort = 2
end end
sort_name = "updated_at" sort_name = "updated_on"
sort_type = @c_sort == 1 ? "asc" : "desc" sort_type = @c_sort == 1 ? "asc" : "desc"
@courses = @user.courses.visible.where("is_delete =?", 0).order("#{sort_name} #{sort_type}") # @courses = @user.courses.visible.where("is_delete =?", 0).order("#{sort_name} #{sort_type}")
@courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS #{sort_name}").order("#{sort_name} #{sort_type}")
#根据 作业+资源数排序 #根据 作业+资源数排序
if @order.to_i == 2 if @order.to_i == 2
@type = 2 @type = 2
@ -3040,11 +3042,11 @@ class UsersController < ApplicationController
@c_sort = 2 @c_sort = 2
end end
sort_name = "updated_on" sort_name = "updated_at"
sort_type = @c_sort == 1 ? "asc" : "desc" sort_type = @c_sort == 1 ? "asc" : "desc"
@projects = @user.projects.visible.order("#{sort_name} #{sort_type}") #@projects = @user.projects.visible.order("#{sort_name} #{sort_type}")
# @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a #{sort_type}") @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS #{sort_name} ").order("#{sort_name} #{sort_type}")
#根据 问题+资源数排序 @project.project_score.issue_num @project.project_score.attach_num #根据 问题+资源数排序 @project.project_score.issue_num @project.project_score.attach_num
if @order.to_i == 2 if @order.to_i == 2

@ -31,7 +31,7 @@
<span class="grayTxt"> <span class="grayTxt">
创建时间:<%= format_time(course.created_at) %> 创建时间:<%= format_time(course.created_at) %>
</span> </span>
<span class="grayTxt">更新时间:<%= format_time(course.updated_at) %></span> <span class="grayTxt">更新时间:<%= format_time(course.updated_on) %></span>
<span class="grayTxt"> <span class="grayTxt">
开课学期:&nbsp;&nbsp;<span><%= current_time_and_term course %></span> 开课学期:&nbsp;&nbsp;<span><%= current_time_and_term course %></span>
</span> </span>

@ -28,7 +28,7 @@
<div class="cl"></div> <div class="cl"></div>
<li class="ml15"> <li class="ml15">
<span class="grayTxt">创建时间:<%= format_time(project.created_on) %></span> <span class="grayTxt">创建时间:<%= format_time(project.created_on) %></span>
<span class="grayTxt">更新时间:<%= format_time(project.updated_on) %></span> <span class="grayTxt">更新时间:<%= format_time(project.updated_at) %></span>
<p class="list-info fr grayTxt"><span><%= project.project_score.issue_num %></span><span>问题</span><span>|</span><span> <%= project.project_score.attach_num %></span><span>资源</span></p> <p class="list-info fr grayTxt"><span><%= project.project_score.issue_num %></span><span>问题</span><span>|</span><span> <%= project.project_score.attach_num %></span><span>资源</span></p>
</li> </li>
<div class="cl"></div> <div class="cl"></div>

Loading…
Cancel
Save