Inserted message body into Work Assignment email notification

TODO Refactor send_email method on Work Assignment Cms controller Signed-off-by: Hebert Douglas <hebertdougl@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

Inserted message body into Work Assignment email notification
TODO Refactor send_email method on Work Assignment Cms controller Signed-off-by: Hebert Douglas <hebertdougl@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
tallys · Tallys Martins
1 parent 6ef3eef0
Showing 4 changed files with 28 additions and 1 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/work_assignment_plugin.rb
plugins/work_assignment/views/work_assignment_plugin_cms/_work_assignment_form.html.erb
@@ -92,4 +92,29 @@ class WorkAssignmentPluginCmsController &lt; CmsController
       redirect_to referer
     end
   end
+
+#TODO
+#Refatorar o método send_email para utilizar o build_mail_message para inserir o link dos arquivos
+=begin
+  def build_mail_message
+    @files_paths = []
+      @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}"
+        @files_paths << @real_file_url
+        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[:email_contact][:message].include? "#{@message}"
+        params[:email_contact][:message] += "<br><br>#{@message}"
+      end
+  end
+=end
+
 end
 \ No newline at end of file
@@ -40,6 +40,7 @@ class EmailContact
         to: email_contact.reciever,
         reply_to: email_contact.email,
         subject: email_contact.subject,
+        message: email_contact.message,
         from: "#{email_contact.name} <#{email_contact.email}>"
       }
@@ -50,6 +50,7 @@ class WorkAssignmentPlugin &lt; Noosfero::Plugin
       :options => {:only => 'view_page'},
       :block => block }
   end
+
   def upload_files_extra_contents
     proc do
 <% form_for('uploaded_file', :url => { :controller => 'work_assignment_plugin_cms', :action => 'upload_files' }, :html => {:multipart => true}) do |f| %>
 	<%= render :partial => 'notify_checkbox',  :locals => { :size => '45'} %>
   <%= render :partial => 'upload_file_form', :locals => { :size => '45'} %>
-  x
+  
 <% end %>
 \ No newline at end of file
	@@ -92,4 +92,29 @@ class WorkAssignmentPluginCmsController < CmsController		@@ -92,4 +92,29 @@ class WorkAssignmentPluginCmsController < CmsController
92	redirect_to referer	92	redirect_to referer
93	end	93	end
94	end	94	end
		95	+
		96	+#TODO
		97	+#Refatorar o método send_email para utilizar o build_mail_message para inserir o link dos arquivos
		98	+=begin
		99	+ def build_mail_message
		100	+ @files_paths = []
		101	+ @files_string = params[:self_files_id]
		102	+ @files_id_list = @files_string.split(' ')
		103	+
		104	+ @files_id_list.each do \|file_id\|
		105	+ @file = environment.articles.find_by_id(file_id)
		106	+ @real_file_url = "http://#{@file.url[:host]}:#{@file.url[:port]}/#{@file.url[:profile]}/#{@file.path}"
		107	+ @files_paths << @real_file_url
		108	+ unless params[:email_contact][:message].include? "#{@real_file_url}"
		109	+ params[:email_contact][:message] += "<br> Clique <a href='#{@real_file_url}'>aqui</a> para acessar o arquivo ou acesse pela URL: <br>"
		110	+ params[:email_contact][:message] += "<br><a href='#{@real_file_url}'>#{@real_file_url}</a>"
		111	+ end
		112	+ end
		113	+ @message = "AVISO: O aluno deve imprimir este email e entrega-lo na secretaria como comprovante do envio!"
		114	+ unless params[:email_contact][:message].include? "#{@message}"
		115	+ params[:email_contact][:message] += "<br><br>#{@message}"
		116	+ end
		117	+ end
		118	+=end
		119	+
95	end	120	end
96	\ No newline at end of file	121	\ No newline at end of file
	@@ -40,6 +40,7 @@ class EmailContact		@@ -40,6 +40,7 @@ class EmailContact
40	to: email_contact.reciever,	40	to: email_contact.reciever,
41	reply_to: email_contact.email,	41	reply_to: email_contact.email,
42	subject: email_contact.subject,	42	subject: email_contact.subject,
		43	+ message: email_contact.message,
43	from: "#{email_contact.name} <#{email_contact.email}>"	44	from: "#{email_contact.name} <#{email_contact.email}>"
44	}	45	}
45		46
	@@ -50,6 +50,7 @@ class WorkAssignmentPlugin < Noosfero::Plugin		@@ -50,6 +50,7 @@ class WorkAssignmentPlugin < Noosfero::Plugin
50	:options => {:only => 'view_page'},	50	:options => {:only => 'view_page'},
51	:block => block }	51	:block => block }
52	end	52	end
		53	+
53		54
54	def upload_files_extra_contents	55	def upload_files_extra_contents
55	proc do	56	proc do
1	<% form_for('uploaded_file', :url => { :controller => 'work_assignment_plugin_cms', :action => 'upload_files' }, :html => {:multipart => true}) do \|f\| %>	1	<% form_for('uploaded_file', :url => { :controller => 'work_assignment_plugin_cms', :action => 'upload_files' }, :html => {:multipart => true}) do \|f\| %>
2	<%= render :partial => 'notify_checkbox', :locals => { :size => '45'} %>	2	<%= render :partial => 'notify_checkbox', :locals => { :size => '45'} %>
3	<%= render :partial => 'upload_file_form', :locals => { :size => '45'} %>	3	<%= render :partial => 'upload_file_form', :locals => { :size => '45'} %>
4	- x	4	+
5	<% end %>	5	<% end %>
6	\ No newline at end of file	6	\ No newline at end of file