Added email reminder for bulletin

app/controllers/panel/announcement/api/bulletins_controller.rb

@@ -0,0 +1,83 @@
+# API for Announcement Module
+# 
+# Simple access control
+#   params[:access_token] = Site ID
+#   ex: /panel/announcement/api/bulletins.json?access_token=5301d8be45d5f42f4f000001
+# 
+# Set Language
+#   Language can be "zh_tw" or "en"
+#   ex: /panel/announcement/api/bulletins.json?lang=en&access_token=5301d8be45d5f42f4f000001
+# 
+# Get Categories and Tags
+#   ex: /panel/announcement/api/categories_tags.json&access_token=5301d8be45d5f42f4f000001
+# 
+# Query Bulletins
+#   Set page number use params[:page_num]
+#   Set number of results per page use params[:per_page]
+#   ex: /panel/announcement/api/bulletins.json?page_num=3&per_page=15&access_token=5301d8be45d5f42f4f000001
+# 
+#   Filter bulletins with categories use params[:categories]
+#   ex: /panel/announcement/api/bulletins.json?categories[]=53046e4045d5f462a2000006&access_token=5301d8be45d5f42f4f000001
+# 
+#   Filter bulletins with tags use params[:tags]
+#   ex: /panel/announcement/api/bulletins.json?tags[]=5318e58d45d5f41127000007&access_token=5301d8be45d5f42f4f000001
+# 
+#   Filter bulletins with "is_hot" use params[:is_hot]
+#   ex: /panel/announcement/api/bulletins.json?is_hot=1&access_token=5301d8be45d5f42f4f000001
+#   
+#   Search bulletin title, subtitle, text with params[:keyword]
+#   ex: /panel/announcement/api/bulletins.json?keyword=大學&access_token=5301d8be45d5f42f4f000001
+
+class Panel::Announcement::Api::BulletinsController < OrbitWidgetController
+  before_filter :set_I18n, :check_site_id
+
+  def get_categories_tags
+    module_id = ModuleApp.where(:key=>"announcement").first.id
+    categories = Category.where(:module_app_id => module_id).collect{|c| {"id"=>c.id, "title"=>c.title_translations}}
+    module_tags = ModuleTag.where(:module_app_id => module_id).collect{|t| t.id}
+    tags = Tag.any_of({:tag_lease_id.in => module_tags}).collect{|t| {"id"=>t.id, "title"=>t.name_translations}}
+
+    render :json => {
+      "categories" => categories, 
+      "tags" => tags
+    }
+  end
+
+  def get_bulletins
+    page_num = params[:page_num].blank? ? 0 : params[:page_num].to_i
+    per_page = params[:per_page].blank? ? 10 : params[:per_page].to_i
+    per_page = per_page > 0 ? per_page : 10
+
+    if !params[:keyword].blank?
+      keyword = Regexp.new(".*"+params[:keyword]+".*")
+      bulletins = Bulletin.any_of({:title=>keyword},{:subtitle=>keyword},{:text=>keyword}).available_for_lang(I18n.locale)
+    else
+      bulletins = Bulletin.available_for_lang(I18n.locale)
+    end
+    
+    bulletins = bulletins.where(:is_hot => params[:is_hot]) if !params[:is_hot].blank?
+    bulletins = bulletins.where(:category_id.in => params[:categories]) if !params[:categories].blank?
+    bulletins = bulletins.where(:tagged_ids.in => params[:tags]) if !params[:tags].blank?
+    
+    bulletins = bulletins.desc( :is_top, :postdate).page(page_num).per(per_page)
+
+    total_pages = (bulletins.count / per_page) + 1
+    render :json => {
+      "bulletins" => bulletins,
+      "bulletins_count" => bulletins.count,
+      "page_num" => page_num,
+      "total_pages" => total_pages,
+      "lang"=>I18n.locale
+    }
+  end
+
+  protected
+
+  def set_I18n
+    I18n.locale = params[:lang] if params[:lang].present?
+  end
+
+  def check_site_id
+    raise ActionController::RoutingError.new('Not Found') if Site.first.id.to_s != params['access_token']
+  end
+end

app/controllers/panel/announcement/back_end/bulletins_controller.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   # include OrbitControllerLib::DivisionForDisable
 
@@ -48,7 +49,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   # GET /bulletins/new.xml
   def new
     if(session[:in_validate_object].blank?)
-      @bulletin = Bulletin.new(:postdate => DateTime.now)
+      @bulletin = Bulletin.new(:postdate => DateTime.now, :email_sentdate => DateTime.now)
     else
       @bulletin = session[:in_validate_object]
       session[:in_validate_object] = {}
@@ -65,7 +66,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   # GET /bulletins/1/edit
   def edit
     @bulletin = Bulletin.find(params[:id])
-    @users = @bulletin.get_users
+    @email_users = @bulletin.get_email_users    
     @tags = get_tags
     is_authorized_sub_manager = @bulletin.category.auth_sub_manager.authorized_user_ids rescue nil
 
@@ -84,6 +85,10 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   # POST /bulletins.xml
   def create
     @tags = get_tags
+
+    params[:bulletin][:email_user_ids] = params[:bulletin][:email_user_ids].uniq
+    params[:bulletin][:email_user_ids].delete('')
+
     @bulletin = Bulletin.new(params[:bulletin])
     @bulletin.deadline = nil if (@bulletin.deadline < @bulletin.postdate rescue nil)
 
@@ -98,6 +103,14 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     respond_to do |format|
       if @bulletin.save
 
+        if @bulletin.email_sent == true && (is_manager? || is_admin?)
+          send_email_data(@bulletin)
+
+          @bulletin.email_sent = false
+          @bulletin.save
+        end
+
+
         format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('announcement.create_bulletin_success')) }
         format.xml  { render :xml => @bulletin, :status => :created, :location => @bulletin }
         # format.js
@@ -124,10 +137,22 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   def update
       @bulletin = Bulletin.find(params[:id])
 
+      params[:bulletin][:tag_ids] = (params[:bulletin][:tag_ids] ? params[:bulletin][:tag_ids] : [])
+
+      params[:bulletin][:email_user_ids] = params[:bulletin][:email_user_ids].uniq
+      params[:bulletin][:email_user_ids].delete('')
+      
       delete_out_invalid_date_from_params
       respond_to do |format|
         if @bulletin.update_attributes(params[:bulletin])
 
+          if @bulletin.email_sent == true && (is_manager? || is_admin?)
+            send_email_data(@bulletin)
+
+            @bulletin.email_sent = false
+            @bulletin.save
+          end
+
           format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('bulletin.update_bulletin_success')) }
           format.js  { render 'toggle_enable' }
           format.xml  { head :ok }
@@ -165,6 +190,45 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
   protected
 
+  def send_email_data(bulletin)
+
+    @site = Site.first
+    @user = User.find(bulletin.create_user_id)
+    @host = request.host_with_port
+
+    @group_mail = MailCron.get_send_group_mail( bulletin.email_user_ids , bulletin.other_mailaddress )
+    
+    if !@group_mail.join.blank?
+
+      @mail_content = {
+        "host" => @host,
+        "lang" => I18n.locale,
+        "site_title" => @site.title,
+        "title" => bulletin.title,
+        "template" => 'announcement_mailer/cron_mail',
+        "url" => "http://#{@host}#{panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.category.id)}"
+      }
+
+      @mail_cron = {  
+        :mail_from_app => 'announcement',
+        # :mail_from => @user.email,
+        # :mail_reply_to => @user.email,
+        :mail_subject => "#{t("announcement.mail_subject",:site_title => @site.title)}：#{bulletin.title}",
+        :mail_to => @group_mail.join(','),
+        :mail_content => @mail_content ,
+        :mail_sentdate => bulletin.email_sentdate,
+        :create_user_id => bulletin.create_user_id,
+        :update_user_id => bulletin.create_user_id
+      } 
+
+      @mail_cron = MailCron.new(@mail_cron) 
+
+      @mail_cron.save
+
+    end
+    
+  end  
+
   def delete_out_invalid_date_from_params
     if((params[:bulletin]["deadline(1i)"] && params[:bulletin]["deadline(1i)"].blank?) or (params[:bulletin]["deadline(2i)"] && params[:bulletin]["deadline(2i)"].blank?) or (params[:bulletin]["deadline(3i)"] && params[:bulletin]["deadline(3i)"].blank?)) 
       params[:bulletin].delete("deadline(1i)")

app/controllers/panel/announcement/front_end/bulletins_controller.rb

@@ -55,6 +55,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
   
   def show
     @item = Page.find(params[:page_id]) rescue nil
+    @fb_share = eval(params[:facebook_share]) rescue false
     if params[:preview] == "true"
       preview_content
     else

app/models/bulletin.rb

@@ -24,13 +24,15 @@ class Bulletin
 
   field :create_user_id
   field :update_user_id, :class_name => "User"
-  field :user_ids
   
   field :view_count, :type => Integer, :default => 0
   
   field :public, :type => Boolean, :default => true
-  field :rss_link
 
+  field :email_sent, :type => Boolean, :default => false
+  field :email_sentdate , :type => DateTime
+  field :email_user_ids
+  field :other_mailaddress
 
   mount_uploader :image, ImageUploader
 
@@ -152,8 +154,8 @@ class Bulletin
     preview_object
   end
 
-  def get_users
+  def get_email_users
-    User.find(self.user_ids) rescue []
+    User.find(self.email_user_ids) rescue []
   end
 
   protected

app/views/announcement_mailer/cron_mail.html.erb

@@ -0,0 +1,32 @@
+<% # encoding: utf-8 %>
+
+<% I18n.locale = @data.mail_content["lang"] %>
+
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+  </head>
+  <body bgcolor="#FFFFFF">
+  	<div style="text-ident:20px">
+  	</div>
+
+				<%= t('announcement.mail_hi') %> <br /><br />
+				<%= t('announcement.mail_url_view') %> <br /><br /> 
+				<a href="<%= @data.mail_content["url"] %>" target="_blank"> <%= @data.mail_content["title"] %> </a> <br /><br />
+				</div>
+				<span style="color:#555">--<br />
+				<%= t('announcement.mail_source') %> ：<a href="http://<%= @data.mail_content["host"] %>" target="_blank"> <%= @data.mail_content["site_title"] %> </a><br />
+				<%= t('announcement.mail_time') %> <%= DateTime.now %>
+			  </span>
+
+  </body>
+</html>
+
+
+
+
+
+
+
+ 

app/views/panel/announcement/back_end/bulletins/_form.html.erb

@@ -9,7 +9,8 @@
   <%= javascript_include_tag "lib/datetimepicker/datetimepicker.js" %>
   <%= javascript_include_tag "lib/modal-preview" %>
   <%= javascript_include_tag "lib/file-type" %>
-  <%= javascript_include_tag "lib/module-area" %>
+  <%= javascript_include_tag "lib/module-area" %>  
+  <%= javascript_include_tag "member-selection" %>
 <% end %>
 
 <%= f.error_messages %>
@@ -34,6 +35,9 @@
     <li>
       <a href="#imageupload" data-toggle="tab"><%= t(:image) %></a>
     </li>
+    <li>
+      <a href="#mail-group" data-toggle="tab"><%= t('announcement.email_reminder')%></a>
+    </li>    
   </ul>
 
   <!-- Module -->
@@ -64,14 +68,6 @@
           <%= f.datetime_picker :deadline, :no_label => true %>
         </div>
       </div>
-      
-      <!-- Promoter -->
-      <div class="control-group">
-        <label class="control-label muted"><%= t(:promoter) %></label>
-        <div class="controls">
-          <%= render partial: 'admin/member_selects/selection_box', locals: {field: 'bulletin[user_ids][]', users: @users} %>
-        </div>
-      </div>
 
     </div>
 
@@ -108,7 +104,6 @@
           <% @tags.each do |tag| %>
             <label class="checkbox inline btn <%= 'active' if @bulletin.tag_ids.include?(tag.id) %>">
               <%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id) %> <%= tag.name %>
-              <%= hidden_field_tag 'bulletin[tag_ids][]', '' %>
             </label>
           <% end %>
         </div>
@@ -149,6 +144,46 @@
 
     </div>
 
+    <!-- Mail Group Module -->
+    <div class="tab-pane fade" id="mail-group">
+
+      <!-- Mail Group -->
+      <div class="control-group">
+        <label class="control-label muted"><%= t("announcement.email_to") %></label>
+        <div class="controls">
+
+          <label class="checkbox inline">
+            <%= check_box_tag('bulletin[email_sent]', '1', (!@bulletin.email_sent.blank? ? true : false), :id=>'remind-check') %><%= t('announcement.activate_email_reminder')%>
+          </label>
+
+          <div class="content-box">
+            <p>
+            <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'bulletin[email_user_ids][]', users: @email_users} %>
+            </p>
+          </div>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label muted"></label>
+        <div class="controls">
+          <div class="content-box">
+            <span class="help-block"><%= "#{t("announcement.other_mailaddress")}(#{t("announcement.other_mailaddress_note")})"%> </span>
+            <%= f.text_area :other_mailaddress, :class=>"span12", :cols=>"25", :rows=>"10" %>
+          </div>
+        </div>
+      </div> 
+
+      <div class="content-box">
+      <div class="control-group">
+        <label class="control-label muted"><%= t("announcement.email_sentdate") %></label>
+        <div class="controls">
+          <%= f.datetime_picker :email_sentdate, :no_label => true %>
+        </div>
+      </div>
+      </div>
+
+    </div>
+
   </div>
 
   <!-- Language Tabs -->
@@ -310,6 +345,12 @@
           $(this).parents('.start-line').hide();
         }
       });
+
+      $('#remind-check').prop('checked') ? '':$('.content-box').addClass('hide')
+      $('#remind-check').on('change', function() {
+          $(this).prop('checked') ? $('.content-box').removeClass('hide'):$('.content-box').addClass('hide')
+      })
+
     });
   </script>
 <% end %>

app/views/panel/announcement/back_end/bulletins/index.html.erb

@@ -37,6 +37,11 @@
 	field type: 'tags',
 				hide: 'all',
 				sort: 'tags'
+	field db_field: 'email_user_ids',
+				hide: 'all',
+				translation: 'announcement.email_to',
+				display_option: '"<br />#{MailCron.get_send_group_mail(object.email_user_ids , object.other_mailaddress).join("， ").html_safe}"',
+				sort: 'email_user_ids'
 	field type: 'id',
 				db_field: 'update_user_id',
 				model: User,

app/views/panel/announcement/front_end/bulletins/show.html.erb

@@ -36,21 +36,22 @@
 			</div>
 		</div>
 	<% end %>
-	<% unless @bulletin.rss_link.blank? %>
-		<div>
-			<%= link_to t('ntu.rss_origin'), @bulletin.rss_link %>
-		</div>
-	<% end %>
 </div>
 
-<% unless @bulletin.user_ids.blank? %>
+<%#= share_links(@bulletin, 'announcement') %>
-	<div class="promoter">
+<% if @fb_share %>
-		<div>
+	<a href="" target="_blank" class="fb-share-button">
-			<%= render partial: 'admin/member_selects/promoter_front', locals: {users: @bulletin.get_users} %>
+ 		<%= image_tag("announcement/fbn.png",:width=>30, :height=>30) %>
-		</div>
+	</a>
-	</div>
+	<script type="text/javascript">
-<% end %>
+		(function(){
-
+			$(".fb-share-button").click(function(){
-<%= share_links(@bulletin, 'announcement') %>
+				var img = window.location.protocol + "//" + window.location.host + "<%= @bulletin.image.url rescue '' %>",
-
+					url = "https://www.facebook.com/sharer/sharer.php?s=100&p[title]=<%= @bulletin.title %>&p[images][0]=" + img + "&p[url]="+window.location.href;
-
+				newwindow = window.open(url,'name','height=500,width=1024');
+				if (window.focus) {newwindow.focus()}
+				return false;
+			})
+		})();
+	</script>
+<% end %>

config/locales/en.yml

@@ -13,7 +13,7 @@ en:
     create_bulletin_category_success: Create Category Successfully
     date: Announcement Date
     default_widget:
-      bulletin_category_with_title: Category
+      bulletin_category_with_title: Bulletin Category with Title
       postdate: Post Date
       subtitle: Subtitle
       title: Title
@@ -36,3 +36,15 @@ en:
       bulletins_and_web_links: Differential Nav.
       index: Index
       search: Search
+    email_reminder: Email Reminder
+    activate_email_reminder: Activate Email Reminder
+    email_sentdate: Email Time
+    email_to: Email To
+    mail_subject: this is an announcement reminder from【%{site_title}】
+    other_mailaddress: Other Email
+    other_mailaddress_note: Divide different email accounts with ","
+    mail_hi: Hi
+    mail_url_view: This email is the reminder of an announcement, please click the link for the details
+    mail_source: Source
+    mail_time: Time
+    image_upload_size_note: The following recommendations %{image_upload_size} upload size

config/locales/zh_tw.yml

@@ -13,7 +13,7 @@ zh_tw:
     create_bulletin_category_success: 建立類別成功
     date: 起迄日期
     default_widget:
-      bulletin_category_with_title: 類別
+      bulletin_category_with_title: 公告類別及標題
       postdate: 張貼日期
       subtitle: 副標題
       title: 標題
@@ -39,3 +39,15 @@ zh_tw:
       index: 索引
       search: 搜尋
     more: 更多+
+    email_reminder: 寄送提醒
+    activate_email_reminder: 開啟寄送提醒
+    email_sentdate: 寄送時間
+    email_to: 寄送對象
+    other_mailaddress: 其他Mail
+    other_mailaddress_note: 輸入多組mail時,請用","逗號隔開
+    mail_subject: 來自【%{site_title}】的公告事件提醒
+    mail_hi: 您好
+    mail_url_view: 此封信件為公告事件提醒，請點選以下連結詳細觀看
+    mail_source: 來源
+    mail_time: 時間
+    image_upload_size_note: 建議檔案小於%{image_upload_size}

config/routes.rb

@@ -41,6 +41,10 @@ Rails.application.routes.draw do
         match "bulletins_side_bar" => "bulletins#bulletins_side_bar"
         match "bulletins_search_block" => "bulletins#bulletins_search_block"
       end
+      namespace :api do
+        get "categories_tags.json" => "bulletins#get_categories_tags"
+        get "bulletins.json" => "bulletins#get_bulletins"
+      end
     end
   end
 end

lib/announcement.rb

@@ -38,6 +38,7 @@ module Announcement
 			    enable ["typeA", "typeB_style3", "typeC"]
 			    image :image
 			    field :postdate
+			    facebook_enabled false
 			    link_field :title,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self}
 			    link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [:category,:id]}}
 			    field :subtitle