diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 56968dd..4d47444 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,53 +5,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + + + - - + + - - + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - + + @@ -173,40 +143,40 @@ @@ -229,8 +199,8 @@ - @@ -240,6 +210,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -361,71 +380,6 @@ - - - - - - - - - - - - - - - - - @@ -612,7 +566,8 @@ - + + 1528408256446 @@ -817,11 +772,18 @@ - - @@ -833,7 +795,8 @@ - + + @@ -859,7 +822,6 @@ - @@ -869,6 +831,7 @@ + @@ -941,7 +904,8 @@ - @@ -1018,13 +982,6 @@ - - - - - - - @@ -1032,129 +989,11 @@ - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1162,36 +1001,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1216,16 +1025,6 @@ - - - - - - - - - - @@ -1233,16 +1032,6 @@ - - - - - - - - - - @@ -1260,23 +1049,10 @@ - - - - - - - - - - - - - @@ -1284,10 +1060,6 @@ - - - - @@ -1295,9 +1067,6 @@ - - - @@ -1305,74 +1074,262 @@ - - - - - + + + + + + + + + + + + + + + - + + + - + - - - - - - - - - - - - - - - - + + - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/war/WEB-INF/View/Access/add.jsp b/war/WEB-INF/View/Access/add.jsp index 9fea16c..51ad732 100644 --- a/war/WEB-INF/View/Access/add.jsp +++ b/war/WEB-INF/View/Access/add.jsp @@ -12,7 +12,7 @@ - Add an access - Hotel Services + A馻dir un Acceso - Hotel Services @@ -35,7 +35,7 @@
Hotel Services   Empleados -
+
<%= user.getName()%> @@ -48,7 +48,7 @@

@@ -120,7 +120,7 @@ - Role: + Rol: <% if(roles.size() > 0) {%> <% } else {%>
- No Roles registered. + No hay Roles registrados. <% } %>
- Resource: + Recurso: <% if (resourses.size() > 0) { %> <% } else { %>
- No Resources registered. + No hay Recursos disponibles. <% } %>
- @@ -163,7 +163,7 @@

- arrow_backGo Back + arrow_backVolver
diff --git a/war/WEB-INF/View/Access/edit.jsp b/war/WEB-INF/View/Access/edit.jsp index 5bff59e..0e81b61 100644 --- a/war/WEB-INF/View/Access/edit.jsp +++ b/war/WEB-INF/View/Access/edit.jsp @@ -13,7 +13,7 @@ - Edit an Access - Hotel Services + Editar un Acceso - Hotel Services @@ -34,7 +34,7 @@
Hotel Services   Empleados -
+
<%= user.getName()%> @@ -47,7 +47,7 @@
  • - Log Out + Cerrar Sesion
  • @@ -87,16 +87,16 @@

    - Edit an Access + Editar un Acceso

    @@ -106,9 +106,9 @@ - New Role: + Nuevo Rol:
    - New Resource: + Nuevo Recurso:
    - @@ -147,7 +147,7 @@

    - arrow_backGo Back + arrow_backVolver
    diff --git a/war/WEB-INF/View/Access/index.jsp b/war/WEB-INF/View/Access/index.jsp index cc8b803..685daed 100644 --- a/war/WEB-INF/View/Access/index.jsp +++ b/war/WEB-INF/View/Access/index.jsp @@ -12,7 +12,7 @@ - Access - Hotel Services + Accesos - Hotel Services @@ -35,7 +35,7 @@
    Hotel Services   Empleados -
    +
    <%= usuario.getName()%> @@ -48,7 +48,7 @@
    • - Log Out + Cerrar Sesi髇
    • diff --git a/war/WEB-INF/View/Access/view.jsp b/war/WEB-INF/View/Access/view.jsp index ed10c57..46545a4 100644 --- a/war/WEB-INF/View/Access/view.jsp +++ b/war/WEB-INF/View/Access/view.jsp @@ -10,7 +10,7 @@ - Insert title here + Ver un Acceso @@ -28,7 +28,7 @@
      Hotel Services   Empleados -
      +
      <%= user.getName()%> @@ -41,7 +41,7 @@
      • - Log Out + Cerrar Sesi髇
      • @@ -81,28 +81,28 @@

        - View an Access + Ver un Acceso

        ID: <%=access.getId()%>
        - Role: <%=access.getRoleName()%>
        - Resource: <%= access.getResourceName() %> + Rol: <%=access.getRoleName()%>
        + Recurso: <%= access.getResourceName() %>

        - arrow_backGo Back + arrow_backVolver
        diff --git a/war/WEB-INF/View/Employees/add.jsp b/war/WEB-INF/View/Employees/add.jsp index 5a1e90c..63e1ca2 100644 --- a/war/WEB-INF/View/Employees/add.jsp +++ b/war/WEB-INF/View/Employees/add.jsp @@ -11,7 +11,7 @@ <% User user = (User) request.getAttribute("User"); %> - Add a Employee - Hotel Services + A帽adir un Empleado - Hotel Services @@ -34,7 +34,7 @@
        Hotel Services   Empleados -
        +
        <%= user.getName()%> @@ -47,7 +47,7 @@
        • - Log Out + Cerrar Sesi贸n
        • @@ -95,24 +95,24 @@

          - Create an Employee + Crear un Empleado

          - Name of the Employee:
          -
          + Nombre del Empleado:
          +
          - Dni of the Employee:
          -
          + Dni del Empleado:
          +
          - Email of the Employee:
          -
          + Correo electr贸nico del Empleado:
          +
          - Phone of the Employee:
          -
          + Tel茅fono del Empleado:
          +
          @@ -123,7 +123,7 @@

          - arrow_backGo Back + arrow_backVolver
          diff --git a/war/WEB-INF/View/Employees/index.jsp b/war/WEB-INF/View/Employees/index.jsp index b03d9e6..27cb725 100644 --- a/war/WEB-INF/View/Employees/index.jsp +++ b/war/WEB-INF/View/Employees/index.jsp @@ -38,7 +38,7 @@
          Hotel Services   Empleados -
          +
          <%= usuario.getName()%> @@ -51,7 +51,7 @@
          • - Log Out + Cerrar Sesi贸n
          • diff --git a/war/WEB-INF/View/Employees/view.jsp b/war/WEB-INF/View/Employees/view.jsp index 58b9ad7..dd9cb4b 100644 --- a/war/WEB-INF/View/Employees/view.jsp +++ b/war/WEB-INF/View/Employees/view.jsp @@ -36,7 +36,7 @@
            Hotel Services   Empleados -
            +
            <%= usuario.getName()%> @@ -49,7 +49,7 @@
            • - Log Out + Cerrar Sesi贸n
            • @@ -97,7 +97,7 @@

              - <%=action%> a Service + <%=action%> un Servicio

              @@ -108,20 +108,20 @@ - Name of the Service:
              -
              + Nombre del Servicio:
              +
              - DNI of the Employee:
              -
              + DNI del Empleado:
              +
              - Email of the Service:
              + Correo electr贸nico del Empleado:

              - Phone of the Employee:
              - + - @@ -131,10 +131,10 @@
              - Name: <%= employee.getName() %>
              + Nombre: <%= employee.getName() %>
              Dni: <%= employee.getDni() %>
              - Email: <%= employee.getEmail() %>
              - Created by: <%= employee.getCreatorUserName() %> + Correo electr贸nico: <%= employee.getEmail() %>
              + Creado por: <%= employee.getCreatorUserName() %>
              @@ -142,7 +142,7 @@

              - arrow_backGo Back + arrow_backVolver
              diff --git a/war/WEB-INF/View/Finances/index.jsp b/war/WEB-INF/View/Finances/index.jsp index 7380790..23a5cac 100644 --- a/war/WEB-INF/View/Finances/index.jsp +++ b/war/WEB-INF/View/Finances/index.jsp @@ -14,7 +14,7 @@ %> - Resources - Hotel Services + Finanzas - Hotel Services @@ -37,7 +37,7 @@
              Hotel Services   Empleados -
              +
              <%= usuario.getName()%> @@ -50,7 +50,7 @@
              • - Log Out + Cerrar Sesi贸n
              • diff --git a/war/WEB-INF/View/Materials/View.jsp b/war/WEB-INF/View/Materials/View.jsp index a175b19..f69cc0b 100644 --- a/war/WEB-INF/View/Materials/View.jsp +++ b/war/WEB-INF/View/Materials/View.jsp @@ -37,7 +37,7 @@
                Hotel Services   Empleados -
                +
                <%= usuario.getName()%> @@ -50,7 +50,7 @@
                • - Log Out + Cerrar Sesi贸n
                • diff --git a/war/WEB-INF/View/Materials/add.jsp b/war/WEB-INF/View/Materials/add.jsp index 0101f1f..65fe022 100644 --- a/war/WEB-INF/View/Materials/add.jsp +++ b/war/WEB-INF/View/Materials/add.jsp @@ -10,7 +10,7 @@ <% User user = (User) request.getAttribute("User"); %> - Add a Service - Hotel Services + A帽adir un Material - Hotel Services @@ -33,7 +33,7 @@
                  Hotel Services   Empleados -
                  +
                  <%= user.getName()%> @@ -46,7 +46,7 @@
                  diff --git a/war/WEB-INF/View/Materials/index.jsp b/war/WEB-INF/View/Materials/index.jsp index fe94407..f5d7a24 100644 --- a/war/WEB-INF/View/Materials/index.jsp +++ b/war/WEB-INF/View/Materials/index.jsp @@ -39,7 +39,7 @@
                  Hotel Services   Empleados -
                  +
                  <%= usuario.getName()%> @@ -52,7 +52,7 @@
                  • - Log Out + Cerrar Sesi贸n
                  • @@ -128,7 +128,7 @@

                    - addCreate + addCrear

                    diff --git a/war/WEB-INF/View/Resources/add.jsp b/war/WEB-INF/View/Resources/add.jsp index f7f1bd5..4ff3e3f 100644 --- a/war/WEB-INF/View/Resources/add.jsp +++ b/war/WEB-INF/View/Resources/add.jsp @@ -11,7 +11,7 @@ <% User user = (User) request.getAttribute("User"); %> - Add a Resource - Hotel Services + A帽adir un Recurso - Hotel Services @@ -33,7 +33,7 @@
                    Hotel Services   Empleados -
                    +
                    <%= user.getName()%> @@ -46,7 +46,7 @@
                    • - Log Out + Cerrar Sesi贸n
                    • @@ -86,25 +86,25 @@

                      - Add a Resource + A帽adir un Recurso

                      - Uri of the Resource:
                      -
                      - Status of the Resource:
                      + URI del Recurso:
                      +
                      + Estado del Recurso:

                      -

                      - arrow_backGo Back + arrow_backVolver
                      diff --git a/war/WEB-INF/View/Resources/index.jsp b/war/WEB-INF/View/Resources/index.jsp index 8955bc8..b77e087 100644 --- a/war/WEB-INF/View/Resources/index.jsp +++ b/war/WEB-INF/View/Resources/index.jsp @@ -16,7 +16,7 @@ %> - Resources - Hotel Services + Recursos - Hotel Services @@ -39,7 +39,7 @@
                      Hotel Services   Empleados -
                      +
                      <%= usuario.getName()%> @@ -52,7 +52,7 @@
                      • - Log Out + Cerrar Sesi贸n
                      • @@ -92,16 +92,16 @@

                        - Resources + Recursos

                        @@ -137,9 +137,9 @@ URI - Status - Date created - Actions + Estado + Fecha de creaci贸n + Acciones @@ -163,9 +163,9 @@ <%= resource.getStatus()%> <%= resource.getCreateDate()%> - View - | Edit - | Delete + Ver + | Editar + | Eliminar <% } %> diff --git a/war/WEB-INF/View/Resources/view.jsp b/war/WEB-INF/View/Resources/view.jsp index 22725ef..e01e7ac 100644 --- a/war/WEB-INF/View/Resources/view.jsp +++ b/war/WEB-INF/View/Resources/view.jsp @@ -15,7 +15,7 @@ <%@ page contentType="text/html;charset=UTF-8" language="java" %> - <%=action%> a User - Hotel Services + <%=action%> un Usuario - Hotel Services @@ -50,7 +50,7 @@
                        • - Log Out + Cerrar Sesi贸n
                        • @@ -90,16 +90,16 @@

                          - <%=action%> a Resource + <%=action%> un Recurso

                          @@ -110,10 +110,10 @@ - Uri:
                          -
                          + URI:
                          +

                          - Status:
                          + Estado:

                          - @@ -140,7 +140,7 @@

                          - arrow_backGo Back + arrow_backVolver
                          diff --git a/war/WEB-INF/View/Roles/add.jsp b/war/WEB-INF/View/Roles/add.jsp index 2f54595..3f1e9fb 100644 --- a/war/WEB-INF/View/Roles/add.jsp +++ b/war/WEB-INF/View/Roles/add.jsp @@ -10,7 +10,7 @@ <% User user = (User) request.getAttribute("User"); %> - Add a Role - Hotel Services + A帽adir un Rol - Hotel Services @@ -32,7 +32,7 @@
                          Hotel Services   Empleados -
                          +
                          <%= user.getName()%> @@ -45,7 +45,7 @@
                          • - Log Out + Cerrar Sesi贸n
                          • @@ -85,25 +85,25 @@

                            - Create a Role + Crear un Role

                            - Name of the Role:
                            -
                            - Status of the Role:
                            + Nombre del Rol:
                            +
                            + Estado del Rol:


                            - @@ -134,15 +134,13 @@ } else { elSwitch.value = "false"; } - - console.log("anumaaa -> " + elSwitch.value); }

                            - arrow_backGo Back + arrow_backVolver
                            diff --git a/war/WEB-INF/View/Roles/index.jsp b/war/WEB-INF/View/Roles/index.jsp index 95c24b4..7faa23d 100644 --- a/war/WEB-INF/View/Roles/index.jsp +++ b/war/WEB-INF/View/Roles/index.jsp @@ -16,7 +16,7 @@ - Home - Hotel Service + Roles - Hotel Service @@ -54,7 +54,7 @@
                            Hotel Services   Empleados -
                            +
                            <%= usuario.getName()%> @@ -67,7 +67,7 @@
                            • - Log Out + Cerrar Sesi贸n
                            • @@ -107,9 +107,9 @@
                              @@ -146,17 +146,17 @@

                              - addCreate + addCrear

                              - - - - + + + + @@ -183,9 +183,9 @@ + Ver + | Editar + | Eliminar <% } %> diff --git a/war/WEB-INF/View/Roles/view.jsp b/war/WEB-INF/View/Roles/view.jsp index 1a81a9f..581d515 100644 --- a/war/WEB-INF/View/Roles/view.jsp +++ b/war/WEB-INF/View/Roles/view.jsp @@ -14,7 +14,7 @@ <%@ page contentType="text/html;charset=UTF-8" language="java" %> - <%=action%> a User - Hotel Services + <%=action%> un Rol - Hotel Services @@ -36,7 +36,7 @@
                              Hotel Services   Empleados -
                              +
                              <%= usuario.getName()%> @@ -49,7 +49,7 @@
                              • - Log Out + Cerrar Sesi贸n
                              • @@ -89,16 +89,16 @@

                                - <%=action%> a Role + <%=action%> un Rol

                                @@ -109,16 +109,16 @@ - Name:
                                -
                                - Status:
                                + Nombre:
                                +
                                + Estado:


                                @@ -143,7 +143,7 @@ } - @@ -162,7 +162,7 @@

                                - arrow_backGo Back + arrow_backVolver
                                diff --git a/war/WEB-INF/View/Services/add.jsp b/war/WEB-INF/View/Services/add.jsp index cc2ee7d..52da5d1 100644 --- a/war/WEB-INF/View/Services/add.jsp +++ b/war/WEB-INF/View/Services/add.jsp @@ -10,7 +10,7 @@ <% User user = (User) request.getAttribute("User"); %> - Add a Service - Hotel Services + Crear un Servicio - Hotel Services @@ -33,7 +33,7 @@
                                Hotel Services   Empleados -
                                +
                                <%= user.getName()%> @@ -46,7 +46,7 @@
                                • - Log Out + Cerrar Sesi贸n
                                • @@ -94,32 +94,32 @@

                                  - Create a Service + Crear un Servicio

                                  - Name of the Service:
                                  -
                                  + Nombre del Servicio:
                                  +
                                  - Price of the Service:
                                  -
                                  + Precio del Servicio:
                                  +
                                  - Description of the Service:
                                  -
                                  + Descripci贸n del Servicio:
                                  +
                                  -

                                  - arrow_backGo Back + arrow_backVolver
                                  diff --git a/war/WEB-INF/View/Services/index.jsp b/war/WEB-INF/View/Services/index.jsp index 7c4a818..fc08e5b 100644 --- a/war/WEB-INF/View/Services/index.jsp +++ b/war/WEB-INF/View/Services/index.jsp @@ -15,7 +15,7 @@ %> - Services - Hotel Services + Servicios - Hotel Services @@ -38,7 +38,7 @@
                                  Hotel Services   Empleados -
                                  +
                                  <%= usuario.getName()%> @@ -51,7 +51,7 @@
                              NameStatusDate createdActionsNombreEstadoFecha de Creaci贸nAcciones
                              <%= roleKey.getStatus()%> <%= roleKey.getCreateDate()%> - View - | Edit - | Delete
                              - - - - - + + + + + @@ -151,9 +151,9 @@ + Ver + | Editar + | Eliminar <% } %> diff --git a/war/WEB-INF/View/Services/view.jsp b/war/WEB-INF/View/Services/view.jsp index acc619b..8a1ad73 100644 --- a/war/WEB-INF/View/Services/view.jsp +++ b/war/WEB-INF/View/Services/view.jsp @@ -36,7 +36,7 @@
                              Hotel Services   Empleados -
                              +
                              <%= usuario.getName()%> @@ -49,7 +49,7 @@
                              • - Log Out + Cerrar Sesi贸n
                              • @@ -97,7 +97,7 @@

                                - <%=action%> a Service + <%=action%> un Servicio

                                @@ -108,17 +108,17 @@ - Name of the Service:
                                -
                                + Nombre del Servicio:
                                +
                                - Price of the Service:
                                -
                                + Precio del Servicio:
                                +
                                - Description of the Service:
                                -
                                + Descripci贸n del Servicio:
                                +
                                - @@ -128,10 +128,10 @@
                                - Name: <%= service.getName() %>
                                - Price: <%= service.getPrice() %>
                                - Description: <%= service.getDescription() %>
                                - Created by: <%= service.getCreatorUserName() %> + Nombre: <%= service.getName() %>
                                + Precio: <%= service.getPrice() %>
                                + Descripci贸n: <%= service.getDescription() %>
                                + Creado por: <%= service.getCreatorUserName() %>
                                @@ -139,7 +139,7 @@

                                - arrow_backGo Back + arrow_backVolver
                                diff --git a/war/WEB-INF/View/Users/add.jsp b/war/WEB-INF/View/Users/add.jsp index 5ec65bf..12322b6 100644 --- a/war/WEB-INF/View/Users/add.jsp +++ b/war/WEB-INF/View/Users/add.jsp @@ -12,7 +12,7 @@ <% List roles = (List) request.getAttribute("Roles"); %> - Add a User - Hotel Services + Crear un Usuario - Hotel Services @@ -35,7 +35,7 @@
                                Hotel Services   Empleados -
                                +
                                <%= user.getName()%> @@ -48,7 +48,7 @@
                                diff --git a/war/WEB-INF/View/Users/index.jsp b/war/WEB-INF/View/Users/index.jsp index eccb86e..e15be45 100644 --- a/war/WEB-INF/View/Users/index.jsp +++ b/war/WEB-INF/View/Users/index.jsp @@ -14,7 +14,7 @@ %> - Users - Hotel Services + Usuarios - Hotel Services @@ -37,7 +37,7 @@
                                Hotel Services   Empleados -
                                +
                                <%= usuario.getName()%> @@ -50,7 +50,7 @@
                              NamePriceDescriptionCreated byActionsNombrePrecioDescripci贸nCreado porAcciones
                              <%= service.getDescription() %> <%= service.getCreatorUserName() %> - View - | Edit - | Delete
                              - - - - - + + + + + @@ -154,9 +154,9 @@ + Ver + | Editar + | Eliminar <% } %> diff --git a/war/WEB-INF/View/Users/view.jsp b/war/WEB-INF/View/Users/view.jsp index af4a0e8..29ceeef 100644 --- a/war/WEB-INF/View/Users/view.jsp +++ b/war/WEB-INF/View/Users/view.jsp @@ -92,16 +92,16 @@

                              - <%=action%> a User + <%=action%> un Usuario

                              @@ -112,11 +112,11 @@ - Name:
                              -
                              + Nombre:
                              +

                              - Email:
                              -
                              + Correo electr贸nico:
                              +

                              @@ -130,16 +130,16 @@
                              - Role of the User:
                              + Rol del Usuario:

                              - @@ -149,9 +149,9 @@
                              - Name: <%=user.getName()%>
                              - Email: <%=user.getEmail()%>
                              - Role: <%= user.getRoleName()%>
                              + Nombre: <%=user.getName()%>
                              + Correo electr贸nico: <%=user.getEmail()%>
                              + Rol: <%= user.getRoleName()%>

                              @@ -163,7 +163,7 @@

                              - arrow_backGo Back + arrow_backVolver
                              diff --git a/war/index.jsp b/war/index.jsp index d9df10a..0eb7854 100644 --- a/war/index.jsp +++ b/war/index.jsp @@ -15,7 +15,7 @@ - Home - Hotel Service + Inicio - Hotel Service @@ -74,12 +74,12 @@
                              - Welcome! Log In to Start + 隆Bienvenido! Inicia Sesi贸n para empezar.

                              - With Google: + Con Google:


                              @@ -173,7 +173,7 @@
                              Hotel Services -
                              +
                              <%= usuario.getName()%> @@ -186,7 +186,7 @@ -
                              Show Services
                              +

                              - Home + Inicio

                              @@ -258,14 +258,14 @@
                              - Welcome, <%=usuario.getName()%>.
                              + Bienvenido <%=usuario.getName()%>.

                              - Here's some data:
                              + Algunos datos:
                              - Your name: <%=usuario.getName()%>
                              - Your email: <%=usuario.getEmail()%>
                              - Your Role: <%=usuario.getRoleName()%> + Tu nombre: <%=usuario.getName()%>
                              + Tu correo electr贸nico: <%=usuario.getEmail()%>
                              + Tu Rol: <%=usuario.getRoleName()%>
                              NameEmailRoleImgActionsNombreCorreo electr贸nicoRolImagenAcciones
                              - View - | Edit - | Delete