From 6a997bace384f0fc72588e7f2c0b2f1998700c0c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 6 Jun 2015 12:11:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=A7=93=E5=90=8D?=
=?UTF-8?q?=E9=A2=9C=E8=89=B2=E8=B0=83=E6=95=B4=20=E5=8C=BF=E8=AF=84?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AD=A6=E5=8F=B7=E6=98=BE=E7=A4=BA--?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/student_work/_evaluation_work.html.erb | 6 ++++--
app/views/student_work/_student_work.html.erb | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index 5a339dc03..11ce7b080 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -6,13 +6,15 @@
<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+ <% else%>
+ --
<% end%>
<% if is_my_work%>
- <%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name %>
+ <%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name, :class => "c_blue02" %>
<% else%>
- <%= link_to "匿名","javascript:void(0)"%>
+ <%= link_to "匿名","javascript:void(0)", :class => "c_blue02"%>
<% end%>
diff --git a/app/views/student_work/_student_work.html.erb b/app/views/student_work/_student_work.html.erb
index e8fb2ce3a..e39cb130d 100644
--- a/app/views/student_work/_student_work.html.erb
+++ b/app/views/student_work/_student_work.html.erb
@@ -6,7 +6,7 @@
- <%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name%>
+ <%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name, :class => "c_blue02"%>
<%= link_to student_work.name, student_work_path(student_work),:remote => true,:title => student_work.name, :class => "c_blue02"%>
From 52f7c66ff0fccd0bdadc1c3c66d8792cf13f1a89 Mon Sep 17 00:00:00 2001
From: huang
Date: Mon, 8 Jun 2015 14:32:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BE=E7=A8=8B?=
=?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E4=B8=AD=E9=82=AE=E4=BB=B6=E9=80=9A?=
=?UTF-8?q?=E7=9F=A5=E9=87=8D=E5=A4=8D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/models/mailer.rb | 31 ++++++++++++++++++++-----------
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index ec46917d9..b6a2bfa32 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -107,6 +107,7 @@ class Mailer < ActionMailer::Base
and (i.created_on between '#{date_from}' and '#{date_to}') order by i.created_on desc"
@issues = Issue.find_by_sql(sql)
+
# @bids 查询课程作业，包括老师发布的作业，以及user提交作业
# @attachments查询课程课件更新
@attachments ||= []
@@ -125,21 +126,29 @@ class Mailer < ActionMailer::Base
# user 提交的作业
# @homeworks = HomeworkAttach.where("user_id=#{user.id} and (created_at between '#{date_from}' and '#{date_to}')").order("created_at desc")
- # 查询user在课程。项目中发布的讨论帖子
- messages = Message.find_by_sql("select me.* from messages me, boards b, members m where
- b.id = me.board_id and b.project_id = m.project_id and m.user_id = '#{user.id}' and (me.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+ # 查询user在课程中发布的讨论帖子
+ course_mesages = Message.find_by_sql("select me.* from messages me, boards b, members m where
+ b.id = me.board_id and b.course_id = m.course_id
+ and b.course_id is not Null and m.user_id = '#{user.id}'
+ and (me.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+ # 查询user在项目中发布的讨论帖子
+ project_messages = Message.find_by_sql("select me.* from messages me, boards b, members m where
+ b.id = me.board_id and b.project_id = m.project_id
+ and b.project_id != '-1' and m.user_id = '#{user.id}' and (me.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
# messages = Message.find_by_sql("select DISTINCT * from messages where author_id = #{user.id} and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
@course_messages ||= []
@project_messages ||= []
- unless messages.first.nil?
- messages.each do |msg|
- if msg.project
- @project_messages << msg
- elsif msg.course
- @course_messages << msg
- end
+ unless course_mesages.first.nil?
+ course_mesages.each do |msg|
+ @course_messages << msg
end
end
+ unless project_messages.first.nil?
+ project_messages.each do |msg|
+ @project_messages << msg
+ end
+ end
+ # wiki
# 查询user在课程中发布的通知，项目中发的新闻
@course_news = (course_ids && !course_ids.empty?) ? News.find_by_sql("select DISTINCT n.* from news n
@@ -157,7 +166,7 @@ class Mailer < ActionMailer::Base
@forums = Forum.find_by_sql("select DISTINCT * from forums where creator_id = #{user.id} and (created_at between '#{date_from}' and '#{date_to}') order by created_at desc")
@memos = Memo.find_by_sql("select DISTINCT m.* from memos m, forums f where (m.author_id = #{user.id} or (m.forum_id = f.id and f.creator_id = #{user.id}))
and (m.created_at between '#{date_from}' and '#{date_to}') order by m.created_at desc")
-
+ puts @attachments
has_content = [@issues,@course_messages,@project_messages,@course_news,@project_news,
@course_journal_messages,@user_journal_messages,@forums,@memos,@attachments,@bids].any? {|o| !o.empty?}
mylogger.debug "Sent activity mail : #{user.mail} - #{has_content}"