Test

.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

back-end java/sokoshotel/build/web/WEB-INF/classes/META-INF/persistence.xml

@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
   <persistence-unit name="sokoshotelPU" transaction-type="JTA">
     <jta-data-source>java:app/sokosweb</jta-data-source>
     <exclude-unlisted-classes>false</exclude-unlisted-classes>
-    <properties/>
+    <properties>
+      <property name="javax.persistence.schema-generation.database.action" value="create"/>
+    </properties>
   </persistence-unit>
 </persistence>

back-end java/sokoshotel/build/web/WEB-INF/glassfish-resources.xml

@@ -21,4 +21,6 @@
         <property name="driverClass" value="com.mysql.jdbc.Driver"/>
     </jdbc-connection-pool>
     <jdbc-resource enabled="true" jndi-name="java:app/sokosweb" object-type="user" pool-name="mysql_sokosweb_rootPool"/>
+    <jdbc-resource enabled="true" jndi-name="java:app/sokosweb" object-type="user" pool-name="mysql_sokosweb_rootPool"/>
+    <jdbc-resource enabled="true" jndi-name="java:app/sokosweb" object-type="user" pool-name="mysql_sokosweb_rootPool"/>
 </resources>

back-end java/sokoshotel/build/web/index.html

@@ -18,7 +18,7 @@
 		<p style="text-align:center;"><img src="https://raw.githubusercontent.com/Anastat/ApplicationDevelopmentProject/master/html/Icons/TF17_vantaa_hotel_logo_400x140_20170120.png" alt="Logo"></p>
 		<p class="form-title"></p>
 		<form class="login" method="post" action="webresources/users/login" onsubmit="esa()">
-			<p id="wrong" class="dynamic-content">Wrong username or password!</p>
+                    <p id="wrong" class="dynamic-content">Wrong username or password!</p><br>
 			<input type="text" placeholder="Username" name="username" id="names" />
 			<input type="password" placeholder="Password" name="password" />
 			<input type="submit" value="Sign In" />

back-end java/sokoshotel/build/web/js/saveNote.js

@@ -1,8 +1,9 @@
 document.addEventListener("DOMContentLoaded", function (event) {
 
     const noteInput = document.querySelector(".noteForm");
-    const url = "http://localhost:8080/sokoshotel/webresources/tasksrest/addNewNote";
-
+    //const url = "http://localhost:8080/sokoshotel/webresources/tasksrest/addNewNote";
+
+
     let note = {};
     let departmentid = {};
     let placeid = {};

back-end java/sokoshotel/build/web/mainpage.html

@@ -18,19 +18,19 @@
 	<div class="content">
 		<nav>
 			<div class="topnav">
-				<a class="active" href="#home"><img src="https://raw.githubusercontent.com/Anastat/ApplicationDevelopmentProject/master/html/Icons/TF17_vantaa_hotel_logo_400x140_20170120.png" alt="Logo" style="width: 40%; height: 40%; float: left;"></a>
-				<a style="float: right;" id="username">Username</a>
-				<img class="icon" src="https://raw.githubusercontent.com/Anastat/ApplicationDevelopmentProject/master/html/Icons/user_icon.png" alt="icon">
+				<a class="active" href="#home"><img src="https://raw.githubusercontent.com/Anastat/ApplicationDevelopmentProject/master/html/Icons/TF17_vantaa_hotel_logo_400x140_20170120.png" alt="Logo"></a>
+				<a id="username">Username</a>
+				<img class="icon" src="./Icons/user_icon.png" alt="icon">
 			</div>
 
 		</nav>
 		<div class="align-center">
 			<form action="submit" class="float-right">
-                            <label><input type="radio" name="option" value="taskListAll" checked> <b>All</b></label>
-                            <label><input type="radio" name="option" value="sortnew"> <b>New</b></label>
-                            <label><input type="radio" name="option" value="sortprocess"> <b>In progress</b></label>
-                            <label><input type="radio" name="option" value="sortdone"> <b>Done</b></label>
-                            <label><input type="radio" name="option" value="sortcancelled"> <b>Cancelled</b></label>
+				<label><input type="radio" name="option" value="taskListAll" checked> <b>All</b></label>
+				<label><input type="radio" name="option" value="sortnew"> <b>New</b></label>
+				<label><input type="radio" name="option" value="sortprocess"> <b>In progress</b></label>
+				<label><input type="radio" name="option" value="sortdone"> <b>Done</b></label>
+				<label><input type="radio" name="option" value="sortcancelled"> <b>Cancelled</b></label>
 			</form>
 
 			<div id="tasks-list" class="boxed">
@@ -40,14 +40,14 @@
 			</div>
 		</div>
 		<aside>
-			<ul >
-				<li><button type="button" class="button">ALL</button></li>
-				<li><button type="button" class="button">FRONT OFFICE</button></li>
-				<li><button type="button" class="button">HOUSEKEEPING</button></li>
-				<li><button type="button" class="button">GUEST SERVICE</button></li>
-				<li><button type="button" class="button">FOOD AND BEVERAGE</button></li>
-				<li><button type="button" class="button">ENGINEERING AND MAINTENANCE</button></li>
-				<li><button type="button" class="button">OTHER DEPARTMENTS</button></li>
+			<ul class="departmentList">
+				<li><button type="button" id="AllDepartments" class="button activeDepartment">ALL</button></li>
+				<li><button type="button" id="frontOffice" class="button disabledDep">FRONT OFFICE</button></li>
+				<li><button type="button" id="housekeeping" class="button disabledDep">HOUSEKEEPING</button></li>
+				<li><button type="button" id="guestservice" class="button disabledDep">GUEST SERVICE</button></li>
+				<li><button type="button" id="food" class="button disabledDep">FOOD AND BEVERAGE</button></li>
+				<li><button type="button" id="engineering" class="button disabledDep">ENGINEERING AND MAINTENANCE</button></li>
+				<li><button type="button" id="other" class="button disabledDep">OTHER DEPARTMENTS</button></li>
 			</ul>
 		</aside>
 	</div>
@@ -96,7 +96,7 @@
 						<option value="4">Main hall</option>
 					</select>
 				<label id="titleLabel">Title</label>
-				<textarea type="text" id="titleInput"></textarea>
+				<textarea id="titleInput"></textarea>
 				<label id="detailsLabel">Details</label>
 				<textarea id="detailsInput"></textarea>
 				<label id="attachmentLabel">Attachment</label>
@@ -110,63 +110,13 @@
 
 	</div>
 	<script>
-		//Save button functionality
-
 		//Hide modal after cancel button pressed
 		var modal = document.getElementById('myModal');
 
 		function hideModal() {
 			modal.style.display = "none";
 		}
 
-		/*function hideNew() {
-			var a = document.getElementById("newButton");
-			var b = document.getElementById("inProcess");
-			var c = document.getElementById("cancelled");
-			var d = document.getElementById("done");
-			console.log(document.getElementById("newButton").value);
-			a.className = "button notDisabled";
-			b.className = "button disabled";
-			c.className = "button disabled";
-			d.className = "button disabled";
-		}
-
-		function hideInProcess() {
-			var a = document.getElementById("newButton");
-			var b = document.getElementById("inProcess");
-			var c = document.getElementById("cancelled");
-			var d = document.getElementById("done");
-			console.log(document.getElementById("inProcess").value);
-			a.className = "button disabled";
-			b.className = "button notDisabled";
-			c.className = "button disabled";
-			d.className = "button disabled";
-		}
-
-		function hideCancelled() {
-			var a = document.getElementById("newButton");
-			var b = document.getElementById("inProcess");
-			var c = document.getElementById("cancelled");
-			var d = document.getElementById("done");
-			console.log(document.getElementById("cancelled").value);
-			a.className = "button disabled";
-			b.className = "button disabled";
-			c.className = "button notDisabled";
-			d.className = "button disabled";
-		}
-
-		function hideDone() {
-			var a = document.getElementById("newButton");
-			var b = document.getElementById("inProcess");
-			var c = document.getElementById("cancelled");
-			var d = document.getElementById("done");
-			console.log(document.getElementById("done").value);
-			a.className = "button disabled";
-			b.className = "button disabled";
-			c.className = "button disabled";
-			d.className = "button notDisabled";
-		}*/
-
 	</script>
 </body>
 

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;

back-end java/sokoshotel/nbproject/build-impl.xml

@@ -1005,17 +1005,18 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jackson-databind.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jackson-module-jaxb-annotations.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jersey-media-json-jackson.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.json-20140107.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
-        <copyfiles files="${file.reference.json-20131018.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.json-simple-1.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jackson-annotations.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jackson-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jackson-databind.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jackson-module-jaxb-annotations.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jersey-media-json-jackson.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.json-20140107.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
     </target>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>

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

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