Fixing email formatting and variables

devinmatte · devinmatte · commit 0076d388a2b3 · 2019-08-10T19:06:13.000-04:00
diff --git a/config.env.py b/config.env.py
@@ -36,7 +36,7 @@
 MAIL_SERVER = environ.get("PACKET_MAIL_SERVER", "thoth.csh.rit.edu")
 MAIL_USERNAME = environ.get("PACKET_MAIL_USERNAME", "packet@csh.rit.edu")
 MAIL_PASSWORD = environ.get("PACKET_MAIL_PASSWORD", None)
-MAIL_USE_TLS = environ.get("PACKET_MAIL_PASSWORD", True)
+MAIL_USE_TLS = environ.get("PACKET_MAIL_TLS", True)
 
 # Slack URL for pushing to #general
 SLACK_WEBHOOK_URL = environ.get("PACKET_SLACK_URL", None)
diff --git a/packet/commands.py b/packet/commands.py
@@ -127,11 +127,10 @@ def create_packets(freshmen_csv):
 
     # Create the new packets and the signatures for each freshman in the given CSV
     freshmen_in_csv = parse_csv(freshmen_csv)
-    print("Creating DB entries...")
+    print("Creating DB entries and sending emails...")
     for freshman in Freshman.query.filter(Freshman.rit_username.in_(freshmen_in_csv)).all():
         packet = Packet(freshman=freshman, start=start, end=end)
         db.session.add(packet)
-        print("Sending Email...")
         send_mail(packet)
 
         for member in all_upper:
diff --git a/packet/mail.py b/packet/mail.py
@@ -9,7 +9,7 @@
 def send_mail(packet):
     if app.config['MAIL_PROD']:
         recipients = ["<" + packet.freshman.rit_username + "@rit.edu>"]
-        msg = Message(subject="CSH Packet Starts " + packet.start.strftime('%D'),
+        msg = Message(subject="CSH Packet Starts " + packet.start.strftime('%A, %B %-d'),
                       sender=app.config.get("MAIL_USERNAME"),
                       recipients=recipients)
 
diff --git a/packet/templates/extend/email.html b/packet/templates/extend/email.html
@@ -2,12 +2,17 @@
 <html lang="en">
 
 {% block head %}
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css">
+    <head>
+        <title>CSH Packet</title>
+        <link rel="stylesheet"
+              href="https://assets.csh.rit.edu/csh-material-bootstrap/4.3.1/dist/csh-material-bootstrap.min.css"
+              media="screen">
+    </head>
 {% endblock %}
 
 <body>
 {% block body %}
 {% endblock %}
 
 </body>
-</html>
+</html>
diff --git a/packet/templates/mail/packet_start.html b/packet/templates/mail/packet_start.html
@@ -5,7 +5,7 @@
         <h2>Hello {{ packet.freshman.name }},</h2>
         <h3>Welcome to Computer Science House!</h3>
         <p>Soon you'll starting the introductory process for CSH, and the first part of that is Packet.</p>
-        <p>Your packet will start on <span class="badge">{{ packet.start.strftime('%D') }} at {{ packet.start.strftime('%I:%M %p') }}</span></p>
+        <p>Your packet will start on <span class="badge">{{ packet.start.strftime('%A, %B %-d') }} at {{ packet.start.strftime('%-I:%M %p') }}</span></p>
         <p>You can view your packet at <a href="https://freshen-packet.csh.rit.edu">freshmen-packet.csh.rit.edu</a> with
             the credentials you should have been sent.</p>
         <p>If you don't know your credentials, reach out to an <a href="mailto:rtp@csh.rit.edu">RTP</a></p>
diff --git a/packet/templates/mail/packet_start.txt b/packet/templates/mail/packet_start.txt
@@ -4,7 +4,7 @@ Welcome to Computer Science House!
 
 Soon you'll starting the introductory process for CSH, and the first part of that is Packet.
 
-Your packet will start on {{ packet.start.strftime('%D') }} at {{ packet.start.strftime('%I:%M %p') }}
+Your packet will start on {{ packet.start.strftime('%A, %B %-d') }} at {{ packet.start.strftime('%-I:%M %p') }}
 
 You can view your packet at freshmen-packet.csh.rit.edu with the credentials you should have been sent.
 If you don't know your credentials, reach out to an RTP
