From f0aca3156145b5dbf91da7d64f6648c38af7e9dc Mon Sep 17 00:00:00 2001 From: kurasova Date: Thu, 16 Jul 2026 13:13:34 -0400 Subject: [PATCH 1/2] testing git auth --- setup.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/setup.sh b/setup.sh index 66276e7a1..a62b4220e 100755 --- a/setup.sh +++ b/setup.sh @@ -42,3 +42,8 @@ export FLASK_APP=run.py export APP_ENV=development export FLASK_RUN_PORT=8080 export FLASK_RUN_HOST=0.0.0.0 # To allow external routing to the application for development + + + + + From 2abcbf443ff426abf860a49cf1484acb0b8e2508 Mon Sep 17 00:00:00 2001 From: kurasova Date: Thu, 16 Jul 2026 16:12:58 -0400 Subject: [PATCH 2/2] Expanded the list of Summer Terms for the CCE Minor Program, Reflecting the Student's academic year --- app/controllers/minor/routes.py | 5 ++++- app/logic/utils.py | 36 +++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/app/controllers/minor/routes.py b/app/controllers/minor/routes.py index 64575ba4f..29e66ed3e 100644 --- a/app/controllers/minor/routes.py +++ b/app/controllers/minor/routes.py @@ -117,13 +117,16 @@ def createSummerExperienceRequest(username): createSummerExperience(username, request.form) flash("Proposal successfully created.", "success") return redirect(url_for('minor.viewCceMinor', username=username, tab="manageProposals")) + + student = User.get_by_id(username) + year_name = User.rawClassLevel summerTerms = selectSurroundingTerms(g.current_term, summerOnly=True) return render_template("minor/summerExperience.html", selectableTerms = summerTerms, contentAreas = [], - user = User.get_by_id(username), + user = student, ) @minor_bp.route('/cceMinor//getEngagementInformation///', methods=['GET']) diff --git a/app/logic/utils.py b/app/logic/utils.py index 87e5c3f0e..a1cdc90db 100644 --- a/app/logic/utils.py +++ b/app/logic/utils.py @@ -36,6 +36,42 @@ def selectSurroundingTerms(currentTerm, prevTerms=2, summerOnly=False): return surroundingTerms +def selectAllSummerTerms(currentTerm, student): + """ + Selects all summer terms for CCE Minor. + """ + year_name = student.rawClassLevel + timeOrder = currentTerm.timeOrder + + match year_name: + case "Freshman": year = 1, + case "Sophomore": year = 2, + case "Junior": year = 3, + case "Senior": year = 4 + + match timeOrder[1]: + case 1: timeOfTheYear = "Fall" + case 2: timeOfTheYear = "Spring" + case 3: timeOfTheYear = "Summer" + + if student.hasGraduated: + return [] + elif timeOfTheYear == "Fall" and year == 1: + firstSummer = currentTerm.year + 1 + lastSummer = currentTerm.year + 3 + else: + firstSummer = currentTerm.year + lastSummer = currentTerm.year + (4 - year) + # because we do not know whether the student came to Berea in the Fall or in the Spring, + # we have an extra summer in the list just in case. + + surroundingTerms = (Term.select() + .where(Term.year >= firstSummer, Term.year <= lastSummer) + .order_by(Term.termOrder) + .where(Term.isSummer)) + + return surroundingTerms + def getStartofCurrentAcademicYear(currentTerm): if ("Summer" in currentTerm.description) or ("Spring" in currentTerm.description): fallTerm = Term.select().where(Term.year==currentTerm.year-1, Term.description == f"Fall {currentTerm.year-1}").get()