fernando
/
WebHostal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Agregado el CRUD de Materiales. 

Completada la funcionalidad Administración de recursos.
master
Araozu 2018-07-14 21:43:48 -05:00
parent 69c419791a
commit 09bee5da7c
50 changed files with 1337 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

601
.idea/workspace.xml
View File

@ -5,30 +5,53 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="2779599e-b2aa-4ead-8b6c-b1aa4798807f" name="Default" comment=""> <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$/src/controller/resourcesManagement/materials/MaterialsControllerAdd.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/war/WEB-INF/View/Finances/index.jsp" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/controller/resourcesManagement/materials/MaterialsControllerDelete.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/controller/resourcesManagement/materials/MaterialsControllerIndex.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/controller/resourcesManagement/materials/MaterialsControllerView.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/model/Material.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/war/WEB-INF/View/Materials/View.jsp" afterDir="false" />
<change afterPath="$PROJECT_DIR$/war/WEB-INF/View/Materials/add.jsp" afterDir="false" />
<change afterPath="$PROJECT_DIR$/war/WEB-INF/View/Materials/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$/.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$/src/controller/employee/access/AccessControllerAdd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/usersManagement/access/AccessControllerAdd.java" 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$/src/controller/employee/access/AccessControllerDelete.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/usersManagement/access/AccessControllerDelete.java" 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$/src/controller/employee/access/AccessControllerEdit.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/usersManagement/access/AccessControllerEdit.java" 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$/src/controller/employee/access/AccessControllerIndex.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/usersManagement/access/AccessControllerIndex.java" 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$/src/controller/employee/access/AccessControllerView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/usersManagement/access/AccessControllerView.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerAdd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/resourcesManagement/employees/EmployeesControllerAdd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerDelete.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/resourcesManagement/employees/EmployeesControllerDelete.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerIndex.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/resourcesManagement/employees/EmployeesControllerIndex.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/resourcesManagement/employees/EmployeesControllerView.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/resources/ResourcesControllerAdd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/usersManagement/resources/ResourcesControllerAdd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/resources/ResourcesControllerDelete.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/usersManagement/resources/ResourcesControllerDelete.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/resources/ResourcesControllerIndex.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/usersManagement/resources/ResourcesControllerIndex.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/resources/ResourcesControllerView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/usersManagement/resources/ResourcesControllerView.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/roles/RolesControllerAdd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/usersManagement/roles/RolesControllerAdd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/roles/RolesControllerDelete.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/usersManagement/roles/RolesControllerDelete.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/roles/RolesControllerIndex.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/usersManagement/roles/RolesControllerIndex.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/roles/RolesControllerView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/usersManagement/roles/RolesControllerView.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/services/ServicesControllerAdd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/resourcesManagement/services/ServicesControllerAdd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/services/ServicesControllerDelete.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/resourcesManagement/services/ServicesControllerDelete.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/services/ServicesControllerIndex.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/resourcesManagement/services/ServicesControllerIndex.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/services/ServicesControllerView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/resourcesManagement/services/ServicesControllerView.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/users/UsersControllerAdd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/usersManagement/users/UsersControllerAdd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/users/UsersControllerDelete.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/usersManagement/users/UsersControllerDelete.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/users/UsersControllerIndex.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/usersManagement/users/UsersControllerIndex.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/employee/users/UsersControllerView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/usersManagement/users/UsersControllerView.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/finances/IncomeReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/financesManagement/IncomeReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/controller/index.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/index.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/model/Access.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/model/Access.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/model/Employee.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/model/Employee.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/model/Service.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/model/Service.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/model/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/model/User.java" 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/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/Finances/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Finances/index.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/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/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/classes/model/Access.class" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/classes/model/Access.class" 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/classes/model/User.class" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/classes/model/User.class" 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/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> </list>
<ignored path="$PROJECT_DIR$/war/WEB-INF/classes/" /> <ignored path="$PROJECT_DIR$/war/WEB-INF/classes/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -58,11 +81,44 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="add.jsp" pinned="false" current-in-tab="true"> <file leaf-file-name="index.jsp" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Services/add.jsp"> <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Employees/index.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210"> <state relative-caret-position="34">
<caret line="62" column="97" lean-forward="true" selection-start-line="62" selection-start-column="97" selection-end-line="62" selection-end-column="97" /> <caret line="2" selection-start-line="2" selection-end-line="2" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" 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/Materials/add.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<caret line="122" column="25" selection-start-line="122" selection-start-column="25" selection-end-line="122" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="MaterialsControllerView.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/controller/resourcesManagement/materials/MaterialsControllerView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="430">
<caret line="52" column="97" selection-start-line="52" selection-start-column="86" selection-end-line="52" selection-end-column="97" />
<folding>
<element signature="method#doGet#0;class#MaterialsControllerView#0" />
</folding>
</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/Materials/View.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1260">
<caret line="141" column="141" selection-start-line="141" selection-start-column="141" selection-end-line="141" selection-end-column="141" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -100,17 +156,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<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$/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$/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/ResourcesControllerAdd.java" />
<option value="$PROJECT_DIR$/src/controller/employee/resources/ResourcesControllerDelete.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$/src/controller/employee/access/AccessControllerView.java" />
@ -126,24 +171,15 @@
<option value="$PROJECT_DIR$/src/controller/employee/employee/EmployeesControllerAdd.java" /> <option value="$PROJECT_DIR$/src/controller/employee/employee/EmployeesControllerAdd.java" />
<option value="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerIndex.java" /> <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/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$/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$/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/add.jsp" />
<option value="$PROJECT_DIR$/war/WEB-INF/View/Access/edit.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/index.jsp" />
<option value="$PROJECT_DIR$/war/WEB-INF/View/Access/view.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/Finances/index.jsp" />
<option value="$PROJECT_DIR$/war/WEB-INF/View/Resources/add.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/index.jsp" />
<option value="$PROJECT_DIR$/war/WEB-INF/View/Resources/view.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/index.jsp" />
<option value="$PROJECT_DIR$/war/WEB-INF/View/Roles/add.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/index.jsp" />
@ -151,6 +187,26 @@
<option value="$PROJECT_DIR$/war/WEB-INF/View/Users/add.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/index.jsp" />
<option value="$PROJECT_DIR$/war/WEB-INF/View/Users/view.jsp" /> <option value="$PROJECT_DIR$/war/WEB-INF/View/Users/view.jsp" />
<option value="$PROJECT_DIR$/war/WEB-INF/View/Services/view.jsp" />
<option value="$PROJECT_DIR$/war/WEB-INF/View/Employees/add.jsp" />
<option value="$PROJECT_DIR$/war/WEB-INF/View/Employees/view.jsp" />
<option value="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerAdd.java" />
<option value="$PROJECT_DIR$/war/WEB-INF/View/Finances/index.jsp" />
<option value="$PROJECT_DIR$/war/WEB-INF/View/Employees/index.jsp" />
<option value="$PROJECT_DIR$/src/controller/resourcesManagement/employees/EmployeesControllerAdd.java" />
<option value="$PROJECT_DIR$/src/model/Materials.java" />
<option value="$PROJECT_DIR$/war/WEB-INF/View/Services/add.jsp" />
<option value="$PROJECT_DIR$/src/controller/resourcesManagement/materials/MaterialsControllerDelete.java" />
<option value="$PROJECT_DIR$/war/WEB-INF/web.xml" />
<option value="$PROJECT_DIR$/war/WEB-INF/View/Material/index.jsp" />
<option value="$PROJECT_DIR$/war/WEB-INF/View/Services/index.jsp" />
<option value="$PROJECT_DIR$/src/controller/resourcesManagement/materials/MaterialsControllerIndex.java" />
<option value="$PROJECT_DIR$/src/controller/resourcesManagement/materials/MaterialsControllerAdd.java" />
<option value="$PROJECT_DIR$/war/WEB-INF/View/Materials/index.jsp" />
<option value="$PROJECT_DIR$/src/controller/resourcesManagement/employees/EmployeesControllerView.java" />
<option value="$PROJECT_DIR$/src/controller/resourcesManagement/materials/MaterialsControllerView.java" />
<option value="$PROJECT_DIR$/war/WEB-INF/View/Materials/add.jsp" />
<option value="$PROJECT_DIR$/war/WEB-INF/View/Materials/View.jsp" />
</list> </list>
</option> </option>
</component> </component>
@ -207,14 +263,21 @@
<item name="Lab09" type="462c0819:PsiDirectoryNode" /> <item name="Lab09" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" /> <item name="controller" type="462c0819:PsiDirectoryNode" />
<item name="employee" type="462c0819:PsiDirectoryNode" /> <item name="financesManagement" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="Lab09" type="b2602c69:ProjectViewProjectNode" /> <item name="Lab09" type="b2602c69:ProjectViewProjectNode" />
<item name="Lab09" type="462c0819:PsiDirectoryNode" /> <item name="Lab09" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" /> <item name="controller" type="462c0819:PsiDirectoryNode" />
<item name="employee" type="462c0819:PsiDirectoryNode" /> <item name="resourcesManagement" 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="resourcesManagement" type="462c0819:PsiDirectoryNode" />
<item name="employees" type="462c0819:PsiDirectoryNode" /> <item name="employees" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
@ -222,7 +285,14 @@
<item name="Lab09" type="462c0819:PsiDirectoryNode" /> <item name="Lab09" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" /> <item name="controller" type="462c0819:PsiDirectoryNode" />
<item name="finances" type="462c0819:PsiDirectoryNode" /> <item name="resourcesManagement" type="462c0819:PsiDirectoryNode" />
<item name="materials" 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="model" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="Lab09" type="b2602c69:ProjectViewProjectNode" /> <item name="Lab09" type="b2602c69:ProjectViewProjectNode" />
@ -242,6 +312,22 @@
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" /> <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="View" type="462c0819:PsiDirectoryNode" /> <item name="View" type="462c0819:PsiDirectoryNode" />
</path> </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" />
<item name="war" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="View" type="462c0819:PsiDirectoryNode" />
<item name="Materials" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="Lab09" type="b2602c69:ProjectViewProjectNode" /> <item name="Lab09" type="b2602c69:ProjectViewProjectNode" />
<item name="Lab09" type="462c0819:PsiDirectoryNode" /> <item name="Lab09" type="462c0819:PsiDirectoryNode" />
@ -355,7 +441,7 @@
<property name="project.structure.last.edited" value="Problems" /> <property name="project.structure.last.edited" value="Problems" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="reference.idesettings.quicklists" /> <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
<property name="settings.editor.splitter.proportion" value="0.21668363" /> <property name="settings.editor.splitter.proportion" value="0.21668363" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
@ -526,7 +612,7 @@
<workItem from="1531449031990" duration="4443000" /> <workItem from="1531449031990" duration="4443000" />
<workItem from="1531489105867" duration="9960000" /> <workItem from="1531489105867" duration="9960000" />
<workItem from="1531523398201" duration="5772000" /> <workItem from="1531523398201" duration="5772000" />
<workItem from="1531582003807" duration="8574000" /> <workItem from="1531582003807" duration="16024000" />
</task> </task>
<task id="LOCAL-00001" summary="Lanzamiento Inicial. Intenten crear branches para trabajar de forma segura."> <task id="LOCAL-00001" summary="Lanzamiento Inicial. Intenten crear branches para trabajar de forma segura.">
<created>1528408256446</created> <created>1528408256446</created>
@ -724,11 +810,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1531601494596</updated> <updated>1531601494596</updated>
</task> </task>
<option name="localTasksCounter" value="29" /> <task id="LOCAL-00029" summary="Arreglo de errores.">
<created>1531607908049</created>
<option name="number" value="00029" />
<option name="presentableId" value="LOCAL-00029" />
<option name="project" value="LOCAL" />
<updated>1531607908049</updated>
</task>
<option name="localTasksCounter" value="30" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="189361000" /> <option name="totallyTimeSpent" value="196811000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@ -741,7 +834,6 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="28" y="84" width="1868" height="935" extended-state="0" /> <frame x="28" y="84" width="1868" height="935" extended-state="0" />
<editor active="true" />
<layout> <layout>
<window_info anchor="right" id="Palette" order="3" /> <window_info anchor="right" id="Palette" order="3" />
<window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50053996" side_tool="true" weight="0.31946144" /> <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50053996" side_tool="true" weight="0.31946144" />
@ -848,7 +940,8 @@
<MESSAGE value="Arreglo de errores" /> <MESSAGE value="Arreglo de errores" />
<MESSAGE value="Division de la aplicacion:&#10;&#10;El sector inicial esta dirigido a los clientes, mientras que las herramientos coma el CRUD solo son solo para empleados." /> <MESSAGE value="Division de la aplicacion:&#10;&#10;El sector inicial esta dirigido a los clientes, mientras que las herramientos coma el CRUD solo son solo para empleados." />
<MESSAGE value="Agregado Employee" /> <MESSAGE value="Agregado Employee" />
<option name="LAST_COMMIT_MESSAGE" value="Agregado Employee" /> <MESSAGE value="Arreglo de errores." />
<option name="LAST_COMMIT_MESSAGE" value="Arreglo de errores." />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
@ -856,98 +949,35 @@
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/controller/employee/roles/RolesControllerAdd.java"> <entry file="file://$PROJECT_DIR$/src/controller/usersManagement/access/AccessControllerAdd.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="356">
<caret line="46" column="68" lean-forward="true" selection-start-line="46" selection-start-column="68" selection-end-line="46" selection-end-column="68" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/war/css/materialize.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="412">
<caret line="6883" column="37" lean-forward="true" selection-start-line="6883" selection-start-column="37" selection-end-line="6883" selection-end-column="37" />
</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">
<caret line="23" column="79" selection-start-line="23" selection-start-column="73" selection-end-line="23" selection-end-column="79" />
</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">
<caret line="39" column="42" selection-start-line="39" selection-start-column="42" selection-end-line="39" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/controller/employee/users/UsersControllerView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1156">
<caret line="81" column="42" selection-start-line="81" selection-start-column="42" selection-end-line="81" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/controller/employee/resources/ResourcesControllerAdd.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="248">
<caret line="63" column="38" selection-start-line="63" selection-start-column="38" selection-end-line="63" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/controller/employee/resources/ResourcesControllerDelete.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="37" column="34" selection-start-line="37" selection-start-column="34" selection-end-line="37" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/controller/employee/resources/ResourcesControllerIndex.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/controller/employee/resources/ResourcesControllerView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="646">
<caret line="88" column="27" selection-start-line="88" selection-start-column="27" selection-end-line="88" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/controller/employee/access/AccessControllerAdd.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570"> <state relative-caret-position="570">
<caret line="95" column="50" selection-start-line="95" selection-start-column="50" selection-end-line="95" selection-end-column="50" /> <caret line="95" column="50" selection-start-line="95" selection-start-column="50" selection-end-line="95" selection-end-column="50" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/controller/employee/access/AccessControllerDelete.java"> <entry file="file://$PROJECT_DIR$/src/controller/usersManagement/access/AccessControllerDelete.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="476"> <state relative-caret-position="476">
<caret line="36" column="42" selection-start-line="36" selection-start-column="42" selection-end-line="36" selection-end-column="42" /> <caret line="36" column="42" selection-start-line="36" selection-start-column="42" selection-end-line="36" selection-end-column="42" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/controller/employee/access/AccessControllerEdit.java"> <entry file="file://$PROJECT_DIR$/src/controller/usersManagement/access/AccessControllerEdit.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1196"> <state relative-caret-position="1196">
<caret line="87" column="44" selection-start-line="87" selection-start-column="44" selection-end-line="87" selection-end-column="44" /> <caret line="87" column="44" selection-start-line="87" selection-start-column="44" selection-end-line="87" selection-end-column="44" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/controller/employee/access/AccessControllerIndex.java"> <entry file="file://$PROJECT_DIR$/src/controller/usersManagement/access/AccessControllerIndex.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="539"> <state relative-caret-position="539">
<caret line="68" column="40" selection-start-line="68" selection-start-column="40" selection-end-line="68" selection-end-column="40" /> <caret line="68" column="40" selection-start-line="68" selection-start-column="40" selection-end-line="68" selection-end-column="40" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/controller/employee/access/AccessControllerView.java"> <entry file="file://$PROJECT_DIR$/src/controller/usersManagement/access/AccessControllerView.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="486"> <state relative-caret-position="486">
<caret line="113" lean-forward="true" selection-start-line="113" selection-end-line="113" /> <caret line="113" lean-forward="true" selection-start-line="113" selection-end-line="113" />
@ -968,14 +998,14 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/controller/employee/users/UsersControllerAdd.java"> <entry file="file://$PROJECT_DIR$/src/controller/usersManagement/users/UsersControllerAdd.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="424"> <state relative-caret-position="424">
<caret line="68" column="79" lean-forward="true" selection-start-line="68" selection-start-column="79" selection-end-line="68" selection-end-column="79" /> <caret line="68" column="79" lean-forward="true" selection-start-line="68" selection-start-column="79" selection-end-line="68" selection-end-column="79" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/controller/employee/users/UsersControllerIndex.java"> <entry file="file://$PROJECT_DIR$/src/controller/usersManagement/users/UsersControllerIndex.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136"> <state relative-caret-position="136">
<caret line="16" column="8" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="8" /> <caret line="16" column="8" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="8" />
@ -988,39 +1018,6 @@
<entry file="file://$PROJECT_DIR$/.idea/vcs.xml"> <entry file="file://$PROJECT_DIR$/.idea/vcs.xml">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/model/Employee.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="5" column="40" selection-start-line="5" selection-start-column="40" selection-end-line="5" selection-end-column="40" />
<folding>
<element signature="e#997#998#0" expanded="true" />
<element signature="e#1024#1025#0" expanded="true" />
<element signature="e#1063#1064#0" expanded="true" />
<element signature="e#1095#1096#0" expanded="true" />
<element signature="e#1127#1128#0" expanded="true" />
<element signature="e#1155#1156#0" expanded="true" />
<element signature="e#1196#1197#0" expanded="true" />
<element signature="e#1230#1231#0" expanded="true" />
<element signature="e#1262#1263#0" expanded="true" />
<element signature="e#1290#1291#0" expanded="true" />
<element signature="e#1331#1332#0" expanded="true" />
<element signature="e#1365#1366#0" expanded="true" />
<element signature="e#1393#1394#0" expanded="true" />
<element signature="e#1419#1420#0" expanded="true" />
<element signature="e#1454#1455#0" expanded="true" />
<element signature="e#1484#1485#0" expanded="true" />
<element signature="e#1518#1519#0" expanded="true" />
<element signature="e#1547#1548#0" expanded="true" />
<element signature="e#1591#1592#0" expanded="true" />
<element signature="e#1627#1628#0" expanded="true" />
<element signature="e#1657#1658#0" expanded="true" />
<element signature="e#1707#1708#0" expanded="true" />
<element signature="e#1746#1747#0" expanded="true" />
<element signature="e#1782#1783#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/war/usersAdminIndex.jsp"> <entry file="file://$PROJECT_DIR$/war/usersAdminIndex.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1173"> <state relative-caret-position="1173">
@ -1028,36 +1025,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<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>
<entry file="file://$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerAdd.java">
<provider selected="true" editor-type-id="text-editor">
<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>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerDelete.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575">
<caret line="49" column="38" selection-start-line="49" selection-start-column="38" selection-end-line="49" selection-end-column="38" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34"> <state relative-caret-position="34">
@ -1068,14 +1035,7 @@
<entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch.lua"> <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch.lua">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/war/WEB-INF/web.xml"> <entry file="file://$PROJECT_DIR$/src/controller/financesManagement/IncomeReport.java">
<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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374"> <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" /> <caret line="32" column="115" selection-start-line="32" selection-start-column="115" selection-end-line="32" selection-end-column="115" />
@ -1116,40 +1076,6 @@
</state> </state>
</provider> </provider>
</entry> </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="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"> <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Resources/add.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="317"> <state relative-caret-position="317">
@ -1174,23 +1100,6 @@
</state> </state>
</provider> </provider>
</entry> </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>
</state>
</provider>
</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="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$/war/index.jsp"> <entry file="file://$PROJECT_DIR$/war/index.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1225"> <state relative-caret-position="-1225">
@ -1249,7 +1158,7 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerIndex.java"> <entry file="file://$PROJECT_DIR$/src/controller/resourcesManagement/employees/EmployeesControllerIndex.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309"> <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" /> <caret line="33" column="50" selection-start-line="33" selection-start-column="50" selection-end-line="33" selection-end-column="50" />
@ -1259,10 +1168,208 @@
</state> </state>
</provider> </provider>
</entry> </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="548">
<caret line="80" column="24" selection-start-line="80" selection-start-column="24" selection-end-line="80" selection-end-column="24" />
</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="527">
<caret line="31" column="7" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="7" />
<folding>
<element signature="n#style#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</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="447">
<caret line="92" column="30" selection-start-line="92" selection-start-column="30" selection-end-line="92" selection-end-column="30" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/controller/resourcesManagement/services/ServicesControllerIndex.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="43" column="17" lean-forward="true" selection-start-line="26" selection-start-column="16" selection-end-line="43" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/model/Employee.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="17" column="15" lean-forward="true" selection-start-line="17" selection-start-column="15" selection-end-line="17" selection-end-column="15" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/controller/resourcesManagement/employees/EmployeesControllerAdd.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309">
<caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Services/add.jsp"> <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Services/add.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210"> <state relative-caret-position="17">
<caret line="62" column="97" lean-forward="true" selection-start-line="62" selection-start-column="97" selection-end-line="62" selection-end-column="97" /> <caret line="1" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/controller/resourcesManagement/employees/EmployeesControllerDelete.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260">
<caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</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="3">
<caret line="47" column="45" lean-forward="true" selection-start-line="47" selection-start-column="45" selection-end-line="47" selection-end-column="45" />
</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="491">
<caret line="283" column="4" lean-forward="true" selection-start-line="283" selection-start-column="4" selection-end-line="283" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/model/Material.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34">
<caret line="2" column="31" lean-forward="true" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
</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="183">
<caret line="141" column="9" selection-start-line="141" selection-start-column="9" selection-end-line="141" selection-end-column="9" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/controller/resourcesManagement/materials/MaterialsControllerIndex.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="371">
<caret line="35" column="14" selection-start-line="35" selection-start-column="14" selection-end-line="35" selection-end-column="14" />
<folding>
<element signature="method#doGet#0;class#MaterialsControllerIndex#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/controller/resourcesManagement/materials/MaterialsControllerDelete.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="648">
<caret line="42" column="20" selection-start-line="42" selection-start-column="20" selection-end-line="42" selection-end-column="20" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#doGet#0;class#MaterialsControllerDelete#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/controller/resourcesManagement/materials/MaterialsControllerAdd.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="739">
<caret line="64" column="116" selection-start-line="64" selection-start-column="116" selection-end-line="64" selection-end-column="116" />
<folding>
<element signature="method#doGet#0;class#MaterialsControllerAdd#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/controller/resourcesManagement/employees/EmployeesControllerView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="262">
<caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#doPost#0;class#EmployeesControllerView#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/controller/resourcesManagement/materials/MaterialsControllerView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="430">
<caret line="52" column="97" selection-start-line="52" selection-start-column="86" selection-end-line="52" selection-end-column="97" />
<folding>
<element signature="method#doGet#0;class#MaterialsControllerView#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Materials/add.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<caret line="122" column="25" selection-start-line="122" selection-start-column="25" selection-end-line="122" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Materials/View.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1260">
<caret line="141" column="141" selection-start-line="141" selection-start-column="141" selection-end-line="141" selection-end-column="141" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Materials/index.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="496">
<caret line="95" column="52" selection-start-line="95" selection-start-column="52" selection-end-line="95" selection-end-column="52" />
<folding>
<element signature="n#style#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#li#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#li#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#li#0;n#ul#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#li#0;n#ul#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#svg#0;n#a#0;n#li#0;n#ul#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<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/index.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34">
<caret line="2" selection-start-line="2" selection-end-line="2" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>

6
src/controller/finances/IncomeReport.java → src/controller/financesManagement/IncomeReport.java
View File

@ -1,7 +1,7 @@
package controller.finances; package controller.financesManagement;
import controller.employee.access.AccessControllerView; import controller.usersManagement.access.AccessControllerView;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
import model.User; import model.User;
import javax.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;

2
src/controller/index.java
View File

@ -1,6 +1,6 @@
package controller; package controller;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
import model.User; import model.User;
import javax.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;

10
src/controller/employee/employees/EmployeesControllerAdd.java → src/controller/resourcesManagement/employees/EmployeesControllerAdd.java
View File

@ -1,4 +1,4 @@
package controller.employee.employees; package controller.resourcesManagement.employees;
import java.io.IOException; import java.io.IOException;
@ -14,8 +14,8 @@ import javax.servlet.http.HttpSession;
import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory; import com.google.appengine.api.datastore.KeyFactory;
import controller.PMF; import controller.PMF;
import controller.employee.access.AccessControllerView; import controller.usersManagement.access.AccessControllerView;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
import model.Employee; import model.Employee;
@SuppressWarnings("serial") @SuppressWarnings("serial")
@ -27,8 +27,6 @@ public class EmployeesControllerAdd extends HttpServlet {
if (AccessControllerView.checkPermission(request.getSession().getAttribute("userID").toString(),request.getRequestURI())){ if (AccessControllerView.checkPermission(request.getSession().getAttribute("userID").toString(),request.getRequestURI())){
PersistenceManager pm = PMF.get().getPersistenceManager(); PersistenceManager pm = PMF.get().getPersistenceManager();
System.out.println("Request URI Add ->" + request.getRequestURI());
String action = request.getParameter("action"); String action = request.getParameter("action");
if (action == null) if (action == null)
@ -84,7 +82,7 @@ public class EmployeesControllerAdd extends HttpServlet {
} else { } else {
request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to create/update a Employee.\"}"); request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to create/update an Employee.\"}");
response.sendRedirect("/e/users"); response.sendRedirect("/e/users");
} }

4
src/controller/employee/employees/EmployeesControllerDelete.java → src/controller/resourcesManagement/employees/EmployeesControllerDelete.java
View File

@ -1,9 +1,9 @@
package controller.employee.employees; package controller.resourcesManagement.employees;
import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory; import com.google.appengine.api.datastore.KeyFactory;
import controller.PMF; import controller.PMF;
import controller.employee.access.AccessControllerView; import controller.usersManagement.access.AccessControllerView;
import model.Employee; import model.Employee;
import javax.jdo.JDOObjectNotFoundException; import javax.jdo.JDOObjectNotFoundException;

8
src/controller/employee/employees/EmployeesControllerIndex.java → src/controller/resourcesManagement/employees/EmployeesControllerIndex.java
View File

@ -1,7 +1,7 @@
package controller.employee.employees; package controller.resourcesManagement.employees;
import controller.employee.access.AccessControllerView; import controller.usersManagement.access.AccessControllerView;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
import model.User; import model.User;
import javax.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;
@ -11,7 +11,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.io.IOException; import java.io.IOException;
import static controller.employee.employees.EmployeesControllerView.getAllEmployees; import static controller.resourcesManagement.employees.EmployeesControllerView.getAllEmployees;
public class EmployeesControllerIndex extends HttpServlet { public class EmployeesControllerIndex extends HttpServlet {

8
src/controller/employee/employees/EmployeesControllerView.java → src/controller/resourcesManagement/employees/EmployeesControllerView.java
View File

@ -1,10 +1,10 @@
package controller.employee.employees; package controller.resourcesManagement.employees;
import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory; import com.google.appengine.api.datastore.KeyFactory;
import controller.PMF; import controller.PMF;
import controller.employee.access.AccessControllerView; import controller.usersManagement.access.AccessControllerView;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
import model.Employee; import model.Employee;
import javax.jdo.PersistenceManager; import javax.jdo.PersistenceManager;
@ -72,7 +72,7 @@ public class EmployeesControllerView extends HttpServlet {
pm.close(); pm.close();
} else { } else {
request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to view/edit a Employee.\"}"); request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"No tienes permiso para editar/ver un Empleado.\"}");
response.sendRedirect("/e/users"); response.sendRedirect("/e/users");
} }

96
src/controller/resourcesManagement/materials/MaterialsControllerAdd.java Normal file
View File

@ -0,0 +1,96 @@
package controller.resourcesManagement.materials;
import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory;
import controller.PMF;
import controller.usersManagement.access.AccessControllerView;
import controller.usersManagement.users.UsersControllerView;
import model.Material;
import javax.jdo.PersistenceManager;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.IOException;
public class MaterialsControllerAdd extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
try{
if (AccessControllerView.checkPermission(request.getSession().getAttribute("userID").toString(),request.getRequestURI())){
PersistenceManager pm = PMF.get().getPersistenceManager();
String action = request.getParameter("action");
if (action == null)
action = "";
if (action.equals("create")){
String name = request.getParameter("Name");
int price = Integer.parseInt(request.getParameter("Price"));
int amount = Integer.parseInt(request.getParameter("Amount"));
String unity = request.getParameter("Unity");
Material material = new Material(name, price, amount, unity);
request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Material creado con éxito.\"}");
pm.makePersistent(material);
} else if (action.equals("update")){
Key k = KeyFactory.stringToKey(request.getParameter("key"));
Material material = pm.getObjectById(Material.class,k);
material.setName(request.getParameter("Name"));
material.setPrice(Integer.parseInt(request.getParameter("Price")));
material.setAmount(Integer.parseInt(request.getParameter("Amount")));
material.setUnity(request.getParameter("Unity"));
pm.close();
request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Material actualizado con éxito.\"}");
} else if (action.equals("redirect")){
HttpSession sesion= request.getSession();
RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Materials/add.jsp");
request.setAttribute("User",UsersControllerView.getUser(sesion.getAttribute("userID").toString()));
dispatcher.forward(request, response);
}
pm.close();
try{
response.sendRedirect("/e/materials");
}
//Al redirigr al jsp para crear, se usa RequestDispatcher, y este entra en conflicto con sendRedirect.
catch (IllegalStateException e){
System.err.println("IllegalStateException: There was a double redirect.");
}
} else {
request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"No tienes permiso para acceder.\"}");
response.sendRedirect("/e/materials");
}
} catch (NullPointerException e){
response.sendRedirect("/");
}
}
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
doPost(request, response);
}
}

59
src/controller/resourcesManagement/materials/MaterialsControllerDelete.java Normal file
View File

@ -0,0 +1,59 @@
package controller.resourcesManagement.materials;
import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory;
import controller.PMF;
import controller.usersManagement.access.AccessControllerView;
import model.Material;
import javax.jdo.JDOObjectNotFoundException;
import javax.jdo.PersistenceManager;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
public class MaterialsControllerDelete extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
try{
if (AccessControllerView.checkPermission(request.getSession().getAttribute("userID").toString(),request.getRequestURI())){
PersistenceManager pm = PMF.get().getPersistenceManager();
String materialKey = request.getParameter("materialKey");
try{
Key k = KeyFactory.stringToKey(materialKey);
Material material = pm.getObjectById(Material.class, k);
pm.deletePersistent(material);
request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Material eliminado con éxito.\"}");
} catch (JDOObjectNotFoundException e){
System.err.println("Exception catched -> " + e.getMessage());
}
pm.close();
response.sendRedirect("/e/materials");
} else {
request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"No tienes permiso para eliminar un Material.\"}");
response.sendRedirect("/e/materials");
}
} catch (NullPointerException e){
response.sendRedirect("/");
}
}
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
doPost(request, response);
}
}

59
src/controller/resourcesManagement/materials/MaterialsControllerIndex.java Normal file
View File

@ -0,0 +1,59 @@
package controller.resourcesManagement.materials;
import controller.usersManagement.access.AccessControllerView;
import controller.usersManagement.users.UsersControllerView;
import model.User;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.IOException;
import static controller.resourcesManagement.materials.MaterialsControllerView.getAllMaterials;
public class MaterialsControllerIndex extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
try{
if (AccessControllerView.checkPermission(request.getSession().getAttribute("userID").toString(),request.getRequestURI())){
//Se usa para revisar si hay una sesion activa
HttpSession sesion= request.getSession();
//Intenta hallar una sesion activa
try{
User user = UsersControllerView.getUser(sesion.getAttribute("userID").toString());
if (user == null) throw new NullPointerException("UsersControllerIndex: El usuario recibido es nulo.");
request.setAttribute("User",user);
request.setAttribute("materialList",getAllMaterials());
request.setAttribute("serverResponse",sesion.getAttribute("serverResponse"));
sesion.setAttribute("serverResponse","!");
RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Materials/index.jsp");
dispatcher.forward(request,response);
}
//Si no la encuentra, redirige a la pagina inicial.
catch (Exception e){
System.err.println("UserControllerIndex: Error catched. " + e.getMessage());
response.getWriter().println("<html><head><script>window.location.replace(\"../\")</script></head></html>");
}
} else {
response.sendRedirect("/e/services");
}
}catch (NullPointerException e){
response.sendRedirect("/");
}
}
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
doPost(request, response);
}
}

107
src/controller/resourcesManagement/materials/MaterialsControllerView.java Normal file
View File

@ -0,0 +1,107 @@
package controller.resourcesManagement.materials;
import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory;
import controller.PMF;
import controller.usersManagement.access.AccessControllerView;
import controller.usersManagement.users.UsersControllerView;
import model.Material;
import javax.jdo.PersistenceManager;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
public class MaterialsControllerView extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
try {
if (AccessControllerView.checkPermission(request.getSession().getAttribute("userID").toString(),request.getRequestURI())){
String action = request.getParameter("action");
if (action == null)
action = "";
PersistenceManager pm = PMF.get().getPersistenceManager();
if (action.equals("editRedirect")) {
RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Materials/view.jsp");
request.setAttribute("User",UsersControllerView.getUser(request.getSession().getAttribute("userID").toString()));
request.setAttribute("Material",getMaterial(request.getParameter("materialKey")));
request.setAttribute("editAllowed",true);
request.setAttribute("action","Editar");
try{
dispatcher.forward(request,response);
} catch (javax.servlet.ServletException e){
e.printStackTrace();
}
}
else if (action.equals("viewRedirect")) {
RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Materials/view.jsp");
request.setAttribute("User",UsersControllerView.getUser(request.getSession().getAttribute("userID").toString()));
request.setAttribute("Material",getMaterial(request.getParameter("materialKey")));
request.setAttribute("editAllowed",false);
request.setAttribute("action","Ver");
try{
dispatcher.forward(request,response);
} catch (javax.servlet.ServletException e){
e.printStackTrace();
}
}
//Si no se encontró acción, regresa al inicio
else {
response.getWriter().println("<html><head><script>window.location.replace(\"../\");</script><body></body></html>");
}
pm.close();
} else {
request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"No tienes permiso para editar/ver un Material.\"}");
response.sendRedirect("/e/materials");
}
} catch (NullPointerException e){
response.sendRedirect("/");
}
}
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
doPost(request, response);
}
@SuppressWarnings("unchecked")
static List<Material> getAllMaterials(){
PersistenceManager pm = controller.PMF.get().getPersistenceManager();
List<Material> employees = (List<Material>) pm.newQuery("select from " + Material.class.getName()).execute();
pm.close();
return employees;
}
private static Material getMaterial(String key){
PersistenceManager pm = PMF.get().getPersistenceManager();
Key k = KeyFactory.stringToKey(key);
Material material = pm.getObjectById(Material.class,k);
pm.close();
return material;
}
}

6
src/controller/employee/services/ServicesControllerAdd.java → src/controller/resourcesManagement/services/ServicesControllerAdd.java
View File

@ -1,4 +1,4 @@
package controller.employee.services; package controller.resourcesManagement.services;
import java.io.IOException; import java.io.IOException;
@ -14,8 +14,8 @@ import javax.servlet.http.HttpSession;
import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory; import com.google.appengine.api.datastore.KeyFactory;
import controller.PMF; import controller.PMF;
import controller.employee.access.AccessControllerView; import controller.usersManagement.access.AccessControllerView;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
import model.Service; import model.Service;
@SuppressWarnings("serial") @SuppressWarnings("serial")

4
src/controller/employee/services/ServicesControllerDelete.java → src/controller/resourcesManagement/services/ServicesControllerDelete.java
View File

@ -1,9 +1,9 @@
package controller.employee.services; package controller.resourcesManagement.services;
import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory; import com.google.appengine.api.datastore.KeyFactory;
import controller.PMF; import controller.PMF;
import controller.employee.access.AccessControllerView; import controller.usersManagement.access.AccessControllerView;
import model.Service; import model.Service;
import javax.jdo.JDOObjectNotFoundException; import javax.jdo.JDOObjectNotFoundException;

8
src/controller/employee/services/ServicesControllerIndex.java → src/controller/resourcesManagement/services/ServicesControllerIndex.java
View File

@ -1,7 +1,7 @@
package controller.employee.services; package controller.resourcesManagement.services;
import controller.employee.access.AccessControllerView; import controller.usersManagement.access.AccessControllerView;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
import model.User; import model.User;
import javax.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;
@ -11,7 +11,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.io.IOException; import java.io.IOException;
import static controller.employee.services.ServicesControllerView.getAllServices; import static controller.resourcesManagement.services.ServicesControllerView.getAllServices;
public class ServicesControllerIndex extends HttpServlet { public class ServicesControllerIndex extends HttpServlet {

6
src/controller/employee/services/ServicesControllerView.java → src/controller/resourcesManagement/services/ServicesControllerView.java
View File

@ -1,10 +1,10 @@
package controller.employee.services; package controller.resourcesManagement.services;
import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory; import com.google.appengine.api.datastore.KeyFactory;
import controller.PMF; import controller.PMF;
import controller.employee.access.AccessControllerView; import controller.usersManagement.access.AccessControllerView;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
import model.Service; import model.Service;
import javax.jdo.PersistenceManager; import javax.jdo.PersistenceManager;

8
src/controller/employee/access/AccessControllerAdd.java → src/controller/usersManagement/access/AccessControllerAdd.java
View File

@ -1,9 +1,9 @@
package controller.employee.access; package controller.usersManagement.access;
import controller.PMF; import controller.PMF;
import controller.employee.resources.ResourcesControllerView; import controller.usersManagement.resources.ResourcesControllerView;
import controller.employee.roles.RolesControllerView; import controller.usersManagement.roles.RolesControllerView;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
import model.Access; import model.Access;
import model.Resource; import model.Resource;
import model.Role; import model.Role;

2
src/controller/employee/access/AccessControllerDelete.java → src/controller/usersManagement/access/AccessControllerDelete.java
View File

@ -1,4 +1,4 @@
package controller.employee.access; package controller.usersManagement.access;
import java.io.IOException; import java.io.IOException;
import javax.servlet.http.*; import javax.servlet.http.*;

4
src/controller/employee/access/AccessControllerEdit.java → src/controller/usersManagement/access/AccessControllerEdit.java
View File

@ -1,9 +1,9 @@
package controller.employee.access; package controller.usersManagement.access;
import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory; import com.google.appengine.api.datastore.KeyFactory;
import controller.PMF; import controller.PMF;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
import model.Access; import model.Access;
import model.Resource; import model.Resource;
import model.Role; import model.Role;

4
src/controller/employee/access/AccessControllerIndex.java → src/controller/usersManagement/access/AccessControllerIndex.java
View File

@ -1,7 +1,7 @@
package controller.employee.access; package controller.usersManagement.access;
import controller.PMF; import controller.PMF;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
import model.Access; import model.Access;
import model.User; import model.User;

8
src/controller/employee/access/AccessControllerView.java → src/controller/usersManagement/access/AccessControllerView.java
View File

@ -1,11 +1,11 @@
package controller.employee.access; package controller.usersManagement.access;
import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory; import com.google.appengine.api.datastore.KeyFactory;
import controller.PMF; import controller.PMF;
import controller.employee.resources.ResourcesControllerView; import controller.usersManagement.resources.ResourcesControllerView;
import controller.employee.roles.RolesControllerView; import controller.usersManagement.roles.RolesControllerView;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
import model.Access; import model.Access;
import model.Resource; import model.Resource;
import model.Role; import model.Role;

5
src/controller/employee/resources/ResourcesControllerAdd.java → src/controller/usersManagement/resources/ResourcesControllerAdd.java
View File

@ -1,11 +1,10 @@
package controller.employee.resources; package controller.usersManagement.resources;
import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory; import com.google.appengine.api.datastore.KeyFactory;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
import model.Resource; import model.Resource;
import javax.jdo.JDOObjectNotFoundException;
import javax.jdo.PersistenceManager; import javax.jdo.PersistenceManager;
import javax.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException; import javax.servlet.ServletException;

3
src/controller/employee/resources/ResourcesControllerDelete.java → src/controller/usersManagement/resources/ResourcesControllerDelete.java
View File

@ -1,9 +1,8 @@
package controller.employee.resources; package controller.usersManagement.resources;
import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory; import com.google.appengine.api.datastore.KeyFactory;
import model.Resource; import model.Resource;
import model.Role;
import javax.jdo.JDOObjectNotFoundException; import javax.jdo.JDOObjectNotFoundException;
import javax.jdo.PersistenceManager; import javax.jdo.PersistenceManager;

6
src/controller/employee/resources/ResourcesControllerIndex.java → src/controller/usersManagement/resources/ResourcesControllerIndex.java
View File

@ -1,10 +1,8 @@
package controller.employee.resources; package controller.usersManagement.resources;
import controller.employee.roles.RolesControllerView; import controller.usersManagement.users.UsersControllerView;
import controller.employee.users.UsersControllerView;
import model.User; import model.User;
import javax.jdo.PersistenceManager;
import javax.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;

6
src/controller/employee/resources/ResourcesControllerView.java → src/controller/usersManagement/resources/ResourcesControllerView.java
View File

@ -1,8 +1,8 @@
package controller.employee.resources; package controller.usersManagement.resources;
import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory; import com.google.appengine.api.datastore.KeyFactory;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
import model.Resource; import model.Resource;
import javax.jdo.PersistenceManager; import javax.jdo.PersistenceManager;
@ -14,8 +14,6 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import static controller.employee.roles.RolesControllerView.getRole;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class ResourcesControllerView extends HttpServlet { public class ResourcesControllerView extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

4
src/controller/employee/roles/RolesControllerAdd.java → src/controller/usersManagement/roles/RolesControllerAdd.java
View File

@ -1,8 +1,8 @@
package controller.employee.roles; package controller.usersManagement.roles;
import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory; import com.google.appengine.api.datastore.KeyFactory;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
import model.Role; import model.Role;
import javax.jdo.PersistenceManager; import javax.jdo.PersistenceManager;

2
src/controller/employee/roles/RolesControllerDelete.java → src/controller/usersManagement/roles/RolesControllerDelete.java
View File

@ -1,4 +1,4 @@
package controller.employee.roles; package controller.usersManagement.roles;
import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory; import com.google.appengine.api.datastore.KeyFactory;

5
src/controller/employee/roles/RolesControllerIndex.java → src/controller/usersManagement/roles/RolesControllerIndex.java
View File

@ -1,9 +1,8 @@
package controller.employee.roles; package controller.usersManagement.roles;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
import model.User; import model.User;
import javax.jdo.PersistenceManager;
import javax.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;

4
src/controller/employee/roles/RolesControllerView.java → src/controller/usersManagement/roles/RolesControllerView.java
View File

@ -1,8 +1,8 @@
package controller.employee.roles; package controller.usersManagement.roles;
import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory; import com.google.appengine.api.datastore.KeyFactory;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
import model.Role; import model.Role;
import javax.jdo.PersistenceManager; import javax.jdo.PersistenceManager;

8
src/controller/employee/users/UsersControllerAdd.java → src/controller/usersManagement/users/UsersControllerAdd.java
View File

@ -1,8 +1,8 @@
package controller.employee.users; package controller.usersManagement.users;
import controller.employee.access.AccessControllerView; import controller.usersManagement.access.AccessControllerView;
import controller.employee.roles.RolesControllerAdd; import controller.usersManagement.roles.RolesControllerAdd;
import controller.employee.roles.RolesControllerView; import controller.usersManagement.roles.RolesControllerView;
import model.Role; import model.Role;
import model.User; import model.User;

4
src/controller/employee/users/UsersControllerDelete.java → src/controller/usersManagement/users/UsersControllerDelete.java
View File

@ -1,6 +1,6 @@
package controller.employee.users; package controller.usersManagement.users;
import controller.employee.access.AccessControllerView; import controller.usersManagement.access.AccessControllerView;
import model.User; import model.User;
import javax.jdo.JDOObjectNotFoundException; import javax.jdo.JDOObjectNotFoundException;

4
src/controller/employee/users/UsersControllerIndex.java → src/controller/usersManagement/users/UsersControllerIndex.java
View File

@ -1,6 +1,6 @@
package controller.employee.users; package controller.usersManagement.users;
import controller.employee.access.AccessControllerView; import controller.usersManagement.access.AccessControllerView;
import model.User; import model.User;
import javax.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;

6
src/controller/employee/users/UsersControllerView.java → src/controller/usersManagement/users/UsersControllerView.java
View File

@ -1,7 +1,7 @@
package controller.employee.users; package controller.usersManagement.users;
import controller.employee.access.AccessControllerView; import controller.usersManagement.access.AccessControllerView;
import controller.employee.roles.RolesControllerView; import controller.usersManagement.roles.RolesControllerView;
import model.User; import model.User;
import javax.jdo.JDOObjectNotFoundException; import javax.jdo.JDOObjectNotFoundException;

4
src/model/Access.java
View File

@ -1,7 +1,7 @@
package model; package model;
import controller.employee.resources.ResourcesControllerView; import controller.usersManagement.resources.ResourcesControllerView;
import controller.employee.roles.RolesControllerView; import controller.usersManagement.roles.RolesControllerView;
import javax.jdo.annotations.IdGeneratorStrategy; import javax.jdo.annotations.IdGeneratorStrategy;
import javax.jdo.annotations.IdentityType; import javax.jdo.annotations.IdentityType;

2
src/model/Employee.java
View File

@ -3,7 +3,7 @@ package model;
import javax.jdo.annotations.*; import javax.jdo.annotations.*;
import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory; import com.google.appengine.api.datastore.KeyFactory;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
@PersistenceCapable(identityType=IdentityType.APPLICATION) @PersistenceCapable(identityType=IdentityType.APPLICATION)
public class Employee { public class Employee {

68
src/model/Material.java Normal file
View File

@ -0,0 +1,68 @@
package model;
import javax.jdo.annotations.*;
import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory;
@PersistenceCapable(identityType=IdentityType.APPLICATION)
public class Material {
@PrimaryKey
@Persistent(valueStrategy = IdGeneratorStrategy.IDENTITY)
private Key key;
@Persistent
private String name;
//Precio por unity
@Persistent
private int price;
//Tipo de unidad -> Peso, cantidad, medida, volumen, etc.
@Persistent
private String unity;
@Persistent
private int amount;
public Material(String name, int price, int quantity, String unity) {
this.name = name;
this.price = price;
this.amount = quantity;
this.unity = unity;
}
public String getKey() {
return KeyFactory.keyToString(key);
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getPrice() {
return price;
}
public void setPrice(int price) {
this.price = price;
}
public String getUnity() {
return unity;
}
public void setUnity(String unity) {
this.unity = unity;
}
public int getAmount() {
return amount;
}
public void setAmount(int amount) {
this.amount = amount;
}
}

2
src/model/Service.java
View File

@ -3,7 +3,7 @@ package model;
import javax.jdo.annotations.*; import javax.jdo.annotations.*;
import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory; import com.google.appengine.api.datastore.KeyFactory;
import controller.employee.users.UsersControllerView; import controller.usersManagement.users.UsersControllerView;
@PersistenceCapable(identityType=IdentityType.APPLICATION) @PersistenceCapable(identityType=IdentityType.APPLICATION)
public class Service { public class Service {

3
src/model/User.java
View File

@ -1,12 +1,11 @@
package model; package model;
import controller.employee.roles.RolesControllerView; import controller.usersManagement.roles.RolesControllerView;
import javax.jdo.annotations.IdentityType; import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.PersistenceCapable; import javax.jdo.annotations.PersistenceCapable;
import javax.jdo.annotations.Persistent; import javax.jdo.annotations.Persistent;
import javax.jdo.annotations.PrimaryKey; import javax.jdo.annotations.PrimaryKey;
import java.util.ArrayList;
@PersistenceCapable(identityType = IdentityType.APPLICATION) @PersistenceCapable(identityType = IdentityType.APPLICATION)
public class User { public class User {

3
war/WEB-INF/View/Employees/add.jsp
View File

@ -87,7 +87,8 @@
<div class="nav-content" style="background-color: #3949a3"> <div class="nav-content" style="background-color: #3949a3">
<ul class="tabs tabs-transparent"> <ul class="tabs tabs-transparent">
<li class="tab"><a href="../services">Servicios</a></li> <li class="tab"><a href="../services">Servicios</a></li>
<li class="tab active"><a class="active" href="../employees">Otros</a></li> <li class="tab active"><a class="active" href="../employees">Empleados</a></li>
<li class="tab"><a href="../materials">Materiales</a></li>
</ul> </ul>
</div> </div>
</nav> </nav>

2
war/WEB-INF/View/Employees/index.jsp
View File

@ -1,6 +1,5 @@
<%@ page import="model.User" %> <%@ page import="model.User" %>
<%@ page import="java.util.List" %> <%@ page import="java.util.List" %>
<%@ page import="model.Service" %>
<%@ page import="model.Employee" %><%-- <%@ page import="model.Employee" %><%--
Created by IntelliJ IDEA. Created by IntelliJ IDEA.
User: Fernando User: Fernando
@ -93,6 +92,7 @@
<ul class="tabs tabs-transparent"> <ul class="tabs tabs-transparent">
<li class="tab"><a href="./services">Servicios</a></li> <li class="tab"><a href="./services">Servicios</a></li>
<li class="tab active"><a class="active" href="#">Empleados</a></li> <li class="tab active"><a class="active" href="#">Empleados</a></li>
<li class="tab"><a href="./materials">Materiales</a></li>
</ul> </ul>
</div> </div>
</nav> </nav>

5
war/WEB-INF/View/Employees/view.jsp
View File

@ -88,8 +88,9 @@
</div> </div>
<div class="nav-content" style="background-color: #3949a3"> <div class="nav-content" style="background-color: #3949a3">
<ul class="tabs tabs-transparent"> <ul class="tabs tabs-transparent">
<li class="tab active"><a class="active" href="../services">Servicios</a></li> <li class="tab"><a href="../services">Servicios</a></li>
<li class="tab"><a href="./users">Otros</a></li> <li class="tab active"><a class="active" href="../employees">Empleados</a></li>
<li class="tab"><a href="../materials">Materiales</a></li>
</ul> </ul>
</div> </div>
</nav> </nav>

1
war/WEB-INF/View/Finances/index.jsp
View File

@ -90,6 +90,7 @@
<div class="nav-content" style="background-color: #3949a3"> <div class="nav-content" style="background-color: #3949a3">
<ul class="tabs tabs-transparent"> <ul class="tabs tabs-transparent">
<li class="tab active"><a class="active" href="#">Totales</a></li> <li class="tab active"><a class="active" href="#">Totales</a></li>
<li class="tab"><a href="./trans">Transacciones</a></li>
</ul> </ul>
</div> </div>
</nav> </nav>

148
war/WEB-INF/View/Materials/View.jsp Normal file
View File

@ -0,0 +1,148 @@
<%@ page import="model.User" %>
<%@ page import="model.Service" %>
<%@ page import="model.Material" %>
<%--
Created by IntelliJ IDEA.
User: Fernando
Date: 07/06/2018
Time: 16:39
To change this template use File | Settings | File Templates.
--%>
<% Material material = (Material) request.getAttribute("Material");
User usuario = (User) request.getAttribute("User");
boolean editAllowed = (Boolean) request.getAttribute("editAllowed");
String action = (String) request.getAttribute("action");%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title><%=action%> un Material - 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>
&nbsp;&nbsp;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="../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="../reports">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"><a href="../services">Servicios</a></li>
<li class="tab"><a href="../employees">Empleados</a></li>
<li class="tab active"><a class="active" href="../materials">Materiales</a></li>
</ul>
</div>
</nav>
<div class="container">
<br />
<span style="font-size: xx-large; font-family: 'Product Sans',Roboto,serif"><%=action%> un Material</span>
<br />
<br />
<% if (editAllowed) {%>
<form method="post" action="./add">
<input name="action" value="create" type="hidden">
Nombre del Material:<br />
<input name="Name" placeholder="Nombre" required value="<%= material.getName() %>"><br />
Cantidad:<br />
<input name="Amount" placeholder="Cantidad" type="number" min="0" required value="<%= material.getAmount() %>"><br />
Precio por unidad:<br />
<input name="Price" placeholder="Precio" type="number" required min="0" step="0.1" value="<%= material.getPrice() %>"><br />
Unidad (ejm. Kg, Litros):<br />
<input name="Unity" placeholder="Unidad" required value="<%= material.getUnity() %>"><br />
<button class="btn waves-effect waves-light indigo darken-1" type="submit" name="action" >Editar
<i class="material-icons right">send</i>
</button>
</form>
<% } else {%>
<div style="font-size: x-large">
Nombre: <%= material.getName() %><br />
Cantidad: <%= material.getAmount() %><br />
Precio: <%= material.getPrice() %><br />
Unidad: <%= material.getUnity() %><br />
</div>
<% } %>
<hr />
<br />
<a href="../materials" class="waves-effect waves-light btn whiteLink indigo darken-1"><i class="material-icons left">arrow_back</i>Volver</a>
</div>
</body>
</html>

129
war/WEB-INF/View/Materials/add.jsp Normal file
View File

@ -0,0 +1,129 @@
<%@ page import="model.User" %>
<%--
Created by IntelliJ IDEA.
User: Fernando
Date: 07/06/2018
Time: 16:39
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<% User user = (User) request.getAttribute("User"); %>
<html lang="es">
<head>
<title>Add a Service - 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>
&nbsp;&nbsp;Empleados
<div class="right valign-wrapper" style="padding: 0 0 0 10px; cursor: pointer; min-width: 150px;" onclick="changeUserOptions()">
<span style="min-width: 80px;">
<%= user.getName()%>
</span>
<img src="<%=user.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="../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="../reports">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"><a href="../services">Servicios</a></li>
<li class="tab"><a href="../employees">Empleados</a></li>
<li class="tab active"><a class="active" href="../material">Materiales</a></li>
</ul>
</div>
</nav>
<div class="container">
<br />
<span style="font-size: xx-large; font-family: 'Product Sans',Roboto,serif">Crear un Material</span>
<br />
<br />
<form method="post" action="./add">
<input name="action" value="create" type="hidden">
Nombre del Material:<br />
<input name="Name" placeholder="Nombre" required><br />
Cantidad:<br />
<input name="Amount" placeholder="Cantidad" type="number" min="0" required><br />
Precio por unidad:<br />
<input name="Price" placeholder="Precio" type="number" required min="0" step="0.1"><br />
Unidad (ejm. Kg, Litros):<br />
<input name="Unity" placeholder="Unidad" required><br />
<button class="btn waves-effect waves-light indigo darken-1" type="submit" name="action">Create
<i class="material-icons right">send</i>
</button>
</form>
<hr />
<br />
<a href="../materials" class="waves-effect waves-light btn whiteLink indigo darken-1"><i class="material-icons left">arrow_back</i>Go Back</a>
</div>
</body>
</html>

166
war/WEB-INF/View/Materials/index.jsp Normal file
View File

@ -0,0 +1,166 @@
<%@ page import="model.User" %>
<%@ page import="java.util.List" %>
<%@ page import="model.Material" %>
<%--
Created by IntelliJ IDEA.
User: Fernando
Date: 07/06/2018
Time: 16:39
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<% User usuario = (User) request.getAttribute("User");
List<Material> materialList = (List<Material>) request.getAttribute("materialList");
String serverResponse = (String) request.getAttribute("serverResponse");
if (serverResponse == null) serverResponse = "!";
%>
<html lang="es">
<head>
<title>Materiales - 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?v=2">
<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>
&nbsp;&nbsp;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="./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="./reports">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"><a href="./services">Servicios</a></li>
<li class="tab"><a href="./employees">Empleados</a></li>
<li class="tab active"><a class="active" href="#">Materiales</a></li>
</ul>
</div>
</nav>
<div class="container">
<br />
<span style="font-size: xx-large; font-family: 'Product Sans',Roboto,serif">Materiales</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 />
<a class="waves-effect waves-light btn whiteLink indigo darken-1" onclick="postRedirect('/e/materials/add',{action:'redirect'})"><i class="material-icons left">add</i>Create</a>
<br />
<br />
<table class="striped responsive-table">
<thead>
<tr>
<td>Nombre</td>
<td>Precio Unitario</td>
<td>Cantidad</td>
<td>Unidad</td>
</tr>
</thead>
<tbody>
<% for (Material material : materialList) {%>
<tr>
<td><%= material.getName()%></td>
<td><%= material.getPrice() %></td>
<td><%= material.getAmount() %></td>
<td><%= material.getUnity() %></td>
<td>
<a class="postLink" onclick="postRedirect('./materials/view',{action:'viewRedirect',materialKey:'<%=material.getKey()%>'})">View</a>
| <a class="postLink" onclick="postRedirect('./materials/view',{action:'editRedirect',materialKey:'<%=material.getKey()%>'})">Edit</a>
| <a class="postLink" onclick="postRedirect('./materials/delete',{materialKey:'<%=material.getKey()%>'})">Delete</a></td>
</tr>
<% } %>
</tbody>
</table>
</div>
</body>
</html>

4
war/WEB-INF/View/Services/add.jsp
View File

@ -1,6 +1,5 @@
<%@ page import="model.User" %> <%@ page import="model.User" %>
<%@ page import="java.util.List" %> <%--
<%@ page import="model.Role" %><%--
Created by IntelliJ IDEA. Created by IntelliJ IDEA.
User: Fernando User: Fernando
Date: 07/06/2018 Date: 07/06/2018
@ -88,6 +87,7 @@
<ul class="tabs tabs-transparent"> <ul class="tabs tabs-transparent">
<li class="tab active"><a class="active" href="../services">Servicios</a></li> <li class="tab active"><a class="active" href="../services">Servicios</a></li>
<li class="tab"><a href="../employees">Empleados</a></li> <li class="tab"><a href="../employees">Empleados</a></li>
<li class="tab"><a href="../materials">Materiales</a></li>
</ul> </ul>
</div> </div>
</nav> </nav>

1
war/WEB-INF/View/Services/index.jsp
View File

@ -92,6 +92,7 @@
<ul class="tabs tabs-transparent"> <ul class="tabs tabs-transparent">
<li class="tab active"><a class="active" href="#">Servicios</a></li> <li class="tab active"><a class="active" href="#">Servicios</a></li>
<li class="tab"><a href="./employees">Empleados</a></li> <li class="tab"><a href="./employees">Empleados</a></li>
<li class="tab"><a href="./materials">Materiales</a></li>
</ul> </ul>
</div> </div>
</nav> </nav>

1
war/WEB-INF/View/Services/view.jsp
View File

@ -90,6 +90,7 @@
<ul class="tabs tabs-transparent"> <ul class="tabs tabs-transparent">
<li class="tab active"><a class="active" href="../services">Servicios</a></li> <li class="tab active"><a class="active" href="../services">Servicios</a></li>
<li class="tab"><a href="../employees">Empleados</a></li> <li class="tab"><a href="../employees">Empleados</a></li>
<li class="tab"><a href="../materials">Materiales</a></li>
</ul> </ul>
</div> </div>
</nav> </nav>

BIN
war/WEB-INF/classes/model/Access.class
View File

Binary file not shown.

BIN
war/WEB-INF/classes/model/User.class
View File

Binary file not shown.

93
war/WEB-INF/web.xml
View File

@ -2,7 +2,7 @@
<servlet> <servlet>
<servlet-name>UsersControllerAdd</servlet-name> <servlet-name>UsersControllerAdd</servlet-name>
<servlet-class>controller.employee.users.UsersControllerAdd</servlet-class> <servlet-class>controller.usersManagement.users.UsersControllerAdd</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>UsersControllerAdd</servlet-name> <servlet-name>UsersControllerAdd</servlet-name>
@ -11,7 +11,7 @@
<servlet> <servlet>
<servlet-name>UsersControllerIndex</servlet-name> <servlet-name>UsersControllerIndex</servlet-name>
<servlet-class>controller.employee.users.UsersControllerIndex</servlet-class> <servlet-class>controller.usersManagement.users.UsersControllerIndex</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>UsersControllerIndex</servlet-name> <servlet-name>UsersControllerIndex</servlet-name>
@ -20,7 +20,7 @@
<servlet> <servlet>
<servlet-name>UsersControllerView</servlet-name> <servlet-name>UsersControllerView</servlet-name>
<servlet-class>controller.employee.users.UsersControllerView</servlet-class> <servlet-class>controller.usersManagement.users.UsersControllerView</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>UsersControllerView</servlet-name> <servlet-name>UsersControllerView</servlet-name>
@ -29,7 +29,7 @@
<servlet> <servlet>
<servlet-name>UsersControllerDelete</servlet-name> <servlet-name>UsersControllerDelete</servlet-name>
<servlet-class>controller.employee.users.UsersControllerDelete</servlet-class> <servlet-class>controller.usersManagement.users.UsersControllerDelete</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>UsersControllerDelete</servlet-name> <servlet-name>UsersControllerDelete</servlet-name>
@ -41,7 +41,7 @@
<servlet> <servlet>
<servlet-name>RolesControllerAdd</servlet-name> <servlet-name>RolesControllerAdd</servlet-name>
<servlet-class>controller.employee.roles.RolesControllerAdd</servlet-class> <servlet-class>controller.usersManagement.roles.RolesControllerAdd</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>RolesControllerAdd</servlet-name> <servlet-name>RolesControllerAdd</servlet-name>
@ -50,7 +50,7 @@
<servlet> <servlet>
<servlet-name>RolesControllerIndex</servlet-name> <servlet-name>RolesControllerIndex</servlet-name>
<servlet-class>controller.employee.roles.RolesControllerIndex</servlet-class> <servlet-class>controller.usersManagement.roles.RolesControllerIndex</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>RolesControllerIndex</servlet-name> <servlet-name>RolesControllerIndex</servlet-name>
@ -59,7 +59,7 @@
<servlet> <servlet>
<servlet-name>RolesControllerView</servlet-name> <servlet-name>RolesControllerView</servlet-name>
<servlet-class>controller.employee.roles.RolesControllerView</servlet-class> <servlet-class>controller.usersManagement.roles.RolesControllerView</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>RolesControllerView</servlet-name> <servlet-name>RolesControllerView</servlet-name>
@ -68,7 +68,7 @@
<servlet> <servlet>
<servlet-name>RolesControllerDelete</servlet-name> <servlet-name>RolesControllerDelete</servlet-name>
<servlet-class>controller.employee.roles.RolesControllerDelete</servlet-class> <servlet-class>controller.usersManagement.roles.RolesControllerDelete</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>RolesControllerDelete</servlet-name> <servlet-name>RolesControllerDelete</servlet-name>
@ -80,7 +80,7 @@
<servlet> <servlet>
<servlet-name>ResourcesControllerAdd</servlet-name> <servlet-name>ResourcesControllerAdd</servlet-name>
<servlet-class>controller.employee.resources.ResourcesControllerAdd</servlet-class> <servlet-class>controller.usersManagement.resources.ResourcesControllerAdd</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>ResourcesControllerAdd</servlet-name> <servlet-name>ResourcesControllerAdd</servlet-name>
@ -89,7 +89,7 @@
<servlet> <servlet>
<servlet-name>ResourcesControllerIndex</servlet-name> <servlet-name>ResourcesControllerIndex</servlet-name>
<servlet-class>controller.employee.resources.ResourcesControllerIndex</servlet-class> <servlet-class>controller.usersManagement.resources.ResourcesControllerIndex</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>ResourcesControllerIndex</servlet-name> <servlet-name>ResourcesControllerIndex</servlet-name>
@ -98,7 +98,7 @@
<servlet> <servlet>
<servlet-name>ResourcesControllerView</servlet-name> <servlet-name>ResourcesControllerView</servlet-name>
<servlet-class>controller.employee.resources.ResourcesControllerView</servlet-class> <servlet-class>controller.usersManagement.resources.ResourcesControllerView</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>ResourcesControllerView</servlet-name> <servlet-name>ResourcesControllerView</servlet-name>
@ -107,7 +107,7 @@
<servlet> <servlet>
<servlet-name>ResourcesControllerDelete</servlet-name> <servlet-name>ResourcesControllerDelete</servlet-name>
<servlet-class>controller.employee.resources.ResourcesControllerDelete</servlet-class> <servlet-class>controller.usersManagement.resources.ResourcesControllerDelete</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>ResourcesControllerDelete</servlet-name> <servlet-name>ResourcesControllerDelete</servlet-name>
@ -119,7 +119,7 @@
<servlet> <servlet>
<servlet-name>AccessControllerEdit</servlet-name> <servlet-name>AccessControllerEdit</servlet-name>
<servlet-class>controller.employee.access.AccessControllerEdit</servlet-class> <servlet-class>controller.usersManagement.access.AccessControllerEdit</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>AccessControllerEdit</servlet-name> <servlet-name>AccessControllerEdit</servlet-name>
@ -128,7 +128,7 @@
<servlet> <servlet>
<servlet-name>AccessControllerAdd</servlet-name> <servlet-name>AccessControllerAdd</servlet-name>
<servlet-class>controller.employee.access.AccessControllerAdd</servlet-class> <servlet-class>controller.usersManagement.access.AccessControllerAdd</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>AccessControllerAdd</servlet-name> <servlet-name>AccessControllerAdd</servlet-name>
@ -137,7 +137,7 @@
<servlet> <servlet>
<servlet-name>AccessControllerIndex</servlet-name> <servlet-name>AccessControllerIndex</servlet-name>
<servlet-class>controller.employee.access.AccessControllerIndex</servlet-class> <servlet-class>controller.usersManagement.access.AccessControllerIndex</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>AccessControllerIndex</servlet-name> <servlet-name>AccessControllerIndex</servlet-name>
@ -146,7 +146,7 @@
<servlet> <servlet>
<servlet-name>AccessControllerView</servlet-name> <servlet-name>AccessControllerView</servlet-name>
<servlet-class>controller.employee.access.AccessControllerView</servlet-class> <servlet-class>controller.usersManagement.access.AccessControllerView</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>AccessControllerView</servlet-name> <servlet-name>AccessControllerView</servlet-name>
@ -155,7 +155,7 @@
<servlet> <servlet>
<servlet-name>AccessControllerDelete</servlet-name> <servlet-name>AccessControllerDelete</servlet-name>
<servlet-class>controller.employee.access.AccessControllerDelete</servlet-class> <servlet-class>controller.usersManagement.access.AccessControllerDelete</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>AccessControllerDelete</servlet-name> <servlet-name>AccessControllerDelete</servlet-name>
@ -168,7 +168,7 @@
--> -->
<servlet> <servlet>
<servlet-name>ServicesControllerAdd</servlet-name> <servlet-name>ServicesControllerAdd</servlet-name>
<servlet-class>controller.employee.services.ServicesControllerAdd</servlet-class> <servlet-class>controller.resourcesManagement.services.ServicesControllerAdd</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>ServicesControllerAdd</servlet-name> <servlet-name>ServicesControllerAdd</servlet-name>
@ -177,7 +177,7 @@
<servlet> <servlet>
<servlet-name>ServicesControllerDelete</servlet-name> <servlet-name>ServicesControllerDelete</servlet-name>
<servlet-class>controller.employee.services.ServicesControllerDelete</servlet-class> <servlet-class>controller.resourcesManagement.services.ServicesControllerDelete</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>ServicesControllerDelete</servlet-name> <servlet-name>ServicesControllerDelete</servlet-name>
@ -186,7 +186,7 @@
<servlet> <servlet>
<servlet-name>ServicesControllerIndex</servlet-name> <servlet-name>ServicesControllerIndex</servlet-name>
<servlet-class>controller.employee.services.ServicesControllerIndex</servlet-class> <servlet-class>controller.resourcesManagement.services.ServicesControllerIndex</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>ServicesControllerIndex</servlet-name> <servlet-name>ServicesControllerIndex</servlet-name>
@ -195,7 +195,7 @@
<servlet> <servlet>
<servlet-name>ServicesControllerView</servlet-name> <servlet-name>ServicesControllerView</servlet-name>
<servlet-class>controller.employee.services.ServicesControllerView</servlet-class> <servlet-class>controller.resourcesManagement.services.ServicesControllerView</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>ServicesControllerView</servlet-name> <servlet-name>ServicesControllerView</servlet-name>
@ -203,9 +203,10 @@
</servlet-mapping> </servlet-mapping>
<servlet> <servlet>
<servlet-name>EmployeesControllerAdd</servlet-name> <servlet-name>EmployeesControllerAdd</servlet-name>
<servlet-class>controller.employee.employees.EmployeesControllerAdd</servlet-class> <servlet-class>controller.resourcesManagement.employees.EmployeesControllerAdd</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
@ -215,7 +216,7 @@
<servlet> <servlet>
<servlet-name>EmployeesControllerView</servlet-name> <servlet-name>EmployeesControllerView</servlet-name>
<servlet-class>controller.employee.employees.EmployeesControllerView</servlet-class> <servlet-class>controller.resourcesManagement.employees.EmployeesControllerView</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
@ -225,7 +226,7 @@
<servlet> <servlet>
<servlet-name>EmployeesControllerDelete</servlet-name> <servlet-name>EmployeesControllerDelete</servlet-name>
<servlet-class>controller.employee.employees.EmployeesControllerDelete</servlet-class> <servlet-class>controller.resourcesManagement.employees.EmployeesControllerDelete</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
@ -235,7 +236,7 @@
<servlet> <servlet>
<servlet-name>EmployeesControllerIndex</servlet-name> <servlet-name>EmployeesControllerIndex</servlet-name>
<servlet-class>controller.employee.employees.EmployeesControllerIndex</servlet-class> <servlet-class>controller.resourcesManagement.employees.EmployeesControllerIndex</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
@ -244,14 +245,54 @@
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>MaterialsControllerAdd</servlet-name>
<servlet-class>controller.resourcesManagement.materials.MaterialsControllerAdd</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>MaterialsControllerAdd</servlet-name>
<url-pattern>/e/materials/add</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>MaterialsControllerDelete</servlet-name>
<servlet-class>controller.resourcesManagement.materials.MaterialsControllerDelete</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>MaterialsControllerDelete</servlet-name>
<url-pattern>/e/materials/delete</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>MaterialsControllerIndex</servlet-name>
<servlet-class>controller.resourcesManagement.materials.MaterialsControllerIndex</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>MaterialsControllerIndex</servlet-name>
<url-pattern>/e/materials</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>MaterialsControllerView</servlet-name>
<servlet-class>controller.resourcesManagement.materials.MaterialsControllerView</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>MaterialsControllerView</servlet-name>
<url-pattern>/e/materials/view</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>IncomeReport</servlet-name> <servlet-name>IncomeReport</servlet-name>
<servlet-class>controller.finances.IncomeReport</servlet-class> <servlet-class>controller.financesManagement.IncomeReport</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>IncomeReport</servlet-name> <servlet-name>IncomeReport</servlet-name>
<url-pattern>/e/reports</url-pattern> <url-pattern>/e/reports</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- Controlador para gestionar el comportamiento del menu de inicio --> <!-- Controlador para gestionar el comportamiento del menu de inicio -->
<servlet> <servlet>