svnno****@sourc*****
svnno****@sourc*****
2007年 10月 8日 (月) 06:43:41 JST
Revision: 612
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=612
Author: shinsuke
Date: 2007-10-08 06:43:40 +0900 (Mon, 08 Oct 2007)
Log Message:
-----------
added view mode for products
Modified Paths:
--------------
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PagerDxo.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html
-------------- next part --------------
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-07 13:03:17 UTC (rev 611)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-07 21:43:40 UTC (rev 612)
@@ -91,8 +91,12 @@
public static final String THUMBNAIL_DISPLAY = "thumbnail";
- public static final String LIST_DISPLAY = "list";
+ public static final String LIST_WITH_IMAGE_DISPLAY = "listwithimage";
+ public static final String LIST_WITH_DISPLAY = "listwithimage";
+
+ public static final String LIST_WITHOUT_DISPLAY = "listwithoutimage";
+
public static final BigDecimal THUMBNAIL_IMAGE_TYPE = new BigDecimal(1);
public static final BigDecimal DETAILS_IMAGE_TYPE = new BigDecimal(2);
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PagerDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PagerDxo.java 2007-10-07 13:03:17 UTC (rev 611)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PagerDxo.java 2007-10-07 21:43:40 UTC (rev 612)
@@ -7,6 +7,7 @@
import jp.sf.pal.pompei.web.PagingResultPage;
import org.seasar.extension.dxo.annotation.ConversionRule;
+import org.seasar.extension.dxo.annotation.ExcludeNull;
public interface PagerDxo extends Serializable {
@@ -16,6 +17,7 @@
+ ",existNextPage : existNextPage")
public void convert(PagingResultBeanWrapper result, PagingResultPage page);
+ @ExcludeNull
@ConversionRule("pageSize : pageSize" + ",currentPageNumber : pageNumber")
public void convert(PagingResultPage page, DefaultPager pager);
}
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java 2007-10-07 13:03:17 UTC (rev 611)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java 2007-10-07 21:43:40 UTC (rev 612)
@@ -8,6 +8,9 @@
*/
private static final long serialVersionUID = 5634903690975646435L;
+ // displayMode is not condition for search
+ private String displayMode;
+
private BigDecimal categoryId;
/**
@@ -23,4 +26,18 @@
public void setCategoryId(BigDecimal categoryId) {
this.categoryId = categoryId;
}
+
+ /**
+ * @return displayMode
+ */
+ public String getDisplayMode() {
+ return displayMode;
+ }
+
+ /**
+ * @param displayMode 設定する displayMode
+ */
+ public void setDisplayMode(String displayMode) {
+ this.displayMode = displayMode;
+ }
}
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-10-07 13:03:17 UTC (rev 611)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-10-07 21:43:40 UTC (rev 612)
@@ -73,7 +73,24 @@
currentCategoryId);
// set page number and size
- getPagerDxo().convert(getProductListPage(), getProductPager());
+ if (getProductListPage().getPageNumber() != 0
+ && getProductListPage().getPageSize() != 0) {
+ getPagerDxo().convert(getProductListPage(), getProductPager());
+ }
+
+ // set display mode
+ if (getProductListPage().getDisplayMode() != null) {
+ getProductPager().setDisplayMode(
+ getProductListPage().getDisplayMode());
+ } else {
+ String displayMode = getProductPager().getDisplayMode();
+ if (displayMode == null) {
+ // set default
+ displayMode = PompeiConstants.THUMBNAIL_DISPLAY;
+ }
+ getProductListPage().setDisplayMode(displayMode);
+ }
+
// set categoryId to pager
getProductPager().setCategoryId(currentCategoryId);
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java 2007-10-07 13:03:17 UTC (rev 611)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java 2007-10-07 21:43:40 UTC (rev 612)
@@ -102,6 +102,26 @@
return "-";
}
+ public String getProductTitle() {
+ //TODO
+ if (getProductItems() != null
+ && getProductIndex() < getProductItems().size()) {
+ List<ProductDescription> list = (List<ProductDescription>) productItems
+ .get(productIndex).get(
+ PompeiConstants.PRODUCT_DESCRIPTION_LIST);
+ for (ProductDescription pd : list) {
+ BigDecimal languagesId = getLanguageService()
+ .getCurrentLanguage().getLanguageId();
+ if (pd.getLanguageId().equals(languagesId)) {
+ // TODO cut a long message?
+ return pd.getTitle();
+ }
+ }
+ // TODO need default lang?
+ }
+ return "-";
+ }
+
/**
* @return displayMode
*/
@@ -120,9 +140,12 @@
return PompeiConstants.THUMBNAIL_DISPLAY.equals(getDisplayMode());
}
- public boolean isListDisplay() {
- return PompeiConstants.LIST_DISPLAY.equals(getDisplayMode());
+ public boolean isListWithImageDisplay() {
+ return PompeiConstants.LIST_WITH_DISPLAY.equals(getDisplayMode());
}
+ public boolean isListWithoutImageDisplay() {
+ return PompeiConstants.LIST_WITHOUT_DISPLAY.equals(getDisplayMode());
+ }
public String getThumbnailSrc() {
if (getProductItems() != null
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html 2007-10-07 13:03:17 UTC (rev 611)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html 2007-10-07 21:43:40 UTC (rev 612)
@@ -8,42 +8,111 @@
</head>
<body>
<form id="productListForm">
-<label>表示方法: </label>
-<span id="isThumbnailDisplay">サムネイル表示</span>
-<span id="isNotThumbnailDisplay"><a id="goProductList-thumbnail" href="./productList.html?fixed_displayMode=thumbnail">サムネイル表示</a></span>
-<span id="isListDisplay">リスト表示</span>
-<span id="isNotListDisplay"><a id="goProductList-list" href="./productList.html?fixed_displayMode=list">リスト表示</a></span>
+<div style="width: 100%;">
+ <div style="display: inline;float: left;">
+ <label>表示方法: </label>
+ <lable>[</lable>
+ <span id="isThumbnailDisplay-top">ウィンドウショッピング</span>
+ <span id="isNotThumbnailDisplay-top"><a id="goProductList-thumbnail" href="./productList.html?fixed_displayMode=thumbnail">ウィンドウショッピング</a></span>
+ <lable>|</lable>
+ <span id="isListWithImageDisplay-top">写真あり一覧</span>
+ <span id="isNotListWithImageDisplay-top"><a id="goProductList-imagelist" href="./productList.html?fixed_displayMode=listwithimage">写真あり一覧</a></span>
+ <lable>|</lable>
+ <span id="isListWithoutImageDisplay-top">写真なし一覧</span>
+ <span id="isNotListWithoutImageDisplay-top"><a id="goProductList-noimagelist" href="./productList.html?fixed_displayMode=listwithoutimage">写真なし一覧</a></span>
+ <lable>]</lable>
+ </div>
+ <div style="display: inline;float: right;">
+ <div id="isExistPrePage-top" style="display: inline;">
+ <a id="goProductList-prev-top" href="productList.html?pageNumber=1&pageSize=1">前へ</a>
+ </div>
+ <div id="isExistNextPage-top" style="display: inline;">
+ <a id="goProductList-next-top" href="productList.html?pageNumber=1&pageSize=1">次へ</a>
+ </div>
+ </div>
+</div>
<br/>
<br/>
-<div style="width:100%;text-align:center;">
- <div id="productItems" style="width:100%;">
- <div style="float:left;width:240px">
- <a id="goProductDetails-image" href="productDetails.html?&productId=1"><img id="thumbnail" src="" alt="画像" border="0"/></a>
- <br/>
- <a id="goProductDetails-string" href="productDetails.html?&productId=1">
- <span id="productName">AAAAAAA</span>
- </a><br/>
- <b style="color: #990000;"><span id="price">価格</span>円</b>
- </div>
- </div>
- <br/>
- <br/>
- <div style="text-align: center;width: 100%;clear: both;">
- <div id="isExistPrePage" style="display: inline;">
- <a id="goProductList-prev" href="productList.html?pageNumber=1&pageSize=1">前へ</a>
- </div>
- <div id="pageNumberItems" style="display: inline;">
- <div id="isCurrentPage" style="display: inline;">
- <span id="pageNumber">1</span>
- </div>
- <div id="isNotCurrentPage" style="display: inline;">
- <a id="goProductList-jump" href="productList.html?pageNumber=1&pageSize=1"><span id="pageNumber">1</span></a>
- </div>
- </div>
- <div id="isExistNextPage" style="display: inline;">
- <a id="goProductList-next" href="productList.html?pageNumber=1&pageSize=1">次へ</a>
- </div>
+<div style="width:100%;text-align:center;clear: both;">
+ <div id="isThumbnailDisplay" style="width: 100%;">
+ <div id="productItems-thumbnail" style="width:100%;">
+ <div style="float:left;width:240px">
+ <a id="goProductDetails-image-thumbnail" href="productDetails.html?&productId=1"><img id="thumbnail-thumbnail" src="" alt="画像" border="0"/></a>
+ <br/>
+ <a id="goProductDetails-string-thumbnail" href="productDetails.html?&productId=1">
+ <span id="productName-thumbnail">AAAAAAA</span>
+ </a><br/>
+ <b style="color: #990000;"><span id="price-thumbnail">価格</span>円</b>
+ </div>
</div>
+ </div>
+ <div id="isListWithImageDisplay" style="width: 100%;">
+ <table style="width: 100%;">
+ <thead>
+ <tr>
+ <th width="240" align="center" style="color: black;background-color: #fff1a1;">写真</th>
+ <th align="center" style="color: black;background-color: #fff1a1;">商品名</th>
+ <th width="100" align="center" style="color: black;background-color: #fff1a1;">価格</th>
+ </tr>
+ </thead>
+ <tbody id="productItems-listwithimage">
+ <tr>
+ <td align="center">
+ <a id="goProductDetails-image-listwithimage" href="productDetails.html?&productId=1"><img id="thumbnail-listwithimage" src="" alt="画像" border="0"/></a>
+ </td>
+ <td align="left">
+ <a id="goProductDetails-string-listwithimage" href="productDetails.html?&productId=1">
+ <span id="productName-listwithimage">AAAAAAA</span><br/>
+ <span id="productTitle-listwithimage">AAAAAAA</span>
+ </a>
+ </td>
+ <td align="right"><b style="color: #990000;"><span id="price-listwithimage">価格</span>円</b></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div id="isListWithoutImageDisplay" style="width: 100%;">
+ <table style="width: 100%;">
+ <thead>
+ <tr>
+ <th align="center" style="color: black;background-color: #fff1a1;">商品名</th>
+ <th align="center" style="color: black;background-color: #fff1a1;">説明</th>
+ <th width="100" align="center" style="color: black;background-color: #fff1a1;">価格</th>
+ </tr>
+ </thead>
+ <tbody id="productItems-listwithoutimage">
+ <tr>
+ <td width="200" align="left">
+ <a id="goProductDetails-string-listwithoutimage" href="productDetails.html?&productId=1">
+ <span id="productName-listwithoutimage">AAAAAAA</span><br/>
+ </a>
+ </td>
+ <td align="left">
+ <span id="productTitle-listwithoutimage">AAAAAAA</span>
+ </td>
+ <td align="right"><b style="color: #990000;"><span id="price-listwithoutimage">価格</span>円</b></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <br/>
+ <br/>
+ <div style="text-align: center;width: 100%;clear: both;">
+ <div id="isExistPrePage-bottom" style="display: inline;">
+ <a id="goProductList-prev-bottom" href="productList.html?pageNumber=1&pageSize=1">前へ</a>
+ </div>
+ <div id="pageNumberItems-bottom" style="display: inline;">
+ <div id="isCurrentPage-bottom" style="display: inline;">
+ <span id="pageNumber-nolink">1</span>
+ </div>
+ <div id="isNotCurrentPage-bottom" style="display: inline;">
+ <a id="goProductList-jump" href="productList.html?pageNumber=1&pageSize=1"><span id="pageNumber-link">1</span></a>
+ </div>
+ </div>
+ <div id="isExistNextPage-bottom" style="display: inline;">
+ <a id="goProductList-next-bottom" href="productList.html?pageNumber=1&pageSize=1">次へ</a>
+ </div>
+ </div>
</div>
</form>
</body></html>