Arreglo de errores.
Araozu
parent
9e5b81032a
commit
69c419791a
|
|
@ -4,18 +4,31 @@
|
|||
<bookmark url="file://$PROJECT_DIR$/war/index.html" line="85" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="2779599e-b2aa-4ead-8b6c-b1aa4798807f" name="Default" comment="Division de la aplicacion: El sector inicial esta dirigido a los clientes, mientras que las herramientos coma el CRUD solo son solo para empleados.">
|
||||
<change afterPath="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerAdd.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerDelete.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerIndex.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerView.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/model/Employee.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/war/WEB-INF/View/Employees/add.jsp" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/war/WEB-INF/View/Employees/index.jsp" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/war/WEB-INF/View/Employees/view.jsp" afterDir="false" />
|
||||
<list default="true" id="2779599e-b2aa-4ead-8b6c-b1aa4798807f" name="Default" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/src/controller/finances/IncomeReport.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/war/WEB-INF/View/Finances/index.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Access/add.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Access/add.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Access/edit.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Access/edit.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Access/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Access/index.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Access/view.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Access/view.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Employees/add.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Employees/add.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Employees/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Employees/index.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Employees/view.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Employees/view.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Resources/add.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Resources/add.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Resources/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Resources/index.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Resources/view.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Resources/view.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Roles/add.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Roles/add.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Roles/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Roles/index.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Roles/view.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Roles/view.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Services/add.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Services/add.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Services/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Services/index.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Services/view.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Services/view.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Users/add.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Users/add.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Users/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Users/index.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Users/view.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Users/view.jsp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/web.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/war/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/index.jsp" afterDir="false" />
|
||||
</list>
|
||||
<ignored path="$PROJECT_DIR$/war/WEB-INF/classes/" />
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
|
|
@ -45,62 +58,11 @@
|
|||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||
<file leaf-file-name="index.jsp" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Employees/index.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="455">
|
||||
<caret line="159" column="15" lean-forward="true" selection-start-line="159" selection-start-column="15" selection-end-line="159" selection-end-column="15" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="EmployeesControllerView.java" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerView.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="355">
|
||||
<caret line="38" column="50" selection-start-line="38" selection-start-column="42" selection-end-line="38" selection-end-column="50" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="add.jsp" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Employees/add.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="576">
|
||||
<caret line="124" column="25" selection-start-line="124" selection-start-column="25" selection-end-line="124" selection-end-column="25" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="view.jsp" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Employees/view.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1332">
|
||||
<caret line="143" column="25" selection-start-line="143" selection-start-column="25" selection-end-line="143" selection-end-column="25" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="view.jsp" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Services/view.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="448">
|
||||
<caret line="129" column="39" selection-start-line="129" selection-start-column="39" selection-end-line="129" selection-end-column="39" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="add.jsp" pinned="false" current-in-tab="false">
|
||||
<file leaf-file-name="add.jsp" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Services/add.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="473">
|
||||
<caret line="32" column="26" lean-forward="true" selection-start-line="32" selection-start-column="26" selection-end-line="32" selection-end-column="26" />
|
||||
<state relative-caret-position="210">
|
||||
<caret line="62" column="97" lean-forward="true" selection-start-line="62" selection-start-column="97" selection-end-line="62" selection-end-column="97" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
@ -138,38 +100,20 @@
|
|||
<component name="IdeDocumentHistory">
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/src/model/User.java" />
|
||||
<option value="$PROJECT_DIR$/src/controller/access/AccessControllerView.java" />
|
||||
<option value="$PROJECT_DIR$/src/controller/users/UsersControllerAdd.java" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/test.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/test.jsp" />
|
||||
<option value="$PROJECT_DIR$/src/controller/employee/roles/RolesControllerAdd.java" />
|
||||
<option value="$PROJECT_DIR$/src/controller/employee/roles/RolesControllerDelete.java" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Services/add.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Services/view.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Users/view.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Users/index.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Users/add.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Access/add.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Access/view.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Access/edit.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Roles/add.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Roles/view.jsp" />
|
||||
<option value="$PROJECT_DIR$/src/controller/employee/access/AccessControllerAdd.java" />
|
||||
<option value="$PROJECT_DIR$/src/controller/employee/access/AccessControllerDelete.java" />
|
||||
<option value="$PROJECT_DIR$/src/controller/employee/access/AccessControllerEdit.java" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Access/index.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Resources/index.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Resources/add.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Resources/view.jsp" />
|
||||
<option value="$PROJECT_DIR$/src/controller/employee/users/UsersControllerAdd.java" />
|
||||
<option value="$PROJECT_DIR$/src/controller/employee/users/UsersControllerDelete.java" />
|
||||
<option value="$PROJECT_DIR$/src/controller/employee/users/UsersControllerView.java" />
|
||||
<option value="$PROJECT_DIR$/src/controller/employee/resources/ResourcesControllerAdd.java" />
|
||||
<option value="$PROJECT_DIR$/src/controller/employee/resources/ResourcesControllerDelete.java" />
|
||||
<option value="$PROJECT_DIR$/src/controller/employee/access/AccessControllerView.java" />
|
||||
<option value="$PROJECT_DIR$/war/index.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Roles/index.jsp" />
|
||||
<option value="$PROJECT_DIR$/src/controller/employee/users/UsersControllerIndex.java" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/usersAdminIndex.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/usersAdminIndex.jsp" />
|
||||
|
|
@ -180,15 +124,33 @@
|
|||
<option value="$PROJECT_DIR$/src/model/Employee.java" />
|
||||
<option value="$PROJECT_DIR$/src/controller/employee/employee/EmployeesControllerIndex.java" />
|
||||
<option value="$PROJECT_DIR$/src/controller/employee/employee/EmployeesControllerAdd.java" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/web.xml" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Services/index.jsp" />
|
||||
<option value="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerIndex.java" />
|
||||
<option value="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerView.java" />
|
||||
<option value="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerAdd.java" />
|
||||
<option value="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerDelete.java" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/web.xml" />
|
||||
<option value="$PROJECT_DIR$/src/controller/finances/IncomeReport.java" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Access/add.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Access/edit.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Access/index.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Access/view.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Employees/add.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Employees/index.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Employees/view.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Employees/add.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Finances/index.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Resources/add.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Resources/index.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Resources/view.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Services/add.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Services/index.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Services/view.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/index.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Roles/add.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Roles/index.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Roles/view.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Users/add.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Users/index.jsp" />
|
||||
<option value="$PROJECT_DIR$/war/WEB-INF/View/Users/view.jsp" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
|
|
@ -255,6 +217,13 @@
|
|||
<item name="employee" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="employees" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="Lab09" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="Lab09" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="controller" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="finances" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="Lab09" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="Lab09" type="462c0819:PsiDirectoryNode" />
|
||||
|
|
@ -273,14 +242,6 @@
|
|||
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="View" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="Lab09" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="Lab09" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="war" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="View" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="Employees" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="Lab09" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="Lab09" type="462c0819:PsiDirectoryNode" />
|
||||
|
|
@ -386,6 +347,7 @@
|
|||
<property name="SearchEverywhereHistoryKey" value="getRoleName	PSI	JAVA://model.Access#getRoleName" />
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="aspect.path.notification.shown" value="true" />
|
||||
<property name="com.intellij.ide.scratch.LRUPopupBuilder$1/New Scratch File" value="Lua" />
|
||||
<property name="last_opened_file_path" value="$USER_HOME$/Desktop/Universidad/Java EE/API AppEngine 1.9" />
|
||||
<property name="list.type.of.created.stylesheet" value="CSS" />
|
||||
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
||||
|
|
@ -564,7 +526,7 @@
|
|||
<workItem from="1531449031990" duration="4443000" />
|
||||
<workItem from="1531489105867" duration="9960000" />
|
||||
<workItem from="1531523398201" duration="5772000" />
|
||||
<workItem from="1531582003807" duration="5201000" />
|
||||
<workItem from="1531582003807" duration="8574000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="Lanzamiento Inicial. Intenten crear branches para trabajar de forma segura.">
|
||||
<created>1528408256446</created>
|
||||
|
|
@ -755,11 +717,18 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1531582200223</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="28" />
|
||||
<task id="LOCAL-00028" summary="Agregado Employee">
|
||||
<created>1531601494596</created>
|
||||
<option name="number" value="00028" />
|
||||
<option name="presentableId" value="LOCAL-00028" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1531601494596</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="29" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="185988000" />
|
||||
<option name="totallyTimeSpent" value="189361000" />
|
||||
</component>
|
||||
<component name="TodoView">
|
||||
<todo-panel id="selected-file">
|
||||
|
|
@ -796,8 +765,8 @@
|
|||
<window_info anchor="bottom" id="Run" order="2" />
|
||||
<window_info anchor="bottom" id="Terminal" order="8" weight="0.32808718" />
|
||||
<window_info id="Persistence" order="2" sideWeight="0.5018226" side_tool="true" weight="0.14578834" />
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49816403" visible="true" weight="0.14902808" />
|
||||
<window_info id="Web" order="7" sideWeight="0.50060755" side_tool="true" weight="0.24961714" />
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49757868" visible="true" weight="0.14902808" />
|
||||
<window_info id="Web" order="7" sideWeight="0.5024213" side_tool="true" weight="0.14902808" />
|
||||
<window_info anchor="bottom" id="Find" order="1" weight="0.32808718" />
|
||||
<window_info anchor="right" id="Google Cloud Storage" order="4" />
|
||||
<window_info anchor="right" id="Theme Preview" order="7" />
|
||||
|
|
@ -878,7 +847,8 @@
|
|||
<MESSAGE value="Mejoras generales" />
|
||||
<MESSAGE value="Arreglo de errores" />
|
||||
<MESSAGE value="Division de la aplicacion: El sector inicial esta dirigido a los clientes, mientras que las herramientos coma el CRUD solo son solo para empleados." />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Division de la aplicacion: El sector inicial esta dirigido a los clientes, mientras que las herramientos coma el CRUD solo son solo para empleados." />
|
||||
<MESSAGE value="Agregado Employee" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Agregado Employee" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
|
|
@ -886,82 +856,6 @@
|
|||
</breakpoint-manager>
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/src/controller/employee/roles/RolesControllerDelete.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="425">
|
||||
<caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/controller/employee/roles/RolesControllerView.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="570">
|
||||
<caret line="96" column="39" selection-start-line="96" selection-start-column="39" selection-end-line="96" selection-end-column="39" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/css/Elements.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="356">
|
||||
<caret line="30" column="8" selection-start-line="30" selection-start-column="8" selection-end-line="30" selection-end-column="8" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Users/add.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="673">
|
||||
<caret line="138" column="84" selection-start-line="138" selection-start-column="84" selection-end-line="138" selection-end-column="84" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Users/view.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="551">
|
||||
<caret line="141" column="71" selection-start-line="141" selection-start-column="55" selection-end-line="141" selection-end-column="71" />
|
||||
<folding>
|
||||
<element signature="n#nav#0;n#body#0;n#html#0;n#!!top" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Users/index.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="507">
|
||||
<caret line="128" lean-forward="true" selection-start-line="128" selection-end-line="128" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Access/add.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="528">
|
||||
<caret line="157" column="83" selection-start-line="157" selection-start-column="83" selection-end-line="157" selection-end-column="83" />
|
||||
<folding>
|
||||
<element signature="n#nav#0;n#body#0;n#html#0;n#!!top" />
|
||||
<element signature="n#style#0;n#i#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Access/view.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="571">
|
||||
<caret line="103" column="4" lean-forward="true" selection-start-line="103" selection-start-column="4" selection-end-line="104" selection-end-column="143" />
|
||||
<folding>
|
||||
<element signature="n#nav#0;n#body#0;n#html#0;n#!!top" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Access/edit.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="395">
|
||||
<caret line="127" column="35" lean-forward="true" selection-start-line="127" selection-start-column="35" selection-end-line="127" selection-end-column="35" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/controller/employee/roles/RolesControllerAdd.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="356">
|
||||
|
|
@ -976,20 +870,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Roles/add.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2329">
|
||||
<caret line="138" column="13" selection-start-line="127" selection-start-column="12" selection-end-line="138" selection-end-column="13" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Roles/view.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2414">
|
||||
<caret line="143" column="17" selection-start-line="143" selection-start-column="17" selection-end-line="143" selection-end-column="17" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/controller/employee/roles/RolesControllerIndex.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="221">
|
||||
|
|
@ -997,33 +877,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Access/index.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="481">
|
||||
<caret line="112" column="8" lean-forward="true" selection-start-line="112" selection-start-column="8" selection-end-line="112" selection-end-column="8" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Resources/index.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="385">
|
||||
<caret line="138" column="23" selection-start-line="138" selection-start-column="23" selection-end-line="138" selection-end-column="23" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Resources/add.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="309">
|
||||
<caret line="104" column="11" selection-start-line="104" selection-start-column="11" selection-end-line="104" selection-end-column="11" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/controller/employee/users/UsersControllerDelete.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="510">
|
||||
|
|
@ -1094,13 +947,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Resources/view.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="411">
|
||||
<caret line="112" column="11" selection-start-line="112" selection-start-column="11" selection-end-line="112" selection-end-column="11" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/controller/employee/access/AccessControllerView.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="486">
|
||||
|
|
@ -1108,16 +954,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/index.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2064">
|
||||
<caret line="162" column="20" lean-forward="true" selection-start-line="162" selection-start-column="20" selection-end-line="162" selection-end-column="20" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/model/User.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="471">
|
||||
|
|
@ -1146,26 +982,12 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Roles/index.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1496">
|
||||
<caret line="89" column="20" selection-end-line="227" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/.idea/vcs.xml">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/.gitignore">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="34">
|
||||
<caret line="2" column="32" lean-forward="true" selection-start-line="2" selection-start-column="32" selection-end-line="2" selection-end-column="32" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/model/Employee.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="85">
|
||||
|
|
@ -1199,13 +1021,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/web.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="186">
|
||||
<caret line="204" lean-forward="true" selection-start-line="204" selection-end-line="204" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/usersAdminIndex.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1173">
|
||||
|
|
@ -1213,27 +1028,20 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Services/index.jsp">
|
||||
<entry file="file://$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerView.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1683">
|
||||
<caret line="100" column="89" selection-start-line="100" selection-start-column="89" selection-end-line="100" selection-end-column="89" />
|
||||
<state relative-caret-position="355">
|
||||
<caret line="38" column="50" selection-start-line="38" selection-start-column="42" selection-end-line="38" selection-end-column="50" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Services/add.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="473">
|
||||
<caret line="32" column="26" lean-forward="true" selection-start-line="32" selection-start-column="26" selection-end-line="32" selection-end-column="26" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerAdd.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="687">
|
||||
<caret line="92" column="38" selection-start-line="92" selection-start-column="38" selection-end-line="92" selection-end-column="38" />
|
||||
<state relative-caret-position="242">
|
||||
<caret line="51" column="52" lean-forward="true" selection-start-line="51" selection-start-column="52" selection-end-line="51" selection-end-column="52" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
|
|
@ -1250,20 +1058,126 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerIndex.java">
|
||||
<entry file="file://$PROJECT_DIR$/.gitignore">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="615">
|
||||
<caret line="51" column="38" selection-start-line="51" selection-start-column="38" selection-end-line="51" selection-end-column="38" />
|
||||
<state relative-caret-position="34">
|
||||
<caret line="2" column="32" lean-forward="true" selection-start-line="2" selection-start-column="32" selection-end-line="2" selection-end-column="32" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch.lua">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/web.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="419">
|
||||
<caret line="252" column="31" selection-start-line="252" selection-start-column="31" selection-end-line="252" selection-end-column="31" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/controller/finances/IncomeReport.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="374">
|
||||
<caret line="32" column="115" selection-start-line="32" selection-start-column="115" selection-end-line="32" selection-end-column="115" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="method#doGet#0;class#IncomeReport#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Access/add.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="389">
|
||||
<caret line="62" column="64" selection-start-line="62" selection-start-column="64" selection-end-line="62" selection-end-column="64" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Access/edit.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="461">
|
||||
<caret line="61" column="64" selection-start-line="61" selection-start-column="64" selection-end-line="61" selection-end-column="64" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Access/index.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="351">
|
||||
<caret line="62" column="64" selection-start-line="62" selection-start-column="64" selection-end-line="62" selection-end-column="64" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Access/view.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="448">
|
||||
<caret line="55" column="64" selection-start-line="55" selection-start-column="64" selection-end-line="55" selection-end-column="64" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Employees/add.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="225">
|
||||
<caret line="61" column="64" selection-start-line="61" selection-start-column="64" selection-end-line="61" selection-end-column="64" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Employees/index.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="455">
|
||||
<caret line="159" column="15" lean-forward="true" selection-start-line="159" selection-start-column="15" selection-end-line="159" selection-end-column="15" />
|
||||
<state relative-caret-position="481">
|
||||
<caret line="66" column="64" selection-start-line="66" selection-start-column="64" selection-end-line="66" selection-end-column="64" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Employees/view.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="296">
|
||||
<caret line="63" column="64" selection-start-line="63" selection-start-column="64" selection-end-line="63" selection-end-column="64" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Finances/index.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="151">
|
||||
<caret line="64" column="64" selection-start-line="64" selection-start-column="64" selection-end-line="64" selection-end-column="64" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Resources/add.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="317">
|
||||
<caret line="60" column="64" selection-start-line="60" selection-start-column="64" selection-end-line="60" selection-end-column="64" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Resources/index.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="169">
|
||||
<caret line="66" column="64" selection-start-line="66" selection-start-column="64" selection-end-line="66" selection-end-column="64" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Resources/view.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="279">
|
||||
<caret line="64" column="64" selection-start-line="64" selection-start-column="64" selection-end-line="64" selection-end-column="64" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Services/index.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="277">
|
||||
<caret line="65" column="64" selection-start-line="65" selection-start-column="64" selection-end-line="65" selection-end-column="64" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
|
|
@ -1272,32 +1186,83 @@
|
|||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Services/view.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="448">
|
||||
<caret line="129" column="39" selection-start-line="129" selection-start-column="39" selection-end-line="129" selection-end-column="39" />
|
||||
<state relative-caret-position="275">
|
||||
<caret line="63" column="64" selection-start-line="63" selection-start-column="64" selection-end-line="63" selection-end-column="64" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerView.java">
|
||||
<entry file="file://$PROJECT_DIR$/war/index.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="355">
|
||||
<caret line="38" column="50" selection-start-line="38" selection-start-column="42" selection-end-line="38" selection-end-column="50" />
|
||||
<state relative-caret-position="-1225">
|
||||
<caret line="200" column="64" selection-start-line="200" selection-start-column="64" selection-end-line="200" selection-end-column="64" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Roles/add.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="489">
|
||||
<caret line="71" column="53" selection-start-line="71" selection-start-column="46" selection-end-line="71" selection-end-column="53" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Roles/index.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="508">
|
||||
<caret line="93" column="52" selection-start-line="93" selection-start-column="52" selection-end-line="93" selection-end-column="52" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Roles/view.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="292">
|
||||
<caret line="75" column="53" selection-start-line="75" selection-start-column="53" selection-end-line="75" selection-end-column="53" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Users/add.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="449">
|
||||
<caret line="74" column="45" selection-start-line="74" selection-start-column="45" selection-end-line="74" selection-end-column="45" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Users/index.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="451">
|
||||
<caret line="76" column="52" selection-start-line="76" selection-start-column="52" selection-end-line="76" selection-end-column="52" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Users/view.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="488">
|
||||
<caret line="78" column="53" selection-start-line="78" selection-start-column="53" selection-end-line="78" selection-end-column="53" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerIndex.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="309">
|
||||
<caret line="33" column="50" selection-start-line="33" selection-start-column="50" selection-end-line="33" selection-end-column="50" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Employees/add.jsp">
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Services/add.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="576">
|
||||
<caret line="124" column="25" selection-start-line="124" selection-start-column="25" selection-end-line="124" selection-end-column="25" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Employees/view.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1332">
|
||||
<caret line="143" column="25" selection-start-line="143" selection-start-column="25" selection-end-line="143" selection-end-column="25" />
|
||||
<state relative-caret-position="210">
|
||||
<caret line="62" column="97" lean-forward="true" selection-start-line="62" selection-start-column="97" selection-end-line="62" selection-end-column="97" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
|
|||
|
|
@ -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("<html><head><script>window.location.replace(\"../\")</script></head></html>");
|
||||
}
|
||||
|
||||
} 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);
|
||||
}
|
||||
}
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
</li>
|
||||
<li><a class="whiteLink" href="../roles">Administración de Usuarios</a></li>
|
||||
<li class="active"><a class="whiteLink active" href="../services">Administración de recursos</a></li>
|
||||
<li><a class="whiteLink" href="">Reportes de Ingresos</a></li>
|
||||
<li><a class="whiteLink" href="../reports">Reportes de Ingresos</a></li>
|
||||
<li>|</li>
|
||||
</ul>
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
@ -76,7 +76,7 @@
|
|||
</li>
|
||||
<li><a class="whiteLink" href="./roles">Administración de Usuarios</a></li>
|
||||
<li class="active"><a class="whiteLink active" href="./services">Administración de recursos</a></li>
|
||||
<li><a class="whiteLink" href="">Reportes de Ingresos</a></li>
|
||||
<li><a class="whiteLink" href="./reports">Reportes de Ingresos</a></li>
|
||||
<li>|</li>
|
||||
</ul>
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
</li>
|
||||
<li><a class="whiteLink" href="../roles">Administración de Usuarios</a></li>
|
||||
<li class="active"><a class="whiteLink active" href="../services">Administración de recursos</a></li>
|
||||
<li><a class="whiteLink" href="">Reportes de Ingresos</a></li>
|
||||
<li><a class="whiteLink" href="../reports">Reportes de Ingresos</a></li>
|
||||
<li>|</li>
|
||||
</ul>
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,137 @@
|
|||
<%@ page import="model.Resource" %>
|
||||
<%@ page import="model.User" %>
|
||||
<%--
|
||||
Created by IntelliJ IDEA.
|
||||
User: Jose
|
||||
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");
|
||||
String serverResponse = (String) request.getAttribute("serverResponse");
|
||||
if (serverResponse == null) serverResponse = "!";
|
||||
%>
|
||||
<html lang="es">
|
||||
<head>
|
||||
<title>Resources - Hotel Services</title>
|
||||
|
||||
<meta name="google-signin-client_id" content="746890482047-c734fgap3p3vb6bdoquufn60bsh2p8l9.apps.googleusercontent.com">
|
||||
|
||||
<script src="https://apis.google.com/js/platform.js" async defer></script>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
|
||||
|
||||
<link type="text/css" rel="stylesheet" href="../../css/Diseno.css">
|
||||
<link type="text/css" rel="stylesheet" href="../../css/materialize.min.css">
|
||||
<link type="text/css" rel="stylesheet" href="../../css/Elements.css">
|
||||
|
||||
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
|
||||
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
|
||||
|
||||
<script src="../../js/GlobalJs.js" async defer></script>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<nav class="nav-extended" style="background-color: #3f51b5">
|
||||
<div class="nav-wrapper" style="max-height: 64px">
|
||||
<a class="whiteLink hide-on-small-only" href="/" style="padding: 0 0 0 20px; font-family: 'Product Sans', Roboto, serif; font-size: xx-large">Hotel Services</a>
|
||||
Empleados
|
||||
<div class="right valign-wrapper" style="padding: 0 0 0 10px; cursor: pointer; min-width: 150px;" onclick="changeUserOptions()">
|
||||
|
||||
<span style="min-width: 80px;">
|
||||
<%= usuario.getName()%>
|
||||
</span>
|
||||
<img src="<%=usuario.getImgUrl()%>" alt="" class="circle responsive-img" style="padding: 5px" width="50px">
|
||||
<i class="material-icons">arrow_drop_down</i>
|
||||
|
||||
<div id="userOptions" style="background-color: white; border:solid 2px #67c9b3; position: absolute;
|
||||
width: auto; display: none;">
|
||||
<ul style="color: black">
|
||||
|
||||
<li style="padding: 0 5px;">
|
||||
<a style="color: black" onclick="postRedirect('./users/view',{action:'closeSession'})">Log Out</a>
|
||||
</li>
|
||||
|
||||
<li id="cerrar" style="padding: 0 5px; cursor: pointer">
|
||||
<i class="small material-icons">arrow_drop_up</i>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
</title>
|
||||
<path fill="white" d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12">
|
||||
</path>
|
||||
</svg>
|
||||
</a>
|
||||
</li>
|
||||
<li><a class="whiteLink" href="./users">Administración de Usuarios</a></li>
|
||||
<li><a class="whiteLink" href="./services">Administración de recursos</a></li>
|
||||
<li class="active"><a class="whiteLink active" href="#">Reportes de Ingresos</a></li>
|
||||
<li>|</li>
|
||||
</ul>
|
||||
|
||||
<!--<div class="dropdown hide-on-large-only" style="padding: 0 10px; font-weight: bold" onclick="toggleDropdown()">Show Services</div>
|
||||
<div id="dropdownContent">
|
||||
<a href="#" onclick="postRedirect('./roles')">Roles</a>
|
||||
<a href="#" style="background-color: lightgray">Users</a>
|
||||
<a onclick="postRedirect('./resources')">Resources</a>
|
||||
<a onclick="postRedirect('./access')">Access</a>
|
||||
</div>-->
|
||||
|
||||
</div>
|
||||
<div class="nav-content" style="background-color: #3949a3">
|
||||
<ul class="tabs tabs-transparent">
|
||||
<li class="tab active"><a class="active" href="#">Totales</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<div class="container">
|
||||
<br />
|
||||
<span style="font-size: xx-large; font-family: 'Product Sans',Roboto,serif">Finanzas</span>
|
||||
<br />
|
||||
<br />
|
||||
|
||||
<%if (!serverResponse.equals("!")){ %>
|
||||
|
||||
<div id="serverResponse">
|
||||
<div style="margin: 10px"></div>
|
||||
</div>
|
||||
<script>
|
||||
var respDiv = document.getElementById("serverResponse");
|
||||
|
||||
var responseData = JSON.parse('<%=serverResponse%>');
|
||||
|
||||
respDiv.style.backgroundColor = responseData["color"];
|
||||
respDiv.innerHTML = "<div style=\"margin: 10px\">" + responseData["response"] + "</div>";
|
||||
|
||||
respDiv.style.maxHeight = "500px";
|
||||
setTimeout(function () {
|
||||
respDiv.style.maxHeight = "0";
|
||||
},1500);
|
||||
|
||||
</script>
|
||||
|
||||
<% } %>
|
||||
<br />
|
||||
<br />
|
||||
|
||||
Incompleto. Faltan datos acerca de:<br />
|
||||
<ol>
|
||||
<li>Ingresos mediante Clientes</li>
|
||||
<li>Egresos mediante pagos a Empleados</li>
|
||||
<li>Egresos mediante compra de recursos (comida, implementos, etc.)</li>
|
||||
</ol>
|
||||
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
</li>
|
||||
<li class="active"><a class="whiteLink active" href="../roles">Administración de Usuarios</a></li>
|
||||
<li><a class="whiteLink" href="../services">Administración de recursos</a></li>
|
||||
<li><a class="whiteLink" href="./azopotamadre">Reportes de Ingresos</a></li>
|
||||
<li><a class="whiteLink" href="../reports">Reportes de Ingresos</a></li>
|
||||
<li>|</li>
|
||||
</ul>
|
||||
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
@ -91,7 +91,7 @@
|
|||
</li>
|
||||
<li class="active"><a class="whiteLink active" href="#">Administración de Usuarios</a></li>
|
||||
<li><a class="whiteLink" href="./services">Administración de recursos</a></li>
|
||||
<li><a class="whiteLink" href="">Reportes de Ingresos</a></li>
|
||||
<li><a class="whiteLink" href="./reports">Reportes de Ingresos</a></li>
|
||||
<li>|</li>
|
||||
</ul>
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
</li>
|
||||
<li class="active"><a class="whiteLink active" href="../roles">Administración de Usuarios</a></li>
|
||||
<li><a class="whiteLink" href="../services">Administración de recursos</a></li>
|
||||
<li><a class="whiteLink" href="../azopotamadre">Reportes de Ingresos</a></li>
|
||||
<li><a class="whiteLink" href="../reports">Reportes de Ingresos</a></li>
|
||||
<li>|</li>
|
||||
</ul>
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
</li>
|
||||
<li><a class="whiteLink" href="../roles">Administración de Usuarios</a></li>
|
||||
<li class="active"><a class="whiteLink active" href="../services">Administración de recursos</a></li>
|
||||
<li><a class="whiteLink" href="">Reportes de Ingresos</a></li>
|
||||
<li><a class="whiteLink" href="../reports">Reportes de Ingresos</a></li>
|
||||
<li>|</li>
|
||||
</ul>
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
</li>
|
||||
<li><a class="whiteLink" href="./roles">Administración de Usuarios</a></li>
|
||||
<li class="active"><a class="whiteLink active" href="./services">Administración de recursos</a></li>
|
||||
<li><a class="whiteLink" href="">Reportes de Ingresos</a></li>
|
||||
<li><a class="whiteLink" href="./reports">Reportes de Ingresos</a></li>
|
||||
<li>|</li>
|
||||
</ul>
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
</li>
|
||||
<li><a class="whiteLink" href="../roles">Administración de Usuarios</a></li>
|
||||
<li class="active"><a class="whiteLink active" href="../services">Administración de recursos</a></li>
|
||||
<li><a class="whiteLink" href="">Reportes de Ingresos</a></li>
|
||||
<li><a class="whiteLink" href="../reports">Reportes de Ingresos</a></li>
|
||||
<li>|</li>
|
||||
</ul>
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
@ -72,7 +72,7 @@
|
|||
</li>
|
||||
<li class="active"><a class="whiteLink active" href="../roles">Administración de Usuarios</a></li>
|
||||
<li><a class="whiteLink" href="../services">Administración de recursos</a></li>
|
||||
<li><a class="whiteLink" href="">Reportes de Ingresos</a></li>
|
||||
<li><a class="whiteLink" href="../reports">Reportes de Ingresos</a></li>
|
||||
<li>|</li>
|
||||
</ul>
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
</li>
|
||||
<li class="active"><a class="whiteLink active">Administración de Usuarios</a></li>
|
||||
<li><a class="whiteLink" href="./services">Administración de recursos</a></li>
|
||||
<li><a class="whiteLink" href="./azopotomadre">Reportes de Ingresos</a></li>
|
||||
<li><a class="whiteLink" href="./reports">Reportes de Ingresos</a></li>
|
||||
<li>|</li>
|
||||
</ul>
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank" style="max-height: 62px">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
@ -76,7 +76,7 @@
|
|||
</li>
|
||||
<li class="active"><a class="whiteLink active" href="#">Administración de Usuarios</a></li>
|
||||
<li><a class="whiteLink" href="../services">Administración de recursos</a></li>
|
||||
<li><a class="whiteLink" href="">Reportes de Ingresos</a></li>
|
||||
<li><a class="whiteLink" href="../reports">Reportes de Ingresos</a></li>
|
||||
<li>|</li>
|
||||
</ul>
|
||||
|
||||
|
|
|
|||
|
|
@ -244,6 +244,15 @@
|
|||
</servlet-mapping>
|
||||
|
||||
|
||||
<servlet>
|
||||
<servlet-name>IncomeReport</servlet-name>
|
||||
<servlet-class>controller.finances.IncomeReport</servlet-class>
|
||||
</servlet>
|
||||
<servlet-mapping>
|
||||
<servlet-name>IncomeReport</servlet-name>
|
||||
<url-pattern>/e/reports</url-pattern>
|
||||
</servlet-mapping>
|
||||
|
||||
<!-- Controlador para gestionar el comportamiento del menu de inicio -->
|
||||
<servlet>
|
||||
<servlet-name>index</servlet-name>
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@
|
|||
|
||||
<ul id="nav-mobile" class="right hide-on-med-and-down">
|
||||
<li>
|
||||
<a href="https://github.com/Grupo-PW2/Lab08" target="_blank">
|
||||
<a href="https://github.com/Grupo-PW2/Web-Hostal" target="_blank">
|
||||
<svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
|
||||
<title id="simpleicons-github-icon">
|
||||
GitHub icon
|
||||
|
|
|
|||
Loading…
Reference in New Issue