From caa5d6ead241581a5b5955ebee300c09eecfbb13 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Mon, 12 Sep 2016 16:39:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E7=BC=93=E5=AD=98=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 28 +++---- app/views/courses/_course_activity.html.erb | 28 +++++-- .../courses/_course_activity_users.html.erb | 76 ++++++++++--------- app/views/courses/show.html.erb | 8 +- app/views/layouts/_course_base_info.html.erb | 2 + app/views/layouts/new_base_user.html.erb | 8 +- app/views/users/_course_attachment.html.erb | 2 + app/views/users/_course_homework.html.erb | 5 +- .../users/_course_journalsformessage.html.erb | 5 +- app/views/users/_course_message.html.erb | 5 +- app/views/users/_course_news.html.erb | 3 +- app/views/users/_user_activities.html.erb | 4 +- 12 files changed, 102 insertions(+), 72 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3c125a185..f6c5ea6d4 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -190,7 +190,7 @@ module ApplicationHelper CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :homework_journal_num => 1) else score = course_contributor_score.homework_journal_num.to_i + 1 - course_contributor_score.update_column(:homework_journal_num, score) + course_contributor_score.update_attribute(:homework_journal_num, score) end # 课程留言 when "Course" @@ -198,42 +198,42 @@ module ApplicationHelper CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :journal_num => 1) else score = course_contributor_score.journal_num.to_i + 1 - course_contributor_score.update_column(:journal_num, score) + course_contributor_score.update_attribute(:journal_num, score) end when "Message" if course_contributor_score.nil? CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 1) else score = course_contributor_score.message_num.to_i + 1 - course_contributor_score.update_column(:message_num, score) + course_contributor_score.update_attribute(:message_num, score) end when "MessageReply" if course_contributor_score.nil? CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_reply_num => 1) else score = course_contributor_score.message_reply_num.to_i + 1 - course_contributor_score.update_column(:message_reply_num, score) + course_contributor_score.update_attribute(:message_reply_num, score) end when "NewReply" if course_contributor_score.nil? CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :news_reply_num => 1) else score = course_contributor_score.news_reply_num.to_i + 1 - course_contributor_score.update_column(:news_reply_num, score) + course_contributor_score.update_attribute(:news_reply_num, score) end when "News" if course_contributor_score.nil? CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :news_num => 1) else score = course_contributor_score.news_num.to_i + 1 - course_contributor_score.update_column(:news_num, score) + course_contributor_score.update_attribute(:news_num, score) end when "Attachment" if course_contributor_score.nil? CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :resource_num => 1) else score = course_contributor_score.resource_num.to_i + 1 - course_contributor_score.update_column(:resource_num, score) + course_contributor_score.update_attribute(:resource_num, score) end end end @@ -245,38 +245,38 @@ module ApplicationHelper when "HomeworkCommon" unless course_contributor_score.nil? score = course_contributor_score.homework_journal_num.to_i - 1 - course_contributor_score.update_column(:homework_journal_num, score < 0 ? 0 : score) + course_contributor_score.update_attribute(:homework_journal_num, score < 0 ? 0 : score) end # 课程留言 when "Course" unless course_contributor_score.nil? score = course_contributor_score.journal_num.to_i - 1 - course_contributor_score.update_column(:journal_num, score < 0 ? 0 : score) + course_contributor_score.update_attribute(:journal_num, score < 0 ? 0 : score) end when "Message" unless course_contributor_score.nil? score = course_contributor_score.message_num.to_i - 1 - course_contributor_score.update_column(:message_num, score < 0 ? 0 : score) + course_contributor_score.update_attribute(:message_num, score < 0 ? 0 : score) end when "MessageReply" unless course_contributor_score.nil? score = course_contributor_score.message_reply_num.to_i - 1 - course_contributor_score.update_column(:message_reply_num, score < 0 ? 0 : score) + course_contributor_score.update_attribute(:message_reply_num, score < 0 ? 0 : score) end when "NewReply" unless course_contributor_score.nil? score = course_contributor_score.news_reply_num.to_i - 1 - course_contributor_score.update_column(:news_reply_num, score < 0 ? 0 : score) + course_contributor_score.update_attribute(:news_reply_num, score < 0 ? 0 : score) end when "News" unless course_contributor_score.nil? score = course_contributor_score.news_num.to_i - 1 - course_contributor_score.update_column(:news_num, score < 0 ? 0 : score) + course_contributor_score.update_attribute(:news_num, score < 0 ? 0 : score) end when "Attachment" unless course_contributor_score.nil? score = course_contributor_score.resource_num.to_i - 1 - course_contributor_score.update_column(:resource_num, score < 0 ? 0 : score) + course_contributor_score.update_attribute(:resource_num, score < 0 ? 0 : score) end end end diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb index c71e5ade4..92d7b6998 100644 --- a/app/views/courses/_course_activity.html.erb +++ b/app/views/courses/_course_activity.html.erb @@ -60,19 +60,33 @@ <% act = activity.course_act %> <% case activity.course_act_type.to_s %> <% when 'HomeworkCommon' %> - <%= render :partial => 'users/course_homework', :locals => {:activity => act, :user_activity_id => activity.id, :course_activity => 1} %> + <%# cache [:user_activity,activity.id,act.updated_at.to_i] do%> + <%= render :partial => 'users/course_homework', :locals => {:activity => act, :user_activity_id => activity.id, :course_activity => 1} %> + <%# end %> <% when 'News' %> - <%= render :partial => 'users/course_news', :locals => {:activity => act, :user_activity_id => activity.id} %> + <%# cache [:user_activity,activity.id,act.updated_on.to_i] do%> + <%= render :partial => 'users/course_news', :locals => {:activity => act, :user_activity_id => activity.id} %> + <%# end %> <% when 'Message' %> - <%= render :partial => 'users/course_message', :locals => {:activity => act, :user_activity_id => activity.id,:is_course=>1,:is_board=>0} %> + <%# cache [:user_activity,activity.id,act.updated_on.to_i] do%> + <%= render :partial => 'users/course_message', :locals => {:activity => act, :user_activity_id => activity.id,:is_course=>1,:is_board=>0} %> + <%# end %> <% when 'Poll' %> - <%= render :partial => 'users/course_poll', :locals => {:activity => act, :user_activity_id => activity.id} %> + <%# cache [:user_activity,activity.id,act.updated_at.to_i] do%> + <%= render :partial => 'users/course_poll', :locals => {:activity => act, :user_activity_id => activity.id} %> + <%# end %> <% when 'JournalsForMessage' %> - <%= render :partial => 'users/course_journalsformessage', :locals => {:activity => act, :user_activity_id => activity.id} %> + <%# cache [:user_activity,activity.id,act.updated_at.to_i] do%> + <%= render :partial => 'users/course_journalsformessage', :locals => {:activity => act, :user_activity_id => activity.id} %> + <%# end %> <% when 'Attachment' %> - <%= render :partial => 'users/course_attachment', :locals => {:activity => act, :user_activity_id => activity.id} %> + <%# cache [:user_activity,activity.id,act.updated_at.to_i] do%> + <%= render :partial => 'users/course_attachment', :locals => {:activity => act, :user_activity_id => activity.id} %> + <%# end %> <% when 'Course' %> - <%= render :partial => 'users/course_create', :locals => {:activity => act, :user_activity_id => activity.id} %> + <%# cache [:user_activity,activity.id,act.updated_at.to_i] do%> + <%= render :partial => 'users/course_create', :locals => {:activity => act, :user_activity_id => activity.id} %> + <%# end %> <% end %> <% end %> <% end %> diff --git a/app/views/courses/_course_activity_users.html.erb b/app/views/courses/_course_activity_users.html.erb index 67ec2ede9..8b2d8546b 100644 --- a/app/views/courses/_course_activity_users.html.erb +++ b/app/views/courses/_course_activity_users.html.erb @@ -23,43 +23,45 @@ 总得分为以上得分之和 <% contributor_course_scor(course.id).each do |contributor_score| %> - <% total_score = contributor_score.resource_num.to_i * 5 + contributor_score.message_num.to_i * 2 + - contributor_score.message_reply_num.to_i * 1 + contributor_score.journal_num.to_i * 1 + - + contributor_score.homework_journal_num.to_i * 1 + contributor_score.news_reply_num.to_i * 1 + - contributor_score.news_num.to_i * 1 %> - <% unless total_score ==0 %> -
  • - <%=link_to image_tag(url_to_avatar(contributor_score.user), :width => "50", :height => "50", :class=> "rankPortrait"),user_path(contributor_score.user) %> -

    <%=link_to contributor_score.user.show_name, user_path(contributor_score.user.id), :title => contributor_score.user.show_name %>

    -

    - - <%=total_score %>

    - -
    • + <% cache [:user_contributor_score,contributor_score.id.to_s+"-"+contributor_score.updated_at.to_i.to_s+"-"+contributor_score.user.updated_on.to_i.to_s] do%> + <% total_score = contributor_score.resource_num.to_i * 5 + contributor_score.message_num.to_i * 2 + + contributor_score.message_reply_num.to_i * 1 + contributor_score.journal_num.to_i * 1 + + + contributor_score.homework_journal_num.to_i * 1 + contributor_score.news_reply_num.to_i * 1 + + contributor_score.news_num.to_i * 1 %> + <% unless total_score ==0 %> +
  • + <%=link_to image_tag(url_to_avatar(contributor_score.user), :width => "50", :height => "50", :class=> "rankPortrait"),user_path(contributor_score.user) %> +

    <%=link_to contributor_score.user.show_name, user_path(contributor_score.user.id), :title => contributor_score.user.show_name %>

    +

    + + <%=total_score %>

    + +
    • + <% end %> <% end %> <% end %>
    diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 3e509faa5..b083b81fb 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -28,6 +28,8 @@ - - <%= render :partial => 'courses/course_activity', :locals => {:course_activities => @course_activities,:page => 0,:type => @type} %> - \ No newline at end of file +<%# cache [:course_activity,@course.id,@course_activities_count,@type,@course_activities[0].updated_at.to_i] do%> + + <%= render :partial => 'courses/course_activity', :locals => {:course_activities => @course_activities,:page => 0,:type => @type} %> + +<%# end %> \ No newline at end of file diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb index 65c065672..24e61e0f0 100644 --- a/app/views/layouts/_course_base_info.html.erb +++ b/app/views/layouts/_course_base_info.html.erb @@ -63,12 +63,14 @@

    + <% cache [:course_title,@course.id,@course.updated_at.to_i] do%>

    主讲老师：<%= link_to(@course.teacher.show_name, user_path(@course.teacher), :class => 'sy_cblue') %> 学时：<%= @course.class_period %>学时 学期：<%= current_time_and_term @course %> 单位：<%= get_occupation_from_user(@course.teacher).blank? ? '无' : get_occupation_from_user(@course.teacher) %>

    + <% end %> <% if is_teacher %> <%= link_to "班级设置", {:controller => 'courses', :action => 'settings', :id => @course}, :class => "sy_btn_grey mr10 fl" %> <% end %> diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index dd9d667b6..5bc54944d 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -165,9 +165,9 @@ <%= link_to '班级',{:controller => "users", :action => "user_courselist", :id => @user.id}, :id => "user_course_list" %> <% courses = @user.favorite_courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(10) %>
    - <% cache [:personal_courses,@user.id,courses.count,courses[0].updated_at.to_i] do%> + <%# cache [:personal_courses,@user.id,courses.count,courses[0].updated_at.to_i] do%> <%=render :partial => 'layouts/homepage_left_course_list', :locals => {:courses => courses} %> - <% end %> + <%# end %>
    <% if is_current_user %> @@ -194,9 +194,9 @@ <%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user.id}, :id => 'user_project_list'%> <% projects = @user.favorite_projects.visible.select("projects.*, (SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(10)%>
    - <% cache [:personal_projects,@user.id,projects.count,projects[0].updated_on.to_i] do%> + <%# cache [:personal_projects,@user.id,projects.count,projects[0].updated_on.to_i] do%> <%=render :partial => 'layouts/homepage_left_project_list', :locals => {:projects => projects} %> - <% end %> + <%# end %>
    <% if is_current_user %> diff --git a/app/views/users/_course_attachment.html.erb b/app/views/users/_course_attachment.html.erb index 4b854f44b..291d1437e 100644 --- a/app/views/users/_course_attachment.html.erb +++ b/app/views/users/_course_attachment.html.erb @@ -1,3 +1,4 @@ +<% cache [:user_courseattachment_activity,activity.id.to_s+"-"+activity.filename+"-"+number_to_human_size(activity.filesize)] do%>
    @@ -39,6 +40,7 @@
    +<% end %> -<% cache [:personal_activities,@user.id,user_activities[0].updated_at.to_i] do%> +<%# cache [:personal_activities,@user.id,user_activities[0].updated_at.to_i] do%> <% user_activities.each do |user_activity| if user_activities %>