diff --git a/app/controllers/admin_routes/adminManagement.py b/app/controllers/admin_routes/adminManagement.py
index 68590cd7..dbef47bf 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 16c3f1d8..d662fe20 100644
--- a/app/static/js/addSupervisorsToDepartment.js
+++ b/app/static/js/addSupervisorsToDepartment.js
@@ -1,14 +1,17 @@
-function addSupervisorToDepartment(supervisorID, departmentID, callback=() => {}) {
+function addSupervisorToDepartment(supervisorID, departmentID, supervisorFirstNameData, supervisorLastNameData, callback=() => {}) {
+ let supervisorFirstName = supervisorFirstNameData
+ let supervisorLastName = supervisorLastNameData
+
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 6ef0f715..fd040e7e 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 = "success";
}
$("#flash_container").prepend('
'+msg+'
');
$("#flasher").delay(3000).fadeOut();
@@ -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('
'+msg+'
');
$("#flasher").delay(3000).fadeOut();
} else {
diff --git a/app/static/js/manageDepartments.js b/app/static/js/manageDepartments.js
index 814f6138..06c01e3b 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 supervisorFirstName = $('#supervisorModalSelect :selected').data("firstname")
+ let supervisorLastName = $('#supervisorModalSelect :selected').data("lastname")
+
let departmentID = $('#departmentModalSelect').data('department-id')
- addSupervisorToDepartment(supervisorID, departmentID, ()=>showSupervisorsInDepartment(departmentID))
+ addSupervisorToDepartment(supervisorID, departmentID, supervisorFirstName, supervisorLastName, ()=>showSupervisorsInDepartment(departmentID))
})
@@ -72,6 +75,8 @@ function showSupervisorsInDepartment(departmentID) {
Remove
`)}
supervisorContent += ("")
@@ -87,16 +92,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}`).data('firstname')
+ let supervisorLastName = $(`#${this.id}`).data('lastname')
$.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 2d4d2c46..5f6a3135 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 ddb1b043..b44422a5 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 %}