From 8ed95f6af6858cb7711cd55141a1abb7cfb11a69 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 14 Sep 2015 10:42:30 +0200 Subject: [PATCH] =?utf8?q?Continued:=20-=20refactured=20index=20page=20as?= =?utf8?q?=20this=20was=20not=20working=20(why,=20JSF=20team=3F)=20-=20add?= =?utf8?q?ed=20very=20basic=20item=20basket=20(total=20amount=20to=20pay?= =?utf8?q?=20is=20missing=20+=20link=20to=20checkout=20page)=20-=20updated?= =?utf8?q?=20jars=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcore-ee-logger.jar | Bin 8006 -> 8032 bytes lib/jcoreee.jar | Bin 18214 -> 18445 bytes lib/jshop-core.jar | Bin 26828 -> 26658 bytes lib/jshop-ee-lib.jar | Bin 6618 -> 6643 bytes .../localization/bundle_de_DE.properties | 1 + .../localization/bundle_en_US.properties | 1 + .../beans/basket/BasketWebBean.java | 26 +++-- .../beans/basket/BasketWebController.java | 18 +++- .../beans/product/AdminProductWebBean.java | 9 +- web/admin/admin_logout.xhtml | 27 +++++ web/basket.xhtml | 49 +++++++++- web/index.xhtml | 92 ++++++++++-------- web/resources/css/cssLayout.css | 4 +- 13 files changed, 170 insertions(+), 57 deletions(-) create mode 100644 web/admin/admin_logout.xhtml diff --git a/lib/jcore-ee-logger.jar b/lib/jcore-ee-logger.jar index 6d0e98ca34bb9da22fe71b465ba1765a785a8053..9631578315fa23cab8f95f90e90b3013588b16ea 100644 GIT binary patch delta 968 zcmaJ=QAkr!7(Vyj?anPuxit-Tb#6o0Q0{eTZYA^PCOXv8AwBdqm)@a z>do!E1s0TVK@>h^27%#IioN+1U(h?pEF!d!VBm8=l}oj`|p4M^W81=gNjoV zg2jPQ6GCssl?o2w*W*fZ)2*-Q2qC?aNQ+S=oQ^~*&w~O*>~%2nGeivuauH@{xEQmK zxCFDGxiJj+3Yk*Y%paf0+OjRo)A6ru+P^ok!%J6$chZZ% z{^`SID?)U|$$NX0$gQ?DwdJvu-Pb42g~p2~A*r8bW+bWaEzH*}=sl?kj&}=nwIm^2 ze{lWOjK0RdkY`dG<8Mn6=OpDeZ}&-Te*=3Q@SP{(gAMrmfUoIry-nhF!0W2EpS{~4 zKoFs;PC{t4?BNl*GIBL8k4=u&G^Q-(jN?rnm)TK?)$$?;uO_#UBnucA7z!pj#q(R}8N{2J>1O7Y zq!#5R=1g3!&J0p|Q65Zv)&NnH#RxCa1B<@p5t6I2IJ7=B1<-728do%%(T_5SxQ77bmBUzH@$Faehv!9Z-or zLJg4Tlb@arQVvoTl%HRskds=Lnq#X}Qk0mSs$@6WgrxDfM$TOIa~$EoM!gPA7uetOeeXc zyLaeCIownlO%?FnnE|4yOgUfwxvxP5R1xKVMlDe?N2hN5cSyCu4&t^;MC< zy86irWe#QWVS(=Ml&emb84=xYH0pFOji~PbWHjo2%8bYhMVa=ao5)*Kc2$Ywt>u)t zT2HxUHtRm>h^szv*m29Dg+t;~hmV^0@y~yEq?QiX%5m?C_9rZ)VW}I-EG$Q(g(ft+ z5ff-pVykM}1lld6B5uKh6&5;_W~BumIt5kBvENoNC?W!4aV~2%dtQUCN zix74SJY)Hghg|}@1)deylen1K|Ai6XmFgcE+JA88$k6uookP2~ACOJ8ZSt?#McG_o zufRU~EU-{uKV9W1^@HffsFj4@YD;H{|<1Ub1l%$JF8zvLkn%^SFVq z{BLQtoXGV#PGFMAsy0r_>qW~F-r(zoArt3keP9~HiIKcX!!ZHBOerWB4dNpPdLcud zk87yGB4R9zzo3>9$-uCoP{fB)9q~wHQEI?qg)B-@%vZ>ww1lfTnOk?Ul;Cj@-?y=h ziI~Dre2PZu1Tzq5hUXr)@Cq~w>`>_`&?H$hU^6$l~dUjd} zD82|_xkVqFEV`#$a%-2=h32>4^yFULMfj;g*4Hn!l2`>08^ zF^Fw8uXwwSA?%Q+%U3vu4JPD*s?tPSMZz$imgi@kle^|!HU5@}%r7uBwd`Yfr>UhH z2bqD42dQOJQ;UMaQBq5ZhQbljNr{32E@KvRM?IG{C>SG3idq!OT*ka8euk}->)l@f%Hcwx2^8#9njS&fKBpx zWVyUqcU8`w`vbYOp)Zim%TSNWJEu2nv*d!j?3!%qQaA!RJBO{UWfzN6kRzu?kV&+{ zxW@bOQ8y)TG!%~>2)eVZg;8(N74%+$^HprF{4HFkP?C}2d>3NCq15i4U&9j>@4yhCLw6Vs9NLzu2hThGFH=@G zg^Z77XVYwL`Ak#DOgCiM%#o*?Y_0kkRjt#iF~dDKX?C28&O8M(QW|bFA5v4o^B>zT zX+m+*gv)9|Y3gGWWJfGy-cg_Gd`Vl&H)A1Vl}wLKACYFp363h{L@ZbPt-fEE7n?~S zLjF58eVDskt=OSFlQ*M2xuV4`RHXC9saNuT${@HcY$~L>Rz}*Y^!$g#6D;iypEKj-C33%6PA*MX^R;m@>pp7yW|cOch}kl)y+j)) v@$N%gdbXiP9phw8q5Na(^mYB>AAcy^>IBr=m}Glui9Yhp_DD*9llt;MC-z>) delta 3237 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 delta 479 zcmexte9M?8z?+$ci-CcIf#HqQL>^71*G?17r!xWB7ZgC`CruzZS(Z^BMENnAf~ZzT zTM%`G(FH_tF&Tp>dnQW|RmJ20q$V*NO!jBzKrwt0vlB>x3$r7T+T6};%><&4utqY1 zXnFQbFu#lQ1DIdKoy^Gl#!1gza*efEHWLFw_T)D_-F#fG70IauC7Jno#q10slS_GL zO_t}oE+dhZSeB??l$)s^l$x7gk_uPF$lx?NkV$-!koM$EAzoc37DfgZ237_p1~vu; zAd8WK9prN$pA#s<#lQ^|0m-ldMc5}V=T`zb?KD3VGmxHqUdR#{I+MACK|Y-9BWwVo z>V(1G-YIMk;{6hK1yPP7z94FXNC=2}CgKdDv_(BZRGDZ1h>{VLnfyf548jZoQ3Yaw zAnLGK5r{Gu&jnG-#LGaGoJ1jrnkZ3-7AE|XnIMTONg1YP{F6WOs88N6smHcL2 allItems () { + // Deligate to basket instance + return this.basket.getAll(); + } + + @Override + public Float calculateCurrentItemPrice () { // Is the current item/amount set? if (this.getCurrentItem() == null) { // Current item is null @@ -135,6 +141,15 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl return totalPrice; } + @Override + public Float calculateItemPrice (final AddableBasketItem item) { + // Caculate item's price + Float totalPrice = (item.getProduct().getPrice() * item.getAmount()); + + // Return it + return totalPrice; + } + @Override public Long getAmount () { return this.amount; @@ -243,13 +258,10 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl AddableBasketItem fake = new BasketItem(product); // Get all items - Map map = this.basket.getAll(); + List list = this.basket.getAll(); // Check all entries - for (Map.Entry entrySet : map.entrySet()) { - // Get item - AddableBasketItem item = entrySet.getValue(); - + for (final AddableBasketItem item : list) { // item must not be null if (null == item) { // Abort here diff --git a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java index ad81ef88..2f6c212e 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java @@ -17,6 +17,7 @@ package org.mxchange.pizzaapplication.beans.basket; import java.io.Serializable; +import java.util.List; import org.mxchange.jshopcore.model.basket.AddableBasketItem; import org.mxchange.jshopcore.model.product.Product; @@ -93,7 +94,15 @@ public interface BasketWebController extends Serializable { * * @return Current item's total price */ - public Float calculateItemPrice (); + public Float calculateCurrentItemPrice (); + + /** + * Calculates total price (no tax added) for given item. + * + * @param item Item instance to calculate total price for + * @return Total price + */ + public Float calculateItemPrice (final AddableBasketItem item); /** * Getter for last entry @@ -108,4 +117,11 @@ public interface BasketWebController extends Serializable { * @return Last num rows */ public int getLastNumRows (); + + /** + * Gets for all added items + * + * @return A list of all added items + */ + public List allItems (); } diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java index c37417d8..335ed468 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java @@ -26,9 +26,9 @@ import javax.naming.NamingException; import org.mxchange.jcoreee.beans.BaseFrameworkBean; import org.mxchange.jshopcore.exceptions.CannotAddProductException; import org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException; +import org.mxchange.jshopcore.model.product.AdminProductSessionBeanRemote; import org.mxchange.jshopcore.model.product.GenericProduct; import org.mxchange.jshopcore.model.product.Product; -import org.mxchange.jshopcore.model.product.ProductSessionBeanRemote; import org.mxchange.pizzaapplication.beans.controller.ShopWebController; /** @@ -44,7 +44,6 @@ public class AdminProductWebBean extends BaseFrameworkBean implements AdminProdu * Serial number */ private static final long serialVersionUID = 5_819_375_183_472_871L; - /** * Property available @@ -64,7 +63,7 @@ public class AdminProductWebBean extends BaseFrameworkBean implements AdminProdu /** * Remote bean for products */ - private final ProductSessionBeanRemote productBean; + private final AdminProductSessionBeanRemote productBean; /** * Shop bean @@ -87,7 +86,7 @@ public class AdminProductWebBean extends BaseFrameworkBean implements AdminProdu InitialContext context = new InitialContext(); // Try to lookup the bean - this.productBean = (ProductSessionBeanRemote) context.lookup("ejb/stateless-product"); //NOI18N + this.productBean = (AdminProductSessionBeanRemote) context.lookup("ejb/stateless-admin-product"); //NOI18N } @Override @@ -136,7 +135,7 @@ public class AdminProductWebBean extends BaseFrameworkBean implements AdminProdu } @Override - public void setId (Long id) { + public void setId (final Long id) { this.id = id; } diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml new file mode 100644 index 00000000..708bd900 --- /dev/null +++ b/web/admin/admin_logout.xhtml @@ -0,0 +1,27 @@ + + + + + Ausloggen + + + + + + + Aus dem Adminbereich ausloggen + + + + Offenes TODO. + + + + + + + diff --git a/web/basket.xhtml b/web/basket.xhtml index 184cf2d1..ffe36a04 100644 --- a/web/basket.xhtml +++ b/web/basket.xhtml @@ -6,18 +6,61 @@ > - Warenkorb + Warenkorb anzeigen - Warenkorb + Alle im Warenkorb befindlichen Artikel: - Hier wird der Warenkorb angezeigt. + + + Artikel: + + + #{item.product.title} + + + + + Einzelpreis: + + + + + + + + + + Anzahl ändern: + + + + + + + + + + + + + Zwischensumme: + + + + + + + + diff --git a/web/index.xhtml b/web/index.xhtml index bd72baff..4c3d08db 100644 --- a/web/index.xhtml +++ b/web/index.xhtml @@ -22,51 +22,65 @@ - -
-
- Folgendes kann bestellt werden: -
+
+
+ Folgendes kann bestellt werden:
+
+ + + +
+
+ #{product.title} +
+ +
+
+ + + - - - - - - + + + + + + - - - - - - - + +
+ #{basketController.amount} +
- - - - - - +
+ +
- - - - - - +
+ +
- - - - - - - +
+ Einzelpreis: + + + +
+ +
+ Zwischensumme: + + + + +
+
+
+ + diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css index 57d90016..ed37fb5a 100644 --- a/web/resources/css/cssLayout.css +++ b/web/resources/css/cssLayout.css @@ -1,5 +1,5 @@ /** -div { +div, table { border: 1px solid #ff0000; } /**/ @@ -115,7 +115,7 @@ table, .table { ul.footer_nav { text-align: center; - width : 100%; + /*width : 95%;*/ list-style: none; margin: 0px; } -- 2.39.5