diff --git a/.gitignore b/.gitignore index 5c55cb5..8c23d19 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,73 @@ back-end java/sokoshotel/build/web/WEB-INF/glassfish-resources.xml back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Users.rapt back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Users.class back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Taskstatus.rapt +back-end java/sokoshotel/build/generated-sources/ap-source-output/Source/Departments_.java +back-end java/sokoshotel/build/generated-sources/ap-source-output/Source/Place_.java +back-end java/sokoshotel/build/generated-sources/ap-source-output/Source/Rights_.java +back-end java/sokoshotel/build/generated-sources/ap-source-output/Source/Tasks_.java +back-end java/sokoshotel/build/generated-sources/ap-source-output/Source/Users_.java +back-end java/sokoshotel/build/web/gfv3ee6.dpf +back-end java/sokoshotel/build/web/Icons/Add.png +back-end java/sokoshotel/build/generated-sources/ap-source-output/Source/Taskhistory_.java +back-end java/sokoshotel/build/generated-sources/ap-source-output/Source/Taskstatus_.java +back-end java/sokoshotel/build/web/Icons/inProcess.png +back-end java/sokoshotel/build/web/index.html +back-end java/sokoshotel/build/web/js/saveNote.js +back-end java/sokoshotel/build/web/Icons/111104-64.png +back-end java/sokoshotel/build/web/Icons/done.png +back-end java/sokoshotel/build/web/mainpage.html +back-end java/sokoshotel/build/web/Icons/TF17_vantaa_hotel_logo_400x140_20170120.png +back-end java/sokoshotel/build/web/Icons/cancelled.png +back-end java/sokoshotel/build/web/Icons/user_icon.png +back-end java/sokoshotel/build/web/Icons/attachment.png +back-end java/sokoshotel/build/web/index.html +back-end java/sokoshotel/build/web/js/saveNote2.js +back-end java/sokoshotel/build/web/js/tasksList2.js +back-end java/sokoshotel/build/web/styles/buttonStyle.css +back-end java/sokoshotel/build/web/styles/style2.css +back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Rights.class +back-end java/sokoshotel/build/web/Icons/calendar.png +back-end java/sokoshotel/build/web/index.html +back-end java/sokoshotel/build/web/mainpage.html +back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Departments.class +back-end java/sokoshotel/build/web/WEB-INF/classes/Source/service/AbstractFacade.class +back-end java/sokoshotel/build/web/index.html +back-end java/sokoshotel/build/web/js/saveNote2 +back-end java/sokoshotel/build/web/js/tasksList.js +back-end java/sokoshotel/build/web/styles/style.css +back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Departments.class +back-end java/sokoshotel/build/web/WEB-INF/classes/Source/service/AbstractFacade.class +back-end java/sokoshotel/build/web/WEB-INF/classes/Source/service/UsersFacadeREST.class +back-end java/sokoshotel/build/web/index.html +back-end java/sokoshotel/build/web/js/saveNote.js +back-end java/sokoshotel/build/web/js/script2.js +back-end java/sokoshotel/build/web/styles/buttonStyle.css +back-end java/sokoshotel/build/web/WEB-INF/classes/META-INF/persistence.xml +back-end java/sokoshotel/build/web/WEB-INF/classes/Source/service/TasksFacadeREST.class +back-end java/sokoshotel/build/web/js/saveNote.js +back-end java/sokoshotel/build/web/index.html +back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Rights.class +back-end java/sokoshotel/build/web/js/script.js +back-end java/sokoshotel/build/web/index.html +back-end java/sokoshotel/build/web/mainpage.html +back-end java/sokoshotel/build/web/styles/listStyle.css +back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Departments.class +back-end java/sokoshotel/build/web/WEB-INF/classes/Source/service/TasksFacadeREST.class +back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Tasks.class +back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Users.class +back-end java/sokoshotel/build/web/index.html +back-end java/sokoshotel/build/web/mainpage.html +back-end java/sokoshotel/build/web/WEB-INF/classes/META-INF/persistence.xml +back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Place.class +back-end java/sokoshotel/build/web/index.html +back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Rights.class +back-end java/sokoshotel/build/web/WEB-INF/lib/jackson-annotations.jar +back-end java/sokoshotel/build/web/WEB-INF/lib/jackson-core.jar +back-end java/sokoshotel/build/web/WEB-INF/lib/jackson-module-jaxb-annotations.jar +back-end java/sokoshotel/build/web/WEB-INF/lib/json-20140107.jar +back-end java/sokoshotel/build/web/WEB-INF/lib/jackson-databind.jar +back-end java/sokoshotel/build/web/WEB-INF/lib/json-simple-1.1.jar +back-end java/sokoshotel/build/web/WEB-INF/lib/jersey-media-json-jackson.jar +back-end java/sokoshotel/nbproject/build-impl.xml~ +back-end java/sokoshotel/web/WEB-INF/glassfish-resources.xml +back-end java/sokoshotel/src/conf/persistence.xml diff --git a/back-end java/sokoshotel/build/web/WEB-INF/classes/META-INF/persistence.xml b/back-end java/sokoshotel/build/web/WEB-INF/classes/META-INF/persistence.xml index eb00f27..283ffc4 100644 --- a/back-end java/sokoshotel/build/web/WEB-INF/classes/META-INF/persistence.xml +++ b/back-end java/sokoshotel/build/web/WEB-INF/classes/META-INF/persistence.xml @@ -1,8 +1,10 @@ - - + + java:app/sokosweb false - + + + diff --git a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Departments.class b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Departments.class index bd774e3..32230c8 100644 Binary files a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Departments.class and b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Departments.class differ diff --git a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Place.class b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Place.class index 796bd68..89e8c6d 100644 Binary files a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Place.class and b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Place.class differ diff --git a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Rights.class b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Rights.class index e13e064..65f16c3 100644 Binary files a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Rights.class and b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Rights.class differ diff --git a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Taskhistory.class b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Taskhistory.class index 079e46d..0626191 100644 Binary files a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Taskhistory.class and b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Taskhistory.class differ diff --git a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Tasks.class b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Tasks.class index 6bde8cf..10b988b 100644 Binary files a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Tasks.class and b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Tasks.class differ diff --git a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Taskstatus.class b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Taskstatus.class index 7ecdf54..6a8cbef 100644 Binary files a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Taskstatus.class and b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Taskstatus.class differ diff --git a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Users.class b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Users.class index 47d41cc..542c0bd 100644 Binary files a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Users.class and b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/Users.class differ diff --git a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/service/AbstractFacade.class b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/service/AbstractFacade.class index 56b1d8a..c806496 100644 Binary files a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/service/AbstractFacade.class and b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/service/AbstractFacade.class differ diff --git a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/service/TasksFacadeREST.class b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/service/TasksFacadeREST.class index 919c96e..0573eed 100644 Binary files a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/service/TasksFacadeREST.class and b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/service/TasksFacadeREST.class differ diff --git a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/service/UsersFacadeREST.class b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/service/UsersFacadeREST.class index ac0e6cc..34afe98 100644 Binary files a/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/service/UsersFacadeREST.class and b/back-end java/sokoshotel/build/web/WEB-INF/classes/Source/service/UsersFacadeREST.class differ diff --git a/back-end java/sokoshotel/build/web/WEB-INF/glassfish-resources.xml b/back-end java/sokoshotel/build/web/WEB-INF/glassfish-resources.xml index 9115b2e..601d987 100644 --- a/back-end java/sokoshotel/build/web/WEB-INF/glassfish-resources.xml +++ b/back-end java/sokoshotel/build/web/WEB-INF/glassfish-resources.xml @@ -21,4 +21,6 @@ + + diff --git a/back-end java/sokoshotel/build/web/index.html b/back-end java/sokoshotel/build/web/index.html index db4dc2d..4ffc4f9 100644 --- a/back-end java/sokoshotel/build/web/index.html +++ b/back-end java/sokoshotel/build/web/index.html @@ -18,7 +18,7 @@

Logo

@@ -96,7 +96,7 @@ - + @@ -110,8 +110,6 @@ diff --git a/back-end java/sokoshotel/build/web/styles/buttonStyle.css b/back-end java/sokoshotel/build/web/styles/buttonStyle.css index 4dd495e..1ef185a 100644 --- a/back-end java/sokoshotel/build/web/styles/buttonStyle.css +++ b/back-end java/sokoshotel/build/web/styles/buttonStyle.css @@ -19,10 +19,10 @@ } -.button-group .button:disabled { +/*.button-group .button:disabled { box-shadow: 8px 8px 8px 0px #ccc; background-color: white; -} +}*/ .button-group .button { border: 1px solid #c2c2c2; diff --git a/back-end java/sokoshotel/nbproject/build-impl.xml b/back-end java/sokoshotel/nbproject/build-impl.xml index 5621f0d..5c1e72a 100644 --- a/back-end java/sokoshotel/nbproject/build-impl.xml +++ b/back-end java/sokoshotel/nbproject/build-impl.xml @@ -1005,17 +1005,18 @@ exists or setup the property manually. For example like this: + - + diff --git a/back-end java/sokoshotel/nbproject/genfiles.properties b/back-end java/sokoshotel/nbproject/genfiles.properties index 4001ba4..1c3ced7 100644 --- a/back-end java/sokoshotel/nbproject/genfiles.properties +++ b/back-end java/sokoshotel/nbproject/genfiles.properties @@ -1,10 +1,10 @@ -build.xml.data.CRC32=7ace71ac +build.xml.data.CRC32=06ef760a build.xml.script.CRC32=f377d21c build.xml.stylesheet.CRC32=651128d4@1.77.1.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=7ace71ac -nbproject/build-impl.xml.script.CRC32=9b827668 +nbproject/build-impl.xml.data.CRC32=06ef760a +nbproject/build-impl.xml.script.CRC32=c9dd8edb nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.77.1.1 nbproject/rest-build.xml.data.CRC32=60b89556 nbproject/rest-build.xml.script.CRC32=4bad503f diff --git a/back-end java/sokoshotel/nbproject/private/private.properties b/back-end java/sokoshotel/nbproject/private/private.properties index 8f014c5..23858ed 100644 --- a/back-end java/sokoshotel/nbproject/private/private.properties +++ b/back-end java/sokoshotel/nbproject/private/private.properties @@ -1,10 +1,16 @@ -deploy.ant.properties.file=C:\\Users\\Kasperi\\AppData\\Roaming\\NetBeans\\8.2\\config\\GlassFishEE6\\Properties\\gfv31352162071.properties +deploy.ant.properties.file=C:\\Users\\Anastasiia\\AppData\\Roaming\\NetBeans\\8.2\\config\\GlassFishEE6\\Properties\\gfv3488505716.properties +file.reference.jackson-annotations.jar=C:\\Program Files (x86)\\glassfish5\\glassfish\\modules\\jackson-annotations.jar +file.reference.jackson-core.jar=C:\\Program Files (x86)\\glassfish5\\glassfish\\modules\\jackson-core.jar +file.reference.jackson-databind.jar=C:\\Program Files (x86)\\glassfish5\\glassfish\\modules\\jackson-databind.jar +file.reference.jackson-module-jaxb-annotations.jar=C:\\Program Files (x86)\\glassfish5\\glassfish\\modules\\jackson-module-jaxb-annotations.jar +file.reference.jersey-media-json-jackson.jar=C:\\Program Files (x86)\\glassfish5\\glassfish\\modules\\jersey-media-json-jackson.jar +file.reference.json-simple-1.1.jar=C:\\Program Files\\Java\\json-simple-1.1.jar j2ee.platform.is.jsr109=true -j2ee.server.domain=C:/Users/Kasperi/Desktop/glassfish-5.0/glassfish5/glassfish/domains/domain1 -j2ee.server.home=C:/Users/Kasperi/Desktop/glassfish-5.0/glassfish5/glassfish -j2ee.server.instance=[C:\\Users\\Kasperi\\Desktop\\glassfish-5.0\\glassfish5\\glassfish;C:\\Users\\Kasperi\\Desktop\\glassfish-5.0\\glassfish5\\glassfish\\domains\\domain1]deployer:gfv3ee6wc:localhost:4848 -j2ee.server.middleware=C:/Users/Kasperi/Desktop/glassfish-5.0/glassfish5 +j2ee.server.domain=C:/Users/Anastasiia/personal_domain +j2ee.server.home=C:/Program Files (x86)/glassfish5/glassfish +j2ee.server.instance=[C:\\Program Files (x86)\\glassfish5\\glassfish;C:\\Users\\Anastasiia\\personal_domain]deployer:gfv3ee6wc:localhost:46387 +j2ee.server.middleware=C:/Program Files (x86)/glassfish5 javac.debug=true javadoc.preview=true selected.browser=default -user.properties.file=C:\\Users\\Kasperi\\AppData\\Roaming\\NetBeans\\8.2\\build.properties +user.properties.file=C:\\Users\\Anastasiia\\AppData\\Roaming\\NetBeans\\8.2\\build.properties diff --git a/back-end java/sokoshotel/nbproject/private/private.xml b/back-end java/sokoshotel/nbproject/private/private.xml index e89fb07..05bd404 100644 --- a/back-end java/sokoshotel/nbproject/private/private.xml +++ b/back-end java/sokoshotel/nbproject/private/private.xml @@ -3,17 +3,27 @@ - file:/C:/Users/Kasperi/Desktop/gitfoldernetbeans/ApplicationDevelopmentProject/back-end%20java/sokoshotel/web/js/script2.js - file:/C:/Users/Kasperi/Desktop/gitfoldernetbeans/ApplicationDevelopmentProject/back-end%20java/sokoshotel/web/mainpage.html - file:/C:/Users/Kasperi/Desktop/gitfoldernetbeans/ApplicationDevelopmentProject/back-end%20java/sokoshotel/web/js/tasksList2.js - file:/C:/Users/Kasperi/Desktop/gitfoldernetbeans/ApplicationDevelopmentProject/back-end%20java/sokoshotel/web/js/tasksList.js - file:/C:/Users/Kasperi/Desktop/gitfoldernetbeans/ApplicationDevelopmentProject/back-end%20java/sokoshotel/web/js/script.js - file:/C:/Users/Kasperi/Desktop/gitfoldernetbeans/ApplicationDevelopmentProject/back-end%20java/sokoshotel/src/java/Source/Rights.java - file:/C:/Users/Kasperi/Desktop/gitfoldernetbeans/ApplicationDevelopmentProject/back-end%20java/sokoshotel/src/java/Source/service/TasksFacadeREST.java - file:/C:/Users/Kasperi/Desktop/gitfoldernetbeans/ApplicationDevelopmentProject/back-end%20java/sokoshotel/src/java/Source/Users.java - file:/C:/Users/Kasperi/Desktop/gitfoldernetbeans/ApplicationDevelopmentProject/back-end%20java/sokoshotel/src/java/Source/Tasks.java - file:/C:/Users/Kasperi/Desktop/gitfoldernetbeans/ApplicationDevelopmentProject/back-end%20java/sokoshotel/src/java/Source/service/ApplicationConfig.java - file:/C:/Users/Kasperi/Desktop/gitfoldernetbeans/ApplicationDevelopmentProject/back-end%20java/sokoshotel/web/js/saveNote2.js + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/web/js/tasksList2.js + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/web/styles/formStyle.css + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/web/index.html + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/web/js/saveNote.js + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/src/java/Source/Taskhistory.java + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/web/js/saveNote2.js + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/src/java/Source/Departments.java + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/src/java/Source/Users.java + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/src/java/Source/service/ApplicationConfig.java + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/web/js/script.js + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/src/java/Source/Tasks.java + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/web/js/tasksList.js + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/src/java/Source/service/UsersFacadeREST.java + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/web/js/script2.js + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/web/styles/buttonStyle.css + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/web/styles/style2.css + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/web/styles/style.css + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/web/mainpage.html + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/src/java/Source/service/TasksFacadeREST.java + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/src/java/Source/Taskstatus.java + file:/D:/ApplicationDevelopmentProject/back-end%20java/sokoshotel/src/java/Source/service/AbstractFacade.java diff --git a/back-end java/sokoshotel/nbproject/project.properties b/back-end java/sokoshotel/nbproject/project.properties index 877681b..2d75c05 100644 --- a/back-end java/sokoshotel/nbproject/project.properties +++ b/back-end java/sokoshotel/nbproject/project.properties @@ -42,6 +42,7 @@ file.reference.jackson-databind.jar=C:\\Users\\Kasperi\\Desktop\\glassfish-5.0\\ file.reference.jackson-module-jaxb-annotations.jar=C:\\Users\\Kasperi\\Desktop\\glassfish-5.0\\glassfish5\\glassfish\\modules\\jackson-module-jaxb-annotations.jar file.reference.jersey-media-json-jackson.jar=C:\\Users\\Kasperi\\Desktop\\glassfish-5.0\\glassfish5\\glassfish\\modules\\jersey-media-json-jackson.jar file.reference.json-20131018.jar=C:\\Users\\Kasperi\\Downloads\\json-20131018.jar +file.reference.json-20140107.jar=C:\\Program Files\\Java\\json-20140107.jar file.reference.json-simple-1.1.jar=../../../../json-simple-1.1.jar/json-simple-1.1.jar includes=** j2ee.compile.on.save=true @@ -63,7 +64,8 @@ javac.classpath=\ ${file.reference.jackson-core.jar}:\ ${file.reference.jackson-databind.jar}:\ ${file.reference.jackson-module-jaxb-annotations.jar}:\ - ${file.reference.jersey-media-json-jackson.jar} + ${file.reference.jersey-media-json-jackson.jar}:\ + ${file.reference.json-20140107.jar} # Space-separated list of extra javac options javac.compilerargs= javac.debug=true diff --git a/back-end java/sokoshotel/nbproject/project.xml b/back-end java/sokoshotel/nbproject/project.xml index 23db6e7..745f23b 100644 --- a/back-end java/sokoshotel/nbproject/project.xml +++ b/back-end java/sokoshotel/nbproject/project.xml @@ -37,6 +37,10 @@ ${file.reference.jersey-media-json-jackson.jar} WEB-INF/lib + + ${file.reference.json-20140107.jar} + WEB-INF/lib + diff --git a/back-end java/sokoshotel/src/conf/persistence.xml b/back-end java/sokoshotel/src/conf/persistence.xml index eb00f27..283ffc4 100644 --- a/back-end java/sokoshotel/src/conf/persistence.xml +++ b/back-end java/sokoshotel/src/conf/persistence.xml @@ -1,8 +1,10 @@ - - + + java:app/sokosweb false - + + + diff --git a/back-end java/sokoshotel/src/java/Source/Tasks.java b/back-end java/sokoshotel/src/java/Source/Tasks.java index c1521b9..e10843d 100644 --- a/back-end java/sokoshotel/src/java/Source/Tasks.java +++ b/back-end java/sokoshotel/src/java/Source/Tasks.java @@ -36,8 +36,9 @@ @Table(name = "tasks") @XmlRootElement @NamedQueries({ - @NamedQuery(name = "Tasks.findAll", query = "SELECT t FROM Tasks t") + @NamedQuery(name = "Tasks.findAll", query = "SELECT t FROM Tasks t ORDER BY t.dueDate DESC, t.dueTime ASC") , @NamedQuery(name = "Tasks.findByTaskID", query = "SELECT t FROM Tasks t WHERE t.taskID = :taskID") + , @NamedQuery(name = "Tasks.findByDepartmentID", query = "SELECT t FROM Tasks t WHERE t.department.departmentID = :departmentID") , @NamedQuery(name = "Tasks.findByDueDate", query = "SELECT t FROM Tasks t WHERE t.dueDate = :dueDate") , @NamedQuery(name = "Tasks.findByDueTime", query = "SELECT t FROM Tasks t WHERE t.dueTime = :dueTime") , @NamedQuery(name = "Tasks.findByTitle", query = "SELECT t FROM Tasks t WHERE t.title = :title") diff --git a/back-end java/sokoshotel/src/java/Source/service/AbstractFacade.java b/back-end java/sokoshotel/src/java/Source/service/AbstractFacade.java index 7832529..5693f41 100644 --- a/back-end java/sokoshotel/src/java/Source/service/AbstractFacade.java +++ b/back-end java/sokoshotel/src/java/Source/service/AbstractFacade.java @@ -5,8 +5,15 @@ */ package Source.service; +import Source.Tasks; +import Source.Users; +import java.util.ArrayList; import java.util.List; import javax.persistence.EntityManager; +import javax.persistence.Query; +import javax.persistence.criteria.Root; +import org.json.JSONArray; +import org.json.JSONObject; /** * @@ -61,4 +68,81 @@ public int count() { return ((Long) q.getSingleResult()).intValue(); } + public String findAllDepartments (String name) { + List results = getEntityManager().createNamedQuery("Tasks.findAll", Tasks.class).getResultList(); + Users users = getEntityManager().createNamedQuery("Users.findByUsername", Users.class).setParameter("username", name).getSingleResult(); + List valid = new ArrayList(); + for (Tasks result : results) { + if (users.getRights().getRightsID()==1) valid.add(result); + else if (result.getDepartment().getDepartmentID() == users.getDepartment().getDepartmentID()) { + valid.add(result); + } + } + return putDataToReturn(valid); + } + + public String findAllDepartmentParameter (Integer department) { + List results = getEntityManager().createNamedQuery("Tasks.findAll", Tasks.class).getResultList(); + List valid = new ArrayList(); + for (Tasks result : results) { + if (result.getDepartment().getDepartmentID().equals(department)) valid.add(result); + + } + return putDataToReturn(valid); + } + public String findByParameter (String param) { + List results = getEntityManager().createNamedQuery("Tasks.findAll", Tasks.class).getResultList(); + + List valid = new ArrayList(); + for (Tasks result : results) { + if (result.getTaskStatus().getStatusName().equals(param)){ + valid.add(result); + } + } + return putDataToReturn(valid); + } + public String findByParameterDepartment (Integer department, String param) { + List results = getEntityManager().createNamedQuery("Tasks.findAll", Tasks.class).getResultList(); + List valid = new ArrayList(); + for (Tasks result : results) { + if (result.getTaskStatus().getStatusName().equals(param) && result.getDepartment().getDepartmentID().equals(department)){ + valid.add(result); + } + } + return putDataToReturn(valid); + } + public String findUsersDepartment (String name) { + Users user = getEntityManager().createNamedQuery("Users.findByUsername", Users.class).setParameter("username", name).getSingleResult(); + return user.getDepartment().getDepartmentID().toString(); + } + + public String findAllDepartmentsWithoutParam () { + List results = getEntityManager().createNamedQuery("Tasks.findAll", Tasks.class).getResultList(); + List valid = new ArrayList(); + for (Tasks result : results) { + valid.add(result); + + } + return putDataToReturn(valid); + } + + private String putDataToReturn (List valid) { + JSONObject obj = new JSONObject(); + JSONArray arr = new JSONArray(); + for (Tasks tasks : valid) { + obj.put("taskID", tasks.getTaskID()); + obj.put("duedate", tasks.getDueDate()); + obj.put("duetime", tasks.getDueTime()); + obj.put("department", tasks.getDepartment().getDepartmentID()); + obj.put("title", tasks.getTitle()); + obj.put("place", tasks.getPlace().getPlaceName()); + obj.put("taskstatus", tasks.getTaskStatus().getTaskStatusID()); + obj.put("details", tasks.getDetails()); + obj.put("attachment", tasks.getAttachment()); + arr.put(obj); + obj = new JSONObject(); + } + return arr.toString(); + } + } diff --git a/back-end java/sokoshotel/src/java/Source/service/TasksFacadeREST.java b/back-end java/sokoshotel/src/java/Source/service/TasksFacadeREST.java index 67c8f3a..fdadbec 100644 --- a/back-end java/sokoshotel/src/java/Source/service/TasksFacadeREST.java +++ b/back-end java/sokoshotel/src/java/Source/service/TasksFacadeREST.java @@ -52,125 +52,68 @@ public class TasksFacadeREST extends AbstractFacade { public TasksFacadeREST() { super(Tasks.class); } - + + @GET + @Path("taskListAll") + @Produces({MediaType.APPLICATION_JSON}) + public String findAllWithoutParam() { + return super.findAllDepartmentsWithoutParam(); + } + @GET - @Path("sortnew/{id}") + @Path("sortnew") @Produces(MediaType.APPLICATION_JSON) - public String sortByNew(@PathParam("id") String name) { - List results = em.createNamedQuery("Tasks.findAll", Tasks.class).getResultList(); - Users users = em.createNamedQuery("Users.findByUsername", Users.class).setParameter("username", name).getSingleResult(); - List valid = new ArrayList(); - JSONObject obj = new JSONObject(); - JSONArray arr = new JSONArray(); - for (Tasks result : results) { - if (result.getTaskStatus().getStatusName().equals("New") && result.getDepartment().getDepartmentID() == users.getDepartment().getDepartmentID()) { - valid.add(result); - } - } - for (Tasks tasks : valid) { - obj.put("taskID", tasks.getTaskID()); - obj.put("duedate", tasks.getDueDate()); - obj.put("duetime", tasks.getDueTime()); - obj.put("department", tasks.getDepartment().getDepartmentID()); - obj.put("title", tasks.getTitle()); - obj.put("place", tasks.getPlace().getPlaceName()); - obj.put("taskstatus", tasks.getTaskStatus().getTaskStatusID()); - obj.put("details", tasks.getDetails()); - obj.put("attachment", tasks.getAttachment()); - arr.put(obj); - obj = new JSONObject(); - } - return arr.toString(); + public String sortByNew() { + return super.findByParameter( "New"); } @GET - @Path("sortprocess/{id}") + @Path("sortprocess") @Produces(MediaType.APPLICATION_JSON) - public String sortByProcess(@PathParam("id") String name) { - List results = em.createNamedQuery("Tasks.findAll", Tasks.class).getResultList(); - Users users = em.createNamedQuery("Users.findByUsername", Users.class).setParameter("username", name).getSingleResult(); - List valid = new ArrayList(); - JSONObject obj = new JSONObject(); - JSONArray arr = new JSONArray(); - for (Tasks result : results) { - if (result.getTaskStatus().getStatusName().equals("In process") && result.getDepartment().getDepartmentID() == users.getDepartment().getDepartmentID()) { - valid.add(result); - } - } - for (Tasks tasks : valid) { - obj.put("taskID", tasks.getTaskID()); - obj.put("duedate", tasks.getDueDate()); - obj.put("duetime", tasks.getDueTime()); - obj.put("department", tasks.getDepartment().getDepartmentID()); - obj.put("title", tasks.getTitle()); - obj.put("place", tasks.getPlace().getPlaceName()); - obj.put("taskstatus", tasks.getTaskStatus().getTaskStatusID()); - obj.put("details", tasks.getDetails()); - obj.put("attachment", tasks.getAttachment()); - arr.put(obj); - obj = new JSONObject(); - } - return arr.toString(); + public String sortByProcess() { + return super.findByParameter("In process"); } @GET - @Path("sortdone/{id}") + @Path("sortdone") @Produces(MediaType.APPLICATION_JSON) - public String sortByDone(@PathParam("id") String name) { - List results = em.createNamedQuery("Tasks.findAll", Tasks.class).getResultList(); - Users users = em.createNamedQuery("Users.findByUsername", Users.class).setParameter("username", name).getSingleResult(); - List valid = new ArrayList(); - JSONObject obj = new JSONObject(); - JSONArray arr = new JSONArray(); - for (Tasks result : results) { - if (result.getTaskStatus().getStatusName().equals("Done") && result.getDepartment().getDepartmentID() == users.getDepartment().getDepartmentID()) { - valid.add(result); - } - } - for (Tasks tasks : valid) { - obj.put("taskID", tasks.getTaskID()); - obj.put("duedate", tasks.getDueDate()); - obj.put("duetime", tasks.getDueTime()); - obj.put("department", tasks.getDepartment().getDepartmentID()); - obj.put("title", tasks.getTitle()); - obj.put("place", tasks.getPlace().getPlaceName()); - obj.put("taskstatus", tasks.getTaskStatus().getTaskStatusID()); - obj.put("details", tasks.getDetails()); - obj.put("attachment", tasks.getAttachment()); - arr.put(obj); - obj = new JSONObject(); - } - return arr.toString(); + public String sortByDone() { + + return super.findByParameter("Done"); } @GET - @Path("sortcancelled/{id}") + @Path("sortcancelled") + @Produces(MediaType.APPLICATION_JSON) + public String sortByCancelled() { + return super.findByParameter("Cancelled"); + } + + @GET + @Path("sortnew/department{id}") + @Produces(MediaType.APPLICATION_JSON) + public String sortByNew(@PathParam("id") Integer department) { + return super.findByParameterDepartment(department, "New"); + } + @GET + @Path("sortprocess/department{id}") + @Produces(MediaType.APPLICATION_JSON) + public String sortByProcess(@PathParam("id") Integer department) { + return super.findByParameterDepartment(department, "In process"); + } + + @GET + @Path("sortdone/department{id}") @Produces(MediaType.APPLICATION_JSON) - public String sortByCancelled(@PathParam("id") String name) { - List results = em.createNamedQuery("Tasks.findAll", Tasks.class).getResultList(); - Users users = em.createNamedQuery("Users.findByUsername", Users.class).setParameter("username", name).getSingleResult(); - List valid = new ArrayList(); - JSONObject obj = new JSONObject(); - JSONArray arr = new JSONArray(); - for (Tasks result : results) { - if (result.getTaskStatus().getStatusName().equals("Cancelled") && result.getDepartment().getDepartmentID() == users.getDepartment().getDepartmentID()) { - valid.add(result); - } - } - for (Tasks tasks : valid) { - obj.put("taskID", tasks.getTaskID()); - obj.put("duedate", tasks.getDueDate()); - obj.put("duetime", tasks.getDueTime()); - obj.put("department", tasks.getDepartment().getDepartmentID()); - obj.put("title", tasks.getTitle()); - obj.put("place", tasks.getPlace().getPlaceName()); - obj.put("taskstatus", tasks.getTaskStatus().getTaskStatusID()); - obj.put("details", tasks.getDetails()); - obj.put("attachment", tasks.getAttachment()); - arr.put(obj); - obj = new JSONObject(); - } - return arr.toString(); + public String sortByDone(@PathParam("id") Integer department) { + + return super.findByParameterDepartment(department, "Done"); + } + @GET + @Path("sortcancelled/department{id}") + @Produces(MediaType.APPLICATION_JSON) + public String sortByCancelledDepartment(@PathParam("id") Integer department) { + return super.findByParameterDepartment(department, "Cancelled"); } @POST @@ -198,122 +141,6 @@ public String editNote(@PathParam("id") int id, Tasks entity) { return "test"; } - @GET - @Path("sortnewmanager") - @Produces(MediaType.APPLICATION_JSON) - public String sortByNewForManager() { - List results = em.createNamedQuery("Tasks.findAll", Tasks.class).getResultList(); - List valid = new ArrayList(); - JSONObject obj = new JSONObject(); - JSONArray arr = new JSONArray(); - for (Tasks result : results) { - if (result.getTaskStatus().getStatusName().equals("New")) { - valid.add(result); - } - } - for (Tasks tasks : valid) { - obj.put("taskID", tasks.getTaskID()); - obj.put("duedate", tasks.getDueDate()); - obj.put("duetime", tasks.getDueTime()); - obj.put("department", tasks.getDepartment().getDepartmentID()); - obj.put("title", tasks.getTitle()); - obj.put("place", tasks.getPlace().getPlaceName()); - obj.put("taskstatus", tasks.getTaskStatus().getTaskStatusID()); - obj.put("details", tasks.getDetails()); - obj.put("attachment", tasks.getAttachment()); - arr.put(obj); - obj = new JSONObject(); - } - return arr.toString(); - } - - @GET - @Path("sortprocessmanager") - @Produces(MediaType.APPLICATION_JSON) - public String sortByProcessForManager() { - List results = em.createNamedQuery("Tasks.findAll", Tasks.class).getResultList(); - List valid = new ArrayList(); - JSONObject obj = new JSONObject(); - JSONArray arr = new JSONArray(); - for (Tasks result : results) { - if (result.getTaskStatus().getStatusName().equals("In process")) { - valid.add(result); - } - } - for (Tasks tasks : valid) { - obj.put("taskID", tasks.getTaskID()); - obj.put("duedate", tasks.getDueDate()); - obj.put("duetime", tasks.getDueTime()); - obj.put("department", tasks.getDepartment().getDepartmentID()); - obj.put("title", tasks.getTitle()); - obj.put("place", tasks.getPlace().getPlaceName()); - obj.put("taskstatus", tasks.getTaskStatus().getTaskStatusID()); - obj.put("details", tasks.getDetails()); - obj.put("attachment", tasks.getAttachment()); - arr.put(obj); - obj = new JSONObject(); - } - return arr.toString(); - } - - @GET - @Path("sortdonemanager") - @Produces(MediaType.APPLICATION_JSON) - public String sortByDoneForManager() { - List results = em.createNamedQuery("Tasks.findAll", Tasks.class).getResultList(); - List valid = new ArrayList(); - JSONObject obj = new JSONObject(); - JSONArray arr = new JSONArray(); - for (Tasks result : results) { - if (result.getTaskStatus().getStatusName().equals("Done")) { - valid.add(result); - } - } - for (Tasks tasks : valid) { - obj.put("taskID", tasks.getTaskID()); - obj.put("duedate", tasks.getDueDate()); - obj.put("duetime", tasks.getDueTime()); - obj.put("department", tasks.getDepartment().getDepartmentID()); - obj.put("title", tasks.getTitle()); - obj.put("place", tasks.getPlace().getPlaceName()); - obj.put("taskstatus", tasks.getTaskStatus().getTaskStatusID()); - obj.put("details", tasks.getDetails()); - obj.put("attachment", tasks.getAttachment()); - arr.put(obj); - obj = new JSONObject(); - } - return arr.toString(); - } - - @GET - @Path("sortcancelledmanager") - @Produces(MediaType.APPLICATION_JSON) - public String sortByCancelledForManager() { - List results = em.createNamedQuery("Tasks.findAll", Tasks.class).getResultList(); - List valid = new ArrayList(); - JSONObject obj = new JSONObject(); - JSONArray arr = new JSONArray(); - for (Tasks result : results) { - if (result.getTaskStatus().getStatusName().equals("Cancelled")) { - valid.add(result); - } - } - for (Tasks tasks : valid) { - obj.put("taskID", tasks.getTaskID()); - obj.put("duedate", tasks.getDueDate()); - obj.put("duetime", tasks.getDueTime()); - obj.put("department", tasks.getDepartment().getDepartmentID()); - obj.put("title", tasks.getTitle()); - obj.put("place", tasks.getPlace().getPlaceName()); - obj.put("taskstatus", tasks.getTaskStatus().getTaskStatusID()); - obj.put("details", tasks.getDetails()); - obj.put("attachment", tasks.getAttachment()); - arr.put(obj); - obj = new JSONObject(); - } - return arr.toString(); - } - @POST @Override @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @@ -352,30 +179,14 @@ public List findAll() { @Path("taskListAll/{id}") @Produces({MediaType.APPLICATION_JSON}) public String findAllWithUselessParam(@PathParam("id") String name) { - List results = em.createNamedQuery("Tasks.findAll", Tasks.class).getResultList(); - Users users = em.createNamedQuery("Users.findByUsername", Users.class).setParameter("username", name).getSingleResult(); - List valid = new ArrayList(); - JSONObject obj = new JSONObject(); - JSONArray arr = new JSONArray(); - for (Tasks result : results) { - if (result.getDepartment().getDepartmentID() == users.getDepartment().getDepartmentID()) { - valid.add(result); - } - } - for (Tasks tasks : valid) { - obj.put("taskID", tasks.getTaskID()); - obj.put("duedate", tasks.getDueDate()); - obj.put("duetime", tasks.getDueTime()); - obj.put("department", tasks.getDepartment().getDepartmentID()); - obj.put("title", tasks.getTitle()); - obj.put("place", tasks.getPlace().getPlaceName()); - obj.put("taskstatus", tasks.getTaskStatus().getTaskStatusID()); - obj.put("details", tasks.getDetails()); - obj.put("attachment", tasks.getAttachment()); - arr.put(obj); - obj = new JSONObject(); - } - return arr.toString(); + return super.findAllDepartments(name); + } + + @GET + @Path("taskListAll/department{id}") + @Produces({MediaType.APPLICATION_JSON}) + public String findAllWithUselessParam(@PathParam("id") Integer department) { + return super.findAllDepartmentParameter(department); } @GET diff --git a/back-end java/sokoshotel/src/java/Source/service/UsersFacadeREST.java b/back-end java/sokoshotel/src/java/Source/service/UsersFacadeREST.java index 4e702e9..89ff1b2 100644 --- a/back-end java/sokoshotel/src/java/Source/service/UsersFacadeREST.java +++ b/back-end java/sokoshotel/src/java/Source/service/UsersFacadeREST.java @@ -67,7 +67,7 @@ public Response checkLogin(@FormParam("username") String name, @FormParam("passw if (results.get(0).getPassword().equals(pw)) { URL url; try { - url = new URL("http://localhost:8080/sokoshotel/mainpage.html"); //login succesfull + url = new URL("http://localhost:46419/sokoshotel/mainpage.html"); //login succesfull URI uri = url.toURI(); return Response.seeOther(uri).build(); //logged in succesfull } catch (MalformedURLException ex) { @@ -77,7 +77,7 @@ public Response checkLogin(@FormParam("username") String name, @FormParam("passw URL url; try { - url = new URL("http://localhost:8080/sokoshotel/?dc=wrong"); //wrong password + url = new URL("http://localhost:46419/sokoshotel/?dc=wrong"); //wrong password URI uri = url.toURI(); return Response.seeOther(uri).build();//logged in failed } catch (MalformedURLException ex) { @@ -88,7 +88,7 @@ public Response checkLogin(@FormParam("username") String name, @FormParam("passw URL url; try { - url = new URL("http://localhost:8080/sokoshotel/?dc=wrong"); //wrong username + url = new URL("http://localhost:46419/sokoshotel/?dc=wrong"); //wrong username URI uri = url.toURI(); return Response.seeOther(uri).build();//logged in failed } catch (MalformedURLException ex) { @@ -110,6 +110,12 @@ public int getRight(@PathParam("name") String name){ return results.getRights().getRightsID(); } + @GET + @Path("getDepartment/{name}") + public int getDepartment(@PathParam("name") String name){ + Users results = em.createNamedQuery("Users.findByUsername", Users.class).setParameter("username", name).getSingleResult(); + return results.getDepartment().getDepartmentID(); + } @PUT @Path("{id}") diff --git a/back-end java/sokoshotel/web/WEB-INF/glassfish-resources.xml b/back-end java/sokoshotel/web/WEB-INF/glassfish-resources.xml index 9115b2e..601d987 100644 --- a/back-end java/sokoshotel/web/WEB-INF/glassfish-resources.xml +++ b/back-end java/sokoshotel/web/WEB-INF/glassfish-resources.xml @@ -21,4 +21,6 @@ + + diff --git a/back-end java/sokoshotel/web/index.html b/back-end java/sokoshotel/web/index.html index db4dc2d..4ffc4f9 100644 --- a/back-end java/sokoshotel/web/index.html +++ b/back-end java/sokoshotel/web/index.html @@ -18,7 +18,7 @@

Logo

@@ -96,7 +96,7 @@ - + @@ -110,8 +110,6 @@ diff --git a/back-end java/sokoshotel/web/styles/buttonStyle.css b/back-end java/sokoshotel/web/styles/buttonStyle.css index 4dd495e..1ef185a 100644 --- a/back-end java/sokoshotel/web/styles/buttonStyle.css +++ b/back-end java/sokoshotel/web/styles/buttonStyle.css @@ -19,10 +19,10 @@ } -.button-group .button:disabled { +/*.button-group .button:disabled { box-shadow: 8px 8px 8px 0px #ccc; background-color: white; -} +}*/ .button-group .button { border: 1px solid #c2c2c2; diff --git a/back-end java/sokoshotel/web/styles/style.css b/back-end java/sokoshotel/web/styles/style.css index 2b32460..adb6051 100644 --- a/back-end java/sokoshotel/web/styles/style.css +++ b/back-end java/sokoshotel/web/styles/style.css @@ -12,9 +12,6 @@ body { display: none; } -img { - width: 400px; -} /*div for the blur effect of the background-image*/ .row::before { content: ""; @@ -55,11 +52,7 @@ p.form-title { } form { - display: flex; - margin: 0 auto; - justify-content: space-around; - flex-wrap: wrap; - flex-direction: row; + text-align: center; } input { @@ -88,6 +81,7 @@ form.login input[type="password"] { width: 280px; } form { + display: flex; flex-direction: column; align-items: center; } diff --git a/back-end java/sokoshotel/web/styles/style2.css b/back-end java/sokoshotel/web/styles/style2.css index dfc3454..b3dfd96 100644 --- a/back-end java/sokoshotel/web/styles/style2.css +++ b/back-end java/sokoshotel/web/styles/style2.css @@ -1,3 +1,5 @@ +/*Styles for main page*/ + @import "formStyle.css"; @import "listStyle.css"; @@ -7,7 +9,9 @@ body { margin: 0; font-family: Arial, Helvetica, sans-serif; } + /*div for the blur effect of the background-image*/ + .blur::before { content: ""; background: url('https://raw.githubusercontent.com/Anastat/ApplicationDevelopmentProject/master/html/img/calendar.jpg') fixed; @@ -27,11 +31,13 @@ body { width: 100%; height: 100%; display: grid; - grid-template-areas: "nav nav nav nav" "content content content aside" "content content content aside" "content content content aside"; + grid-template-columns: repeat(4, 1fr); + grid-template-areas: "nav nav nav nav" "content content content aside" "content content content aside" "content content content aside" "content content content aside"; z-index: -1; } nav { + position: relative; grid-area: nav; } @@ -43,9 +49,13 @@ nav { box-shadow: 0px 1px 1px black; } +.active img { + width: 45%; + float: left; +} + .topnav a { float: left; - color: black; text-align: center; padding: 10px 15px; text-decoration: none; @@ -59,23 +69,30 @@ nav { .topnav a.active { background-color: #f5f0e8; - color: black; +} + +#username { + float: right; + padding: 2%; } .icon { - width: 2%; + padding-top: 10px; + width: 3%; float: right; } .align-center { - padding-top: 5%; + position: absolute; + padding-top: 5%; width: 100%; height: 100%; margin: auto; grid-area: content; } -aside .button, .align-center .button { +aside .button, +.align-center .button { width: 200px; height: 40px; background-color: #f5f0e8; @@ -87,42 +104,54 @@ aside .button, .align-center .button { box-shadow: 4px 4px 5px 0px rgba(50, 50, 50, 0.75); border-radius: 7px; } + +/*styles for disable aside buttons*/ + +aside button.disabledDep { + box-shadow: inset -1px -1px 30px 0px #ccc; +} + /*radio buttons all, new, done etc.*/ + .float-right { - padding: 10px; - position: relative; - text-align: center; + padding: 10px; + position: relative; + text-align: center; } /*content from database, displays tasks*/ + .boxed { - position: relative; - border: none; - width: 80%; - height: 600px; - overflow: auto; - margin: auto; - cursor: pointer; + position: relative; + border: none; + width: 90%; + height: 70%; + overflow: auto; + margin: auto; + cursor: pointer; + -moz-height: 75%; } + /*button Add new task*/ + .wrapper { - position: relative; - padding-top: 10px; - text-align: center; + position: relative; + padding-top: 10px; + text-align: center; } aside { - display: flex; - flex-direction: row; grid-area: aside; align-content: center; - padding-top: 20%; + margin: auto; + -moz-align-content: center; } aside ul { - + list-style: none; } + aside ul li { margin: 0 0 10% 0; } @@ -174,6 +203,18 @@ aside ul li { .modal-content { margin-left: 5%; } + nav { + height: 10%; + } + .content { + grid-template-columns: repeat(3, 1fr); + grid-template-rows: 1fr 6fr; + grid-template-areas: "nav nav nav" "content content content"; + } + aside { + display: none; + + } } @media (min-width: 0) and (max-width: 480px) {