Creating new EmailContact model for sending work assignment notifications.

(work_assignment_rails3) Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>

Creating new EmailContact model for sending work assignment notifications.
(work_assignment_rails3) Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>
André Guedes · Tallys Martins
1 parent 46a4526b
Showing 4 changed files with 81 additions and 16 deletions Show diff stats
plugins/work_assignment/controllers/myprofile/work_assignment_plugin_cms_controller.rb
plugins/work_assignment/lib/ext/email_contact.rb
plugins/work_assignment/lib/ext/person.rb
plugins/work_assignment/views/work_assignment_plugin_cms/send_email.html.erb
@@ -43,27 +43,27 @@ class WorkAssignmentPluginCmsController &lt; CmsController
     @parent = check_parent(params[:id])
     @files_id_list = params[:files_id]
     @target = ['',@parent.url[:profile], @parent.url[:page]].join('/')
-    @contact
+    @email_contact
     if request.post? && params[:confirm] == 'true'
       @files_paths = []
-      @files_id_list = params[:self_files_id]
+      @files_string = params[:self_files_id]
+      @files_id_list = @files_string.split(' ')
       @files_id_list.each do |file_id|
         @file = environment.articles.find_by_id(file_id)
-        @real_file_url = "http://#{@file.url[:host]}:#{@file.url[:port]}/ #{@file.url[:profile]}/#{@file.path}"
+        @real_file_url = "http://#{@file.url[:host]}:#{@file.url[:port]}/#{@file.url[:profile]}/#{@file.path}"
         @files_paths << @real_file_url
-        unless params[:contact][:message].include? "#{@real_file_url}"
-          params[:contact][:message] += "<br> Clique <a href='#{@real_file_url}'>aqui</a> para acessar o arquivo ou acesse pela URL: <br>"
-          params[:contact][:message] += "<br><a href='#{@real_file_url}'>#{@real_file_url}</a>"
+        unless params[:email_contact][:message].include? "#{@real_file_url}"
+          params[:email_contact][:message] += "<br> Clique <a href='#{@real_file_url}'>aqui</a> para acessar o arquivo ou acesse pela URL: <br>"
+          params[:email_contact][:message] += "<br><a href='#{@real_file_url}'>#{@real_file_url}</a>"
         end
       end
       @message = "AVISO: O aluno deve imprimir este email e entrega-lo na secretaria como comprovante do envio!"
-      unless params[:contact][:message].include? "#{@message}"
-        params[:contact][:message] += "<br><br>#{@message}"
+      unless params[:email_contact][:message].include? "#{@message}"
+        params[:email_contact][:message] += "<br><br>#{@message}"
       end
-
-      @contact = user.build_contact(profile, params[:contact])
-      if @contact.deliver
+      @email_contact = user.build_email_contact(params[:email_contact])
+      if @email_contact.deliver
         session[:notice] = _('Contact successfully sent')
         redirect_to @target
       else
@@ -79,7 +79,7 @@ class WorkAssignmentPluginCmsController &lt; CmsController
         redirect_to :action => 'index'
       end
     else
-      @contact = user.build_contact(profile)
+      @email_contact = user.build_email_contact()
     end
   end
@@ -0,0 +1,58 @@
+class EmailContact
+
+  include ActiveModel::Validations
+
+  def initialize(attributes = nil)
+    if attributes
+      attributes.each do |attr,value|
+        self.send("#{attr}=", value)
+      end
+    end
+  end
+
+  attr_accessor :name
+  attr_accessor :subject
+  attr_accessor :message
+  attr_accessor :email
+  attr_accessor :receive_a_copy
+  attr_accessor :reciever
+  attr_accessor :sender
+
+  N_('Subject'); N_('Message'); N_('e-Mail'); N_('Name')
+
+  validates_presence_of :subject, :email, :message, :name
+  validates_format_of :email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {|o| !o.email.blank?})
+
+  def deliver
+    return false unless self.valid?
+    EmailContact::EmailSender.notification(self).deliver
+  end
+
+  class EmailSender < ActionMailer::Base
+    def notification(email_contact)
+      @name = email_contact.name
+      @email = email_contact.email
+      @message = email_contact.message
+      @target = email_contact.reciever
+
+      options = {
+        content_type: 'text/html',
+        to: email_contact.reciever,
+        reply_to: email_contact.email,
+        subject: email_contact.subject,
+        from: "#{email_contact.name} <#{email_contact.email}>"
+      }
+
+      if email_contact.sender
+        options.merge!('X-Noosfero-Sender' => email_contact.sender.identifier)
+      end
+
+      if email_contact.receive_a_copy
+        options.merge!(cc: "#{email_contact.name} <#{email_contact.email}>")
+      end
+
+      mail(options)
+    end
+  end
+
+end
@@ -0,0 +1,7 @@
+require_dependency 'person'
+
+class Person
+  def build_email_contact(params = {})
+    EmailContact.new(params.merge(:name => name, :email => email, :sender => self))
+  end
+end
 \ No newline at end of file
-<%= error_messages_for 'contact' %>
+<%= error_messages_for 'email_contact' %>
-<%=labelled_form_for :contact do |f| %>
+<%=labelled_form_for :email_contact do |f| %>
   <%= hidden_field_tag(:confirm, 'false') %>
   <%= hidden_field_tag(:self_files_id, @files_id_list) %>
   <%= required_fields_message %>
   <%= required f.text_field(:subject) %>
-  <%# required f.text_field(:dest) %>
+  <%= required f.text_field(:reciever) %>
   <%= required f.text_field(:name) %>
   <%= render :file => 'shared/tiny_mce' %>
   <%= required f.text_area(:message, :class => 'mceEditor') %>
-  <%= labelled_form_field check_box(:contact, :receive_a_copy) + _('I want to receive a copy of the message in my e-mail.'), '' %>
+  <%= labelled_form_field check_box(:email_contact, :receive_a_copy) + _('I want to receive a copy of the message in my e-mail.'), '' %>
   <%= submit_button(:send, _('Send'), :onclick => "$('confirm').value = 'true'") %>
   <%= submit_button(:cancel, _('Cancel'), :onclick =>"$('confirm').value = 'false'") %>
@@ -0,0 +1,58 @@		@@ -0,0 +1,58 @@
	1	+class EmailContact
	2	+
	3	+ include ActiveModel::Validations
	4	+
	5	+ def initialize(attributes = nil)
	6	+ if attributes
	7	+ attributes.each do \|attr,value\|
	8	+ self.send("#{attr}=", value)
	9	+ end
	10	+ end
	11	+ end
	12	+
	13	+ attr_accessor :name
	14	+ attr_accessor :subject
	15	+ attr_accessor :message
	16	+ attr_accessor :email
	17	+ attr_accessor :receive_a_copy
	18	+ attr_accessor :reciever
	19	+ attr_accessor :sender
	20	+
	21	+ N_('Subject'); N_('Message'); N_('e-Mail'); N_('Name')
	22	+
	23	+ validates_presence_of :subject, :email, :message, :name
	24	+ validates_format_of :email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {\|o\| !o.email.blank?})
	25	+
	26	+ def deliver
	27	+ return false unless self.valid?
	28	+ EmailContact::EmailSender.notification(self).deliver
	29	+ end
	30	+
	31	+ class EmailSender < ActionMailer::Base
	32	+ def notification(email_contact)
	33	+ @name = email_contact.name
	34	+ @email = email_contact.email
	35	+ @message = email_contact.message
	36	+ @target = email_contact.reciever
	37	+
	38	+ options = {
	39	+ content_type: 'text/html',
	40	+ to: email_contact.reciever,
	41	+ reply_to: email_contact.email,
	42	+ subject: email_contact.subject,
	43	+ from: "#{email_contact.name} <#{email_contact.email}>"
	44	+ }
	45	+
	46	+ if email_contact.sender
	47	+ options.merge!('X-Noosfero-Sender' => email_contact.sender.identifier)
	48	+ end
	49	+
	50	+ if email_contact.receive_a_copy
	51	+ options.merge!(cc: "#{email_contact.name} <#{email_contact.email}>")
	52	+ end
	53	+
	54	+ mail(options)
	55	+ end
	56	+ end
	57	+
	58	+end
	@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
		1	+require_dependency 'person'
		2	+
		3	+class Person
		4	+ def build_email_contact(params = {})
		5	+ EmailContact.new(params.merge(:name => name, :email => email, :sender => self))
		6	+ end
		7	+end
0	\ No newline at end of file	8	\ No newline at end of file
1		1
2	-<%= error_messages_for 'contact' %>	2	+<%= error_messages_for 'email_contact' %>
3		3
4	-<%=labelled_form_for :contact do \|f\| %>	4	+<%=labelled_form_for :email_contact do \|f\| %>
5	<%= hidden_field_tag(:confirm, 'false') %>	5	<%= hidden_field_tag(:confirm, 'false') %>
6	<%= hidden_field_tag(:self_files_id, @files_id_list) %>	6	<%= hidden_field_tag(:self_files_id, @files_id_list) %>
7		7
8	<%= required_fields_message %>	8	<%= required_fields_message %>
9		9
10	<%= required f.text_field(:subject) %>	10	<%= required f.text_field(:subject) %>
11	- <%# required f.text_field(:dest) %>	11	+ <%= required f.text_field(:reciever) %>
12	<%= required f.text_field(:name) %>	12	<%= required f.text_field(:name) %>
13		13
14	<%= render :file => 'shared/tiny_mce' %>	14	<%= render :file => 'shared/tiny_mce' %>
15	<%= required f.text_area(:message, :class => 'mceEditor') %>	15	<%= required f.text_area(:message, :class => 'mceEditor') %>
16		16
17	- <%= labelled_form_field check_box(:contact, :receive_a_copy) + _('I want to receive a copy of the message in my e-mail.'), '' %>	17	+ <%= labelled_form_field check_box(:email_contact, :receive_a_copy) + _('I want to receive a copy of the message in my e-mail.'), '' %>
18		18
19	<%= submit_button(:send, _('Send'), :onclick => "$('confirm').value = 'true'") %>	19	<%= submit_button(:send, _('Send'), :onclick => "$('confirm').value = 'true'") %>
20	<%= submit_button(:cancel, _('Cancel'), :onclick =>"$('confirm').value = 'false'") %>	20	<%= submit_button(:cancel, _('Cancel'), :onclick =>"$('confirm').value = 'false'") %>