From 0ed7a1e48a24c1511c74ba9aad8255fde03c1f2e Mon Sep 17 00:00:00 2001 From: munsakad Date: Tue, 16 Jun 2026 13:28:18 -0400 Subject: [PATCH 01/15] scaling issues on buttons on course proposals is fixed --- .../serviceLearning/slcNewProposal.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/templates/serviceLearning/slcNewProposal.html b/app/templates/serviceLearning/slcNewProposal.html index 29ada7df8..356b8f143 100644 --- a/app/templates/serviceLearning/slcNewProposal.html +++ b/app/templates/serviceLearning/slcNewProposal.html @@ -26,11 +26,16 @@ {% include "serviceLearning/slcQuestionnaire.html" %}
-
+
- - + + + + + {% if g.current_user.isCeltsAdmin %} + + {% endif %}
@@ -38,11 +43,6 @@
- - - {% if g.current_user.isCeltsAdmin %} - - {% endif %}
From a0a2d27639d5c54eac9609b62bf75682bee4ad26 Mon Sep 17 00:00:00 2001 From: Brian Ramsay Date: Tue, 16 Jun 2026 13:46:31 -0400 Subject: [PATCH 02/15] Ignore SSL connection to mysql in devcontainer --- .devcontainer/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index e767a9714..987d9bae4 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -18,6 +18,7 @@ services: db: image: mysql restart: always + command: --require_secure_transport=OFF environment: MYSQL_DATABASE: 'celts' MYSQL_USER: 'celts_user' @@ -31,4 +32,4 @@ services: - celts_data:/var/lib/mysql volumes: - celts_data: \ No newline at end of file + celts_data: From a3f03d4b15c9e0b000c80588a4d19f6a2c8d307e Mon Sep 17 00:00:00 2001 From: munsakad Date: Tue, 16 Jun 2026 15:21:05 -0400 Subject: [PATCH 03/15] Fixed buttons and scaling at the bottom of all three pages, including page indicators - slcNewProposal: restored Next/Submit to RIGHT column, Previous/Cancel/Exit on LEFT; dots now use flex centering on a full-width row so they stay straight at all screen sizes; flex-wrap on button groups prevents overflow - emergencyContactInfo & insuranceInfo: responsive button rows now stack centered on mobile and sit on opposite ends on wider screens; buttons wrap cleanly instead of overflowing --- app/templates/main/emergencyContactInfo.html | 10 +++++----- app/templates/main/insuranceInfo.html | 10 +++++----- .../serviceLearning/slcNewProposal.html | 18 +++++++++--------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/templates/main/emergencyContactInfo.html b/app/templates/main/emergencyContactInfo.html index 2a4ab1f53..c27261f2b 100644 --- a/app/templates/main/emergencyContactInfo.html +++ b/app/templates/main/emergencyContactInfo.html @@ -68,14 +68,14 @@

Emergency Contact



-
-
- {{'Exit' if readOnly else 'Cancel'}} +
+
+ {{'Exit' if readOnly else 'Cancel'}}
-
+
{% if not readOnly %} - Save & Exit + Save & Exit Continue to Insurance Info {% endif %}
diff --git a/app/templates/main/insuranceInfo.html b/app/templates/main/insuranceInfo.html index 5639e4ebd..b3cc35549 100644 --- a/app/templates/main/insuranceInfo.html +++ b/app/templates/main/insuranceInfo.html @@ -72,14 +72,14 @@

Insurance Information



-
-
- {{'Exit' if readOnly else 'Cancel'}} +
+
+ {{'Exit' if readOnly else 'Cancel'}}
-
+
{% if not readOnly %} - Save & Exit + Save & Exit Continue to Emergency Contact {% endif %}
diff --git a/app/templates/serviceLearning/slcNewProposal.html b/app/templates/serviceLearning/slcNewProposal.html index 356b8f143..965e3d47d 100644 --- a/app/templates/serviceLearning/slcNewProposal.html +++ b/app/templates/serviceLearning/slcNewProposal.html @@ -25,24 +25,24 @@
{% include "serviceLearning/slcQuestionnaire.html" %}
-
-
+
+
- - - {% if g.current_user.isCeltsAdmin %} - - {% endif %}
-
+
-
+
+ + + {% if g.current_user.isCeltsAdmin %} + + {% endif %}
From defc0bb83b0a320c8f31e45b061c06704e01a538 Mon Sep 17 00:00:00 2001 From: munsakad Date: Tue, 16 Jun 2026 15:58:58 -0400 Subject: [PATCH 04/15] Revert changes to emergencyContactInfo and insuranceInfo Only slcNewProposal.html changes should be on this branch. --- app/templates/main/emergencyContactInfo.html | 10 +++++----- app/templates/main/insuranceInfo.html | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/templates/main/emergencyContactInfo.html b/app/templates/main/emergencyContactInfo.html index c27261f2b..2a4ab1f53 100644 --- a/app/templates/main/emergencyContactInfo.html +++ b/app/templates/main/emergencyContactInfo.html @@ -68,14 +68,14 @@

Emergency Contact



-
-
- {{'Exit' if readOnly else 'Cancel'}} +
+
+ {{'Exit' if readOnly else 'Cancel'}}
-
+
{% if not readOnly %} - Save & Exit + Save & Exit Continue to Insurance Info {% endif %}
diff --git a/app/templates/main/insuranceInfo.html b/app/templates/main/insuranceInfo.html index b3cc35549..5639e4ebd 100644 --- a/app/templates/main/insuranceInfo.html +++ b/app/templates/main/insuranceInfo.html @@ -72,14 +72,14 @@

Insurance Information



-
-
- {{'Exit' if readOnly else 'Cancel'}} +
+
+ {{'Exit' if readOnly else 'Cancel'}}
-
+
{% if not readOnly %} - Save & Exit + Save & Exit Continue to Emergency Contact {% endif %}
From 7f623979a54141ed5a5c47c7ca40b08e8020174c Mon Sep 17 00:00:00 2001 From: munsakad Date: Tue, 16 Jun 2026 16:11:03 -0400 Subject: [PATCH 05/15] Move page indicator below buttons so right buttons never go under dots Separated the layout into two rows: top row holds Previous/Cancel/Exit on the left and Next/Submit on the right (always on the same row at any screen size), bottom row holds the centered step dots. This prevents the dots from ever pushing right buttons below them when the page is scaled. --- .../serviceLearning/slcNewProposal.html | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/app/templates/serviceLearning/slcNewProposal.html b/app/templates/serviceLearning/slcNewProposal.html index 965e3d47d..43de55e7c 100644 --- a/app/templates/serviceLearning/slcNewProposal.html +++ b/app/templates/serviceLearning/slcNewProposal.html @@ -25,24 +25,28 @@
{% include "serviceLearning/slcQuestionnaire.html" %}
-
-
- - - - +
+
+
+ + + + +
+
+ + + {% if g.current_user.isCeltsAdmin %} + + {% endif %} +
-
- - - -
-
- - - {% if g.current_user.isCeltsAdmin %} - - {% endif %} +
+
+ + + +
From 60f10ef99ad44d0bbc2c3a57be29e38842db8e67 Mon Sep 17 00:00:00 2001 From: munsakad Date: Tue, 16 Jun 2026 16:16:43 -0400 Subject: [PATCH 06/15] Fix button scaling and layout on emergencyContactInfo and insuranceInfo Cancel/Exit stays on the left, Save & Exit/Continue stays on the right. Buttons use flex-wrap and responsive columns so they scale cleanly on all screen sizes without overflow. --- app/templates/main/emergencyContactInfo.html | 10 +++++----- app/templates/main/insuranceInfo.html | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/templates/main/emergencyContactInfo.html b/app/templates/main/emergencyContactInfo.html index 2a4ab1f53..c27261f2b 100644 --- a/app/templates/main/emergencyContactInfo.html +++ b/app/templates/main/emergencyContactInfo.html @@ -68,14 +68,14 @@

Emergency Contact



-
-
- {{'Exit' if readOnly else 'Cancel'}} +
+
+ {{'Exit' if readOnly else 'Cancel'}}
-
+
{% if not readOnly %} - Save & Exit + Save & Exit Continue to Insurance Info {% endif %}
diff --git a/app/templates/main/insuranceInfo.html b/app/templates/main/insuranceInfo.html index 5639e4ebd..b3cc35549 100644 --- a/app/templates/main/insuranceInfo.html +++ b/app/templates/main/insuranceInfo.html @@ -72,14 +72,14 @@

Insurance Information



-
-
- {{'Exit' if readOnly else 'Cancel'}} +
+
+ {{'Exit' if readOnly else 'Cancel'}}
-
+
{% if not readOnly %} - Save & Exit + Save & Exit Continue to Emergency Contact {% endif %}
From 885d5b1b2617d290b967b7e58761deaa99555f8f Mon Sep 17 00:00:00 2001 From: munsakad Date: Tue, 16 Jun 2026 16:43:36 -0400 Subject: [PATCH 07/15] Add user-facing error handling to withdraw ajax request Replaces silent console.log with an alert so the user is notified when a withdrawal fails. Also fixes done -> complete so the select reset actually runs. --- app/static/js/slcManagement.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/static/js/slcManagement.js b/app/static/js/slcManagement.js index b62f72784..7e946fa70 100644 --- a/app/static/js/slcManagement.js +++ b/app/static/js/slcManagement.js @@ -140,10 +140,13 @@ function withdraw(){ location.reload(); }, error: function(request, status, error) { - console.log(status,error); - + console.log(status, error); + let message = (request.responseJSON && request.responseJSON.message) + ? request.responseJSON.message + : "An error occurred while withdrawing the course. Please try again."; + alert(message); }, - done: function () { + complete: function () { $('#' + courseID).val('---'); } }); From 664991ad2e20e7e7e2bf39e916c33d5573661da7 Mon Sep 17 00:00:00 2001 From: feitsopb Date: Wed, 17 Jun 2026 10:31:40 -0400 Subject: [PATCH 08/15] Revert unrelated files from exception handling branch --- .devcontainer/docker-compose.yml | 3 +- app/templates/main/emergencyContactInfo.html | 10 ++--- app/templates/main/insuranceInfo.html | 10 ++--- .../serviceLearning/slcNewProposal.html | 38 +++++++++---------- 4 files changed, 28 insertions(+), 33 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 987d9bae4..e767a9714 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -18,7 +18,6 @@ services: db: image: mysql restart: always - command: --require_secure_transport=OFF environment: MYSQL_DATABASE: 'celts' MYSQL_USER: 'celts_user' @@ -32,4 +31,4 @@ services: - celts_data:/var/lib/mysql volumes: - celts_data: + celts_data: \ No newline at end of file diff --git a/app/templates/main/emergencyContactInfo.html b/app/templates/main/emergencyContactInfo.html index c27261f2b..2a4ab1f53 100644 --- a/app/templates/main/emergencyContactInfo.html +++ b/app/templates/main/emergencyContactInfo.html @@ -68,14 +68,14 @@

Emergency Contact



-
-
- {{'Exit' if readOnly else 'Cancel'}} +
+
+ {{'Exit' if readOnly else 'Cancel'}}
-
+
{% if not readOnly %} - Save & Exit + Save & Exit Continue to Insurance Info {% endif %}
diff --git a/app/templates/main/insuranceInfo.html b/app/templates/main/insuranceInfo.html index b3cc35549..5639e4ebd 100644 --- a/app/templates/main/insuranceInfo.html +++ b/app/templates/main/insuranceInfo.html @@ -72,14 +72,14 @@

Insurance Information



-
-
- {{'Exit' if readOnly else 'Cancel'}} +
+
+ {{'Exit' if readOnly else 'Cancel'}}
-
+
{% if not readOnly %} - Save & Exit + Save & Exit Continue to Emergency Contact {% endif %}
diff --git a/app/templates/serviceLearning/slcNewProposal.html b/app/templates/serviceLearning/slcNewProposal.html index 43de55e7c..29ada7df8 100644 --- a/app/templates/serviceLearning/slcNewProposal.html +++ b/app/templates/serviceLearning/slcNewProposal.html @@ -25,28 +25,24 @@
{% include "serviceLearning/slcQuestionnaire.html" %}
-
-
-
- - - - -
-
- - - {% if g.current_user.isCeltsAdmin %} - - {% endif %} -
+
+
+ + + +
-
-
- - - -
+
+ + + +
+
+ + + {% if g.current_user.isCeltsAdmin %} + + {% endif %}
From d1551aa5e7078145eac1b33d113205744a2daf2b Mon Sep 17 00:00:00 2001 From: feitsopb Date: Wed, 17 Jun 2026 11:37:48 -0400 Subject: [PATCH 09/15] Use flash message for withdraw errors --- app/static/js/slcManagement.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/static/js/slcManagement.js b/app/static/js/slcManagement.js index 7e946fa70..4b786775e 100644 --- a/app/static/js/slcManagement.js +++ b/app/static/js/slcManagement.js @@ -141,10 +141,13 @@ function withdraw(){ }, error: function(request, status, error) { console.log(status, error); - let message = (request.responseJSON && request.responseJSON.message) - ? request.responseJSON.message - : "An error occurred while withdrawing the course. Please try again."; - alert(message); + let message; + if (request.responseJSON && request.responseJSON.message) { + message = request.responseJSON.message; + } else { + message = "An error occurred while withdrawing the course. Please try again."; + } + msgFlash(message, "danger"); }, complete: function () { $('#' + courseID).val('---'); From 5c6b5194e26c7e50b27169df0419afed3479400f Mon Sep 17 00:00:00 2001 From: munsakad Date: Wed, 17 Jun 2026 14:49:54 -0400 Subject: [PATCH 10/15] Display withdraw error message inside modal instead of page flash --- app/static/js/slcManagement.js | 14 +++++++------- app/templates/serviceLearning/slcManagement.html | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/static/js/slcManagement.js b/app/static/js/slcManagement.js index 4b786775e..5c021ddf6 100644 --- a/app/static/js/slcManagement.js +++ b/app/static/js/slcManagement.js @@ -7,6 +7,9 @@ $(document).ready(function() { $('.modal').on('hidden.bs.modal', function () { resetAllSelections() }); + $('#withdrawModal').on('hidden.bs.modal', function () { + $("#withdrawError").text("").addClass("d-none"); + }); $('#renewTerm').on('change', function(){ if ($('#renewTerm').value != "---"){ $('#renewBtn').prop('disabled', false); @@ -141,13 +144,10 @@ function withdraw(){ }, error: function(request, status, error) { console.log(status, error); - let message; - if (request.responseJSON && request.responseJSON.message) { - message = request.responseJSON.message; - } else { - message = "An error occurred while withdrawing the course. Please try again."; - } - msgFlash(message, "danger"); + let message = (request.responseJSON && request.responseJSON.message) + ? request.responseJSON.message + : "An error occurred while withdrawing the course. Please try again."; + $("#withdrawError").text(message).removeClass("d-none"); }, complete: function () { $('#' + courseID).val('---'); diff --git a/app/templates/serviceLearning/slcManagement.html b/app/templates/serviceLearning/slcManagement.html index b48512b02..16cfab4cf 100644 --- a/app/templates/serviceLearning/slcManagement.html +++ b/app/templates/serviceLearning/slcManagement.html @@ -70,6 +70,7 @@
+

Are you sure you want to withdraw this service-learning course proposal?

Note: This action is irreversible. Once withdrawn, the proposal will be forever deleted. From ab6b6fc8fb915212383952aac4f18fa79c1ce746 Mon Sep 17 00:00:00 2001 From: feitsopb Date: Wed, 17 Jun 2026 16:01:04 -0400 Subject: [PATCH 11/15] Use flash message for SLC withdraw errors --- app/static/js/slcManagement.js | 14 +++++--------- app/templates/serviceLearning/slcManagement.html | 1 - 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/static/js/slcManagement.js b/app/static/js/slcManagement.js index 5c021ddf6..68489c74b 100644 --- a/app/static/js/slcManagement.js +++ b/app/static/js/slcManagement.js @@ -7,9 +7,6 @@ $(document).ready(function() { $('.modal').on('hidden.bs.modal', function () { resetAllSelections() }); - $('#withdrawModal').on('hidden.bs.modal', function () { - $("#withdrawError").text("").addClass("d-none"); - }); $('#renewTerm').on('change', function(){ if ($('#renewTerm').value != "---"){ $('#renewBtn').prop('disabled', false); @@ -128,7 +125,6 @@ function renew(){ location = '/serviceLearning/editProposal/' + newID; }, error: function(request, status, error) { - console.log(status,error); } }) resetAllSelections() @@ -143,11 +139,11 @@ function withdraw(){ location.reload(); }, error: function(request, status, error) { - console.log(status, error); - let message = (request.responseJSON && request.responseJSON.message) - ? request.responseJSON.message - : "An error occurred while withdrawing the course. Please try again."; - $("#withdrawError").text(message).removeClass("d-none"); + let message = "An error occurred while withdrawing the course. Please try again."; + if (request.responseJSON && request.responseJSON.message) { + message = request.responseJSON.message; + } + msgFlash(message, "danger"); }, complete: function () { $('#' + courseID).val('---'); diff --git a/app/templates/serviceLearning/slcManagement.html b/app/templates/serviceLearning/slcManagement.html index 16cfab4cf..b48512b02 100644 --- a/app/templates/serviceLearning/slcManagement.html +++ b/app/templates/serviceLearning/slcManagement.html @@ -70,7 +70,6 @@

-

Are you sure you want to withdraw this service-learning course proposal?

Note: This action is irreversible. Once withdrawn, the proposal will be forever deleted. From d60551960239062febbda08c285611156e13f2fd Mon Sep 17 00:00:00 2001 From: feitsopb Date: Thu, 18 Jun 2026 14:40:03 -0400 Subject: [PATCH 12/15] Handle SLC withdraw response status --- app/controllers/serviceLearning/routes.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/serviceLearning/routes.py b/app/controllers/serviceLearning/routes.py index be08837e6..b63906984 100644 --- a/app/controllers/serviceLearning/routes.py +++ b/app/controllers/serviceLearning/routes.py @@ -197,7 +197,7 @@ def updateInstructorPhone(): instructorData = request.get_json() (User.update(phoneNumber=instructorData[1]) .where(User.username == instructorData[0])).execute() - return "success" + return "success", 200 @serviceLearning_bp.route('/serviceLearning/withdraw/', methods = ['POST']) def withdrawCourse(courseID): @@ -205,12 +205,14 @@ def withdrawCourse(courseID): if g.current_user.isAdmin or g.current_user.isFaculty: withdrawProposal(courseID) flash("Course successfully withdrawn", 'success') + return "" else: flash("Unauthorized to perform this action", 'warning') except Exception as e: print(e) flash("Withdrawal Unsuccessful", 'warning') - return "" + + return "", 500 @serviceLearning_bp.route('/proposalReview/', methods = ['GET', 'POST']) From acfc5a7a442a000591d3f9f18f1c00d95e398e55 Mon Sep 17 00:00:00 2001 From: feitsopb Date: Thu, 18 Jun 2026 14:54:13 -0400 Subject: [PATCH 13/15] Reload SLC management after withdraw error --- app/static/js/slcManagement.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/static/js/slcManagement.js b/app/static/js/slcManagement.js index 68489c74b..46ce0b517 100644 --- a/app/static/js/slcManagement.js +++ b/app/static/js/slcManagement.js @@ -144,6 +144,7 @@ function withdraw(){ message = request.responseJSON.message; } msgFlash(message, "danger"); + location.reload(); }, complete: function () { $('#' + courseID).val('---'); From 8be7e053fae6b809cc62ba439fb6d59e7fa21ed1 Mon Sep 17 00:00:00 2001 From: feitsopb Date: Thu, 18 Jun 2026 15:35:40 -0400 Subject: [PATCH 14/15] resolved comment R200 --- app/controllers/serviceLearning/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/serviceLearning/routes.py b/app/controllers/serviceLearning/routes.py index b63906984..95812e395 100644 --- a/app/controllers/serviceLearning/routes.py +++ b/app/controllers/serviceLearning/routes.py @@ -197,7 +197,7 @@ def updateInstructorPhone(): instructorData = request.get_json() (User.update(phoneNumber=instructorData[1]) .where(User.username == instructorData[0])).execute() - return "success", 200 + return "success" @serviceLearning_bp.route('/serviceLearning/withdraw/', methods = ['POST']) def withdrawCourse(courseID): From 0d757457c3b5258b1bffbde493629118a116ca71 Mon Sep 17 00:00:00 2001 From: feitsopb Date: Thu, 18 Jun 2026 15:49:26 -0400 Subject: [PATCH 15/15] removed complete function from line 145 in slcManagemnet.js --- app/static/js/slcManagement.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/static/js/slcManagement.js b/app/static/js/slcManagement.js index c9c2009a7..5326ae3ee 100644 --- a/app/static/js/slcManagement.js +++ b/app/static/js/slcManagement.js @@ -142,9 +142,6 @@ function withdraw(){ error: function(request, status, error) { location.reload(); }, - complete: function () { - $('#' + courseID).val('---'); - } }); };