moved branches

Jesson Soto Ventura · Jesson Soto Ventura · commit 8917ef531390 · 2018-01-31T15:26:37.000-05:00
diff --git a/api/API/files.py b/api/API/files.py
@@ -24,16 +24,14 @@ def removeFiles(username):
 
 
 
-def create_message(username_email):
+def create_message(username_email, body):
   '''
   Parameters: 
     username_email(s) - Emails of the recipients
+    body - The body of the email
   '''
   msg = Message("Subject",
-                  sender="ramosmaciasg@berea.edu",
+                  sender=app.config['MAIL_USERNAME'],
                   recipients=[username_email])  #create a message instance
-  msg.html = '<b>HTML</b> body'
+  msg.html = body
   return msg
-  
-
-  
diff --git a/api/chair/awardLetters.py b/api/chair/awardLetters.py
@@ -4,6 +4,7 @@
 from ..API.committee import addCommitteeMembers, removeCommitteeMembers, getCommitteeMembers
 from ..API.faculty import getFacultyWithAcceptedProjects
 from ..API.budget import getTotalBudget
+from ..API.files import create_message
 
 
 from ..pages import *
@@ -60,7 +61,6 @@ def awardLetters_generate(username,pID):
   if not g.user.isCommitteeMember:
     abort(403)
   # All of our queries
-  print(pID)
   project = Projects.get(Projects.pID == pID)
   # we need the current year to get current faculty with projects
   template = EmailTemplates.get(EmailTemplates.eID == 1)
@@ -80,19 +80,8 @@ def awardLetters_generate(username,pID):
   body = body.replace("@@Start Date@@",start)
   body = body.replace("@@End Date@@",end)
   body = body.replace("@@Stipend@@",stipend)
-  
-  mail_to = "mailto:%s@berea.edu?subject=%s&body=%s" % (username, subject, body)
-  
-  #Replace common html tags to ascii hex values
-  mail_to = mail_to.replace("&nbsp;"," ")
-  mail_to = mail_to.replace("&ldquo;","%22")
-  mail_to = mail_to.replace("&rdquo;","%22")
-  mail_to = mail_to.replace("&rsquo;","%27")
-  mail_to = mail_to.replace(" ", "%20")
-  mail_to = mail_to.replace("\n", "%0A")
-  mail_to = mail_to.replace("<p>","")
-  mail_to = mail_to.replace("</p>","%0A")
-  
+  acceptance_email = create_message("%s@berea.edu" % (username), body)
+  mail.send(acceptance_email)
+  mail_to = "JESSON IS HERE"
+
   return jsonify({"mail_to": mail_to})
-  
-  
diff --git a/api/chair/email_accepted.py b/api/chair/email_accepted.py
@@ -12,33 +12,32 @@ def emailProjects_GET ():
   # All of our queries
   # we need the current year to get current faculty with projects
   currentCycle = getCurrentParameters()
-  
+
   faculty =  getFacultyWithProjects(currentCycle.year)
-  
+
   return render_template (  "chair/allProjects.html",
                             username = g.user.username,
                             cfg = cfg,
                             fac = faculty,
                           )
-                          
+
 @app.route("/email")
 def email():
   '''this route is for testing purposes'''
   my_email="guillermoramos330179@gmail.com"
-  print("I AM SENDING THINGS")
   msg = create_message(my_email)
   mail.send(msg)
   return "Message is sent."
-                          
-                          
+
+
 @app.route("/email/<username>")
 @login_required
 def view_email(username):
   currentCycle = getCurrentParameters()
-  
+
   faculty = getFacultyByYear(username, currentCycle.year)
-  
+
   return render_template("snips/email.html",
                           person = faculty,
                           cfg = cfg)
-  
+
