[jboss-cvs] jboss-seam/examples/seambay/view ...
Shane Bryzak
sbryzak at redhat.com
Tue Jul 17 03:12:38 EDT 2007
User: sbryzak2
Date: 07/07/17 03:12:38
Modified: examples/seambay/view auction.xhtml bid.xhtml
search.xhtml
Log:
support for outbids/rebids
Revision Changes Path
1.11 +6 -20 jboss-seam/examples/seambay/view/auction.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: auction.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/seambay/view/auction.xhtml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- auction.xhtml 17 Jul 2007 03:37:23 -0000 1.10
+++ auction.xhtml 17 Jul 2007 07:12:38 -0000 1.11
@@ -73,16 +73,9 @@
</s:fragment>
</label>
<div>
- <s:fragment rendered="#{auction.highBid ne null}">
- $<b><h:outputText value="#{auction.highBid.actualAmount}">
- <f:convertNumber minFractionDigits="2" maxFractionDigits="2"/>
- </h:outputText></b>
- </s:fragment>
- <s:fragment rendered="#{auction.highBid eq null}">
- $<b><h:outputText value="#{auction.price}">
+ $<b><h:outputText value="#{auction.currentPrice}">
<f:convertNumber minFractionDigits="2" maxFractionDigits="2"/>
</h:outputText></b>
- </s:fragment>
</div>
</div>
@@ -213,16 +206,9 @@
<label>Starting price:</label>
</s:fragment>
- <s:fragment rendered="#{auction.highBid ne null}">
- <span>$ </span><b><h:outputText value="#{auction.highBid.actualAmount}">
- <f:convertNumber minFractionDigits="2" maxFractionDigits="2"/>
- </h:outputText></b>
- </s:fragment>
- <s:fragment rendered="#{auction.highBid eq null}">
- <span>$ </span><b><h:outputText value="#{auction.price}">
+ <span>$ </span><b><h:outputText value="#{auction.currentPrice}">
<f:convertNumber minFractionDigits="2" maxFractionDigits="2"/>
</h:outputText></b>
- </s:fragment>
</div>
1.6 +72 -22 jboss-seam/examples/seambay/view/bid.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: bid.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/seambay/view/bid.xhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- bid.xhtml 17 Jul 2007 03:37:23 -0000 1.5
+++ bid.xhtml 17 Jul 2007 07:12:38 -0000 1.6
@@ -30,19 +30,23 @@
</tr>
</table>
- <s:div styleClass="headerTitle" rendered="#{bidAction.validBid}">
+ <s:div styleClass="headerTitle" rendered="#{bidAction.outcome == 'confirm'}">
Review and Confirm your Bid
</s:div>
- <s:div styleClass="headerTitle" rendered="#{not bidAction.validBid}">
+ <s:div styleClass="headerTitle" rendered="#{bidAction.outcome == 'invalid'}">
Place Bid
</s:div>
+ <s:div styleClass="headerTitle" rendered="#{bidAction.outcome == 'outbid'}">
+ Bid Confirmation
+ </s:div>
+
<div class="headerContent">
<b>Hello #{authenticatedAccount.name}!</b>
</div>
- <s:div rendered="#{not bidAction.validBid}" styleClass="subSection">
+ <s:div rendered="#{bidAction.outcome == 'invalid'}" styleClass="subSection">
<div class="alertImage"/>
<div class="alertContent">
<div class="error">The following must be corrected before continuing:</div>
@@ -52,6 +56,20 @@
</div>
</s:div>
+ <s:div rendered="#{bidAction.outcome == 'outbid'}" styleClass="subSection">
+ <div class="outbidImage"/>
+ <div class="alertContent">
+ <b>Your bid has been submitted</b>
+
+ <h2>You've been outbid by another bidder</h2>
+
+ <ul>
+ <li>Another bidder placed a higher maximum bid, or placed the same maximum bid before you placed yours.</li>
+ <li>You must increase your maximum bid for a chance to win this item</li>
+ </ul>
+ </div>
+ </s:div>
+
<div class="bidImage">
<s:graphicImage rendered="#{bidAction.bid.auction.image ne null}" value="#{bidAction.bid.auction.image.data}">
<s:transformImageSize width="80" maintainRatio="true"/>
@@ -60,31 +78,52 @@
<div class="bidItem">
<b>Item you're bidding on:</b><br/>
- ${bidAction.bid.auction.title}<br/>
+
+ <s:fragment rendered="#{bidAction.outcome == 'outbid'}">
+ <h:outputLink value="#{facesContext.externalContext.requestContextPath}/itemdetail/#{bidAction.bid.auction.auctionId}">
+ #{bidAction.bid.auction.title}
+ </h:outputLink><br/>
<div class="itemDetailRow">
- <s:fragment rendered="#{auction.highBid ne null}">
+ <label>Time left:</label>
+ <div>
+ #{bidAction.bid.auction.daysHoursLeft} [<h:outputText value="#{bidAction.bid.auction.endDate}">
+ <f:convertDateTime pattern="dd-MMM-yyyy H:mm:ss"/>
+ </h:outputText>]
+ </div>
+ </div>
+
+ <div class="itemDetailRow">
+ <label>History:</label>
+ <div>
+ <s:link view="/bidhistory.seam" propagation="none">
+ #{bidAction.bid.auction.bids} bids
+ <f:param name="auctionId" value="#{bidAction.bid.auction.auctionId}"/>
+ </s:link>
+ </div>
+ </div>
+ </s:fragment>
+
+ <s:fragment rendered="#{bidAction.outcome != 'outbid'}">
+ #{bidAction.bid.auction.title}<br/>
+ </s:fragment>
+
+ <div class="itemDetailRow">
+ <s:fragment rendered="#{bidAction.bid.auction.highBid ne null}">
<label>Current bid:</label>
</s:fragment>
- <s:fragment rendered="#{auction.highBid eq null}">
+ <s:fragment rendered="#{bidAction.bid.auction.highBid eq null}">
<label>Starting price:</label>
</s:fragment>
<div>
- <s:fragment rendered="#{auction.highBid ne null}">
- AU $<h:outputText value="#{bidAction.bid.auction.highBid.actualAmount}">
- <f:convertNumber minFractionDigits="2" maxFractionDigits="2"/>
- </h:outputText>
- </s:fragment>
- <s:fragment rendered="#{auction.highBid eq null}">
- AU $<h:outputText value="#{bidAction.bid.auction.price}">
+ AU $<h:outputText value="#{bidAction.bid.auction.currentPrice}">
<f:convertNumber minFractionDigits="2" maxFractionDigits="2"/>
</h:outputText>
- </s:fragment>
</div>
</div>
- <s:div styleClass="itemDetailRow" rendered="#{bidAction.validBid}">
+ <s:div styleClass="itemDetailRow" rendered="#{bidAction.outcome != 'invalid'}">
<label><b>Your maximum bid:</b></label>
<div>
<b>AU $<h:outputText value="#{bidAction.bid.maxAmount}">
@@ -93,12 +132,11 @@
</div>
</s:div>
- <h:form rendered="#{not bidAction.validBid}">
+ <h:form rendered="#{bidAction.outcome == 'invalid'}">
<div class="maximumBidRow">
<label>Your maximum bid:</label>
<div>
- <b>$ </b>
- <h:inputText id="bidAmount" value="#{bidAmount}"/>
+ <b>$ </b><h:inputText id="bidAmount" value="#{bidAmount}"/>
<span> (Enter $<h:outputText value="#{bidAction.bid.auction.requiredBid}">
<f:convertNumber minFractionDigits="2" maxFractionDigits="2"/>
</h:outputText> <b>or more</b>)</span>
@@ -112,8 +150,20 @@
</div>
- <h:form rendered="#{bidAction.validBid}">
+ <h:form rendered="#{bidAction.outcome == 'outbid'}">
+ <div class="increaseBid" >
+ <label>Increase your maximum bid:</label>
+ <div>
+ <b>$ </b><h:inputText id="bidAmount" value="#{bidAmount}"/>
+ <span> (Enter $<h:outputText value="#{bidAction.bid.auction.requiredBid}">
+ <f:convertNumber minFractionDigits="2" maxFractionDigits="2"/>
+ </h:outputText> <b>or more</b>)</span>
+ </div>
+ </div>
+ <h:commandButton styleClass="bidAgain" action="#{bidAction.updateBid}" value="Bid Again >"/>
+ </h:form>
+ <h:form rendered="#{bidAction.outcome == 'confirm'}">
<div class="confirmBid">
<b>By clicking on the button below, you agree to buy this item if you're the
winning bidder.</b><br/>
1.11 +1 -1 jboss-seam/examples/seambay/view/search.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: search.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/seambay/view/search.xhtml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- search.xhtml 17 Jul 2007 03:37:23 -0000 1.10
+++ search.xhtml 17 Jul 2007 07:12:38 -0000 1.11
@@ -82,7 +82,7 @@
</h:column>
<h:column>
<f:facet name="header">Price</f:facet>
- $<h:outputText value="#{auction.price}">
+ $<h:outputText value="#{auction.currentPrice}">
<f:convertNumber minFractionDigits="2" maxFractionDigits="2"/>
</h:outputText>
</h:column>
More information about the jboss-cvs-commits
mailing list