From 69c419791a24d3080cff5d1ab9fb97d13040d4a4 Mon Sep 17 00:00:00 2001 From: Araozu Date: Sat, 14 Jul 2018 17:38:27 -0500 Subject: [PATCH] Arreglo de errores. --- .idea/workspace.xml | 539 ++++++++++------------ src/controller/finances/IncomeReport.java | 57 +++ war/WEB-INF/View/Access/add.jsp | 2 +- war/WEB-INF/View/Access/edit.jsp | 2 +- war/WEB-INF/View/Access/index.jsp | 2 +- war/WEB-INF/View/Access/view.jsp | 2 +- war/WEB-INF/View/Employees/add.jsp | 4 +- war/WEB-INF/View/Employees/index.jsp | 4 +- war/WEB-INF/View/Employees/view.jsp | 4 +- war/WEB-INF/View/Finances/index.jsp | 137 ++++++ war/WEB-INF/View/Resources/add.jsp | 2 +- war/WEB-INF/View/Resources/index.jsp | 2 +- war/WEB-INF/View/Resources/view.jsp | 2 +- war/WEB-INF/View/Roles/add.jsp | 4 +- war/WEB-INF/View/Roles/index.jsp | 4 +- war/WEB-INF/View/Roles/view.jsp | 4 +- war/WEB-INF/View/Services/add.jsp | 4 +- war/WEB-INF/View/Services/index.jsp | 4 +- war/WEB-INF/View/Services/view.jsp | 4 +- war/WEB-INF/View/Users/add.jsp | 4 +- war/WEB-INF/View/Users/index.jsp | 4 +- war/WEB-INF/View/Users/view.jsp | 4 +- war/WEB-INF/web.xml | 9 + war/index.jsp | 2 +- 24 files changed, 487 insertions(+), 319 deletions(-) create mode 100644 src/controller/finances/IncomeReport.java create mode 100644 war/WEB-INF/View/Finances/index.jsp diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a0d458d..3fed986 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,18 +4,31 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + @@ -138,38 +100,20 @@ @@ -255,6 +217,13 @@ + + + + + + + @@ -273,14 +242,6 @@ - - - - - - - - @@ -386,6 +347,7 @@ + @@ -564,7 +526,7 @@ - + 1528408256446 @@ -755,11 +717,18 @@ - - @@ -796,8 +765,8 @@ - - + + @@ -878,7 +847,8 @@ - @@ -886,82 +856,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -976,20 +870,6 @@ - - - - - - - - - - - - - - @@ -997,33 +877,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1094,13 +947,6 @@ - - - - - - - @@ -1108,16 +954,6 @@ - - - - - - - - - - @@ -1146,26 +982,12 @@ - - - - - - - - - - - - - - @@ -1199,13 +1021,6 @@ - - - - - - - @@ -1213,27 +1028,20 @@ - + - - + + - + - - - - - - - - - + + @@ -1250,20 +1058,126 @@ - + - - + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1272,32 +1186,83 @@ - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - + + diff --git a/src/controller/finances/IncomeReport.java b/src/controller/finances/IncomeReport.java new file mode 100644 index 0000000..167e10a --- /dev/null +++ b/src/controller/finances/IncomeReport.java @@ -0,0 +1,57 @@ +package controller.finances; + +import controller.employee.access.AccessControllerView; +import controller.employee.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; + +public class IncomeReport 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("serverResponse",sesion.getAttribute("serverResponse")); + sesion.setAttribute("serverResponse","!"); + RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Finances/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 { + request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to access /reports.\"}"); + response.sendRedirect("/e/users"); + } + + } catch (NullPointerException e){ + response.sendRedirect("/e/users"); + } + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + doPost(request, response); + } +} diff --git a/war/WEB-INF/View/Access/add.jsp b/war/WEB-INF/View/Access/add.jsp index c10147d..9fea16c 100644 --- a/war/WEB-INF/View/Access/add.jsp +++ b/war/WEB-INF/View/Access/add.jsp @@ -60,7 +60,7 @@