From 80fd6c0b804ed9ca2fb4e94c4b7097a1b4f4d443 Mon Sep 17 00:00:00 2001 From: nahom70 Date: Wed, 17 Jun 2026 19:52:13 +0000 Subject: [PATCH 1/4] Fixed issue #531; Now remove and discard has consistant msg flash color --- app/static/js/emailTemplates.js | 2 +- app/static/js/manageDepartments.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/static/js/emailTemplates.js b/app/static/js/emailTemplates.js index 6ef0f715c..f0d84121e 100644 --- a/app/static/js/emailTemplates.js +++ b/app/static/js/emailTemplates.js @@ -152,7 +152,7 @@ function discard() { $("#subject").val('').selectpicker("refresh") CKEDITOR.instances["editor1"].setData('') msg = "The email template changes have been discarded."; - category = "info"; + category = "danger"; } $("#flash_container").prepend(''); $("#flasher").delay(3000).fadeOut(); diff --git a/app/static/js/manageDepartments.js b/app/static/js/manageDepartments.js index 814f6138e..9838e3ebc 100755 --- a/app/static/js/manageDepartments.js +++ b/app/static/js/manageDepartments.js @@ -93,7 +93,7 @@ function removeSupervisorFromDepartment () { data: data, success: function(response) { if (response == "True") { - msgFlash("Supervisor has been removed from department.", 'success') + msgFlash("Supervisor has been removed from department.", 'fail') showSupervisorsInDepartment(departmentID) } else { msgFlash("Supervisor is not a member of this department.", "warning") From 856eedcca70988714ea977f93ab7c98175e36cb5 Mon Sep 17 00:00:00 2001 From: nahom70 Date: Fri, 19 Jun 2026 14:02:43 +0000 Subject: [PATCH 2/4] Fixed issue #531 --- app/static/js/emailTemplates.js | 2 +- app/static/js/manageDepartments.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/static/js/emailTemplates.js b/app/static/js/emailTemplates.js index f0d84121e..45f047c0a 100644 --- a/app/static/js/emailTemplates.js +++ b/app/static/js/emailTemplates.js @@ -152,7 +152,7 @@ function discard() { $("#subject").val('').selectpicker("refresh") CKEDITOR.instances["editor1"].setData('') msg = "The email template changes have been discarded."; - category = "danger"; + category = "success"; } $("#flash_container").prepend(''); $("#flasher").delay(3000).fadeOut(); diff --git a/app/static/js/manageDepartments.js b/app/static/js/manageDepartments.js index 9838e3ebc..814f6138e 100755 --- a/app/static/js/manageDepartments.js +++ b/app/static/js/manageDepartments.js @@ -93,7 +93,7 @@ function removeSupervisorFromDepartment () { data: data, success: function(response) { if (response == "True") { - msgFlash("Supervisor has been removed from department.", 'fail') + msgFlash("Supervisor has been removed from department.", 'success') showSupervisorsInDepartment(departmentID) } else { msgFlash("Supervisor is not a member of this department.", "warning") From d442b4f9f6dec0edb076249cfd634cced1ca84eb Mon Sep 17 00:00:00 2001 From: nahom70 Date: Mon, 22 Jun 2026 20:57:03 +0000 Subject: [PATCH 3/4] Updated message flash colors with added intuitivity to it. --- app/controllers/admin_routes/adminManagement.py | 6 +----- app/static/js/addSupervisorsToDepartment.js | 10 +++++++--- app/static/js/emailTemplates.js | 2 +- app/static/js/manageDepartments.js | 11 ++++++++--- app/static/js/termManagement.js | 2 +- app/templates/admin/manageDepartments.html | 2 +- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/app/controllers/admin_routes/adminManagement.py b/app/controllers/admin_routes/adminManagement.py index 68590cd70..dbef47bff 100644 --- a/app/controllers/admin_routes/adminManagement.py +++ b/app/controllers/admin_routes/adminManagement.py @@ -84,8 +84,4 @@ def removeAdmin(user, adminType): def flashMessage(user, action, adminType): message = "{} has been {} as a {} Admin".format(user.fullName, action, adminType) - - if action == 'added': - flash(message, "success") - elif action == 'removed': - flash(message, "danger") + flash(message, "success") diff --git a/app/static/js/addSupervisorsToDepartment.js b/app/static/js/addSupervisorsToDepartment.js index 16c3f1d85..d05c0467c 100644 --- a/app/static/js/addSupervisorsToDepartment.js +++ b/app/static/js/addSupervisorsToDepartment.js @@ -1,14 +1,18 @@ -function addSupervisorToDepartment(supervisorID, departmentID, callback=() => {}) { +function addSupervisorToDepartment(supervisorID, departmentID, supervisor_FirstName, supervisor_LastName, callback=() => {}) { + let supervisorfirstName = supervisor_FirstName + let supervisorLastName = supervisor_LastName + console.log("Names ",supervisorfirstName, supervisorLastName) + return $.ajax({ method: "POST", url: `/supervisorPortal/addUserToDept`, data: {"supervisorID": supervisorID, "departmentID": departmentID}, success: function(response) { if (response == "True") { - msgFlash("Supervisor has been added to department.", "success") + msgFlash(`Supervisor ${supervisorfirstName} ${supervisorLastName} (${supervisorID}) has been added to the department.`, "success") clearDropdowns() } else { - msgFlash("Supervisor is already a member of this department.", "warning") + msgFlash(`Supervisor ${supervisorfirstName} ${supervisorLastName} (${supervisorID}) is already a member of this department.`, "warning") clearDropdowns() } if (callback){ diff --git a/app/static/js/emailTemplates.js b/app/static/js/emailTemplates.js index 45f047c0a..fd040e7ec 100644 --- a/app/static/js/emailTemplates.js +++ b/app/static/js/emailTemplates.js @@ -165,7 +165,7 @@ function saveChanges() { // will ask the user if they are sure they want to save their changes. if ( !$("#subject").val() ) { msg = "There are no changes to be saved."; - category = "danger"; + category = "warning"; $("#flash_container").prepend(''); $("#flasher").delay(3000).fadeOut(); } else { diff --git a/app/static/js/manageDepartments.js b/app/static/js/manageDepartments.js index 814f6138e..fa5cc1100 100755 --- a/app/static/js/manageDepartments.js +++ b/app/static/js/manageDepartments.js @@ -52,8 +52,11 @@ function attachModalToDepartment() { $("#supervisorModalSelect").on('change', function() { let supervisorID = $('#supervisorModalSelect :selected').val() + let supervisor_FirstName = $('#supervisorModalSelect :selected').data("firstname") + let supervisor_LastName = $('#supervisorModalSelect :selected').data("lastname") + let departmentID = $('#departmentModalSelect').data('department-id') - addSupervisorToDepartment(supervisorID, departmentID, ()=>showSupervisorsInDepartment(departmentID)) + addSupervisorToDepartment(supervisorID, departmentID, supervisor_FirstName, supervisor_LastName, ()=>showSupervisorsInDepartment(departmentID)) }) @@ -87,16 +90,18 @@ function removeSupervisorFromDepartment () { let departmentID = $(`#${this.id}`).data('department') let supervisorID = $(`#${this.id}`).data('supervisor') let data = {"supervisorID": supervisorID, "departmentID": departmentID} + let supervisorfirstName = $(`#${this.id}`).parent().find('div').first().text().split(" ").slice(1, -1).join(" ") + let supervisorLastName = $(`#${this.id}`).parent().find('div').first().text().split(" ").slice(-1)[0] $.ajax({ method: "POST", url: "/admin/manageDepartments/removeSupervisorFromDepartment", data: data, success: function(response) { if (response == "True") { - msgFlash("Supervisor has been removed from department.", 'success') + msgFlash(`Supervisor ${supervisorfirstName} ${supervisorLastName} (${supervisorID}) has been removed from department. `, 'success') showSupervisorsInDepartment(departmentID) } else { - msgFlash("Supervisor is not a member of this department.", "warning") + msgFlash(`Supervisor ${supervisorfirstName} ${supervisorLastName} is not a member of this department.`, "warning") } }, error: function() { diff --git a/app/static/js/termManagement.js b/app/static/js/termManagement.js index 2d4d2c469..5f6a3135a 100755 --- a/app/static/js/termManagement.js +++ b/app/static/js/termManagement.js @@ -111,7 +111,7 @@ function termStatus(term) { $(termBtnID).removeClass("btn-success"); $(termBtnID).addClass("btn-danger"); $(termBtnID).text("Closed"); - category = "danger"; + category = "success"; state = "'Closed'."; } else { $(termBtnID).removeClass("btn-danger"); diff --git a/app/templates/admin/manageDepartments.html b/app/templates/admin/manageDepartments.html index ddb1b0431..b44422a54 100755 --- a/app/templates/admin/manageDepartments.html +++ b/app/templates/admin/manageDepartments.html @@ -118,7 +118,7 @@

Manage Departments

title='Supervisor'> {% for supervisor in allSupervisors %} {% endfor %} From 8311e06b088e288898cf4cfe01a3c0aba54dbd44 Mon Sep 17 00:00:00 2001 From: nahom70 Date: Wed, 8 Jul 2026 20:29:39 +0000 Subject: [PATCH 4/4] fixed naming convention and changed how data is forwarded on removesove --- app/static/js/addSupervisorsToDepartment.js | 11 +++++------ app/static/js/manageDepartments.js | 12 +++++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/static/js/addSupervisorsToDepartment.js b/app/static/js/addSupervisorsToDepartment.js index d05c0467c..d662fe205 100644 --- a/app/static/js/addSupervisorsToDepartment.js +++ b/app/static/js/addSupervisorsToDepartment.js @@ -1,7 +1,6 @@ -function addSupervisorToDepartment(supervisorID, departmentID, supervisor_FirstName, supervisor_LastName, callback=() => {}) { - let supervisorfirstName = supervisor_FirstName - let supervisorLastName = supervisor_LastName - console.log("Names ",supervisorfirstName, supervisorLastName) +function addSupervisorToDepartment(supervisorID, departmentID, supervisorFirstNameData, supervisorLastNameData, callback=() => {}) { + let supervisorFirstName = supervisorFirstNameData + let supervisorLastName = supervisorLastNameData return $.ajax({ method: "POST", @@ -9,10 +8,10 @@ function addSupervisorToDepartment(supervisorID, departmentID, supervisor_FirstN data: {"supervisorID": supervisorID, "departmentID": departmentID}, success: function(response) { if (response == "True") { - msgFlash(`Supervisor ${supervisorfirstName} ${supervisorLastName} (${supervisorID}) has been added to the department.`, "success") + msgFlash(`Supervisor ${supervisorFirstName} ${supervisorLastName} (${supervisorID}) has been added to the department.`, "success") clearDropdowns() } else { - msgFlash(`Supervisor ${supervisorfirstName} ${supervisorLastName} (${supervisorID}) is already a member of this department.`, "warning") + msgFlash(`Supervisor ${supervisorFirstName} ${supervisorLastName} (${supervisorID}) is already a member of this department.`, "warning") clearDropdowns() } if (callback){ diff --git a/app/static/js/manageDepartments.js b/app/static/js/manageDepartments.js index fa5cc1100..06c01e3b5 100755 --- a/app/static/js/manageDepartments.js +++ b/app/static/js/manageDepartments.js @@ -52,11 +52,11 @@ function attachModalToDepartment() { $("#supervisorModalSelect").on('change', function() { let supervisorID = $('#supervisorModalSelect :selected').val() - let supervisor_FirstName = $('#supervisorModalSelect :selected').data("firstname") - let supervisor_LastName = $('#supervisorModalSelect :selected').data("lastname") + let supervisorFirstName = $('#supervisorModalSelect :selected').data("firstname") + let supervisorLastName = $('#supervisorModalSelect :selected').data("lastname") let departmentID = $('#departmentModalSelect').data('department-id') - addSupervisorToDepartment(supervisorID, departmentID, supervisor_FirstName, supervisor_LastName, ()=>showSupervisorsInDepartment(departmentID)) + addSupervisorToDepartment(supervisorID, departmentID, supervisorFirstName, supervisorLastName, ()=>showSupervisorsInDepartment(departmentID)) }) @@ -75,6 +75,8 @@ function showSupervisorsInDepartment(departmentID) {
Remove
`)} supervisorContent += ("") @@ -90,8 +92,8 @@ function removeSupervisorFromDepartment () { let departmentID = $(`#${this.id}`).data('department') let supervisorID = $(`#${this.id}`).data('supervisor') let data = {"supervisorID": supervisorID, "departmentID": departmentID} - let supervisorfirstName = $(`#${this.id}`).parent().find('div').first().text().split(" ").slice(1, -1).join(" ") - let supervisorLastName = $(`#${this.id}`).parent().find('div').first().text().split(" ").slice(-1)[0] + let supervisorfirstName = $(`#${this.id}`).data('firstname') + let supervisorLastName = $(`#${this.id}`).data('lastname') $.ajax({ method: "POST", url: "/admin/manageDepartments/removeSupervisorFromDepartment",