Merge branch 'teacher_info' into 'master'

Fix teacher request email data See merge request portalmec/portalmec!498

Merge branch 'teacher_info' into 'master'
730b657c · Israel Barreto Sant'Anna · a975e8a1 · 460bbd78 · 730b657c · 730b657c
Commit 730b657c authored 6 years ago by Israel Barreto Sant'Anna
--- a/app/controllers/v1/users_controller.rb
+++ b/app/controllers/v1/users_controller.rb
@@ -86,7 +86,7 @@ class V1::UsersController < ApplicationController
    current_user.submitter_request = :requested

    if current_user.save
-      TeacherMailer.new_teacher_received(teacher_params).deliver_now
+      TeacherMailer.new_teacher_received(current_user).deliver_now
      render status: :ok
    else
      render json: current_user.errors, status: :unprocessable_entity

--- a/app/mailers/teacher_mailer.rb
+++ b/app/mailers/teacher_mailer.rb
@@ -20,8 +20,8 @@
 class TeacherMailer < ApplicationMailer
  default to: 'integrada.contato@mec.gov.br'

-  def new_teacher_received(teacher_info)
-    @teacher = teacher_info
+  def new_teacher_received(teacher)
+    @teacher = teacher
    mail(subject: "Novo professor cadastrado")
  end


--- a/app/views/teacher_mailer/new_teacher_received.html.erb
+++ b/app/views/teacher_mailer/new_teacher_received.html.erb
@@ -5,11 +5,11 @@
    <style>/* Email styles need to be inline */</style>
  </head>
  <body>
-  <h2>Nome do professor: <%= @teacher[:name] %></h1>
-  <h2>CPF: <%= @teacher[:cpf] %></h1>
-  <h2>Nome da Escola: <%= @teacher[:school] %></h1>
-  <h2>Telefone da Escola: <%= @teacher[:phone] %></h1>
-  <h2>Municipio: <%= @teacher[:city] %></h1>
-  <h2>UF: <%= @teacher[:uf] %></h1>
+  <h2>Nome do professor: <%= @teacher.name %></h1>
+  <h2>CPF: <%= @teacher.cpf %></h1>
+  <h2>Nome da Escola: <%= @teacher.school.name %></h1>
+  <h2>Telefone da Escola: <%= @teacher.school.phone %></h1>
+  <h2>Municipio: <%= @teacher.school.city %></h1>
+  <h2>UF: <%= @teacher.school.uf %></h1>
  </body>
 </html>