From 1e96f6f222d45521d212905ee8b1984ba6d131b1 Mon Sep 17 00:00:00 2001 From: Araozu Date: Sat, 14 Jul 2018 10:29:59 -0500 Subject: [PATCH] Division de la aplicacion: El sector inicial esta dirigido a los clientes, mientras que las herramientos coma el CRUD solo son solo para empleados. --- .idea/libraries/API_AppEngine_1.xml | 4 +- .idea/misc.xml | 5 +- .idea/workspace.xml | 1176 ++++++++--------- Lab09.iml | 3 +- .../access/AccessControllerAdd.java | 12 +- .../access/AccessControllerDelete.java | 11 +- .../access/AccessControllerEdit.java | 12 +- .../access/AccessControllerIndex.java | 5 +- .../access/AccessControllerView.java | 21 +- .../resources/ResourcesControllerAdd.java | 6 +- .../resources/ResourcesControllerDelete.java | 4 +- .../resources/ResourcesControllerIndex.java | 6 +- .../resources/ResourcesControllerView.java | 6 +- .../roles/RolesControllerAdd.java | 6 +- .../roles/RolesControllerDelete.java | 4 +- .../roles/RolesControllerIndex.java | 4 +- .../roles/RolesControllerView.java | 4 +- .../services/ServicesControllerAdd.java | 9 +- .../services/ServicesControllerDelete.java | 5 +- .../services/ServicesControllerIndex.java | 8 +- .../services/ServicesControllerView.java | 7 +- .../users/UsersControllerAdd.java | 12 +- .../users/UsersControllerDelete.java | 8 +- .../users/UsersControllerIndex.java | 5 +- .../users/UsersControllerView.java | 9 +- src/controller/index.java | 2 +- src/model/Access.java | 4 +- src/model/Service.java | 2 +- src/model/User.java | 2 +- war/WEB-INF/View/Access/add.jsp | 57 +- war/WEB-INF/View/Access/edit.jsp | 59 +- war/WEB-INF/View/Access/index.jsp | 78 +- war/WEB-INF/View/Access/view.jsp | 53 +- war/WEB-INF/View/Resources/add.jsp | 56 +- war/WEB-INF/View/Resources/index.jsp | 51 +- war/WEB-INF/View/Resources/view.jsp | 58 +- war/WEB-INF/View/Roles/add.jsp | 84 +- war/WEB-INF/View/Roles/index.jsp | 138 +- war/WEB-INF/View/Roles/view.jsp | 93 +- war/WEB-INF/View/Services/add.jsp | 62 +- war/WEB-INF/View/Services/index.jsp | 43 +- war/WEB-INF/View/Services/view.jsp | 56 +- war/WEB-INF/View/Users/add.jsp | 64 +- war/WEB-INF/View/Users/index.jsp | 45 +- war/WEB-INF/View/Users/view.jsp | 52 +- .../access/AccessControllerAdd.class | Bin 5801 -> 0 bytes .../access/AccessControllerDelete.class | Bin 2326 -> 0 bytes .../access/AccessControllerIndex.class | Bin 3436 -> 0 bytes .../access/AccessControllerView.class | Bin 5378 -> 0 bytes .../controller/roles/RolesControllerAdd.class | Bin 4288 -> 0 bytes .../roles/RolesControllerDelete.class | Bin 2681 -> 0 bytes .../roles/RolesControllerIndex.class | Bin 2601 -> 0 bytes .../roles/RolesControllerView.class | Bin 4733 -> 0 bytes .../controller/users/UsersControllerAdd.class | Bin 6282 -> 0 bytes .../users/UsersControllerDelete.class | Bin 2340 -> 0 bytes .../users/UsersControllerIndex.class | Bin 2763 -> 0 bytes .../users/UsersControllerView.class | Bin 5089 -> 0 bytes war/WEB-INF/classes/model/Access.class | Bin 12993 -> 13011 bytes war/WEB-INF/classes/model/User.class | Bin 12005 -> 12014 bytes war/WEB-INF/web.xml | 86 +- war/index.jsp | 14 +- war/test.jsp | 384 ++++++ war/usersAdminIndex.jsp | 159 +++ 63 files changed, 1874 insertions(+), 1180 deletions(-) rename src/controller/{ => employee}/access/AccessControllerAdd.java (94%) rename src/controller/{ => employee}/access/AccessControllerDelete.java (86%) rename src/controller/{ => employee}/access/AccessControllerEdit.java (92%) rename src/controller/{ => employee}/access/AccessControllerIndex.java (96%) rename src/controller/{ => employee}/access/AccessControllerView.java (89%) rename src/controller/{ => employee}/resources/ResourcesControllerAdd.java (95%) rename src/controller/{ => employee}/resources/ResourcesControllerDelete.java (94%) rename src/controller/{ => employee}/resources/ResourcesControllerIndex.java (92%) rename src/controller/{ => employee}/resources/ResourcesControllerView.java (96%) rename src/controller/{ => employee}/roles/RolesControllerAdd.java (95%) rename src/controller/{ => employee}/roles/RolesControllerDelete.java (94%) rename src/controller/{ => employee}/roles/RolesControllerIndex.java (95%) rename src/controller/{ => employee}/roles/RolesControllerView.java (98%) rename src/controller/{ => employee}/services/ServicesControllerAdd.java (94%) rename src/controller/{ => employee}/services/ServicesControllerDelete.java (95%) rename src/controller/{ => employee}/services/ServicesControllerIndex.java (91%) rename src/controller/{ => employee}/services/ServicesControllerView.java (95%) rename src/controller/{ => employee}/users/UsersControllerAdd.java (96%) rename src/controller/{ => employee}/users/UsersControllerDelete.java (90%) rename src/controller/{ => employee}/users/UsersControllerIndex.java (92%) rename src/controller/{ => employee}/users/UsersControllerView.java (97%) delete mode 100644 war/WEB-INF/classes/controller/access/AccessControllerAdd.class delete mode 100644 war/WEB-INF/classes/controller/access/AccessControllerDelete.class delete mode 100644 war/WEB-INF/classes/controller/access/AccessControllerIndex.class delete mode 100644 war/WEB-INF/classes/controller/access/AccessControllerView.class delete mode 100644 war/WEB-INF/classes/controller/roles/RolesControllerAdd.class delete mode 100644 war/WEB-INF/classes/controller/roles/RolesControllerDelete.class delete mode 100644 war/WEB-INF/classes/controller/roles/RolesControllerIndex.class delete mode 100644 war/WEB-INF/classes/controller/roles/RolesControllerView.class delete mode 100644 war/WEB-INF/classes/controller/users/UsersControllerAdd.class delete mode 100644 war/WEB-INF/classes/controller/users/UsersControllerDelete.class delete mode 100644 war/WEB-INF/classes/controller/users/UsersControllerIndex.class delete mode 100644 war/WEB-INF/classes/controller/users/UsersControllerView.class create mode 100644 war/test.jsp create mode 100644 war/usersAdminIndex.jsp diff --git a/.idea/libraries/API_AppEngine_1.xml b/.idea/libraries/API_AppEngine_1.xml index 2bca1ae..4ed7638 100644 --- a/.idea/libraries/API_AppEngine_1.xml +++ b/.idea/libraries/API_AppEngine_1.xml @@ -1,10 +1,10 @@ - + - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index e208459..3c93f8e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,9 @@ - + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 6e4278b..4e1af0e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,34 +4,37 @@ - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -43,27 +46,28 @@ + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + + + @@ -498,19 +378,25 @@ + - + - - + + - + + + + + + @@ -518,9 +404,6 @@ - - - - + + + + + + + + - + - + - - + + + - + - + - - - + + + - - + + @@ -851,420 +826,411 @@ - - - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - + + - - - - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1282,7 +1248,7 @@ - No facets are configured + Web (Lab09)|Web + jquery-3.2.1 - Android API 27 Platform + LuaJ diff --git a/Lab09.iml b/Lab09.iml index 80be7e2..2ccf9cd 100644 --- a/Lab09.iml +++ b/Lab09.iml @@ -38,8 +38,7 @@ - - + diff --git a/src/controller/access/AccessControllerAdd.java b/src/controller/employee/access/AccessControllerAdd.java similarity index 94% rename from src/controller/access/AccessControllerAdd.java rename to src/controller/employee/access/AccessControllerAdd.java index c5edcef..68912e4 100644 --- a/src/controller/access/AccessControllerAdd.java +++ b/src/controller/employee/access/AccessControllerAdd.java @@ -1,9 +1,9 @@ -package controller.access; +package controller.employee.access; import controller.PMF; -import controller.resources.ResourcesControllerView; -import controller.roles.RolesControllerView; -import controller.users.UsersControllerView; +import controller.employee.resources.ResourcesControllerView; +import controller.employee.roles.RolesControllerView; +import controller.employee.users.UsersControllerView; import model.Access; import model.Resource; import model.Role; @@ -93,7 +93,7 @@ public class AccessControllerAdd extends HttpServlet { try{ if (redirect){ request.setAttribute("serverResponse",""); - response.sendRedirect("/access"); + response.sendRedirect("/e/access"); } } //Al redirigr al jsp para crear, se usa RequestDispatcher, y este entra en conflicto con sendRedirect. @@ -104,7 +104,7 @@ public class AccessControllerAdd extends HttpServlet { }else{ request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to create an access.\"}"); - response.sendRedirect("/access"); + response.sendRedirect("/e/access"); } diff --git a/src/controller/access/AccessControllerDelete.java b/src/controller/employee/access/AccessControllerDelete.java similarity index 86% rename from src/controller/access/AccessControllerDelete.java rename to src/controller/employee/access/AccessControllerDelete.java index b29390a..69786e3 100644 --- a/src/controller/access/AccessControllerDelete.java +++ b/src/controller/employee/access/AccessControllerDelete.java @@ -1,10 +1,7 @@ -package controller.access; +package controller.employee.access; import java.io.IOException; import javax.servlet.http.*; -import java.util.Date; -import java.util.List; -import java.text.DateFormat; import javax.servlet.*; import javax.jdo.PersistenceManager; import model.*; @@ -30,14 +27,14 @@ public class AccessControllerDelete extends HttpServlet { pm.deletePersistent(r); request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Access deleted successfully.\"}"); - response.sendRedirect("/access"); + response.sendRedirect("/e/access"); } catch(javax.jdo.JDOObjectNotFoundException nf) { - response.sendRedirect("/access"); + response.sendRedirect("/e/access"); } } else { request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to delete an access.\"}"); - response.sendRedirect("/access"); + response.sendRedirect("/e/access"); } } catch (NullPointerException e){ diff --git a/src/controller/access/AccessControllerEdit.java b/src/controller/employee/access/AccessControllerEdit.java similarity index 92% rename from src/controller/access/AccessControllerEdit.java rename to src/controller/employee/access/AccessControllerEdit.java index 5855474..a381d51 100644 --- a/src/controller/access/AccessControllerEdit.java +++ b/src/controller/employee/access/AccessControllerEdit.java @@ -1,9 +1,9 @@ -package controller.access; +package controller.employee.access; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; import controller.PMF; -import controller.users.UsersControllerView; +import controller.employee.users.UsersControllerView; import model.Access; import model.Resource; import model.Role; @@ -69,7 +69,7 @@ public class AccessControllerEdit extends HttpServlet { request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Access updated successfully.\"}"); - response.sendRedirect("/access"); + response.sendRedirect("/e/access"); } } else if(request.getParameter("info").equals("redirect")){ @@ -85,15 +85,15 @@ public class AccessControllerEdit extends HttpServlet { } } catch(javax.jdo.JDOObjectNotFoundException nf) { - response.sendRedirect("/index.jsp"); + response.sendRedirect("/"); } catch (NumberFormatException e){ - response.sendRedirect("/users"); + response.sendRedirect("/e/users"); } }else{ request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to edit an access.\"}"); - response.sendRedirect("/access"); + response.sendRedirect("/e/access"); } diff --git a/src/controller/access/AccessControllerIndex.java b/src/controller/employee/access/AccessControllerIndex.java similarity index 96% rename from src/controller/access/AccessControllerIndex.java rename to src/controller/employee/access/AccessControllerIndex.java index d635222..d9c65d2 100644 --- a/src/controller/access/AccessControllerIndex.java +++ b/src/controller/employee/access/AccessControllerIndex.java @@ -1,8 +1,7 @@ -package controller.access; +package controller.employee.access; import controller.PMF; -import controller.resources.ResourcesControllerView; -import controller.users.UsersControllerView; +import controller.employee.users.UsersControllerView; import model.Access; import model.User; diff --git a/src/controller/access/AccessControllerView.java b/src/controller/employee/access/AccessControllerView.java similarity index 89% rename from src/controller/access/AccessControllerView.java rename to src/controller/employee/access/AccessControllerView.java index b9d24e9..0150c73 100644 --- a/src/controller/access/AccessControllerView.java +++ b/src/controller/employee/access/AccessControllerView.java @@ -1,11 +1,11 @@ -package controller.access; +package controller.employee.access; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; import controller.PMF; -import controller.resources.ResourcesControllerView; -import controller.roles.RolesControllerView; -import controller.users.UsersControllerView; +import controller.employee.resources.ResourcesControllerView; +import controller.employee.roles.RolesControllerView; +import controller.employee.users.UsersControllerView; import model.Access; import model.Resource; import model.Role; @@ -51,7 +51,7 @@ public class AccessControllerView extends HttpServlet { } else { request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to view an access.\"}"); - response.sendRedirect("/access"); + response.sendRedirect("/e/access"); } @@ -60,7 +60,7 @@ public class AccessControllerView extends HttpServlet { System.err.println("JDOObjectNotFound -> AccessControllerView"); nf.printStackTrace(); request.getSession().setAttribute("serverResponse","{\"color\": \"darkorange\",\"response\":\"Error trying to view the Access.\"}"); - response.sendRedirect("/access"); + response.sendRedirect("/e/access"); } catch (NullPointerException e){ System.err.println("NPE -> Trying to access a servlet without logging in."); @@ -104,15 +104,16 @@ public class AccessControllerView extends HttpServlet { public static boolean checkPermission(String userID, String uri){ User user = UsersControllerView.getUser(userID); - String userRoleName = user.getRoleName(); String userRoleKey = user.getRoleKey(); if (userRoleKey == null) userRoleKey = ""; + if (user.getRoleName().equals("admin")) { + return true; + } + for (Access access: getAllAccess()){ - if (userRoleName.equals("admin")){ - return true; - } else if (access.getRoleKey().equals(userRoleKey) && access.getStatus()){ + if (access.getRoleKey().equals(userRoleKey) && access.getStatus()){ if (access.getResourceName().equals(uri) && ResourcesControllerView.getResource(access.getResourceKey()).getStatus()){ return true; } diff --git a/src/controller/resources/ResourcesControllerAdd.java b/src/controller/employee/resources/ResourcesControllerAdd.java similarity index 95% rename from src/controller/resources/ResourcesControllerAdd.java rename to src/controller/employee/resources/ResourcesControllerAdd.java index 8c09568..9939709 100644 --- a/src/controller/resources/ResourcesControllerAdd.java +++ b/src/controller/employee/resources/ResourcesControllerAdd.java @@ -1,8 +1,8 @@ -package controller.resources; +package controller.employee.resources; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; -import controller.users.UsersControllerView; +import controller.employee.users.UsersControllerView; import model.Resource; import javax.jdo.JDOObjectNotFoundException; @@ -61,7 +61,7 @@ public class ResourcesControllerAdd extends HttpServlet { pm.close(); try{ - response.sendRedirect("/resources"); + response.sendRedirect("/e/resources"); } //Al redirigr al jsp para crear, se usa RequestDispatcher, y este entra en conflicto con sendRedirect. catch (IllegalStateException e){ diff --git a/src/controller/resources/ResourcesControllerDelete.java b/src/controller/employee/resources/ResourcesControllerDelete.java similarity index 94% rename from src/controller/resources/ResourcesControllerDelete.java rename to src/controller/employee/resources/ResourcesControllerDelete.java index e026a4d..d06115c 100644 --- a/src/controller/resources/ResourcesControllerDelete.java +++ b/src/controller/employee/resources/ResourcesControllerDelete.java @@ -1,4 +1,4 @@ -package controller.resources; +package controller.employee.resources; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; @@ -35,7 +35,7 @@ public class ResourcesControllerDelete extends HttpServlet { System.err.println("Exception captured -> " + e.getMessage()); } - response.sendRedirect("/resources"); + response.sendRedirect("/e/resources"); } diff --git a/src/controller/resources/ResourcesControllerIndex.java b/src/controller/employee/resources/ResourcesControllerIndex.java similarity index 92% rename from src/controller/resources/ResourcesControllerIndex.java rename to src/controller/employee/resources/ResourcesControllerIndex.java index 945f76e..10e3d2e 100644 --- a/src/controller/resources/ResourcesControllerIndex.java +++ b/src/controller/employee/resources/ResourcesControllerIndex.java @@ -1,7 +1,7 @@ -package controller.resources; +package controller.employee.resources; -import controller.roles.RolesControllerView; -import controller.users.UsersControllerView; +import controller.employee.roles.RolesControllerView; +import controller.employee.users.UsersControllerView; import model.User; import javax.jdo.PersistenceManager; diff --git a/src/controller/resources/ResourcesControllerView.java b/src/controller/employee/resources/ResourcesControllerView.java similarity index 96% rename from src/controller/resources/ResourcesControllerView.java rename to src/controller/employee/resources/ResourcesControllerView.java index 2fa6921..9098598 100644 --- a/src/controller/resources/ResourcesControllerView.java +++ b/src/controller/employee/resources/ResourcesControllerView.java @@ -1,8 +1,8 @@ -package controller.resources; +package controller.employee.resources; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; -import controller.users.UsersControllerView; +import controller.employee.users.UsersControllerView; import model.Resource; import javax.jdo.PersistenceManager; @@ -14,7 +14,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import static controller.roles.RolesControllerView.getRole; +import static controller.employee.roles.RolesControllerView.getRole; @SuppressWarnings("serial") public class ResourcesControllerView extends HttpServlet { diff --git a/src/controller/roles/RolesControllerAdd.java b/src/controller/employee/roles/RolesControllerAdd.java similarity index 95% rename from src/controller/roles/RolesControllerAdd.java rename to src/controller/employee/roles/RolesControllerAdd.java index 0dc0b56..5020817 100644 --- a/src/controller/roles/RolesControllerAdd.java +++ b/src/controller/employee/roles/RolesControllerAdd.java @@ -1,8 +1,8 @@ -package controller.roles; +package controller.employee.roles; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; -import controller.users.UsersControllerView; +import controller.employee.users.UsersControllerView; import model.Role; import javax.jdo.PersistenceManager; @@ -75,7 +75,7 @@ public class RolesControllerAdd extends HttpServlet { pm.close(); try{ - response.sendRedirect("/roles"); + response.sendRedirect("/e/roles"); } //Al redirigr al jsp para crear, se usa RequestDispatcher, y este entra en conflicto con sendRedirect. catch (IllegalStateException e){ diff --git a/src/controller/roles/RolesControllerDelete.java b/src/controller/employee/roles/RolesControllerDelete.java similarity index 94% rename from src/controller/roles/RolesControllerDelete.java rename to src/controller/employee/roles/RolesControllerDelete.java index 09c3f4c..c1441e4 100644 --- a/src/controller/roles/RolesControllerDelete.java +++ b/src/controller/employee/roles/RolesControllerDelete.java @@ -1,4 +1,4 @@ -package controller.roles; +package controller.employee.roles; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; @@ -32,7 +32,7 @@ public class RolesControllerDelete extends HttpServlet { System.err.println("Exception captured -> " + e.getMessage()); } - response.sendRedirect("/roles"); + response.sendRedirect("/e/roles"); } diff --git a/src/controller/roles/RolesControllerIndex.java b/src/controller/employee/roles/RolesControllerIndex.java similarity index 95% rename from src/controller/roles/RolesControllerIndex.java rename to src/controller/employee/roles/RolesControllerIndex.java index c3f0737..156e9b8 100644 --- a/src/controller/roles/RolesControllerIndex.java +++ b/src/controller/employee/roles/RolesControllerIndex.java @@ -1,6 +1,6 @@ -package controller.roles; +package controller.employee.roles; -import controller.users.UsersControllerView; +import controller.employee.users.UsersControllerView; import model.User; import javax.jdo.PersistenceManager; diff --git a/src/controller/roles/RolesControllerView.java b/src/controller/employee/roles/RolesControllerView.java similarity index 98% rename from src/controller/roles/RolesControllerView.java rename to src/controller/employee/roles/RolesControllerView.java index 403e891..fbfda9c 100644 --- a/src/controller/roles/RolesControllerView.java +++ b/src/controller/employee/roles/RolesControllerView.java @@ -1,8 +1,8 @@ -package controller.roles; +package controller.employee.roles; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; -import controller.users.UsersControllerView; +import controller.employee.users.UsersControllerView; import model.Role; import javax.jdo.PersistenceManager; diff --git a/src/controller/services/ServicesControllerAdd.java b/src/controller/employee/services/ServicesControllerAdd.java similarity index 94% rename from src/controller/services/ServicesControllerAdd.java rename to src/controller/employee/services/ServicesControllerAdd.java index 29c7c25..7a0f360 100644 --- a/src/controller/services/ServicesControllerAdd.java +++ b/src/controller/employee/services/ServicesControllerAdd.java @@ -1,7 +1,6 @@ -package controller.services; +package controller.employee.services; import java.io.IOException; -import java.util.List; import javax.jdo.PersistenceManager; import javax.servlet.RequestDispatcher; @@ -15,10 +14,8 @@ import javax.servlet.http.HttpSession; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; import controller.PMF; -import controller.access.AccessControllerView; -import controller.roles.RolesControllerView; -import controller.users.UsersControllerView; -import model.Access; +import controller.employee.access.AccessControllerView; +import controller.employee.users.UsersControllerView; import model.Service; @SuppressWarnings("serial") diff --git a/src/controller/services/ServicesControllerDelete.java b/src/controller/employee/services/ServicesControllerDelete.java similarity index 95% rename from src/controller/services/ServicesControllerDelete.java rename to src/controller/employee/services/ServicesControllerDelete.java index e16367f..98a5c19 100644 --- a/src/controller/services/ServicesControllerDelete.java +++ b/src/controller/employee/services/ServicesControllerDelete.java @@ -1,9 +1,9 @@ -package controller.services; +package controller.employee.services; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; import controller.PMF; -import controller.access.AccessControllerView; +import controller.employee.access.AccessControllerView; import model.Service; import javax.jdo.JDOObjectNotFoundException; @@ -12,7 +12,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.List; @SuppressWarnings("serial") public class ServicesControllerDelete extends HttpServlet { diff --git a/src/controller/services/ServicesControllerIndex.java b/src/controller/employee/services/ServicesControllerIndex.java similarity index 91% rename from src/controller/services/ServicesControllerIndex.java rename to src/controller/employee/services/ServicesControllerIndex.java index a815274..7dc01b5 100644 --- a/src/controller/services/ServicesControllerIndex.java +++ b/src/controller/employee/services/ServicesControllerIndex.java @@ -1,7 +1,7 @@ -package controller.services; +package controller.employee.services; -import controller.access.AccessControllerView; -import controller.users.UsersControllerView; +import controller.employee.access.AccessControllerView; +import controller.employee.users.UsersControllerView; import model.User; import javax.servlet.RequestDispatcher; @@ -11,7 +11,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.io.IOException; -import static controller.services.ServicesControllerView.getAllServices; +import static controller.employee.services.ServicesControllerView.getAllServices; public class ServicesControllerIndex extends HttpServlet { diff --git a/src/controller/services/ServicesControllerView.java b/src/controller/employee/services/ServicesControllerView.java similarity index 95% rename from src/controller/services/ServicesControllerView.java rename to src/controller/employee/services/ServicesControllerView.java index 836aef2..0aaab5b 100644 --- a/src/controller/services/ServicesControllerView.java +++ b/src/controller/employee/services/ServicesControllerView.java @@ -1,13 +1,12 @@ -package controller.services; +package controller.employee.services; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; import controller.PMF; -import controller.access.AccessControllerView; -import controller.users.UsersControllerView; +import controller.employee.access.AccessControllerView; +import controller.employee.users.UsersControllerView; import model.Service; -import javax.jdo.JDOObjectNotFoundException; import javax.jdo.PersistenceManager; import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServlet; diff --git a/src/controller/users/UsersControllerAdd.java b/src/controller/employee/users/UsersControllerAdd.java similarity index 96% rename from src/controller/users/UsersControllerAdd.java rename to src/controller/employee/users/UsersControllerAdd.java index a96b701..88d8bad 100644 --- a/src/controller/users/UsersControllerAdd.java +++ b/src/controller/employee/users/UsersControllerAdd.java @@ -1,8 +1,8 @@ -package controller.users; +package controller.employee.users; -import controller.access.AccessControllerView; -import controller.roles.RolesControllerAdd; -import controller.roles.RolesControllerView; +import controller.employee.access.AccessControllerView; +import controller.employee.roles.RolesControllerAdd; +import controller.employee.roles.RolesControllerView; import model.Role; import model.User; @@ -57,7 +57,7 @@ public class UsersControllerAdd extends HttpServlet { String userImg = request.getParameter("userImg"); String userRole = request.getParameter("userRole"); - String rutaRedireccion = "/users"; + String rutaRedireccion = "/e/users"; switch (action) { //Si se quiere iniciar sesion y/o registrar un usuario desde el inicio de sesion de Google @@ -137,7 +137,7 @@ public class UsersControllerAdd extends HttpServlet { } else { request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to create a user.\"}"); - response.sendRedirect("/users"); + response.sendRedirect("/e/users"); } diff --git a/src/controller/users/UsersControllerDelete.java b/src/controller/employee/users/UsersControllerDelete.java similarity index 90% rename from src/controller/users/UsersControllerDelete.java rename to src/controller/employee/users/UsersControllerDelete.java index c85cb94..fa892a3 100644 --- a/src/controller/users/UsersControllerDelete.java +++ b/src/controller/employee/users/UsersControllerDelete.java @@ -1,6 +1,6 @@ -package controller.users; +package controller.employee.users; -import controller.access.AccessControllerView; +import controller.employee.access.AccessControllerView; import model.User; import javax.jdo.JDOObjectNotFoundException; @@ -32,12 +32,12 @@ public class UsersControllerDelete extends HttpServlet { pm.close(); - response.sendRedirect("/users"); + response.sendRedirect("/e/users"); } else { request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to delete a user.\"}"); - response.sendRedirect("/users"); + response.sendRedirect("/e/users"); } diff --git a/src/controller/users/UsersControllerIndex.java b/src/controller/employee/users/UsersControllerIndex.java similarity index 92% rename from src/controller/users/UsersControllerIndex.java rename to src/controller/employee/users/UsersControllerIndex.java index 379b68e..98194d8 100644 --- a/src/controller/users/UsersControllerIndex.java +++ b/src/controller/employee/users/UsersControllerIndex.java @@ -1,6 +1,6 @@ -package controller.users; +package controller.employee.users; -import controller.access.AccessControllerView; +import controller.employee.access.AccessControllerView; import model.User; import javax.servlet.RequestDispatcher; @@ -20,6 +20,7 @@ public class UsersControllerIndex extends HttpServlet { //Se usa para revisar si hay una sesion activa HttpSession sesion= request.getSession(); + System.out.println("URI de peticion -> " + request.getRequestURI()); if (AccessControllerView.checkPermission(sesion.getAttribute("userID").toString(),request.getRequestURI())){ //Intenta hallar una sesion activa diff --git a/src/controller/users/UsersControllerView.java b/src/controller/employee/users/UsersControllerView.java similarity index 97% rename from src/controller/users/UsersControllerView.java rename to src/controller/employee/users/UsersControllerView.java index 2514c62..d13c182 100644 --- a/src/controller/users/UsersControllerView.java +++ b/src/controller/employee/users/UsersControllerView.java @@ -1,7 +1,7 @@ -package controller.users; +package controller.employee.users; -import controller.access.AccessControllerView; -import controller.roles.RolesControllerView; +import controller.employee.access.AccessControllerView; +import controller.employee.roles.RolesControllerView; import model.User; import javax.jdo.JDOObjectNotFoundException; @@ -13,7 +13,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.io.IOException; -import java.util.Iterator; import java.util.List; @SuppressWarnings("serial") @@ -80,7 +79,7 @@ public class UsersControllerView extends HttpServlet { } else { request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to edit/view a user.\"}"); - response.sendRedirect("/users"); + response.sendRedirect("/e/users"); } diff --git a/src/controller/index.java b/src/controller/index.java index f0ab53a..d5673ce 100644 --- a/src/controller/index.java +++ b/src/controller/index.java @@ -1,6 +1,6 @@ package controller; -import controller.users.UsersControllerView; +import controller.employee.users.UsersControllerView; import model.User; import javax.servlet.RequestDispatcher; diff --git a/src/model/Access.java b/src/model/Access.java index 5e6514b..140fd8d 100644 --- a/src/model/Access.java +++ b/src/model/Access.java @@ -1,7 +1,7 @@ package model; -import controller.resources.ResourcesControllerView; -import controller.roles.RolesControllerView; +import controller.employee.resources.ResourcesControllerView; +import controller.employee.roles.RolesControllerView; import javax.jdo.annotations.IdGeneratorStrategy; import javax.jdo.annotations.IdentityType; diff --git a/src/model/Service.java b/src/model/Service.java index 63918a0..01f8eb3 100644 --- a/src/model/Service.java +++ b/src/model/Service.java @@ -3,7 +3,7 @@ package model; import javax.jdo.annotations.*; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; -import controller.users.UsersControllerView; +import controller.employee.users.UsersControllerView; @PersistenceCapable(identityType=IdentityType.APPLICATION) public class Service { diff --git a/src/model/User.java b/src/model/User.java index ffeb11f..35a2741 100644 --- a/src/model/User.java +++ b/src/model/User.java @@ -1,6 +1,6 @@ package model; -import controller.roles.RolesControllerView; +import controller.employee.roles.RolesControllerView; import javax.jdo.annotations.IdentityType; import javax.jdo.annotations.PersistenceCapable; diff --git a/war/WEB-INF/View/Access/add.jsp b/war/WEB-INF/View/Access/add.jsp index ac4a504..c10147d 100644 --- a/war/WEB-INF/View/Access/add.jsp +++ b/war/WEB-INF/View/Access/add.jsp @@ -18,23 +18,23 @@ - - - + + + - + -
@@ -99,7 +104,7 @@
- info_outline + info_outline
The admin Role has full access by default. @@ -150,7 +155,7 @@
- @@ -158,7 +163,7 @@

- arrow_backGo Back + arrow_backGo Back
diff --git a/war/WEB-INF/View/Access/edit.jsp b/war/WEB-INF/View/Access/edit.jsp index 3b5bee3..881fae2 100644 --- a/war/WEB-INF/View/Access/edit.jsp +++ b/war/WEB-INF/View/Access/edit.jsp @@ -18,22 +18,22 @@ - - - + + + - + -
@@ -95,7 +100,7 @@

-
+ @@ -134,12 +139,16 @@ <% } %>
-
+
+
+ arrow_backGo Back +
diff --git a/war/WEB-INF/View/Access/index.jsp b/war/WEB-INF/View/Access/index.jsp index 8d96a93..de5de9c 100644 --- a/war/WEB-INF/View/Access/index.jsp +++ b/war/WEB-INF/View/Access/index.jsp @@ -19,22 +19,22 @@ - - - + + + - + -