WIP ⚠️

This is now attaching a CSV to the mailer, but it's blank. Still working on this.
rubyforgood · Aug 11, 2023 · 4b07418 · 4b07418
1 parent 10f6b92
commit 4b07418
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 77 deletions.
diff --git a/app/controllers/learning_hours_controller.rb b/app/controllers/learning_hours_controller.rb
@@ -22,7 +22,7 @@ def create
     respond_to do |format|
       if @learning_hour.save
         format.html { redirect_to volunteer_learning_hours_path(volunteer_id: current_user.id), notice: "New entry was successfully created." }
-        LearningHoursMailer.with(user: @user, casa_org: @casa_org).learning_hours_report_email.deliver_later
+        LearningHoursMailer.with(user: @user, casa_org: @casa_org, csv_data: csv_data).learning_hours_report_email.deliver_later
       else
         format.html { render :new, status: 404 }
       end

diff --git a/app/mailers/learning_hours_mailer.rb b/app/mailers/learning_hours_mailer.rb
@@ -1,8 +1,8 @@
 class LearningHoursMailer < ApplicationMailer
-  def learning_hours_report_email(user)
+  def learning_hours_report_email(user, casa_org, csv_data)
     @user = user
-    @casa_org = user.casa_org
-    #attachments["learning_hours_report.csv"] = attachment
+    @casa_org = casa_org
+    attachments['learning_hours_report.csv'] = csv_data
     mail(to: @user.email, subject: "Learning Hours Report - #{last_day_of_month.strftime('%Y-%m-%d')}")
   end
 

diff --git a/app/views/learning_hours_mailer/learning_hours_report_email.html.erb b/app/views/learning_hours_mailer/learning_hours_report_email.html.erb
@@ -6,91 +6,75 @@
   <title>Actionable emails e.g. reset password</title>
   <style>/* Email styles need to be inline, except @media queries */</style>
   <style type="text/css">
-      @media only screen and (max-width: 640px) {
-          body {
-              padding: 0 !important;
-          }
+    @media only screen and (max-width: 640px) {
+      body {
+        padding: 0 !important;
+      }
 
-          h3 {
-              font-weight: 800 !important;
-              margin: 20px 0 5px !important;
-          }
+      h3 {
+        font-weight: 800 !important;
+        margin: 20px 0 5px !important;
+      }
 
-          h3 {
-              font-size: 16px !important;
-          }
+      h3 {
+        font-size: 16px !important;
+      }
 
-          .container {
-              padding: 0 !important;
-              width: 100% !important;
-          }
+      .container {
+        padding: 0 !important;
+        width: 100% !important;
       }
+    }
   </style>
 </head>
 
 <body itemscope itemtype="http://schema.org/EmailMessage" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; background-color: #f6f6f6; margin: 0;" bgcolor="#f6f6f6">
-<table class="main-body" style="box-sizing: border-box; min-height: 150px; padding-top: 5px; padding-right: 5px; padding-bottom: 5px; padding-left: 5px; width: 100%; height: 100%; background-color: rgb(234, 236, 237);" width="100%" height="100%" bgcolor="rgb(234, 236, 237)">
-  <tbody style="box-sizing: border-box;">
-  <tr class="row" style="box-sizing: border-box; vertical-align: top;" valign="top">
-    <td class="main-body-cell" style="box-sizing: border-box;">
-      <table class="container" style="box-sizing: border-box; font-family: Helvetica, serif; min-height: 150px; padding-top: 5px; padding-right: 5px; padding-bottom: 5px; padding-left: 5px; margin-top: auto; margin-right: auto; margin-bottom: auto; margin-left: auto; height: 0px; width: 90%; max-width: 550px;" width="90%" height="0">
-        <tbody style="box-sizing: border-box;">
-        <tr style="box-sizing: border-box;">
-          <td class="container-cell" style="box-sizing: border-box; vertical-align: top; font-size: medium; padding-bottom: 50px;" valign="top">
-            <table class="c1766" style="box-sizing: border-box; margin-top: 0px; margin-right: auto; background:#728089;margin-left: 0px; padding-top: 5px; padding-right: 5px; padding-bottom: 5px; padding-left: 5px; width: 100%; min-height: 30px;" width="100%">
-              <tbody style="box-sizing: border-box;">
-              <tr style="box-sizing: border-box;">
-                <td class="cell c1776" style="box-sizing: border-box; width: 70%; vertical-align: middle;" width="70%" valign="middle">
-                  <div class="c1144" style="box-sizing: border-box; padding-top: 10px; padding-right: 10px; padding-bottom: 10px; padding-left: 10px; font-size: 17px; font-weight: 500;text-align: center;color: #fff;">Court
-                    Appointed Special Advocate (CASA) / <%= @casa_organization&.name %>
-                    <br style="box-sizing: border-box;">
-                  </div>
-                </td>
-              </tr>
-              </tbody>
-            </table>
-            <table class="card" style="background:#fff;box-sizing: border-box; min-height: 150px; padding-top: 5px; padding-right: 5px; padding-bottom: 5px; padding-left: 5px; margin-bottom: 20px; height: 0px;" height="0">
-              <tbody style="box-sizing: border-box;">
+  <table class="main-body" style="box-sizing: border-box; min-height: 150px; padding-top: 5px; padding-right: 5px; padding-bottom: 5px; padding-left: 5px; width: 100%; height: 100%; background-color: rgb(234, 236, 237);" width="100%" height="100%" bgcolor="rgb(234, 236, 237)">
+    <tbody style="box-sizing: border-box;">
+      <tr class="row" style="box-sizing: border-box; vertical-align: top;" valign="top">
+        <td class="main-body-cell" style="box-sizing: border-box;">
+          <table class="container" style="box-sizing: border-box; font-family: Helvetica, serif; min-height: 150px; padding-top: 5px; padding-right: 5px; padding-bottom: 5px; padding-left: 5px; margin-top: auto; margin-right: auto; margin-bottom: auto; margin-left: auto; height: 0px; width: 90%; max-width: 550px;" width="90%" height="0">
+            <tbody style="box-sizing: border-box;">
               <tr style="box-sizing: border-box;">
-                <td class="card-cell" style="box-sizing: border-box; background-color: rgb(255, 255, 255); overflow-x: hidden; overflow-y: hidden; border-top-left-radius: 3px; border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; text-align: center;" bgcolor="rgb(255, 255, 255)" align="center">
-                  <table class="table100 c1357" style="box-sizing: border-box; width: 100%; min-height: 150px; padding-top: 5px; padding-right: 5px; padding-bottom: 5px; padding-left: 5px; height: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; border-collapse: collapse;" width="100%" height="0">
+                <td class="container-cell" style="box-sizing: border-box; vertical-align: top; font-size: medium; padding-bottom: 50px;" valign="top">
+                  <table class="c1766" style="box-sizing: border-box; margin-top: 0px; margin-right: auto; background:#728089;margin-left: 0px; padding-top: 5px; padding-right: 5px; padding-bottom: 5px; padding-left: 5px; width: 100%; min-height: 30px; background:#fff; min-height: 150px; margin-bottom: 20px; border-top-left-radius: 3px; border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px;" width="100%" height="0">
                     <tbody style="box-sizing: border-box;">
-                    <tr style="box-sizing: border-box;">
-                      <td class="card-content" style="box-sizing: border-box; font-size: 13px; line-height: 20px; color: rgb(111, 119, 125); padding-top: 10px; padding-right: 20px; padding-bottom: 0px; padding-left: 20px; vertical-align: top;" valign="top">
-
-                        <!-- this needs to be adjusted; it's nesting cards versus just displaying one. WIP -->
-                        <h3 style="box-sizing: border-box; font-weight: 800; margin: 20px 0 5px; font-size: 16px;">Learning hours have been added this week!</h3>
-                        <p style="box-sizing: border-box;">Please see the attached full report or export the full report at <a href="https://casa-qa.herokuapp.com/reports" style="box-sizing: border-box;">https://casa-qa.herokuapp.com/reports</a>.</p>
-                      </td>
-                    </tr>
+                      <tr style="box-sizing: border-box;">
+                        <td class="cell c1776" style="box-sizing: border-box; width: 70%; vertical-align: middle;" width="70%" valign="middle">
+                          <div class="c1144" style="box-sizing: border-box; padding-top: 10px; padding-right: 10px; padding-bottom: 10px; padding-left: 10px; font-size: 17px; font-weight: 500;text-align: center;color: #fff;">Court
+                            Appointed Special Advocate (CASA) / <%= @casa_organization&.name %>
+                            <br style="box-sizing: border-box;">
+                          </div>
+                        </td>
+                      </tr>
+                      <tr style="box-sizing: border-box;">
+                        <td class="card-content" style="box-sizing: border-box; font-size: 13px; line-height: 20px; color: rgb(111, 119, 125); padding-top: 10px; padding-right: 20px; padding-bottom: 0px; padding-left: 20px; vertical-align: top;" valign="top">
+                          <h3 style="box-sizing: border-box; font-weight: 800; margin: 20px 0 5px; font-size: 16px;">Learning hours have been added this week!</h3>
+                          <p style="box-sizing: border-box;">Please see the attached full report or export the full report at <a href="https://casa-qa.herokuapp.com/reports" style="box-sizing: border-box;">https://casa-qa.herokuapp.com/reports</a>.</p>
+                        </td>
+                      </tr>
                     </tbody>
                   </table>
+                  <table class="footer" style="box-sizing: border-box; margin-top: 50px; color: rgb(152, 156, 165); text-align: center; font-size: 11px; padding-top: 5px; padding-right: 5px; padding-bottom: 5px; padding-left: 5px;" align="center">
+                    <tbody style="box-sizing: border-box;">
+                      <tr style="box-sizing: border-box;">
+                        <td class="footer-cell" style="box-sizing: border-box;"></td>
+                      </tr>
+                    </tbody>
+                  </table>
+                  <div class="c2577" style="text-align:center;box-sizing: border-box; padding-top: 10px; padding-right: 10px; padding-bottom: 10px; padding-left: 10px;">
+                    <p class="footer-info" style="box-sizing: border-box;">Court Appointed Special Advocate (CASA) / <%= @casa_organization&.name %>
+                      <br style="box-sizing: border-box;">
+                      <br style="box-sizing: border-box;"><%= @casa_organization&.address %>
+                    </p>
+                  </div>
                 </td>
               </tr>
-              </tbody>
-            </table>
-            <table class="footer" style="box-sizing: border-box; margin-top: 50px; color: rgb(152, 156, 165); text-align: center; font-size: 11px; padding-top: 5px; padding-right: 5px; padding-bottom: 5px; padding-left: 5px;" align="center">
-              <tbody style="box-sizing: border-box;">
-              <tr style="box-sizing: border-box;">
-                <td class="footer-cell" style="box-sizing: border-box;">
-                </td>
-              </tr>
-              </tbody>
-            </table>
-            <div class="c2577" style="text-align:center;box-sizing: border-box; padding-top: 10px; padding-right: 10px; padding-bottom: 10px; padding-left: 10px;">
-              <p class="footer-info" style="box-sizing: border-box;">Court Appointed Special Advocate (CASA) /
-                <%= @casa_organization&.name %>
-                <br style="box-sizing: border-box;">
-                <br style="box-sizing: border-box;"><%= @casa_organization&.address %>
-              </p>
-            </div>
-          </td>
-        </tr>
-        </tbody>
-      </table>
-    </td>
-  </tr>
-  </tbody>
-</table>
+            </tbody>
+          </table>
+        </td>
+      </tr>
+    </tbody>
+  </table>
 </body>
 </html>
diff --git a/lib/mailers/previews/learning_hours_mailer_preview.rb b/lib/mailers/previews/learning_hours_mailer_preview.rb
@@ -6,7 +6,7 @@ def learning_hours_report_email
     if user.nil?
       DebugPreviewMailer.invalid_user("user")
     else
-      LearningHoursMailer.learning_hours_report_email(user)
+      LearningHoursMailer.learning_hours_report_email(user, @casa_org, @csv_data)
     end
   end
 end