按天发送中添加项目新闻

app/models/mailer.rb

@@ -139,6 +139,7 @@ class Mailer < ActionMailer::Base
         end
       end
     end
+
     #  查询user在课程中发布的通知，项目中发的新闻
     @course_news = (course_ids && !course_ids.empty?) ? News.find_by_sql("select DISTINCT n.*  from news n
                                                 where n.course_id in (#{course_ids})
@@ -151,18 +152,13 @@ class Mailer < ActionMailer::Base
                                                   jour_type='Course' and user_id = #{user.id}
                                                   and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
     @user_journal_messages = user.journals_for_messages.where("m_parent_id IS NULL and (created_on between '#{date_from}' and '#{date_to}')").order('created_on DESC')
-
-
     # 查询user新建贴吧或发布帖子
     @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")
 
-
     has_content = [@issues,@homeworks,@course_messages,@project_messages,@course_news,@project_news,
-                   @course_journal_messages,@user_journal_messages,@forums,@memos,@attachments,@bids].any? {|o|
+                   @course_journal_messages,@user_journal_messages,@forums,@memos,@attachments,@bids].any? {|o| !o.empty?}
-      !o.empty?
-    }
     mylogger.debug "Sent activity mail : #{user.mail} - #{has_content}"
     #有内容才发，没有不发
     mail :to => user.mail,:subject => subject if has_content

app/views/mailer/send_for_user_activities.html.erb

@@ -35,11 +35,12 @@
             <% end %>
 
             <div class="cl"></div>
-          </ul><!--课程动态 end-->
+          </ul><!--课程通知 end-->
       <% end %>
+
+      <!--课程作业-->
       <% if  !@bids.first.nil?  || !@homeworks.first.nil? %>
           <ul class="wmail_ul" style="clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
-
             <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;"><%= l(:label_homework_overview) %><span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @bids.count %>)</span></h4>
             <% unless @bids.first.nil?%>
                 <% @bids.each do |bid| %>
@@ -92,9 +93,9 @@
           </ul><!--作业动态 end-->
       <% end %>
 
+      <!-- 课程留言 -->
       <% unless @course_journal_messages.first.nil? %>
           <ul class="wmail_ul" style="clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
-
             <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
               <%= l(:view_course_journals_for_messages) %>
               <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @course_journal_messages.count %>)</span>
@@ -121,45 +122,39 @@
                   <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(course_journal_message.created_on) %></span>
                 </li>
             <% end %>
-
             <div class="cl"></div>
           </ul><!--课程留言 end-->
       <% end %>
 
+      <!-- 课程讨论区 -->
       <% unless @course_messages.first.nil? %>
           <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
-
             <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
               <%= l(:view_borad_course) %>
               <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @course_journal_messages.count %>)</span>
             </h4>
-
             <% @course_messages.each do |course_message|%>
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
-
                   <%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course.id, :token => @token.value),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
-
                   <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value), :class => "wmail_name",
                               :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_send_course_messages) %></span>
-
                   <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id,:token => @token.value),
                               :class => 'wmail_info',
-                              :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                              :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-                  %>
                   <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(course_message.created_on) %></span>
                 </li>
             <% end %>
-
             <div class="cl"></div>
-          </ul><!--课程讨论  end-->
+          </ul><!-- 课程讨论区end -->
       <% end %>
 
+      <!-- 课件 -->
       <% unless @attachments.first.nil? %>
           <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
             <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
@@ -191,8 +186,11 @@
             <div class="cl"></div>
           </ul><!--课件下载  end-->
       <% end %>
-    </div><!--课程动态  end-->
+    </div>
 <% end %>
+
+
+
 <!--项目相关-->
 <% if @issues.first || @project_messages.first %>
     <div class="wmail_main" style="padding:20px 10px 0px;">
@@ -207,16 +205,13 @@
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
-
                   <%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project, :token => @token.value),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
-
                   <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value), :class => "wmail_name",
                               :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_project_issue) %></span>
-
                   <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value),
                               :class => 'wmail_info',
                               :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
@@ -229,6 +224,7 @@
           </ul><!--问题跟踪 end-->
       <% end %>
 
+      <!-- 讨论区 -->
       <% unless @project_messages.first.nil? %>
           <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
             <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
@@ -261,9 +257,42 @@
             <div class="cl"></div>
           </ul><!--项目论坛 end-->
       <% end %>
-    </div><!--项目动态  end-->
-<% end %>
 
+      <!--项目新闻-->
+      <% unless @project_news.first.nil? %>
+          <ul class="wmail_ul" style=" list-style-type:none;clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
+            <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
+              <%= l(:label_course_news) %>
+              <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @project_news.count %>)</span>
+            </h4>
+            <% @project_news.each do |project_new|%>
+                <li style="clear: both; list-style: none;">
+                  <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+                  <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
+
+                  <%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project, :token => @token.value),
+                              :class=> "wmail_column",
+                              :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
+                  <%= link_to project_new.author, user_activities_url(project_new.author,:token => @token.value), :class => "wmail_name",
+                              :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_project_notice) %></span>
+
+                  <%= link_to truncate(project_new.title,length: 30,omission: '...'), news_url(project_new,:token => @token.value),
+                              :class => 'wmail_info',
+                              :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
+                  %>
+                  <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(project_new.created_on) %></span>
+                </li>
+            <% end %>
+            <div class="cl"></div>
+          </ul><!-- 项目新闻end -->
+      <% end %>
+
+    </div>
+<% end %><!-- 项目动态end -->
+
+<!-- 用户留言 -->
 <% unless @user_journal_messages.first.nil? %>
     <div class="wmail_main" style="padding:20px 10px 0px;">
       <h2 class="wmail_h2" style="color:#15bccf; "><%= l(:label_activities) %></h2>

config/locales/projects/zh.yml

@@ -86,6 +86,7 @@ zh:
   label_roadmap: 里程碑 #版本路线图
   project_module_dts: DTS测试工具
   label_project_tool_response: 用户反馈
+  label_course_news: 项目新闻
 
   label_project_overview: "项目简介"
   label_expend_information: 展开更多信息