diff --git a/src/controller/access/AccessControllerAdd.java b/src/controller/access/AccessControllerAdd.java index ed938d5..93f01f8 100644 --- a/src/controller/access/AccessControllerAdd.java +++ b/src/controller/access/AccessControllerAdd.java @@ -76,7 +76,7 @@ public class AccessControllerAdd extends HttpServlet { Access a = new Access(idRole, idResource,true); //persist the entity pm.makePersistent(a); - request.getSession().setAttribute("serverResponse","Access created successfully."); + request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Access created successfully.\"}"); } } else if (request.getParameter("info").equals("check")){ diff --git a/src/controller/access/AccessControllerDelete.java b/src/controller/access/AccessControllerDelete.java index a089920..2a2c248 100644 --- a/src/controller/access/AccessControllerDelete.java +++ b/src/controller/access/AccessControllerDelete.java @@ -24,7 +24,7 @@ public class AccessControllerDelete extends HttpServlet { pm.deletePersistent(r); - request.getSession().setAttribute("serverResponse","Access deleted successfully."); + request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Access deleted successfully.\"}"); response.sendRedirect("/access"); } catch(javax.jdo.JDOObjectNotFoundException nf) { response.sendRedirect("/access"); diff --git a/src/controller/access/AccessControllerEdit.java b/src/controller/access/AccessControllerEdit.java index 3d7ad36..c2e46ff 100644 --- a/src/controller/access/AccessControllerEdit.java +++ b/src/controller/access/AccessControllerEdit.java @@ -62,7 +62,7 @@ public class AccessControllerEdit extends HttpServlet { a.setResourceKey(idResource); } - request.getSession().setAttribute("serverResponse","Access updated successfully."); + request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Access updated successfully.\"}"); response.sendRedirect("/access"); diff --git a/src/controller/access/AccessControllerView.java b/src/controller/access/AccessControllerView.java index 982b83b..b2c0895 100644 --- a/src/controller/access/AccessControllerView.java +++ b/src/controller/access/AccessControllerView.java @@ -49,7 +49,7 @@ public class AccessControllerView extends HttpServlet { }catch(javax.jdo.JDOObjectNotFoundException nf) { System.err.println("JDOObjectNotFound -> AccessControllerView"); nf.printStackTrace(); - request.getSession().setAttribute("serverResponse","Error trying to view the Access."); + request.getSession().setAttribute("serverResponse","{\"color\": \"darkorange\",\"response\":\"Error trying to view the Access.\"}"); response.sendRedirect("/access"); } catch (NullPointerException e){ diff --git a/src/controller/resources/ResourcesControllerAdd.java b/src/controller/resources/ResourcesControllerAdd.java index ed39a7d..8c09568 100644 --- a/src/controller/resources/ResourcesControllerAdd.java +++ b/src/controller/resources/ResourcesControllerAdd.java @@ -35,7 +35,7 @@ public class ResourcesControllerAdd extends HttpServlet { Boolean status = Boolean.parseBoolean(request.getParameter("status")); createRole(url,status,pm); - request.getSession().setAttribute("serverResponse","Resource created successfully."); + request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Resource created successfully.\"}"); break; case "redirect": @@ -54,7 +54,7 @@ public class ResourcesControllerAdd extends HttpServlet { resourc.setUrl(request.getParameter("url")); resourc.setStatus(Boolean.parseBoolean(request.getParameter("status"))); - request.getSession().setAttribute("serverResponse","Resource updated successfully."); + request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Resource updated successfully.\"}"); break; } diff --git a/src/controller/resources/ResourcesControllerDelete.java b/src/controller/resources/ResourcesControllerDelete.java index 3462e8c..e026a4d 100644 --- a/src/controller/resources/ResourcesControllerDelete.java +++ b/src/controller/resources/ResourcesControllerDelete.java @@ -25,7 +25,7 @@ public class ResourcesControllerDelete extends HttpServlet { Key key = KeyFactory.stringToKey(request.getParameter("key")); try{ pm.deletePersistent(pm.getObjectById(Resource.class, key)); - request.getSession().setAttribute("serverResponse","Resource deleted successfully."); + request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Resource deleted successfully.\"}"); } catch (JDOObjectNotFoundException e){ System.err.println("Exception catched -> " + e.getMessage()); } diff --git a/src/controller/roles/RolesControllerAdd.java b/src/controller/roles/RolesControllerAdd.java index 91f77b5..0dc0b56 100644 --- a/src/controller/roles/RolesControllerAdd.java +++ b/src/controller/roles/RolesControllerAdd.java @@ -47,7 +47,7 @@ public class RolesControllerAdd extends HttpServlet { Boolean status = Boolean.parseBoolean(request.getParameter("roleStatus")); createRole(name,status,pm); - request.getSession().setAttribute("serverResponse","Role created successfully."); + request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Role created successfully.\"}"); break; @@ -67,7 +67,7 @@ public class RolesControllerAdd extends HttpServlet { role1.setName(request.getParameter("roleName")); role1.setStatus(Boolean.parseBoolean(request.getParameter("roleStatus"))); //role1.setImgUrl(userImg); - request.getSession().setAttribute("serverResponse","Role updated successfully."); + request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Role updated successfully.\"}"); break; diff --git a/src/controller/roles/RolesControllerDelete.java b/src/controller/roles/RolesControllerDelete.java index 0257e85..09c3f4c 100644 --- a/src/controller/roles/RolesControllerDelete.java +++ b/src/controller/roles/RolesControllerDelete.java @@ -22,7 +22,7 @@ public class RolesControllerDelete extends HttpServlet { Key k = KeyFactory.stringToKey(request.getParameter("key")); try{ pm.deletePersistent(pm.getObjectById(Role.class, k)); - request.getSession().setAttribute("serverResponse","Role deleted successfully."); + request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Role deleted successfully.\"}"); } catch (JDOObjectNotFoundException e){ System.err.println("Exception catched -> " + e.getMessage()); } diff --git a/src/controller/services/ServicesControllerAdd.java b/src/controller/services/ServicesControllerAdd.java index f5cf63b..df51a73 100644 --- a/src/controller/services/ServicesControllerAdd.java +++ b/src/controller/services/ServicesControllerAdd.java @@ -46,7 +46,7 @@ public class ServicesControllerAdd extends HttpServlet { Service service = new Service (name, price, description,userCreatorKey); - request.getSession().setAttribute("serverResponse","Service created successfully."); + request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Service created successfully.\"}"); pm.makePersistent(service); @@ -63,7 +63,7 @@ public class ServicesControllerAdd extends HttpServlet { pm.close(); - request.getSession().setAttribute("serverResponse","Service updated successfully."); + request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Service updated successfully.\"}"); } else if (action.equals("redirect")){ @@ -85,7 +85,7 @@ public class ServicesControllerAdd extends HttpServlet { } else { - request.getSession().setAttribute("serverResponse","You do not have the rights to access."); + request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to create/update a Service.\"}"); response.sendRedirect("/users"); } diff --git a/src/controller/services/ServicesControllerDelete.java b/src/controller/services/ServicesControllerDelete.java index 27c1375..91059d5 100644 --- a/src/controller/services/ServicesControllerDelete.java +++ b/src/controller/services/ServicesControllerDelete.java @@ -32,7 +32,7 @@ public class ServicesControllerDelete extends HttpServlet { pm.deletePersistent(service); - request.getSession().setAttribute("serverResponse","Service deleted successfully."); + request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Service deleted successfully.\"}"); } catch (JDOObjectNotFoundException e){ System.err.println("Exception catched -> " + e.getMessage()); } @@ -42,7 +42,7 @@ public class ServicesControllerDelete extends HttpServlet { response.sendRedirect("/services"); } else { - request.getSession().setAttribute("serverResponse","You do not have the rights to access."); + request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to delete a Service.\"}"); response.sendRedirect("/users"); } diff --git a/src/controller/services/ServicesControllerIndex.java b/src/controller/services/ServicesControllerIndex.java index 505dbaf..e052c0d 100644 --- a/src/controller/services/ServicesControllerIndex.java +++ b/src/controller/services/ServicesControllerIndex.java @@ -44,7 +44,7 @@ public class ServicesControllerIndex extends HttpServlet { } } else { - request.getSession().setAttribute("serverResponse","You do not have the rights to access."); + request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to access /services.\"}"); response.sendRedirect("/users"); } diff --git a/src/controller/services/ServicesControllerView.java b/src/controller/services/ServicesControllerView.java index 26f389a..442b284 100644 --- a/src/controller/services/ServicesControllerView.java +++ b/src/controller/services/ServicesControllerView.java @@ -73,7 +73,7 @@ public class ServicesControllerView extends HttpServlet { pm.close(); } else { - request.getSession().setAttribute("serverResponse","You do not have the rights to access."); + request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to view/edit a Service.\"}"); response.sendRedirect("/users"); } diff --git a/src/controller/users/UsersControllerAdd.java b/src/controller/users/UsersControllerAdd.java index f85f676..1f66e92 100644 --- a/src/controller/users/UsersControllerAdd.java +++ b/src/controller/users/UsersControllerAdd.java @@ -81,7 +81,7 @@ public class UsersControllerAdd extends HttpServlet { misesion.setMaxInactiveInterval(3600); } - serverResponse = "You are logged-in"; + serverResponse = "{\"color\": \"#26a69a\",\"response\":\"You are logged in.\"}"; break; @@ -97,7 +97,7 @@ public class UsersControllerAdd extends HttpServlet { //Si lo que se quiere es Crear (proviene del formulario) case "create": createUser(userID, userEmail, userName, userImg, userRole, pm); - serverResponse = "User created successfully."; + serverResponse = "{\"color\": \"#26a69a\",\"response\":\"User created successfully.\"}"; break; //Si lo que se quiere es actualizar un Usuario @@ -110,7 +110,7 @@ public class UsersControllerAdd extends HttpServlet { user.setImgUrl(userImg); user.setRoleKey(userRole); - serverResponse = "User Updated successfully."; + serverResponse = "{\"color\": \"#26a69a\",\"response\":\"Service updated successfully.\"}"; break; } diff --git a/src/controller/users/UsersControllerDelete.java b/src/controller/users/UsersControllerDelete.java index abf0816..abddafe 100644 --- a/src/controller/users/UsersControllerDelete.java +++ b/src/controller/users/UsersControllerDelete.java @@ -20,7 +20,7 @@ public class UsersControllerDelete extends HttpServlet { try{ pm.deletePersistent(pm.getObjectById(User.class, userID)); - request.getSession().setAttribute("serverResponse","User deleted successfully."); + request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Service deleted sucessfully.\"}"); } catch (JDOObjectNotFoundException e){ System.err.println("Exception catched -> " + e.getMessage()); } diff --git a/war/WEB-INF/View/Access/add.jsp b/war/WEB-INF/View/Access/add.jsp index cb2e9f6..ac4a504 100644 --- a/war/WEB-INF/View/Access/add.jsp +++ b/war/WEB-INF/View/Access/add.jsp @@ -101,10 +101,8 @@
info_outline
-
- The admin Role has full access by default.
-
-
+
+ The admin Role has full access by default.

diff --git a/war/WEB-INF/View/Access/index.jsp b/war/WEB-INF/View/Access/index.jsp index 0479a6a..5b827b1 100644 --- a/war/WEB-INF/View/Access/index.jsp +++ b/war/WEB-INF/View/Access/index.jsp @@ -102,7 +102,12 @@ <% } %> diff --git a/war/WEB-INF/View/Roles/add.jsp b/war/WEB-INF/View/Roles/add.jsp index a977221..d1c546f 100644 --- a/war/WEB-INF/View/Roles/add.jsp +++ b/war/WEB-INF/View/Roles/add.jsp @@ -74,8 +74,6 @@
  • |
  • Services
  • |
    • -
  • Services
    • -
  • |
    • Show Services
    diff --git a/war/WEB-INF/View/Roles/index.jsp b/war/WEB-INF/View/Roles/index.jsp index 67c0490..06a26ef 100644 --- a/war/WEB-INF/View/Roles/index.jsp +++ b/war/WEB-INF/View/Roles/index.jsp @@ -105,7 +105,12 @@