diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3fed986..56968dd 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,30 +5,53 @@ - - + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + - - - - + + - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -100,17 +156,6 @@ @@ -207,14 +263,21 @@ - + - + + + + + + + + @@ -222,7 +285,14 @@ - + + + + + + + + @@ -242,6 +312,22 @@ + + + + + + + + + + + + + + + + @@ -355,7 +441,7 @@ - + @@ -526,7 +612,7 @@ - + 1528408256446 @@ -724,11 +810,18 @@ - - @@ -741,7 +834,6 @@ - @@ -848,7 +940,8 @@ - @@ -856,98 +949,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + @@ -968,14 +998,14 @@ - + - + @@ -988,39 +1018,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1028,36 +1025,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1068,14 +1035,7 @@ - - - - - - - - + @@ -1116,40 +1076,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1174,23 +1100,6 @@ - - - - - - - - - - - - - - - - - @@ -1249,7 +1158,7 @@ - + @@ -1259,10 +1168,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/controller/finances/IncomeReport.java b/src/controller/financesManagement/IncomeReport.java similarity index 93% rename from src/controller/finances/IncomeReport.java rename to src/controller/financesManagement/IncomeReport.java index 167e10a..f7b2726 100644 --- a/src/controller/finances/IncomeReport.java +++ b/src/controller/financesManagement/IncomeReport.java @@ -1,7 +1,7 @@ -package controller.finances; +package controller.financesManagement; -import controller.employee.access.AccessControllerView; -import controller.employee.users.UsersControllerView; +import controller.usersManagement.access.AccessControllerView; +import controller.usersManagement.users.UsersControllerView; import model.User; import javax.servlet.RequestDispatcher; diff --git a/src/controller/index.java b/src/controller/index.java index d5673ce..678a55d 100644 --- a/src/controller/index.java +++ b/src/controller/index.java @@ -1,6 +1,6 @@ package controller; -import controller.employee.users.UsersControllerView; +import controller.usersManagement.users.UsersControllerView; import model.User; import javax.servlet.RequestDispatcher; diff --git a/src/controller/employee/employees/EmployeesControllerAdd.java b/src/controller/resourcesManagement/employees/EmployeesControllerAdd.java similarity index 93% rename from src/controller/employee/employees/EmployeesControllerAdd.java rename to src/controller/resourcesManagement/employees/EmployeesControllerAdd.java index d8aa6b6..cf6cd59 100644 --- a/src/controller/employee/employees/EmployeesControllerAdd.java +++ b/src/controller/resourcesManagement/employees/EmployeesControllerAdd.java @@ -1,4 +1,4 @@ -package controller.employee.employees; +package controller.resourcesManagement.employees; import java.io.IOException; @@ -14,8 +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.employee.access.AccessControllerView; -import controller.employee.users.UsersControllerView; +import controller.usersManagement.access.AccessControllerView; +import controller.usersManagement.users.UsersControllerView; import model.Employee; @SuppressWarnings("serial") @@ -27,8 +27,6 @@ public class EmployeesControllerAdd extends HttpServlet { if (AccessControllerView.checkPermission(request.getSession().getAttribute("userID").toString(),request.getRequestURI())){ PersistenceManager pm = PMF.get().getPersistenceManager(); - System.out.println("Request URI Add ->" + request.getRequestURI()); - String action = request.getParameter("action"); if (action == null) @@ -84,7 +82,7 @@ public class EmployeesControllerAdd extends HttpServlet { } else { - request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to create/update a Employee.\"}"); + request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to create/update an Employee.\"}"); response.sendRedirect("/e/users"); } diff --git a/src/controller/employee/employees/EmployeesControllerDelete.java b/src/controller/resourcesManagement/employees/EmployeesControllerDelete.java similarity index 94% rename from src/controller/employee/employees/EmployeesControllerDelete.java rename to src/controller/resourcesManagement/employees/EmployeesControllerDelete.java index 2c623e2..b5ca441 100644 --- a/src/controller/employee/employees/EmployeesControllerDelete.java +++ b/src/controller/resourcesManagement/employees/EmployeesControllerDelete.java @@ -1,9 +1,9 @@ -package controller.employee.employees; +package controller.resourcesManagement.employees; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; import controller.PMF; -import controller.employee.access.AccessControllerView; +import controller.usersManagement.access.AccessControllerView; import model.Employee; import javax.jdo.JDOObjectNotFoundException; diff --git a/src/controller/employee/employees/EmployeesControllerIndex.java b/src/controller/resourcesManagement/employees/EmployeesControllerIndex.java similarity index 89% rename from src/controller/employee/employees/EmployeesControllerIndex.java rename to src/controller/resourcesManagement/employees/EmployeesControllerIndex.java index bf18e39..3807071 100644 --- a/src/controller/employee/employees/EmployeesControllerIndex.java +++ b/src/controller/resourcesManagement/employees/EmployeesControllerIndex.java @@ -1,7 +1,7 @@ -package controller.employee.employees; +package controller.resourcesManagement.employees; -import controller.employee.access.AccessControllerView; -import controller.employee.users.UsersControllerView; +import controller.usersManagement.access.AccessControllerView; +import controller.usersManagement.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.employee.employees.EmployeesControllerView.getAllEmployees; +import static controller.resourcesManagement.employees.EmployeesControllerView.getAllEmployees; public class EmployeesControllerIndex extends HttpServlet { diff --git a/src/controller/employee/employees/EmployeesControllerView.java b/src/controller/resourcesManagement/employees/EmployeesControllerView.java similarity index 93% rename from src/controller/employee/employees/EmployeesControllerView.java rename to src/controller/resourcesManagement/employees/EmployeesControllerView.java index 67cef2d..3f3bb85 100644 --- a/src/controller/employee/employees/EmployeesControllerView.java +++ b/src/controller/resourcesManagement/employees/EmployeesControllerView.java @@ -1,10 +1,10 @@ -package controller.employee.employees; +package controller.resourcesManagement.employees; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; import controller.PMF; -import controller.employee.access.AccessControllerView; -import controller.employee.users.UsersControllerView; +import controller.usersManagement.access.AccessControllerView; +import controller.usersManagement.users.UsersControllerView; import model.Employee; import javax.jdo.PersistenceManager; @@ -72,7 +72,7 @@ public class EmployeesControllerView extends HttpServlet { pm.close(); } else { - request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to view/edit a Employee.\"}"); + request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"No tienes permiso para editar/ver un Empleado.\"}"); response.sendRedirect("/e/users"); } diff --git a/src/controller/resourcesManagement/materials/MaterialsControllerAdd.java b/src/controller/resourcesManagement/materials/MaterialsControllerAdd.java new file mode 100644 index 0000000..294517e --- /dev/null +++ b/src/controller/resourcesManagement/materials/MaterialsControllerAdd.java @@ -0,0 +1,96 @@ +package controller.resourcesManagement.materials; + +import com.google.appengine.api.datastore.Key; +import com.google.appengine.api.datastore.KeyFactory; +import controller.PMF; +import controller.usersManagement.access.AccessControllerView; +import controller.usersManagement.users.UsersControllerView; +import model.Material; + +import javax.jdo.PersistenceManager; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.IOException; + +public class MaterialsControllerAdd extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + try{ + + if (AccessControllerView.checkPermission(request.getSession().getAttribute("userID").toString(),request.getRequestURI())){ + + PersistenceManager pm = PMF.get().getPersistenceManager(); + + String action = request.getParameter("action"); + + if (action == null) + action = ""; + + if (action.equals("create")){ + + String name = request.getParameter("Name"); + int price = Integer.parseInt(request.getParameter("Price")); + int amount = Integer.parseInt(request.getParameter("Amount")); + String unity = request.getParameter("Unity"); + + Material material = new Material(name, price, amount, unity); + + request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Material creado con éxito.\"}"); + + pm.makePersistent(material); + + + } else if (action.equals("update")){ + + Key k = KeyFactory.stringToKey(request.getParameter("key")); + + Material material = pm.getObjectById(Material.class,k); + + material.setName(request.getParameter("Name")); + material.setPrice(Integer.parseInt(request.getParameter("Price"))); + material.setAmount(Integer.parseInt(request.getParameter("Amount"))); + material.setUnity(request.getParameter("Unity")); + + pm.close(); + + request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Material actualizado con éxito.\"}"); + + } else if (action.equals("redirect")){ + + HttpSession sesion= request.getSession(); + RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Materials/add.jsp"); + request.setAttribute("User",UsersControllerView.getUser(sesion.getAttribute("userID").toString())); + dispatcher.forward(request, response); + + } + + pm.close(); + try{ + response.sendRedirect("/e/materials"); + } + //Al redirigr al jsp para crear, se usa RequestDispatcher, y este entra en conflicto con sendRedirect. + catch (IllegalStateException e){ + System.err.println("IllegalStateException: There was a double redirect."); + } + + } else { + + request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"No tienes permiso para acceder.\"}"); + response.sendRedirect("/e/materials"); + + } + + } catch (NullPointerException e){ + response.sendRedirect("/"); + } + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + doPost(request, response); + } +} diff --git a/src/controller/resourcesManagement/materials/MaterialsControllerDelete.java b/src/controller/resourcesManagement/materials/MaterialsControllerDelete.java new file mode 100644 index 0000000..587426c --- /dev/null +++ b/src/controller/resourcesManagement/materials/MaterialsControllerDelete.java @@ -0,0 +1,59 @@ +package controller.resourcesManagement.materials; + +import com.google.appengine.api.datastore.Key; +import com.google.appengine.api.datastore.KeyFactory; +import controller.PMF; +import controller.usersManagement.access.AccessControllerView; +import model.Material; + +import javax.jdo.JDOObjectNotFoundException; +import javax.jdo.PersistenceManager; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +public class MaterialsControllerDelete extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + try{ + + if (AccessControllerView.checkPermission(request.getSession().getAttribute("userID").toString(),request.getRequestURI())){ + + PersistenceManager pm = PMF.get().getPersistenceManager(); + + String materialKey = request.getParameter("materialKey"); + + try{ + Key k = KeyFactory.stringToKey(materialKey); + Material material = pm.getObjectById(Material.class, k); + + pm.deletePersistent(material); + + request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Material eliminado con éxito.\"}"); + } catch (JDOObjectNotFoundException e){ + System.err.println("Exception catched -> " + e.getMessage()); + } + + pm.close(); + + response.sendRedirect("/e/materials"); + + } else { + + request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"No tienes permiso para eliminar un Material.\"}"); + response.sendRedirect("/e/materials"); + + } + + } catch (NullPointerException e){ + response.sendRedirect("/"); + } + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + doPost(request, response); + } +} diff --git a/src/controller/resourcesManagement/materials/MaterialsControllerIndex.java b/src/controller/resourcesManagement/materials/MaterialsControllerIndex.java new file mode 100644 index 0000000..06bac46 --- /dev/null +++ b/src/controller/resourcesManagement/materials/MaterialsControllerIndex.java @@ -0,0 +1,59 @@ +package controller.resourcesManagement.materials; + +import controller.usersManagement.access.AccessControllerView; +import controller.usersManagement.users.UsersControllerView; +import model.User; + +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.IOException; + +import static controller.resourcesManagement.materials.MaterialsControllerView.getAllMaterials; + +public class MaterialsControllerIndex extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + try{ + + if (AccessControllerView.checkPermission(request.getSession().getAttribute("userID").toString(),request.getRequestURI())){ + + //Se usa para revisar si hay una sesion activa + HttpSession sesion= request.getSession(); + + //Intenta hallar una sesion activa + try{ + User user = UsersControllerView.getUser(sesion.getAttribute("userID").toString()); + if (user == null) throw new NullPointerException("UsersControllerIndex: El usuario recibido es nulo."); + + request.setAttribute("User",user); + request.setAttribute("materialList",getAllMaterials()); + request.setAttribute("serverResponse",sesion.getAttribute("serverResponse")); + sesion.setAttribute("serverResponse","!"); + RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Materials/index.jsp"); + dispatcher.forward(request,response); + + } + //Si no la encuentra, redirige a la pagina inicial. + catch (Exception e){ + System.err.println("UserControllerIndex: Error catched. " + e.getMessage()); + response.getWriter().println(""); + } + + } else { + response.sendRedirect("/e/services"); + } + + }catch (NullPointerException e){ + response.sendRedirect("/"); + } + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + doPost(request, response); + } +} diff --git a/src/controller/resourcesManagement/materials/MaterialsControllerView.java b/src/controller/resourcesManagement/materials/MaterialsControllerView.java new file mode 100644 index 0000000..36e5045 --- /dev/null +++ b/src/controller/resourcesManagement/materials/MaterialsControllerView.java @@ -0,0 +1,107 @@ +package controller.resourcesManagement.materials; + +import com.google.appengine.api.datastore.Key; +import com.google.appengine.api.datastore.KeyFactory; +import controller.PMF; +import controller.usersManagement.access.AccessControllerView; +import controller.usersManagement.users.UsersControllerView; +import model.Material; + +import javax.jdo.PersistenceManager; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; + +public class MaterialsControllerView extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + try { + + if (AccessControllerView.checkPermission(request.getSession().getAttribute("userID").toString(),request.getRequestURI())){ + + String action = request.getParameter("action"); + + if (action == null) + action = ""; + + PersistenceManager pm = PMF.get().getPersistenceManager(); + + if (action.equals("editRedirect")) { + RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Materials/view.jsp"); + + request.setAttribute("User",UsersControllerView.getUser(request.getSession().getAttribute("userID").toString())); + request.setAttribute("Material",getMaterial(request.getParameter("materialKey"))); + + request.setAttribute("editAllowed",true); + request.setAttribute("action","Editar"); + + try{ + dispatcher.forward(request,response); + } catch (javax.servlet.ServletException e){ + e.printStackTrace(); + } + + } + else if (action.equals("viewRedirect")) { + RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Materials/view.jsp"); + + request.setAttribute("User",UsersControllerView.getUser(request.getSession().getAttribute("userID").toString())); + request.setAttribute("Material",getMaterial(request.getParameter("materialKey"))); + + request.setAttribute("editAllowed",false); + request.setAttribute("action","Ver"); + + try{ + dispatcher.forward(request,response); + } catch (javax.servlet.ServletException e){ + e.printStackTrace(); + } + + } + //Si no se encontró acción, regresa al inicio + else { + response.getWriter().println(""); + } + + pm.close(); + + } else { + + request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"No tienes permiso para editar/ver un Material.\"}"); + response.sendRedirect("/e/materials"); + + } + + } catch (NullPointerException e){ + response.sendRedirect("/"); + } + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + doPost(request, response); + } + + @SuppressWarnings("unchecked") + static List getAllMaterials(){ + PersistenceManager pm = controller.PMF.get().getPersistenceManager(); + List employees = (List) pm.newQuery("select from " + Material.class.getName()).execute(); + pm.close(); + return employees; + } + + private static Material getMaterial(String key){ + PersistenceManager pm = PMF.get().getPersistenceManager(); + + Key k = KeyFactory.stringToKey(key); + Material material = pm.getObjectById(Material.class,k); + + pm.close(); + return material; + } + +} diff --git a/src/controller/employee/services/ServicesControllerAdd.java b/src/controller/resourcesManagement/services/ServicesControllerAdd.java similarity index 95% rename from src/controller/employee/services/ServicesControllerAdd.java rename to src/controller/resourcesManagement/services/ServicesControllerAdd.java index 7a0f360..32a4084 100644 --- a/src/controller/employee/services/ServicesControllerAdd.java +++ b/src/controller/resourcesManagement/services/ServicesControllerAdd.java @@ -1,4 +1,4 @@ -package controller.employee.services; +package controller.resourcesManagement.services; import java.io.IOException; @@ -14,8 +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.employee.access.AccessControllerView; -import controller.employee.users.UsersControllerView; +import controller.usersManagement.access.AccessControllerView; +import controller.usersManagement.users.UsersControllerView; import model.Service; @SuppressWarnings("serial") diff --git a/src/controller/employee/services/ServicesControllerDelete.java b/src/controller/resourcesManagement/services/ServicesControllerDelete.java similarity index 94% rename from src/controller/employee/services/ServicesControllerDelete.java rename to src/controller/resourcesManagement/services/ServicesControllerDelete.java index 98a5c19..abd875f 100644 --- a/src/controller/employee/services/ServicesControllerDelete.java +++ b/src/controller/resourcesManagement/services/ServicesControllerDelete.java @@ -1,9 +1,9 @@ -package controller.employee.services; +package controller.resourcesManagement.services; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; import controller.PMF; -import controller.employee.access.AccessControllerView; +import controller.usersManagement.access.AccessControllerView; import model.Service; import javax.jdo.JDOObjectNotFoundException; diff --git a/src/controller/employee/services/ServicesControllerIndex.java b/src/controller/resourcesManagement/services/ServicesControllerIndex.java similarity index 89% rename from src/controller/employee/services/ServicesControllerIndex.java rename to src/controller/resourcesManagement/services/ServicesControllerIndex.java index 7dc01b5..f39a257 100644 --- a/src/controller/employee/services/ServicesControllerIndex.java +++ b/src/controller/resourcesManagement/services/ServicesControllerIndex.java @@ -1,7 +1,7 @@ -package controller.employee.services; +package controller.resourcesManagement.services; -import controller.employee.access.AccessControllerView; -import controller.employee.users.UsersControllerView; +import controller.usersManagement.access.AccessControllerView; +import controller.usersManagement.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.employee.services.ServicesControllerView.getAllServices; +import static controller.resourcesManagement.services.ServicesControllerView.getAllServices; public class ServicesControllerIndex extends HttpServlet { diff --git a/src/controller/employee/services/ServicesControllerView.java b/src/controller/resourcesManagement/services/ServicesControllerView.java similarity index 95% rename from src/controller/employee/services/ServicesControllerView.java rename to src/controller/resourcesManagement/services/ServicesControllerView.java index 0aaab5b..06bf750 100644 --- a/src/controller/employee/services/ServicesControllerView.java +++ b/src/controller/resourcesManagement/services/ServicesControllerView.java @@ -1,10 +1,10 @@ -package controller.employee.services; +package controller.resourcesManagement.services; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; import controller.PMF; -import controller.employee.access.AccessControllerView; -import controller.employee.users.UsersControllerView; +import controller.usersManagement.access.AccessControllerView; +import controller.usersManagement.users.UsersControllerView; import model.Service; import javax.jdo.PersistenceManager; diff --git a/src/controller/employee/access/AccessControllerAdd.java b/src/controller/usersManagement/access/AccessControllerAdd.java similarity index 95% rename from src/controller/employee/access/AccessControllerAdd.java rename to src/controller/usersManagement/access/AccessControllerAdd.java index 68912e4..8a59036 100644 --- a/src/controller/employee/access/AccessControllerAdd.java +++ b/src/controller/usersManagement/access/AccessControllerAdd.java @@ -1,9 +1,9 @@ -package controller.employee.access; +package controller.usersManagement.access; import controller.PMF; -import controller.employee.resources.ResourcesControllerView; -import controller.employee.roles.RolesControllerView; -import controller.employee.users.UsersControllerView; +import controller.usersManagement.resources.ResourcesControllerView; +import controller.usersManagement.roles.RolesControllerView; +import controller.usersManagement.users.UsersControllerView; import model.Access; import model.Resource; import model.Role; diff --git a/src/controller/employee/access/AccessControllerDelete.java b/src/controller/usersManagement/access/AccessControllerDelete.java similarity index 97% rename from src/controller/employee/access/AccessControllerDelete.java rename to src/controller/usersManagement/access/AccessControllerDelete.java index 69786e3..9b2d29a 100644 --- a/src/controller/employee/access/AccessControllerDelete.java +++ b/src/controller/usersManagement/access/AccessControllerDelete.java @@ -1,4 +1,4 @@ -package controller.employee.access; +package controller.usersManagement.access; import java.io.IOException; import javax.servlet.http.*; diff --git a/src/controller/employee/access/AccessControllerEdit.java b/src/controller/usersManagement/access/AccessControllerEdit.java similarity index 97% rename from src/controller/employee/access/AccessControllerEdit.java rename to src/controller/usersManagement/access/AccessControllerEdit.java index a381d51..67fa3b8 100644 --- a/src/controller/employee/access/AccessControllerEdit.java +++ b/src/controller/usersManagement/access/AccessControllerEdit.java @@ -1,9 +1,9 @@ -package controller.employee.access; +package controller.usersManagement.access; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; import controller.PMF; -import controller.employee.users.UsersControllerView; +import controller.usersManagement.users.UsersControllerView; import model.Access; import model.Resource; import model.Role; diff --git a/src/controller/employee/access/AccessControllerIndex.java b/src/controller/usersManagement/access/AccessControllerIndex.java similarity index 96% rename from src/controller/employee/access/AccessControllerIndex.java rename to src/controller/usersManagement/access/AccessControllerIndex.java index d9c65d2..b5eb692 100644 --- a/src/controller/employee/access/AccessControllerIndex.java +++ b/src/controller/usersManagement/access/AccessControllerIndex.java @@ -1,7 +1,7 @@ -package controller.employee.access; +package controller.usersManagement.access; import controller.PMF; -import controller.employee.users.UsersControllerView; +import controller.usersManagement.users.UsersControllerView; import model.Access; import model.User; diff --git a/src/controller/employee/access/AccessControllerView.java b/src/controller/usersManagement/access/AccessControllerView.java similarity index 94% rename from src/controller/employee/access/AccessControllerView.java rename to src/controller/usersManagement/access/AccessControllerView.java index 0150c73..05c20ba 100644 --- a/src/controller/employee/access/AccessControllerView.java +++ b/src/controller/usersManagement/access/AccessControllerView.java @@ -1,11 +1,11 @@ -package controller.employee.access; +package controller.usersManagement.access; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; import controller.PMF; -import controller.employee.resources.ResourcesControllerView; -import controller.employee.roles.RolesControllerView; -import controller.employee.users.UsersControllerView; +import controller.usersManagement.resources.ResourcesControllerView; +import controller.usersManagement.roles.RolesControllerView; +import controller.usersManagement.users.UsersControllerView; import model.Access; import model.Resource; import model.Role; diff --git a/src/controller/employee/resources/ResourcesControllerAdd.java b/src/controller/usersManagement/resources/ResourcesControllerAdd.java similarity index 95% rename from src/controller/employee/resources/ResourcesControllerAdd.java rename to src/controller/usersManagement/resources/ResourcesControllerAdd.java index 9939709..3233feb 100644 --- a/src/controller/employee/resources/ResourcesControllerAdd.java +++ b/src/controller/usersManagement/resources/ResourcesControllerAdd.java @@ -1,11 +1,10 @@ -package controller.employee.resources; +package controller.usersManagement.resources; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; -import controller.employee.users.UsersControllerView; +import controller.usersManagement.users.UsersControllerView; import model.Resource; -import javax.jdo.JDOObjectNotFoundException; import javax.jdo.PersistenceManager; import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; diff --git a/src/controller/employee/resources/ResourcesControllerDelete.java b/src/controller/usersManagement/resources/ResourcesControllerDelete.java similarity index 96% rename from src/controller/employee/resources/ResourcesControllerDelete.java rename to src/controller/usersManagement/resources/ResourcesControllerDelete.java index d06115c..b225361 100644 --- a/src/controller/employee/resources/ResourcesControllerDelete.java +++ b/src/controller/usersManagement/resources/ResourcesControllerDelete.java @@ -1,9 +1,8 @@ -package controller.employee.resources; +package controller.usersManagement.resources; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; import model.Resource; -import model.Role; import javax.jdo.JDOObjectNotFoundException; import javax.jdo.PersistenceManager; diff --git a/src/controller/employee/resources/ResourcesControllerIndex.java b/src/controller/usersManagement/resources/ResourcesControllerIndex.java similarity index 90% rename from src/controller/employee/resources/ResourcesControllerIndex.java rename to src/controller/usersManagement/resources/ResourcesControllerIndex.java index 10e3d2e..fb5daeb 100644 --- a/src/controller/employee/resources/ResourcesControllerIndex.java +++ b/src/controller/usersManagement/resources/ResourcesControllerIndex.java @@ -1,10 +1,8 @@ -package controller.employee.resources; +package controller.usersManagement.resources; -import controller.employee.roles.RolesControllerView; -import controller.employee.users.UsersControllerView; +import controller.usersManagement.users.UsersControllerView; import model.User; -import javax.jdo.PersistenceManager; import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; diff --git a/src/controller/employee/resources/ResourcesControllerView.java b/src/controller/usersManagement/resources/ResourcesControllerView.java similarity index 96% rename from src/controller/employee/resources/ResourcesControllerView.java rename to src/controller/usersManagement/resources/ResourcesControllerView.java index 9098598..e0536f5 100644 --- a/src/controller/employee/resources/ResourcesControllerView.java +++ b/src/controller/usersManagement/resources/ResourcesControllerView.java @@ -1,8 +1,8 @@ -package controller.employee.resources; +package controller.usersManagement.resources; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; -import controller.employee.users.UsersControllerView; +import controller.usersManagement.users.UsersControllerView; import model.Resource; import javax.jdo.PersistenceManager; @@ -14,8 +14,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import static controller.employee.roles.RolesControllerView.getRole; - @SuppressWarnings("serial") public class ResourcesControllerView extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { diff --git a/src/controller/employee/roles/RolesControllerAdd.java b/src/controller/usersManagement/roles/RolesControllerAdd.java similarity index 96% rename from src/controller/employee/roles/RolesControllerAdd.java rename to src/controller/usersManagement/roles/RolesControllerAdd.java index 5020817..af45524 100644 --- a/src/controller/employee/roles/RolesControllerAdd.java +++ b/src/controller/usersManagement/roles/RolesControllerAdd.java @@ -1,8 +1,8 @@ -package controller.employee.roles; +package controller.usersManagement.roles; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; -import controller.employee.users.UsersControllerView; +import controller.usersManagement.users.UsersControllerView; import model.Role; import javax.jdo.PersistenceManager; diff --git a/src/controller/employee/roles/RolesControllerDelete.java b/src/controller/usersManagement/roles/RolesControllerDelete.java similarity index 97% rename from src/controller/employee/roles/RolesControllerDelete.java rename to src/controller/usersManagement/roles/RolesControllerDelete.java index c1441e4..113d1c2 100644 --- a/src/controller/employee/roles/RolesControllerDelete.java +++ b/src/controller/usersManagement/roles/RolesControllerDelete.java @@ -1,4 +1,4 @@ -package controller.employee.roles; +package controller.usersManagement.roles; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; diff --git a/src/controller/employee/roles/RolesControllerIndex.java b/src/controller/usersManagement/roles/RolesControllerIndex.java similarity index 93% rename from src/controller/employee/roles/RolesControllerIndex.java rename to src/controller/usersManagement/roles/RolesControllerIndex.java index 156e9b8..8fec1bc 100644 --- a/src/controller/employee/roles/RolesControllerIndex.java +++ b/src/controller/usersManagement/roles/RolesControllerIndex.java @@ -1,9 +1,8 @@ -package controller.employee.roles; +package controller.usersManagement.roles; -import controller.employee.users.UsersControllerView; +import controller.usersManagement.users.UsersControllerView; import model.User; -import javax.jdo.PersistenceManager; import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; diff --git a/src/controller/employee/roles/RolesControllerView.java b/src/controller/usersManagement/roles/RolesControllerView.java similarity index 97% rename from src/controller/employee/roles/RolesControllerView.java rename to src/controller/usersManagement/roles/RolesControllerView.java index fbfda9c..61567b5 100644 --- a/src/controller/employee/roles/RolesControllerView.java +++ b/src/controller/usersManagement/roles/RolesControllerView.java @@ -1,8 +1,8 @@ -package controller.employee.roles; +package controller.usersManagement.roles; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; -import controller.employee.users.UsersControllerView; +import controller.usersManagement.users.UsersControllerView; import model.Role; import javax.jdo.PersistenceManager; diff --git a/src/controller/employee/users/UsersControllerAdd.java b/src/controller/usersManagement/users/UsersControllerAdd.java similarity index 97% rename from src/controller/employee/users/UsersControllerAdd.java rename to src/controller/usersManagement/users/UsersControllerAdd.java index 88d8bad..0e3291f 100644 --- a/src/controller/employee/users/UsersControllerAdd.java +++ b/src/controller/usersManagement/users/UsersControllerAdd.java @@ -1,8 +1,8 @@ -package controller.employee.users; +package controller.usersManagement.users; -import controller.employee.access.AccessControllerView; -import controller.employee.roles.RolesControllerAdd; -import controller.employee.roles.RolesControllerView; +import controller.usersManagement.access.AccessControllerView; +import controller.usersManagement.roles.RolesControllerAdd; +import controller.usersManagement.roles.RolesControllerView; import model.Role; import model.User; diff --git a/src/controller/employee/users/UsersControllerDelete.java b/src/controller/usersManagement/users/UsersControllerDelete.java similarity index 94% rename from src/controller/employee/users/UsersControllerDelete.java rename to src/controller/usersManagement/users/UsersControllerDelete.java index fa892a3..fc4cdf3 100644 --- a/src/controller/employee/users/UsersControllerDelete.java +++ b/src/controller/usersManagement/users/UsersControllerDelete.java @@ -1,6 +1,6 @@ -package controller.employee.users; +package controller.usersManagement.users; -import controller.employee.access.AccessControllerView; +import controller.usersManagement.access.AccessControllerView; import model.User; import javax.jdo.JDOObjectNotFoundException; diff --git a/src/controller/employee/users/UsersControllerIndex.java b/src/controller/usersManagement/users/UsersControllerIndex.java similarity index 95% rename from src/controller/employee/users/UsersControllerIndex.java rename to src/controller/usersManagement/users/UsersControllerIndex.java index 98194d8..19af341 100644 --- a/src/controller/employee/users/UsersControllerIndex.java +++ b/src/controller/usersManagement/users/UsersControllerIndex.java @@ -1,6 +1,6 @@ -package controller.employee.users; +package controller.usersManagement.users; -import controller.employee.access.AccessControllerView; +import controller.usersManagement.access.AccessControllerView; import model.User; import javax.servlet.RequestDispatcher; diff --git a/src/controller/employee/users/UsersControllerView.java b/src/controller/usersManagement/users/UsersControllerView.java similarity index 97% rename from src/controller/employee/users/UsersControllerView.java rename to src/controller/usersManagement/users/UsersControllerView.java index d13c182..7e48a9d 100644 --- a/src/controller/employee/users/UsersControllerView.java +++ b/src/controller/usersManagement/users/UsersControllerView.java @@ -1,7 +1,7 @@ -package controller.employee.users; +package controller.usersManagement.users; -import controller.employee.access.AccessControllerView; -import controller.employee.roles.RolesControllerView; +import controller.usersManagement.access.AccessControllerView; +import controller.usersManagement.roles.RolesControllerView; import model.User; import javax.jdo.JDOObjectNotFoundException; diff --git a/src/model/Access.java b/src/model/Access.java index 140fd8d..6378062 100644 --- a/src/model/Access.java +++ b/src/model/Access.java @@ -1,7 +1,7 @@ package model; -import controller.employee.resources.ResourcesControllerView; -import controller.employee.roles.RolesControllerView; +import controller.usersManagement.resources.ResourcesControllerView; +import controller.usersManagement.roles.RolesControllerView; import javax.jdo.annotations.IdGeneratorStrategy; import javax.jdo.annotations.IdentityType; diff --git a/src/model/Employee.java b/src/model/Employee.java index 54100bc..3bf3503 100644 --- a/src/model/Employee.java +++ b/src/model/Employee.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.employee.users.UsersControllerView; +import controller.usersManagement.users.UsersControllerView; @PersistenceCapable(identityType=IdentityType.APPLICATION) public class Employee { diff --git a/src/model/Material.java b/src/model/Material.java new file mode 100644 index 0000000..41d30cd --- /dev/null +++ b/src/model/Material.java @@ -0,0 +1,68 @@ +package model; + +import javax.jdo.annotations.*; +import com.google.appengine.api.datastore.Key; +import com.google.appengine.api.datastore.KeyFactory; + +@PersistenceCapable(identityType=IdentityType.APPLICATION) +public class Material { + + @PrimaryKey + @Persistent(valueStrategy = IdGeneratorStrategy.IDENTITY) + private Key key; + + @Persistent + private String name; + + //Precio por unity + @Persistent + private int price; + + //Tipo de unidad -> Peso, cantidad, medida, volumen, etc. + @Persistent + private String unity; + + @Persistent + private int amount; + + public Material(String name, int price, int quantity, String unity) { + this.name = name; + this.price = price; + this.amount = quantity; + this.unity = unity; + } + + public String getKey() { + return KeyFactory.keyToString(key); + } + + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + public int getPrice() { + return price; + } + public void setPrice(int price) { + this.price = price; + } + + public String getUnity() { + return unity; + } + public void setUnity(String unity) { + this.unity = unity; + } + + public int getAmount() { + return amount; + } + public void setAmount(int amount) { + this.amount = amount; + } + +} \ No newline at end of file diff --git a/src/model/Service.java b/src/model/Service.java index 01f8eb3..2ea332f 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.employee.users.UsersControllerView; +import controller.usersManagement.users.UsersControllerView; @PersistenceCapable(identityType=IdentityType.APPLICATION) public class Service { diff --git a/src/model/User.java b/src/model/User.java index 35a2741..4222e90 100644 --- a/src/model/User.java +++ b/src/model/User.java @@ -1,12 +1,11 @@ package model; -import controller.employee.roles.RolesControllerView; +import controller.usersManagement.roles.RolesControllerView; import javax.jdo.annotations.IdentityType; import javax.jdo.annotations.PersistenceCapable; import javax.jdo.annotations.Persistent; import javax.jdo.annotations.PrimaryKey; -import java.util.ArrayList; @PersistenceCapable(identityType = IdentityType.APPLICATION) public class User { diff --git a/war/WEB-INF/View/Employees/add.jsp b/war/WEB-INF/View/Employees/add.jsp index 2d474ab..5a1e90c 100644 --- a/war/WEB-INF/View/Employees/add.jsp +++ b/war/WEB-INF/View/Employees/add.jsp @@ -87,7 +87,8 @@
diff --git a/war/WEB-INF/View/Employees/index.jsp b/war/WEB-INF/View/Employees/index.jsp index 31dc66b..b03d9e6 100644 --- a/war/WEB-INF/View/Employees/index.jsp +++ b/war/WEB-INF/View/Employees/index.jsp @@ -1,6 +1,5 @@ <%@ page import="model.User" %> <%@ page import="java.util.List" %> -<%@ page import="model.Service" %> <%@ page import="model.Employee" %><%-- Created by IntelliJ IDEA. User: Fernando @@ -93,6 +92,7 @@ diff --git a/war/WEB-INF/View/Employees/view.jsp b/war/WEB-INF/View/Employees/view.jsp index 6807fa3..58b9ad7 100644 --- a/war/WEB-INF/View/Employees/view.jsp +++ b/war/WEB-INF/View/Employees/view.jsp @@ -88,8 +88,9 @@
diff --git a/war/WEB-INF/View/Finances/index.jsp b/war/WEB-INF/View/Finances/index.jsp index e880cde..7380790 100644 --- a/war/WEB-INF/View/Finances/index.jsp +++ b/war/WEB-INF/View/Finances/index.jsp @@ -90,6 +90,7 @@
diff --git a/war/WEB-INF/View/Materials/View.jsp b/war/WEB-INF/View/Materials/View.jsp new file mode 100644 index 0000000..a175b19 --- /dev/null +++ b/war/WEB-INF/View/Materials/View.jsp @@ -0,0 +1,148 @@ +<%@ page import="model.User" %> +<%@ page import="model.Service" %> +<%@ page import="model.Material" %> +<%-- + Created by IntelliJ IDEA. + User: Fernando + Date: 07/06/2018 + Time: 16:39 + To change this template use File | Settings | File Templates. +--%> +<% Material material = (Material) request.getAttribute("Material"); + User usuario = (User) request.getAttribute("User"); + boolean editAllowed = (Boolean) request.getAttribute("editAllowed"); + String action = (String) request.getAttribute("action");%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + <%=action%> un Material - Hotel Services + + + + + + + + + + + + + + + + + + + +
+
+ <%=action%> un Material +
+
+ + <% if (editAllowed) {%> + +
+ + + Nombre del Material:
+
+ + Cantidad:
+
+ + Precio por unidad:
+
+ + Unidad (ejm. Kg, Litros):
+
+ + + +
+ + <% } else {%> + + +
+ Nombre: <%= material.getName() %>
+ Cantidad: <%= material.getAmount() %>
+ Precio: <%= material.getPrice() %>
+ Unidad: <%= material.getUnity() %>
+
+ + <% } %> + +
+
+ arrow_backVolver + + +
+ + + diff --git a/war/WEB-INF/View/Materials/add.jsp b/war/WEB-INF/View/Materials/add.jsp new file mode 100644 index 0000000..0101f1f --- /dev/null +++ b/war/WEB-INF/View/Materials/add.jsp @@ -0,0 +1,129 @@ +<%@ page import="model.User" %> +<%-- + Created by IntelliJ IDEA. + User: Fernando + Date: 07/06/2018 + Time: 16:39 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<% User user = (User) request.getAttribute("User"); %> + + + Add a Service - Hotel Services + + + + + + + + + + + + + + + + + + + + +
+
+ Crear un Material +
+
+ +
+ + + Nombre del Material:
+
+ + Cantidad:
+
+ + Precio por unidad:
+
+ + Unidad (ejm. Kg, Litros):
+
+ + + +
+
+
+ arrow_backGo Back + + +
+ + + diff --git a/war/WEB-INF/View/Materials/index.jsp b/war/WEB-INF/View/Materials/index.jsp new file mode 100644 index 0000000..fe94407 --- /dev/null +++ b/war/WEB-INF/View/Materials/index.jsp @@ -0,0 +1,166 @@ +<%@ page import="model.User" %> +<%@ page import="java.util.List" %> +<%@ page import="model.Material" %> +<%-- + Created by IntelliJ IDEA. + User: Fernando + Date: 07/06/2018 + Time: 16:39 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<% User usuario = (User) request.getAttribute("User"); + List materialList = (List) request.getAttribute("materialList"); + String serverResponse = (String) request.getAttribute("serverResponse"); + if (serverResponse == null) serverResponse = "!"; +%> + + + Materiales - Hotel Services + + + + + + + + + + + + + + + + + + + + +
+
+ Materiales +
+
+ + <%if (!serverResponse.equals("!")){ %> + +
+
+
+ + + <% } %> +
+
+ + addCreate +
+
+ + + + + + + + + + + + + + <% for (Material material : materialList) {%> + + + + + + + + <% } %> + + +
NombrePrecio UnitarioCantidadUnidad
<%= material.getName()%><%= material.getPrice() %><%= material.getAmount() %><%= material.getUnity() %> + View + | Edit + | Delete
+ +
+ + + diff --git a/war/WEB-INF/View/Services/add.jsp b/war/WEB-INF/View/Services/add.jsp index 7c6b130..cc2ee7d 100644 --- a/war/WEB-INF/View/Services/add.jsp +++ b/war/WEB-INF/View/Services/add.jsp @@ -1,6 +1,5 @@ <%@ page import="model.User" %> -<%@ page import="java.util.List" %> -<%@ page import="model.Role" %><%-- +<%-- Created by IntelliJ IDEA. User: Fernando Date: 07/06/2018 @@ -88,6 +87,7 @@ diff --git a/war/WEB-INF/View/Services/index.jsp b/war/WEB-INF/View/Services/index.jsp index 6ffa21c..7c4a818 100644 --- a/war/WEB-INF/View/Services/index.jsp +++ b/war/WEB-INF/View/Services/index.jsp @@ -92,6 +92,7 @@ diff --git a/war/WEB-INF/View/Services/view.jsp b/war/WEB-INF/View/Services/view.jsp index 67ad6b3..acc619b 100644 --- a/war/WEB-INF/View/Services/view.jsp +++ b/war/WEB-INF/View/Services/view.jsp @@ -90,6 +90,7 @@ diff --git a/war/WEB-INF/classes/model/Access.class b/war/WEB-INF/classes/model/Access.class index 334e3ad..6e036db 100644 Binary files a/war/WEB-INF/classes/model/Access.class and b/war/WEB-INF/classes/model/Access.class differ diff --git a/war/WEB-INF/classes/model/User.class b/war/WEB-INF/classes/model/User.class index b3b4f4a..99a796e 100644 Binary files a/war/WEB-INF/classes/model/User.class and b/war/WEB-INF/classes/model/User.class differ diff --git a/war/WEB-INF/web.xml b/war/WEB-INF/web.xml index 7baa50f..27dbe44 100644 --- a/war/WEB-INF/web.xml +++ b/war/WEB-INF/web.xml @@ -2,7 +2,7 @@ UsersControllerAdd - controller.employee.users.UsersControllerAdd + controller.usersManagement.users.UsersControllerAdd UsersControllerAdd @@ -11,7 +11,7 @@ UsersControllerIndex - controller.employee.users.UsersControllerIndex + controller.usersManagement.users.UsersControllerIndex UsersControllerIndex @@ -20,7 +20,7 @@ UsersControllerView - controller.employee.users.UsersControllerView + controller.usersManagement.users.UsersControllerView UsersControllerView @@ -29,7 +29,7 @@ UsersControllerDelete - controller.employee.users.UsersControllerDelete + controller.usersManagement.users.UsersControllerDelete UsersControllerDelete @@ -41,7 +41,7 @@ RolesControllerAdd - controller.employee.roles.RolesControllerAdd + controller.usersManagement.roles.RolesControllerAdd RolesControllerAdd @@ -50,7 +50,7 @@ RolesControllerIndex - controller.employee.roles.RolesControllerIndex + controller.usersManagement.roles.RolesControllerIndex RolesControllerIndex @@ -59,7 +59,7 @@ RolesControllerView - controller.employee.roles.RolesControllerView + controller.usersManagement.roles.RolesControllerView RolesControllerView @@ -68,7 +68,7 @@ RolesControllerDelete - controller.employee.roles.RolesControllerDelete + controller.usersManagement.roles.RolesControllerDelete RolesControllerDelete @@ -80,7 +80,7 @@ ResourcesControllerAdd - controller.employee.resources.ResourcesControllerAdd + controller.usersManagement.resources.ResourcesControllerAdd ResourcesControllerAdd @@ -89,7 +89,7 @@ ResourcesControllerIndex - controller.employee.resources.ResourcesControllerIndex + controller.usersManagement.resources.ResourcesControllerIndex ResourcesControllerIndex @@ -98,7 +98,7 @@ ResourcesControllerView - controller.employee.resources.ResourcesControllerView + controller.usersManagement.resources.ResourcesControllerView ResourcesControllerView @@ -107,7 +107,7 @@ ResourcesControllerDelete - controller.employee.resources.ResourcesControllerDelete + controller.usersManagement.resources.ResourcesControllerDelete ResourcesControllerDelete @@ -119,7 +119,7 @@ AccessControllerEdit - controller.employee.access.AccessControllerEdit + controller.usersManagement.access.AccessControllerEdit AccessControllerEdit @@ -128,7 +128,7 @@ AccessControllerAdd - controller.employee.access.AccessControllerAdd + controller.usersManagement.access.AccessControllerAdd AccessControllerAdd @@ -137,7 +137,7 @@ AccessControllerIndex - controller.employee.access.AccessControllerIndex + controller.usersManagement.access.AccessControllerIndex AccessControllerIndex @@ -146,7 +146,7 @@ AccessControllerView - controller.employee.access.AccessControllerView + controller.usersManagement.access.AccessControllerView AccessControllerView @@ -155,7 +155,7 @@ AccessControllerDelete - controller.employee.access.AccessControllerDelete + controller.usersManagement.access.AccessControllerDelete AccessControllerDelete @@ -168,7 +168,7 @@ --> ServicesControllerAdd - controller.employee.services.ServicesControllerAdd + controller.resourcesManagement.services.ServicesControllerAdd ServicesControllerAdd @@ -177,7 +177,7 @@ ServicesControllerDelete - controller.employee.services.ServicesControllerDelete + controller.resourcesManagement.services.ServicesControllerDelete ServicesControllerDelete @@ -186,7 +186,7 @@ ServicesControllerIndex - controller.employee.services.ServicesControllerIndex + controller.resourcesManagement.services.ServicesControllerIndex ServicesControllerIndex @@ -195,7 +195,7 @@ ServicesControllerView - controller.employee.services.ServicesControllerView + controller.resourcesManagement.services.ServicesControllerView ServicesControllerView @@ -203,9 +203,10 @@ + EmployeesControllerAdd - controller.employee.employees.EmployeesControllerAdd + controller.resourcesManagement.employees.EmployeesControllerAdd @@ -215,7 +216,7 @@ EmployeesControllerView - controller.employee.employees.EmployeesControllerView + controller.resourcesManagement.employees.EmployeesControllerView @@ -225,7 +226,7 @@ EmployeesControllerDelete - controller.employee.employees.EmployeesControllerDelete + controller.resourcesManagement.employees.EmployeesControllerDelete @@ -235,7 +236,7 @@ EmployeesControllerIndex - controller.employee.employees.EmployeesControllerIndex + controller.resourcesManagement.employees.EmployeesControllerIndex @@ -244,14 +245,54 @@ + + + MaterialsControllerAdd + controller.resourcesManagement.materials.MaterialsControllerAdd + + + MaterialsControllerAdd + /e/materials/add + + + + MaterialsControllerDelete + controller.resourcesManagement.materials.MaterialsControllerDelete + + + MaterialsControllerDelete + /e/materials/delete + + + + MaterialsControllerIndex + controller.resourcesManagement.materials.MaterialsControllerIndex + + + MaterialsControllerIndex + /e/materials + + + + MaterialsControllerView + controller.resourcesManagement.materials.MaterialsControllerView + + + MaterialsControllerView + /e/materials/view + + + + IncomeReport - controller.finances.IncomeReport + controller.financesManagement.IncomeReport IncomeReport /e/reports +