Email Ashley SLC submitted courses Issue#831

app/controllers/serviceLearning/routes.py

@@ -19,7 +19,6 @@
 from app.controllers.main.routes import getRedirectTarget, setRedirectTarget
 from app.controllers.serviceLearning import serviceLearning_bp
 
-
 @serviceLearning_bp.route('/serviceLearning/courseManagement', methods = ['GET'])
 @serviceLearning_bp.route('/serviceLearning/courseManagement/<username>', methods = ['GET'])
 def serviceCourseManagement(username=None):
@@ -30,6 +29,7 @@ def serviceCourseManagement(username=None):
         user = User.get(User.username==username) if username else g.current_user
         courseDict = getServiceLearningCoursesData(user)
         termList = selectSurroundingTerms(g.current_term, prevTerms=0)
+        status = CourseStatus.select
         return render_template('serviceLearning/slcManagement.html',
             user=user,
             courseDict=courseDict,
@@ -45,27 +45,30 @@ def slcEditProposal(courseID):
         Route for editing proposals, it will fill the form with the data found in the database
         given a courseID.
     """
-    course = Course.get_by_id(courseID)
-    questionData = (CourseQuestion.select().where(CourseQuestion.course == course))
-    questionanswers = [question.questionContent for question in questionData]
-    courseInstructor = CourseInstructor.select().where(CourseInstructor.course == courseID)
-
-    isAllSectionsServiceLearning = ""
-    isPermanentlyDesignated = ""
-
-    if course.isAllSectionsServiceLearning:
-        isAllSectionsServiceLearning = True
-    if course.isPermanentlyDesignated:
-        isPermanentlyDesignated = True
-    terms = selectSurroundingTerms(g.current_term, 0)
-    return render_template('serviceLearning/slcNewProposal.html',
-                                course = course,
-                                questionanswers = questionanswers,
-                                terms = terms,
-                                courseInstructor = courseInstructor,
-                                isAllSectionsServiceLearning = isAllSectionsServiceLearning,
-                                isPermanentlyDesignated = isPermanentlyDesignated,
-                                redirectTarget=getRedirectTarget())
+    if g.current_user.isCeltsAdmin or g.current_user.isFaculty:
+        course = Course.get_by_id(courseID)
+        questionData = (CourseQuestion.select().where(CourseQuestion.course == course))
+        questionanswers = [question.questionContent for question in questionData]
+        courseInstructor = CourseInstructor.select().where(CourseInstructor.course == courseID)
+
+        isAllSectionsServiceLearning = ""
+        isPermanentlyDesignated = ""
+        course.status = CourseStatus.APPROVED
+
+
+        if course.isAllSectionsServiceLearning:
+            isAllSectionsServiceLearning = True
+        if course.isPermanentlyDesignated:
+            isPermanentlyDesignated = True
+        terms = selectSurroundingTerms(g.current_term, 0)
+        return render_template('serviceLearning/slcNewProposal.html',
+                                    course = course,
+                                    questionanswers = questionanswers,
+                                    terms = terms,
+                                    courseInstructor = courseInstructor,
+                                    isAllSectionsServiceLearning = isAllSectionsServiceLearning,
+                                    isPermanentlyDesignated = isPermanentlyDesignated,
+                                    redirectTarget=getRedirectTarget())
 
 @serviceLearning_bp.route('/serviceLearning/createCourse', methods=['POST'])
 def slcCreateCourse():

app/logic/emailHandler.py

@@ -2,6 +2,7 @@
 from peewee import DoesNotExist, JOIN
 from flask_mail import Mail, Message
 import os
+import email.message
 
 from app import app
 from app.models.programEvent import ProgramEvent
@@ -251,3 +252,24 @@ def retrieve_last_email(event_id):
             return last_email
         except DoesNotExist:
             return None
+
+
+    def email_when_submitted(recipient, subject, body):
+        defaultEmailInfo = {"senderName":"Ashley Cochrane", "replyTo":self.reply_to}
+        template_id, subject, body = self.build_email()
+
+        with self.mail.connect() as conn:
+            for recipient in self.recipients:
+                full_name = "Ashley Cochrane"
+                email_body = self.replace_name_placeholder(full_name, body)
+
+                conn.send(Message(
+                    body = "This is the message"
+                    subject = "Hello Ashley",
+                    recipients = [[email protected]],
+                    email_body,
+                    reply_to = defaultEmailInfo["replyTo"],
+                    sender = (defaultEmailInfo["senderName"], defaultEmailInfo["replyTo"])
+                    ))
+        self.store_sent_email(subject, template_id)
+        return True

app/templates/serviceLearning/slcManagement.html

@@ -34,12 +34,14 @@ <h1 class="text-center mb-2">{{user.firstName}} {{user.lastName}}'s SLC Proposal
           <td>{{courseDict[course]['term'].description}}</td>
           <td>{{courseDict[course]['status']}}</td>
           <td>
-            <select class="form-select courseData" id="{{courseDict[course]['id']}}" onchange='changeAction(this)'>
-              <option value="---" disabled selected>Select Action</option>
-              <option value="Renew">Renew</option>
-              <option value="View">View</option>
-              <option value="Withdraw">Withdraw</option>
-              <option value="Edit">Edit</option>
+              <select class="form-select courseData" id="{{courseDict[course]['id']}}" onchange='changeAction(this)'>
+                <option value="---" disabled selected>Select Action</option>
+                <option value="Renew">Renew</option>
+                <option value="View">View</option>
+                <option value="Withdraw">Withdraw</option>
+                <option value="Edit">Edit</option>
+
+
             </select>
           </td>
         </tr>