Fixed issue #531; Now remove and discard has consistant msg flash color

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")

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){

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('<div class="alert alert-'+ category +'" role="alert" id="flasher">'+msg+'</div>');
   $("#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('<div class="alert alert-'+ category +'" role="alert" id="flasher">'+msg+'</div>');
     $("#flasher").delay(3000).fadeOut();
   } else {

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) {
                                 <div class='btn btn-danger col-auto removeSupervisorFromDepartment' 
                                   data-supervisor="${supervisors[i]['ID']}" 
                                   data-department="${departmentID}" 
+                                  data-firstname="${supervisorFirstName}" 
+                                  data-lastname="${supervisors[i]['LAST_NAME']}"
                                   id="${supervisors[i]['ID']}-${departmentID}">Remove</div>
                                </span>`)}
       supervisorContent += ("</div>")
@@ -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() {

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");

app/templates/admin/manageDepartments.html

@@ -118,7 +118,7 @@ <h1>Manage Departments</h1>
           title='Supervisor'>
         {% for supervisor in allSupervisors  %}
           <option value="{{supervisor.ID}}"
-                  data-content="{{supervisor.FIRST_NAME}} {{supervisor.LAST_NAME}}<small class='text-muted'> ({{supervisor.ID}})</small>">
+                  data-content="{{supervisor.FIRST_NAME}} {{supervisor.LAST_NAME}}<small class='text-muted'> ({{supervisor.ID}})</small>" data-firstname="{{supervisor.FIRST_NAME}}"  data-lastname="{{supervisor.LAST_NAME}}">
             {{supervisor.FIRST_NAME}} {{supervisor.LAST_NAME}}
           </option>
         {% endfor %}