Merge pull request #1233 from BCStudentSoftwareDevTeam/slc-status-fin…

…al-branch Slc status final branch
BCStudentSoftwareDevTeam · Jul 23, 2024 · e221513 · e221513
2 parents 645431b + 0a1e754
commit e221513
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/app/controllers/admin/routes.py b/app/controllers/admin/routes.py
@@ -54,6 +54,7 @@ def downloadFile():
     return send_file(filepath, as_attachment=True)
 
 
+
 @admin_bp.route('/switch_user', methods=['POST'])
 def switchUser():
     if app.env == "production":

diff --git a/app/controllers/serviceLearning/routes.py b/app/controllers/serviceLearning/routes.py
@@ -69,14 +69,15 @@ def slcEditProposal(courseID):
             filePaths = FileHandler(courseId=course.id).retrievePath(associatedAttachments)
 
             terms = selectSurroundingTerms(g.current_term, 0)
-           
+
             return render_template('serviceLearning/slcNewProposal.html',
                                     course = course,
                                     questionanswers = questionAnswers,
                                     terms = terms,
                                     statusOfCourse = statusOfCourse,
                                     courseInstructor = courseInstructor,
                                     filePaths = filePaths,
+                                    courseStatus = courseStatus,
                                     redirectTarget = getRedirectTarget())
 
     else:

diff --git a/app/models/course.py b/app/models/course.py
@@ -1,7 +1,6 @@
 from app.models import *
 from app.models.term import Term
 from app.models.courseStatus import CourseStatus
-from app.models.note import Note
 from app.models.user import User
 
 class Course(baseModel):
@@ -18,5 +17,4 @@ class Course(baseModel):
     isAllSectionsServiceLearning = BooleanField(default=False)
     isRegularlyOccurring = BooleanField(default=False)
     isPreviouslyApproved = BooleanField(default=False)
-    hasSlcComponent = BooleanField(default=False)
-
+    hasSlcComponent = BooleanField(default=False)
diff --git a/app/models/courseStatus.py b/app/models/courseStatus.py
@@ -1,5 +1,6 @@
 from app.models import*
 
+
 class CourseStatus(baseModel):
     status = CharField()
     IN_PROGRESS = 1

diff --git a/app/templates/serviceLearning/slcProposal.html b/app/templates/serviceLearning/slcProposal.html
@@ -1,4 +1,9 @@
-<h2 class="text-center pt-4 pb-2"> New Proposal For Service-Learning Course</h2>
+ <h2 class="text-center pt-4 pb-2">Proposal For Service-Learning Course</h2>
+
+      <h3 class="text-center pb-4">Status:
+          {{ courseStatus.status }}
+      </h3>
+
 <p class="text-center fw-bold"> Please review the <a class="guidelines" href="#">service-learning course guidelines</a> before completing this form </p>
 <div class="container-fluid">
   <div class="row">

diff --git a/app/templates/serviceLearning/slcQuestionnaire.html b/app/templates/serviceLearning/slcQuestionnaire.html
@@ -4,7 +4,7 @@
 <link rel="stylesheet" href="{{url_for('static', filename ='css/slcQuestionnaire.css')}}">
 {% endblock %}
 
-<h2 class="text-center pt-4">New Service-Learning Course</h2>
+<h2 class="text-center pt-4">For New Service-Learning Courses</h2>
   <p class="text-center fw-bold"> Please review the <a class="guidelines" href="#">service-learning course guidelines</a> before completing this form </p>
 <p>Referring to the Criteria for Service-Learning Course Designation/ALE Requirement met through Service-Learning, please address the following in a
    one-page proposal narrative. You might aim for approximately 500 words in total. Attach your syllabus (or the one form the most recent time that the course was taught). If you are in the process of