From 885d5b1b2617d290b967b7e58761deaa99555f8f Mon Sep 17 00:00:00 2001 From: munsakad Date: Tue, 16 Jun 2026 16:43:36 -0400 Subject: [PATCH 01/10] 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 02/10] 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 03/10] 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 04/10] 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 05/10] 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 06/10] 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 07/10] 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 08/10] 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 09/10] 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('---'); - } }); }; From 8cb3ad8950519f56752e8c0c1c3ccf3d0eb48a5b Mon Sep 17 00:00:00 2001 From: munsakad Date: Mon, 22 Jun 2026 16:41:23 -0400 Subject: [PATCH 10/10] modified the error messaged --- app/controllers/serviceLearning/routes.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/serviceLearning/routes.py b/app/controllers/serviceLearning/routes.py index 95812e395..40f76fbda 100644 --- a/app/controllers/serviceLearning/routes.py +++ b/app/controllers/serviceLearning/routes.py @@ -208,9 +208,11 @@ def withdrawCourse(courseID): return "" else: flash("Unauthorized to perform this action", 'warning') + return "", 403 except Exception as e: print(e) - flash("Withdrawal Unsuccessful", 'warning') + flash("Error: Failed to withdraw course", 'alert') + return "", 500