#2096 course、forge的邮件通知系统，改为可以每日一报、一事一报、不报

app/models/mailer.rb

@@ -114,15 +114,17 @@ 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")
-    if days == 1
+
     subject = "[ #{user.show_name} : #{l(:label_day_mail)}]"
     @subject = " #{user.show_name} : #{date_to - 1.days}  #{l(:label_day_mail)}"
-    else
-      subject = "[ #{user.show_name} :  #{l(:label_week_mail)}]"
-      @subject = "#{user.show_name} : #{l(:label_week_mail)}"
-    end
-    mail :to => user.mail,:subject => subject
 
+    has_content = [@issues,@homeworks,@course_messages,@project_messages,@course_news,@project_news,
+                   @course_journal_messages,@user_journal_messages,@forums,@memos,@attachments,@bids].any? {|o|
+                    !o.empty?
+                  }
+    binding.pry
+    #有内容才发，没有不发
+    mail :to => user.mail,:subject => subject if has_content
   end
 
   # 公共讨论区发帖、回帖添加邮件发送信息

app/models/user.rb

@@ -64,9 +64,10 @@ class User < Principal
       },
   }
 
+  #每日一报、一事一报、不报
   MAIL_NOTIFICATION_OPTIONS = [
     ['all', :label_user_mail_option_all],
-    ['week', :label_user_mail_option_week],
+    #['week', :label_user_mail_option_week],
     ['day', :label_user_mail_option_day],
     ['none', :label_user_mail_option_none]
   ]

config/initializers/send_mail.rb

@@ -1,27 +1,12 @@
-#!/usr/bin/env ruby
+#coding=utf-8
-
-require 'rubygems'
-require 'rufus-scheduler'
-
-#users = User.where("mail_notification = 'week' or mail_notification = 'day'")
 
 scheduler = Rufus::Scheduler.new
-scheduler.cron('0 0 * * 1') do
+
-  users = User.where("mail_notification = 'week'")
+#每天18:00发送当天的邮件汇总
-  users.each do |user|
+scheduler.cron('0 18 * * *') do
-  #Rails.logger.info "send mail to #{user.show_name}(#{user.mail}) at #{Time.now}"
+  users = User.where(mail_notification: 'day')
-    Thread.start do
-      Mailer.send_for_user_activities(user, Date.today, 7).deliver
-    end
-  end
-end
-scheduler.cron('0 0 * * *') do
-  users = User.where("mail_notification = 'day'")
   users.each do |user|
-    #Rails.logger.info "send mail to #{user.show_name}(#{user.mail}) at #{Time.now}"
+    mailer = Mailer.send_for_user_activities(user, Date.today, 1)
-    Thread.start do
+    mailer.deliver if mailer
-      Mailer.send_for_user_activities(user, Date.today, 1).deliver
   end
 end
-end
-

config/locales/zh.yml

@@ -80,7 +80,7 @@ zh:
   field_enterprise_name: 组织
 
   label_week_mail: 一周动态
-  label_day_mail: 一日动态
+  label_day_mail: 今日动态
   #added by huang
   field_tea_name: 教师
   field_couurse_time: 学时
@@ -2031,5 +2031,5 @@ zh:
   label_name_not_null: 名称不能为空
   modal_valid_unpassing: 该分班已经存在
 
-
+  mail_footer: 点击修改邮件发送设置
 

db/migrate/20150328115230_chnage_mail_notification_week_to_day.rb

@@ -0,0 +1,8 @@
+class ChnageMailNotificationWeekToDay < ActiveRecord::Migration
+  def up
+    User.where(mail_notification: 'week').update_all(mail_notification: 'day')
+  end
+
+  def down
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150309090143) do
+ActiveRecord::Schema.define(:version => 20150328115230) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -638,16 +638,6 @@ ActiveRecord::Schema.define(:version => 20150309090143) do
 
   add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
 
-  create_table "journal_details_copy", :force => true do |t|
-    t.integer "journal_id",               :default => 0,  :null => false
-    t.string  "property",   :limit => 30, :default => "", :null => false
-    t.string  "prop_key",   :limit => 30, :default => "", :null => false
-    t.text    "old_value"
-    t.text    "value"
-  end
-
-  add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id"
-
   create_table "journal_replies", :id => false, :force => true do |t|
     t.integer "journal_id"
     t.integer "user_id"
@@ -1069,12 +1059,12 @@ ActiveRecord::Schema.define(:version => 20150309090143) do
   end
 
   create_table "roles", :force => true do |t|
-    t.string  "name",              :limit => 90
+    t.string  "name",              :limit => 30, :default => "",        :null => false
-    t.integer "position"
+    t.integer "position",                        :default => 1
-    t.boolean "assignable"
+    t.boolean "assignable",                      :default => true
-    t.integer "builtin"
+    t.integer "builtin",                         :default => 0,         :null => false
     t.text    "permissions"
-    t.string  "issues_visibility", :limit => 90
+    t.string  "issues_visibility", :limit => 30, :default => "default", :null => false
   end
 
   create_table "schools", :force => true do |t|