From 1dce6eeca6e733e8ac76921731a29745ba0fc79b Mon Sep 17 00:00:00 2001 From: Anastat Date: Wed, 7 Mar 2018 08:56:35 +0200 Subject: [PATCH 1/2] functionality for departments buttons --- .gitignore | 70 ++++ .../WEB-INF/classes/META-INF/persistence.xml | 8 +- .../WEB-INF/classes/Source/Departments.class | Bin 4002 -> 4128 bytes .../web/WEB-INF/classes/Source/Place.class | Bin 3304 -> 3398 bytes .../web/WEB-INF/classes/Source/Rights.class | Bin 3476 -> 3602 bytes .../WEB-INF/classes/Source/Taskhistory.class | Bin 3757 -> 3851 bytes .../web/WEB-INF/classes/Source/Tasks.class | Bin 5774 -> 6021 bytes .../WEB-INF/classes/Source/Taskstatus.class | Bin 4013 -> 4139 bytes .../web/WEB-INF/classes/Source/Users.class | Bin 4813 -> 4907 bytes .../Source/service/AbstractFacade.class | Bin 3228 -> 7404 bytes .../Source/service/TasksFacadeREST.class | Bin 11644 -> 5985 bytes .../Source/service/UsersFacadeREST.class | Bin 5631 -> 5919 bytes .../build/web/WEB-INF/glassfish-resources.xml | 2 + back-end java/sokoshotel/build/web/index.html | 2 +- .../sokoshotel/build/web/js/saveNote.js | 5 +- .../sokoshotel/build/web/mainpage.html | 84 +---- .../build/web/styles/buttonStyle.css | 4 +- .../sokoshotel/nbproject/build-impl.xml | 3 +- .../sokoshotel/nbproject/genfiles.properties | 6 +- .../nbproject/private/private.properties | 18 +- .../sokoshotel/nbproject/private/private.xml | 32 +- .../sokoshotel/nbproject/project.properties | 4 +- .../sokoshotel/nbproject/project.xml | 4 + .../sokoshotel/src/conf/persistence.xml | 8 +- .../sokoshotel/src/java/Source/Tasks.java | 3 +- .../java/Source/service/AbstractFacade.java | 84 +++++ .../java/Source/service/TasksFacadeREST.java | 301 ++++-------------- .../java/Source/service/UsersFacadeREST.java | 12 +- .../web/WEB-INF/glassfish-resources.xml | 2 + back-end java/sokoshotel/web/index.html | 2 +- back-end java/sokoshotel/web/js/saveNote.js | 5 +- back-end java/sokoshotel/web/js/saveNote2.js | 6 +- back-end java/sokoshotel/web/js/tasksList2.js | 296 ++++++++++++++--- back-end java/sokoshotel/web/mainpage.html | 84 +---- .../sokoshotel/web/styles/buttonStyle.css | 4 +- back-end java/sokoshotel/web/styles/style.css | 10 +- .../sokoshotel/web/styles/style2.css | 87 +++-- 37 files changed, 641 insertions(+), 505 deletions(-) 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 bd774e37af138381d2d2b490352b5ff179b22b43..32230c88af40defd32a8f1a17c2ddf20f438a923 100644 GIT binary patch delta 443 zcmZ9HyG{Z@7=_R5g1d`Ih|-vtNJ0W$5=ac4(O_YL!B|kBBFX|QF5<52F6$jHs4qZk zVSEEarG*b*>qA)BS$q4ZA%^Ch`DW&vKmWt{eK`C2^ZWuJiCZ6nXef|iak05LT$(<( zIFNA2{Yb*G4+K&OI=X4t453U-b=5>&HL8gfSFH_+4TBIa z_)+XW$sC{4Mc}||3oTv2ju=n}<_5n=u;E<#q$Kpswpd-}LaA;mV z-R4~Pg^o*`E8Q)NYm1v#@3F@ezcbOhVx(_fmRMG#yjn9T`BQU#y%;nqezg(0tdWae z>`b!FolBd0g^|v?6guDbxH40y&aCrgDiuv8%0sIPrT*ku!$M|53F`}}=snRITPH7^ zV3ZAJFvyD8M=btBO8fyW7nm2h*1woF*wlw8GAO-3j4kPsI3pq3_yRiuyE)7Zdm_qu RpK{1S7Y{X7x>(g%`v=eXJ-h$_ 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 796bd6822c3b457a62ef05b2d77916e291d7b603..89e8c6d9c2f393287cb5b938c74373b61e47be32 100644 GIT binary patch delta 414 zcmZ9HyH3L}7=@2b6!#KwQwQ1!fdpH-v=bnK7y!{5lzS=Qrlz!n1d=ptyhLZ-fCY79 zU|?Y2NqC3~_${OgvHYJu+viyROuuK!A73x80P?s`U;=g=CR%zZJuVYy<4T~T*%i1> zAO<@INApGxHwI7hR^U#+e=gUJ6^41wZ)aTTl9^yA5t%Ll?>{CV@>T4Rk7E(LD1c*|&XX|WLrhaP z^*>m{G6mPIQtNLa$DV!+``~*0`xu7P@VJOQF=Ce9W+r*-*lI5tV(p&-2?`A^y3)12!s2H zh*Lkj(7Z6YTU=}}THMvIy5OFarV66lO7(!u)^kK6!mECO9vFM%2T=*f+g_AcEEc zW5^MCz>p_rd?*AbCEX;puuVKbr8`Jc|2mxq;P!nYNZHW;U;(QX{E#xWzl8#J`7jhQ pLY{&fd*mf5p0?;8_6ZIM%0;-AA=5?LuApk6)D3_ICs;{`=00I$;r)qo_a|K-@or4K!yj85o#`j)J-%@oO+ybuDLMX)LeQbs3o{E z-7*m+Xq)b6t~EDr!Ixu;-^&lAtn{r_<`BC~NUz~gklqt#Hj*zW3hWCU6tGt~6j9bCjv~r^JT_SA Iz>% 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 079e46d19a188f700e862c27913077a62a819ea1..0626191778dcfc4101605b028cecd89c80615800 100644 GIT binary patch delta 432 zcmZ9HO-lk%7=_QhP0ct>LE9EFeb|S6ELuuG zqeZxD(GTcHwCHz4^u-h0l=`!w+|nSJ|uc?FQbosKayLeOw1#g*bo@uf6% z1UOQ0EWM@TM2C)shEwThQqDEBrC+GHRB`p3y;qV9Q;u7X*}^Xf)AnL%r|A|&N(7?5 zXxol&`j%sR43SjT49s}lw9E1JK)9||67#(eWr;_x4WyA_2>)i|8Pls(EYEk`mVqtg zy31-Z+`)~34sIEEG;d%Rd%Z_>WsvdiyHTCd7#RDeCAkVZbHTu-NHya zv5h?OC}y#PBsezceHcpU6Jg3m{s(Cg1+~$&(%(W3Qw~D`tkKwK_6|2&JXL@Q#b$s delta 315 zcmX|*yG{Z@7)H;`E}3No5(xz%Xe>-XamnBpm9m}Z)QV~rDyQ;k^TEaaRE$EEg_<2ody z8E~V0tI-O$({4LDj_!N(?0e$(%c&V_?vuJJdy7<)uB+sGJY?wcXs~0o3@fbmzuj!g zn539(lp=#MfAS~mkh3+y$Wu)6nr%-mu`HZpf*KVp3t|r8r+>(cUr<>FMXu)NBg>i& qQKuw5htIn7hB)Ifn`{Ye3&^N9&5nq2y~|!qV}SdL2Ln7*Jo*Po+cdra 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 6bde8cf53f5f2d556883d989da7005fedaccc69d..10b988b21cac35821b41e03c66889b22bb1ecc6b 100644 GIT binary patch delta 997 zcmZ9K*-sNu6o-FzbQ}sTYireDoJ7DHvDIKqT!Y1yl(U*Jf_su!y&fGJ-^N;x)Z+<*}3Sbc) zCSqz|X7&mj9Jp#NgVu5_5!Z1;!A&dPQgAyFDY%q?J60UBmf-~4wc?0^dkXH4HZ4)| z8D=*`>b!<-R_mG(^#&XEL~8UBy;-j>G>isQGs6u=l)+iDQ)||I^_o%VD{a;zk#I;~ z78_9tSpM>0pd?UKuA1tqveNZxxfb0OB`7WP2g=lyTU65<+N1k5Q&;_gU{UUGE)Vb4 z)xuyApJZE;IZf1fYr{rpWs6^L)FS3?-7t&&3;{lDo0Sz;-cWp7>{s*ErGGiL+BVE) zKCmMKdSCnR5Ali4cC=tWgPV^gxp_{~jMPz#*)fV3gQQm4(H7f~v{jNfV=}hz1*tCn z(vfT1MpOYCD)~1@GZXdZ8a_;_AA8RF@FL#hSWGUWB?zl+(km`}U$af2$p5|k{!f#6R$o=HG z@B`$}3;&t?W%2{UXQlht72(6_9(j=bHQ`6d-xU5U`62Sd!Y|J7v3tTF$neNxr*hi6B zBY?yeSDEV-6uhRpd`oxvj_&O}^6-%xF887XXr;_#%)vpFQ2S=8Ou}T_ccfES=l?C+ z5TuqPt|jfCu$EHoR19Qd9TnrB<0Z6{kQCrT2qLQIoQu7A&pf~Lo_FA!ls8;fxbk=TC4h1) z1rf)%g3-o!%_kCs|1%vJ19 z|1_(FaAZr+k&V`_bT~L83Knd%!56TrTh6pKGX?orgnC4A0;|!0wP-{!nox?9 z*o0H^V0ch8>j}TYuF(Pmr{&j3LT=6Tgs(lB=Nj$w4()I0o!YH@*XX7vweQRKL`wT8 zy`Mgy{X2a~`klHF z6jNimP|Y#@@rv$m*v)O51{7is5AcV$sB1Uh1W5631~WtXd?s^i>RRSHc7^qi@RnwyWa1&2iV6D z3rQzvW#vQo0(RD-{(}%C%{lYUKj-`~4}m!2%iu#vn-hnp#3%!&Lw+1<8 zD5!PM75*10$jN2MV}Lx3HWbJO6-RAsp-8YzP|CtLg)%*)>k6ticA98NG@H09vGxm| CLtB>s delta 317 zcmX|*%PvDv6o$XOciHD0&CxU_7-(WZVrpPki9{mNQ75QUcj{WlwWv!mm-84RB4;LH zEMCPcNLhQ*$^Wl!<;%)?&bYBNxX3C!AW&T%TL&0X{X4 z3)hz}t~?s9uPry0+qdFJhY>$1bWUh>7e9IZro?>w>g6*{?$b1RQ0QDaO(ki0Bg$k^ z$#n2zl#0i~YTukfsXzHjTV&Qs7`cFozrx0FnFZmHAr{G_nH95(l>bXs{2nJ)m=w9* xU6|1eJwwj*}hxa)AQjr$G{{sFK2H?IHy 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 47d41ccdd99ee20aa9cbb0806487ea76cd0c80e0..542c0bdabe8739320124f539eb553a95b5c149a3 100644 GIT binary patch delta 509 zcmZ9IO)o=16o%iqDYvdm+UiOyB%*e@=}shsNJzy(ilmCGMzv}#ciQV)eSd$~Pq4ER zI}1NRV&Px-1vUg{BDoQp_nl|Xyyu+EOY>c%^!)Ys1R#cM19e!bf`L^fYf9FYY$z!y z*;KM+U>iF+c9rkx*f(He#g7B!hf0q8I97h5<5b5PLqKvTYvqTyBeS+h^ma3_K8Bhu zTilmI73~a7wv%ZUyfDcvAzKISqLb!v?(%%65O%>TP)ss}<2lQoa_{D zd$_51*Xqwr3}b}B{LMxaG*X%v!+81D9}8UI(!>R>7_`QeiS)yp|4nCF`8AM>7_<%h zra#bh&{<;)qePWpNRczu1X?)}+=xxUBCbUXCea2BNvc=FSM`YyWyAl2Y4lL=BiLX1 z+fc)l8U~IAau+^KlV_-LL}CV6f*iqY5|tgu(?hzRgOIR2oL9Kup`%cGSWsB>(1i#| KEPA}8%F91t`)7^- delta 358 zcmX}mxlRI67>42ZjKD06Mn)@QK}<1aTR}1s9YNlt$yeqlD5+urhQO zUVw>Sg0)v*Wz_#P)66%| zOOpqMkt(?Ook9D{RH_|Ml#{axrT*lH3=?@blvp1`wI34)Bl9eXdl+VsF%0rj#);TJ zc+&Ul*k?lGoR>Q^DC&z?VnDV|gp%yCH0gj9Rt0Nk`W64K@R|LRK`lL+)r+ RLk60=A#0lTkg+}O{eN!HL+=0p 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 56b1d8adf685e3f500ab5c4759e40f87189aa3b1..c80649639d53af5346d0ecc709e70d756395dc41 100644 GIT binary patch literal 7404 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 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 919c96ed9fffa04dfd3dca253aa851cd7dc12b55..0573eedcbed0e07976f3fc780b5cc3074ca61fb5 100644 GIT binary patch literal 5985 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 literal 11644 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 SV&n;BWC^~LD7)vt{eJ>g-vBWH 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 ac0e6cc76dbb147cb2464b1915f324d6b2a035fe..34afe98e17235198984b458d6770b83e0fcf388a 100644 GIT binary patch delta 2387 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 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) { From 7b44f441d7db1309fcb063ad353c5af35c1ca070 Mon Sep 17 00:00:00 2001 From: Anastat Date: Wed, 7 Mar 2018 09:54:09 +0200 Subject: [PATCH 2/2] url changes --- back-end java/sokoshotel/web/js/saveNote2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/back-end java/sokoshotel/web/js/saveNote2.js b/back-end java/sokoshotel/web/js/saveNote2.js index 4554c87..8bf42cd 100644 --- a/back-end java/sokoshotel/web/js/saveNote2.js +++ b/back-end java/sokoshotel/web/js/saveNote2.js @@ -6,7 +6,7 @@ document.addEventListener("DOMContentLoaded", function () { const noteInput = document.querySelector(".noteForm"); //const url = "webresources/tasksrest/addNewNote"; - const url = "http://localhost:46419/sokoshotel/webresources/tasksrest/addNewNote"; + const url = "http://10.114.32.70:8080/sokoshotel/webresources/tasksrest/addNewNote"; let note = {}; let departmentid = {}; let placeid = {}; @@ -53,7 +53,7 @@ document.addEventListener("DOMContentLoaded", function () { } }; if(document.getElementById("taskID").value !== ""){ - const urll = "http://localhost:46419/sokoshotel/webresources/tasksrest/editNote/" + document.getElementById("taskID").value; + const urll = "http://10.114.32.70:8080/sokoshotel/webresources/tasksrest/editNote/" + document.getElementById("taskID").value; fetch(urll, init) .then(response => response.json()) .then(json => console.log("Note saved: " + JSON.stringify(json)))