From 1a2aaecb9e72e7d09b58d7f64eb0bec2e9f24c8d Mon Sep 17 00:00:00 2001 From: MihailKuznetsov Date: Tue, 3 Jun 2014 14:46:40 +0300 Subject: [PATCH] Added employee generator and sortiing servlet --- .idea/artifacts/employee_webcontrol_war.xml | 5 - .../employee_webcontrol_war_exploded.xml | 2 +- .../Maven__javax_servlet_jsp_jstl_1_2.xml | 11 + .../Maven__javax_servlet_jstl_1_2.xml | 13 + ...ven__mysql_mysql_connector_java_5_1_30.xml | 13 + .../javax_servlet_jsp_jstl_jstl_1_2.xml | 10 + .idea/workspace.xml | 873 ++++++++++++------ employee-webcontrol.iml | 7 +- pom.xml | 12 + .../com/ztaticvienn/controller/Runner.java | 3 - .../java/com/ztaticvienn/controller/Test.java | 34 + .../comparator/EmployeeDateComparator.java | 17 + .../comparator/EmployeeIdComparator.java | 15 + .../comparator/EmployeeNameComparator.java | 15 + .../comparator/EmployeeSalaryComparator.java | 15 + .../comparator/EmployeeSurnameComparator.java | 16 + .../controller/database/DatabaseAccess.java | 75 +- .../controller/entities/Company.java | 31 +- .../controller/entities/Employee.java | 47 +- .../controller/entities/EmployeeData.java | 7 - .../entities/EmployeeGenerator.java | 18 + .../entities/EmployeeSalaryType.java | 8 - .../entities/FixedSalaryEmployee.java | 7 + .../entities/HourlyWageEmployee.java | 6 + .../controller/factories/EmployeeFactory.java | 7 + .../factories/FixedSalaryEmployeeFactory.java | 7 + .../factories/HourlyWageEmployeeFactory.java | 7 + .../controller/servlets/IndexServlet.java | 19 - .../controller/servlets/ShowServlet.java | 21 - .../controller/util/DateParser.java | 31 + .../controller/web/AddServlet.java | 71 ++ .../controller/web/ShowServlet.java | 31 + .../controller/web/SortServlet.java | 25 + .../web/listeners/ServletContext.java | 40 + src/main/webapp/WEB-INF/addinfo.jsp | 20 + src/main/webapp/WEB-INF/js/app.js | 1 + src/main/webapp/WEB-INF/lib/jstl-1.2.jar | Bin 0 -> 414240 bytes src/main/webapp/WEB-INF/showemployees.jsp | 38 + src/main/webapp/WEB-INF/web.xml | 42 +- src/main/webapp/add.html | 49 + src/main/webapp/css/main.css | 31 + src/main/webapp/index.html | 35 + src/main/webapp/index.jsp | 6 - src/main/webapp/showemployees.jsp | 16 - .../com/ztaticvienn/controller/Runner.class | Bin 2518 -> 2329 bytes .../com/ztaticvienn/controller/Test.class | Bin 0 -> 1687 bytes .../comparator/EmployeeDateComparator.class | Bin 0 -> 1095 bytes .../comparator/EmployeeIdComparator.class | Bin 0 -> 1089 bytes .../comparator/EmployeeNameComparator.class | Bin 0 -> 1094 bytes .../comparator/EmployeeSalaryComparator.class | Bin 0 -> 1102 bytes .../EmployeeSurnameComparator.class | Bin 0 -> 1106 bytes .../controller/database/DatabaseAccess.class | Bin 1785 -> 4190 bytes .../controller/entities/Company$1.class | Bin 0 -> 659 bytes .../controller/entities/Company.class | Bin 1069 -> 2245 bytes .../controller/entities/Employee.class | Bin 1556 -> 2820 bytes .../entities/EmployeeSalaryType.class | Bin 1163 -> 1164 bytes .../entities/FixedSalaryEmployee.class | Bin 506 -> 784 bytes .../entities/HourlyWageEmployee.class | Bin 631 -> 909 bytes .../controller/util/DateParser.class | Bin 0 -> 1202 bytes .../controller/web/AddServlet.class | Bin 0 -> 3259 bytes .../controller/web/ShowServlet.class | Bin 0 -> 1424 bytes .../controller/web/SortServlet.class | Bin 0 -> 1006 bytes .../web/listeners/ServletContext.class | Bin 0 -> 1172 bytes target/employee-webcontrol.war | Bin 4232475 -> 1301038 bytes .../employee-webcontrol/WEB-INF/addinfo.jsp | 20 + .../com/ztaticvienn/controller/Runner.class | Bin 0 -> 2329 bytes .../com/ztaticvienn/controller/Test.class | Bin 0 -> 1687 bytes .../comparator/EmployeeDateComparator.class | Bin 0 -> 1095 bytes .../comparator/EmployeeIdComparator.class | Bin 0 -> 1089 bytes .../comparator/EmployeeNameComparator.class | Bin 0 -> 1094 bytes .../comparator/EmployeeSalaryComparator.class | Bin 0 -> 1102 bytes .../EmployeeSurnameComparator.class | Bin 0 -> 1106 bytes .../controller/database/DatabaseAccess.class | Bin 0 -> 4190 bytes .../controller/entities/Company$1.class | Bin 0 -> 659 bytes .../controller/entities/Company.class | Bin 1069 -> 2245 bytes .../controller/entities/Employee.class | Bin 1556 -> 2820 bytes .../entities/EmployeeSalaryType.class | Bin 1163 -> 1164 bytes .../entities/FixedSalaryEmployee.class | Bin 481 -> 784 bytes .../entities/HourlyWageEmployee.class | Bin 478 -> 909 bytes .../controller/util/DateParser.class | Bin 0 -> 1202 bytes .../controller/web/AddServlet.class | Bin 0 -> 3259 bytes .../controller/web/ShowServlet.class | Bin 0 -> 1424 bytes .../controller/web/SortServlet.class | Bin 0 -> 1006 bytes .../web/listeners/ServletContext.class | Bin 0 -> 1172 bytes target/employee-webcontrol/WEB-INF/js/app.js | 1 + .../WEB-INF/lib/jstl-1.2.jar | Bin 0 -> 414240 bytes .../lib/mysql-connector-java-5.1.30.jar | Bin 0 -> 954038 bytes .../WEB-INF/showemployees.jsp | 38 + target/employee-webcontrol/WEB-INF/web.xml | 36 +- target/employee-webcontrol/add.html | 49 + target/employee-webcontrol/css/main.css | 31 + target/employee-webcontrol/index.html | 24 + 92 files changed, 1549 insertions(+), 407 deletions(-) create mode 100644 .idea/libraries/Maven__javax_servlet_jsp_jstl_1_2.xml create mode 100644 .idea/libraries/Maven__javax_servlet_jstl_1_2.xml create mode 100644 .idea/libraries/Maven__mysql_mysql_connector_java_5_1_30.xml create mode 100644 .idea/libraries/javax_servlet_jsp_jstl_jstl_1_2.xml create mode 100644 src/main/java/com/ztaticvienn/controller/Test.java create mode 100644 src/main/java/com/ztaticvienn/controller/comparator/EmployeeDateComparator.java create mode 100644 src/main/java/com/ztaticvienn/controller/comparator/EmployeeIdComparator.java create mode 100644 src/main/java/com/ztaticvienn/controller/comparator/EmployeeNameComparator.java create mode 100644 src/main/java/com/ztaticvienn/controller/comparator/EmployeeSalaryComparator.java create mode 100644 src/main/java/com/ztaticvienn/controller/comparator/EmployeeSurnameComparator.java delete mode 100644 src/main/java/com/ztaticvienn/controller/entities/EmployeeData.java create mode 100644 src/main/java/com/ztaticvienn/controller/entities/EmployeeGenerator.java delete mode 100644 src/main/java/com/ztaticvienn/controller/entities/EmployeeSalaryType.java create mode 100644 src/main/java/com/ztaticvienn/controller/factories/EmployeeFactory.java create mode 100644 src/main/java/com/ztaticvienn/controller/factories/FixedSalaryEmployeeFactory.java create mode 100644 src/main/java/com/ztaticvienn/controller/factories/HourlyWageEmployeeFactory.java delete mode 100644 src/main/java/com/ztaticvienn/controller/servlets/IndexServlet.java delete mode 100644 src/main/java/com/ztaticvienn/controller/servlets/ShowServlet.java create mode 100644 src/main/java/com/ztaticvienn/controller/util/DateParser.java create mode 100644 src/main/java/com/ztaticvienn/controller/web/AddServlet.java create mode 100644 src/main/java/com/ztaticvienn/controller/web/ShowServlet.java create mode 100644 src/main/java/com/ztaticvienn/controller/web/SortServlet.java create mode 100644 src/main/java/com/ztaticvienn/controller/web/listeners/ServletContext.java create mode 100644 src/main/webapp/WEB-INF/addinfo.jsp create mode 100644 src/main/webapp/WEB-INF/js/app.js create mode 100644 src/main/webapp/WEB-INF/lib/jstl-1.2.jar create mode 100644 src/main/webapp/WEB-INF/showemployees.jsp create mode 100644 src/main/webapp/add.html create mode 100644 src/main/webapp/css/main.css create mode 100644 src/main/webapp/index.html delete mode 100644 src/main/webapp/index.jsp delete mode 100644 src/main/webapp/showemployees.jsp create mode 100644 target/classes/com/ztaticvienn/controller/Test.class create mode 100644 target/classes/com/ztaticvienn/controller/comparator/EmployeeDateComparator.class create mode 100644 target/classes/com/ztaticvienn/controller/comparator/EmployeeIdComparator.class create mode 100644 target/classes/com/ztaticvienn/controller/comparator/EmployeeNameComparator.class create mode 100644 target/classes/com/ztaticvienn/controller/comparator/EmployeeSalaryComparator.class create mode 100644 target/classes/com/ztaticvienn/controller/comparator/EmployeeSurnameComparator.class create mode 100644 target/classes/com/ztaticvienn/controller/entities/Company$1.class create mode 100644 target/classes/com/ztaticvienn/controller/util/DateParser.class create mode 100644 target/classes/com/ztaticvienn/controller/web/AddServlet.class create mode 100644 target/classes/com/ztaticvienn/controller/web/ShowServlet.class create mode 100644 target/classes/com/ztaticvienn/controller/web/SortServlet.class create mode 100644 target/classes/com/ztaticvienn/controller/web/listeners/ServletContext.class create mode 100644 target/employee-webcontrol/WEB-INF/addinfo.jsp create mode 100644 target/employee-webcontrol/WEB-INF/classes/com/ztaticvienn/controller/Runner.class create mode 100644 target/employee-webcontrol/WEB-INF/classes/com/ztaticvienn/controller/Test.class create mode 100644 target/employee-webcontrol/WEB-INF/classes/com/ztaticvienn/controller/comparator/EmployeeDateComparator.class create mode 100644 target/employee-webcontrol/WEB-INF/classes/com/ztaticvienn/controller/comparator/EmployeeIdComparator.class create mode 100644 target/employee-webcontrol/WEB-INF/classes/com/ztaticvienn/controller/comparator/EmployeeNameComparator.class create mode 100644 target/employee-webcontrol/WEB-INF/classes/com/ztaticvienn/controller/comparator/EmployeeSalaryComparator.class create mode 100644 target/employee-webcontrol/WEB-INF/classes/com/ztaticvienn/controller/comparator/EmployeeSurnameComparator.class create mode 100644 target/employee-webcontrol/WEB-INF/classes/com/ztaticvienn/controller/database/DatabaseAccess.class create mode 100644 target/employee-webcontrol/WEB-INF/classes/com/ztaticvienn/controller/entities/Company$1.class create mode 100644 target/employee-webcontrol/WEB-INF/classes/com/ztaticvienn/controller/util/DateParser.class create mode 100644 target/employee-webcontrol/WEB-INF/classes/com/ztaticvienn/controller/web/AddServlet.class create mode 100644 target/employee-webcontrol/WEB-INF/classes/com/ztaticvienn/controller/web/ShowServlet.class create mode 100644 target/employee-webcontrol/WEB-INF/classes/com/ztaticvienn/controller/web/SortServlet.class create mode 100644 target/employee-webcontrol/WEB-INF/classes/com/ztaticvienn/controller/web/listeners/ServletContext.class create mode 100644 target/employee-webcontrol/WEB-INF/js/app.js create mode 100644 target/employee-webcontrol/WEB-INF/lib/jstl-1.2.jar create mode 100644 target/employee-webcontrol/WEB-INF/lib/mysql-connector-java-5.1.30.jar create mode 100644 target/employee-webcontrol/WEB-INF/showemployees.jsp create mode 100644 target/employee-webcontrol/add.html create mode 100644 target/employee-webcontrol/css/main.css create mode 100644 target/employee-webcontrol/index.html diff --git a/.idea/artifacts/employee_webcontrol_war.xml b/.idea/artifacts/employee_webcontrol_war.xml index b20c82b..e2bd027 100644 --- a/.idea/artifacts/employee_webcontrol_war.xml +++ b/.idea/artifacts/employee_webcontrol_war.xml @@ -3,11 +3,6 @@ $PROJECT_DIR$/target - - - - - \ No newline at end of file diff --git a/.idea/artifacts/employee_webcontrol_war_exploded.xml b/.idea/artifacts/employee_webcontrol_war_exploded.xml index 9b91437..8441b3f 100644 --- a/.idea/artifacts/employee_webcontrol_war_exploded.xml +++ b/.idea/artifacts/employee_webcontrol_war_exploded.xml @@ -8,7 +8,7 @@ - + diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jsp_jstl_1_2.xml new file mode 100644 index 0000000..fedee2a --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jstl_1_2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_30.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_30.xml new file mode 100644 index 0000000..48ab9df --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_30.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/javax_servlet_jsp_jstl_jstl_1_2.xml b/.idea/libraries/javax_servlet_jsp_jstl_jstl_1_2.xml new file mode 100644 index 0000000..b11e213 --- /dev/null +++ b/.idea/libraries/javax_servlet_jsp_jstl_jstl_1_2.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c9ec8e4..8d23bf6 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,29 +1,35 @@ - + - - - - - - - - - - - + + + + + + + + + + + + + + + + - + + @@ -47,111 +53,111 @@ - - + + - - + + - - + + - - - + + + + + + + + + - - + + - - - + + + + + + - - + + - - - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - + + + @@ -176,24 +182,52 @@ @@ -247,6 +281,7 @@ + @@ -266,9 +301,186 @@ - @@ -279,10 +491,10 @@ - + - + @@ -293,8 +505,8 @@ - - + + @@ -302,13 +514,16 @@ + + + - + @@ -331,6 +546,28 @@ + + + + + + - - + + - + + - - + + + @@ -786,7 +1025,16 @@ - + + + + + + + + + + 1400246425588 @@ -796,39 +1044,39 @@ - - + - + + - - + + - + - + - - + + - @@ -851,7 +1099,17 @@ - + + + + + + + + + +