Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Slc status final branch #1233

Merged
merged 4 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/controllers/admin/routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
3 changes: 2 additions & 1 deletion app/controllers/serviceLearning/routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 1 addition & 3 deletions app/models/course.py
Original file line number Diff line number Diff line change
@@ -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):
Expand All @@ -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)
1 change: 1 addition & 0 deletions app/models/courseStatus.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from app.models import*


class CourseStatus(baseModel):
status = CharField()
IN_PROGRESS = 1
Expand Down
7 changes: 6 additions & 1 deletion app/templates/serviceLearning/slcProposal.html
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
2 changes: 1 addition & 1 deletion app/templates/serviceLearning/slcQuestionnaire.html
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading