[pal-cvs 2838] [583] added admin page for editing customers.

svnno****@sourc***** svnno****@sourc*****
2007年 9月 25日 (火) 18:12:35 JST


Revision: 583
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=583
Author:   shinsuke
Date:     2007-09-25 18:12:34 +0900 (Tue, 25 Sep 2007)

Log Message:
-----------
added admin page for editing customers. 

Modified Paths:
--------------
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/CustomerService.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListPage.java
    pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/customer/label.properties
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerConfirm.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerEdit.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerList.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/index.html

Added Paths:
-----------
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/AbstractCustomerEditPage.java


-------------- next part --------------
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java	2007-09-25 07:09:39 UTC (rev 582)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java	2007-09-25 09:12:34 UTC (rev 583)
@@ -6,8 +6,8 @@
 
 import jp.sf.pal.pompei.exentity.AddressBook;
 import jp.sf.pal.pompei.exentity.Customer;
+import jp.sf.pal.pompei.web.admin.customer.AbstractCustomerEditPage;
 import jp.sf.pal.pompei.web.admin.customer.CustomerConfirmPage;
-import jp.sf.pal.pompei.web.admin.customer.CustomerEditPage;
 import jp.sf.pal.pompei.web.user.checkout.CheckoutConfirmPage;
 import jp.sf.pal.pompei.web.user.checkout.UserAddressSelectPage;
 import jp.sf.pal.pompei.web.user.checkout.UserInfoEditPage;
@@ -16,31 +16,38 @@
 
 public interface CustomerDxo extends Serializable {
 
-    Customer convert(CustomerEditPage memberEditPage);
+    Customer convert(AbstractCustomerEditPage memberEditPage);
 
-    AddressBook convertAddress(CustomerEditPage memberEditPage);
+    AddressBook convertAddress(AbstractCustomerEditPage memberEditPage);
 
     Customer convert(CustomerConfirmPage memberConfirmPage);
 
     AddressBook convertAddress(CustomerConfirmPage memberConfirmPage);
 
     //TODO
-    @ConversionRule("customerId : customerId"
-            + ",lastName : lLastname"
+    @ConversionRule("customerId : customerId" + ",lastName : lLastname"
             + ",firstName : customerFirstname"
             + ",entryCity : addressBook.entryCity"
             + ",entryState : addressBook.entryState"
             + ",entryCompany : addressBook.entryCompany")
     List<Map<String, Object>> convertMap(List memberItems);
 
-    void convert(Customer customer, CustomerEditPage memberEditPage);
+    //TODO above methods might not be needed..
 
-    void convert(CustomerConfirmPage memberConfirmPage, Customer customer);
+    public void convert(AbstractCustomerEditPage memberConfirmPage,
+            AddressBook book);
 
-    void convert(CustomerConfirmPage memberConfirmPage, AddressBook book);
+    public void convert(AbstractCustomerEditPage customerEditPage,
+            Customer customer);
 
-    //TODO above methods might not be needed..
+    public void convert(Customer customer,
+            AbstractCustomerEditPage customerEditPage);
 
+    public void convert(AddressBook addressBook,
+            AbstractCustomerEditPage customerEditPage);
+
+    public List<Map<String, Object>> convert(List<Customer> list);
+
     public void convert(Customer customer, UserInfoEditPage page);
 
     public void convert(AddressBook addressBook, UserInfoEditPage page);

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/CustomerService.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/CustomerService.java	2007-09-25 07:09:39 UTC (rev 582)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/CustomerService.java	2007-09-25 09:12:34 UTC (rev 583)
@@ -33,5 +33,5 @@
 
     public Customer getCustomerByPortalId(String portalId);
 
-    public void updateCustomer(Customer customers);
+    public void updateCustomer(Customer customer, AddressBook addressBook);
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java	2007-09-25 07:09:39 UTC (rev 582)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java	2007-09-25 09:12:34 UTC (rev 583)
@@ -40,8 +40,12 @@
         addressBookBhv.insert(addressBook);
     }
 
-    public void updateCustomer(Customer customers, AddressBook addressBook) {
+    public void updateCustomer(Customer customer, AddressBook addressBook) {
+        getCustomerBhv().update(customer);
 
+        if (addressBook != null) {
+            getAddressBookBhv().update(addressBook);
+        }
     }
 
     public AddressBookBhv getAddressBookBhv() {
@@ -75,17 +79,15 @@
     }
 
     public List<Customer> getCustomerList() {
-        CustomerCB customersCB = new CustomerCB();
-        //        customersCB.setupSelect_AddressBook();
-        List<Customer> customersList = customerBhv.selectList(customersCB);
+        CustomerCB cb = new CustomerCB();
+        List<Customer> customersList = customerBhv.selectList(cb);
         return customersList;
     }
 
     public Customer getCustomer(BigDecimal customersId) {
-        CustomerCB customersCB = new CustomerCB();
-        //        customersCB.setupSelect_CustomerInfoAsOne()
-        customersCB.query().setCustomerId_Equal(customersId);
-        Customer customers = customerBhv.selectEntity(customersCB);
+        CustomerCB cb = new CustomerCB();
+        cb.query().setCustomerId_Equal(customersId);
+        Customer customers = customerBhv.selectEntity(cb);
         return customers;
     }
 
@@ -97,14 +99,14 @@
         return customers;
     }
 
-    public void deleteCustomer(BigDecimal customersId) {
-        Customer customers = getCustomer(customersId);
+    public void deleteCustomer(BigDecimal customerId) {
+        Customer customer = getCustomer(customerId);
 
         AddressBookCB addressBookCB = new AddressBookCB();
-        addressBookCB.query().setCustomerId_Equal(customers.getCustomerId());
+        addressBookCB.query().setCustomerId_Equal(customer.getCustomerId());
         addressBookBhv.deleteList(addressBookBhv.selectList(addressBookCB));
 
-        customerBhv.delete(customers);
+        customerBhv.delete(customer);
     }
 
     public AddressBook getAddressBook(BigDecimal addressBookId) {

Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/AbstractCustomerEditPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/AbstractCustomerEditPage.java	2007-09-25 07:09:39 UTC (rev 582)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/AbstractCustomerEditPage.java	2007-09-25 09:12:34 UTC (rev 583)
@@ -0,0 +1,201 @@
+package jp.sf.pal.pompei.web.admin.customer;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.seasar.teeda.extension.util.LabelHelper;
+
+public abstract class AbstractCustomerEditPage implements Serializable {
+
+    private BigDecimal addressBookId;
+
+    private String cellphone;
+
+    private String city;
+
+    private String company;
+
+    private BigDecimal customerId;
+
+    private Date dayOfBirth;
+
+    private String department;
+
+    private String emailAddress;
+
+    private String fax;
+
+    private String firstname;
+
+    private String gender;
+
+    private String lastname;
+
+    private String mode;
+
+    private String postcode;
+
+    private String state;
+
+    private String streetAddress;
+
+    private String telephone;
+
+    private LabelHelper labelHelper;
+
+    public AbstractCustomerEditPage() {
+        super();
+    }
+
+    public BigDecimal getAddressBookId() {
+        return addressBookId;
+    }
+
+    public void setAddressBookId(BigDecimal addressBookId) {
+        this.addressBookId = addressBookId;
+    }
+
+    public String getCellphone() {
+        return cellphone;
+    }
+
+    public void setCellphone(String cellphone) {
+        this.cellphone = cellphone;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public BigDecimal getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(BigDecimal customerId) {
+        this.customerId = customerId;
+    }
+
+    public Date getDayOfBirth() {
+        return dayOfBirth;
+    }
+
+    public void setDayOfBirth(Date dayOfBirth) {
+        this.dayOfBirth = dayOfBirth;
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    public String getEmailAddress() {
+        return emailAddress;
+    }
+
+    public void setEmailAddress(String emailAddress) {
+        this.emailAddress = emailAddress;
+    }
+
+    public String getFax() {
+        return fax;
+    }
+
+    public void setFax(String fax) {
+        this.fax = fax;
+    }
+
+    public String getFirstname() {
+        return firstname;
+    }
+
+    public void setFirstname(String firstname) {
+        this.firstname = firstname;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public String getLastname() {
+        return lastname;
+    }
+
+    public void setLastname(String lastname) {
+        this.lastname = lastname;
+    }
+
+    public String getMode() {
+        return mode;
+    }
+
+    public void setMode(String mode) {
+        this.mode = mode;
+    }
+
+    public String getPostcode() {
+        return postcode;
+    }
+
+    public void setPostcode(String postcode) {
+        this.postcode = postcode;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getStreetAddress() {
+        return streetAddress;
+    }
+
+    public void setStreetAddress(String streetAddress) {
+        this.streetAddress = streetAddress;
+    }
+
+    public String getTelephone() {
+        return telephone;
+    }
+
+    public void setTelephone(String telephone) {
+        this.telephone = telephone;
+    }
+
+    /**
+     * @return labelHelper
+     */
+    public LabelHelper getLabelHelper() {
+        return labelHelper;
+    }
+
+    /**
+     * @param labelHelper 設定する labelHelper
+     */
+    public void setLabelHelper(LabelHelper labelHelper) {
+        this.labelHelper = labelHelper;
+    }
+
+}
\ No newline at end of file


Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/AbstractCustomerEditPage.java
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmAction.java	2007-09-25 07:09:39 UTC (rev 582)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmAction.java	2007-09-25 09:12:34 UTC (rev 583)
@@ -1,107 +1,148 @@
-package jp.sf.pal.pompei.web.admin.customer;
-
-import java.io.Serializable;
-
-import jp.sf.pal.pompei.PompeiConstants;
-import jp.sf.pal.pompei.dxo.CustomerDxo;
-import jp.sf.pal.pompei.service.CustomerService;
-
-public class CustomerConfirmAction implements Serializable {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = -1188349655650999839L;
-
-    /**
-     *
-     */
-    private CustomerConfirmPage memberConfirmPage;
-
-    private CustomerDxo memberDxo;
-
-    private CustomerService memberService;
-
-    public Class doUpdate() {
-        if (isInsert()) {
-            //            Customers customers = memberDxo.convert(memberConfirmPage);
-            //            customers.setGender(memberConfirmPage.getGender());
-            //            customers.setDayOfBirth(DateUtil.getTimeStamp(memberConfirmPage
-            //                    .getCustomersDob()));
-            //            AddressBooks book = memberDxo.convertAddress(memberConfirmPage);
-            //
-            //            book.setState(PageUtil.getLabelOfValue(memberConfirmPage
-            //                    .getEntryZoneIdItems(), memberConfirmPage.getEntryZoneId()
-            //                    .toString()));
-            //            book.setGender(customers.getGender());
-            //            book.setFirstname(customers.getFirstname());
-            //            book.setLastname(customers.getLastname());
-            //            book.setCustomers(customers);
-            //            memberService.addCustomers(book);
-        } else if (isUpdate()) {
-            //            Customers customers = memberService.getCustomer(memberConfirmPage
-            //                    .getCustomersId());
-            //            AddressBook book = customers.getAddressBook();
-            //
-            //            memberDxo.convert(memberConfirmPage, customers);
-            //            memberDxo.convert(memberConfirmPage, book);
-            //
-            //            customers.setCustomersDob(DateUtil.getTimeStamp(memberConfirmPage
-            //                    .getCustomersDob()));
-            //
-            //            book.setEntryState(PageUtil.getLabelOfValue(memberConfirmPage
-            //                    .getEntryZoneIdItems(), memberConfirmPage.getEntryZoneId()
-            //                    .toString()));
-            //            book.setEntryGender(customers.getCustomersGender());
-            //            book.setEntryFirstname(customers.getCustomersFirstname());
-            //            book.setEntryLastname(customers.getCustomersLastname());
-            //
-            //            memberService.updateCustomer(customers);
-
-        } else {
-            return null;
-        }
-        return CustomerListPage.class;
-    }
-
-    private boolean isUpdate() {
-        String mode = memberConfirmPage.getMode();
-        return mode != null && mode.equals(PompeiConstants.UPDATE_MODE);
-    }
-
-    private boolean isInsert() {
-        String mode = memberConfirmPage.getMode();
-        return mode != null && mode.equals(PompeiConstants.INSERT_MODE);
-    }
-
-    /**
-     * @return memberConfirmPage
-     */
-    public CustomerConfirmPage getCustomerConfirmPage() {
-        return memberConfirmPage;
-    }
-
-    /**
-     * @param memberConfirmPage 設定する memberConfirmPage
-     */
-    public void setCustomerConfirmPage(CustomerConfirmPage memberConfirmPage) {
-        this.memberConfirmPage = memberConfirmPage;
-    }
-
-    public CustomerDxo getCustomerDxo() {
-        return memberDxo;
-    }
-
-    public void setCustomerDxo(CustomerDxo memberDxo) {
-        this.memberDxo = memberDxo;
-    }
-
-    public CustomerService getCustomerService() {
-        return memberService;
-    }
-
-    public void setCustomerService(CustomerService memberService) {
-        this.memberService = memberService;
-    }
-
-}
+package jp.sf.pal.pompei.web.admin.customer;
+
+import java.io.Serializable;
+
+import jp.sf.pal.pompei.PompeiConstants;
+import jp.sf.pal.pompei.dxo.CustomerDxo;
+import jp.sf.pal.pompei.exentity.AddressBook;
+import jp.sf.pal.pompei.exentity.Customer;
+import jp.sf.pal.pompei.service.CustomerService;
+
+public class CustomerConfirmAction implements Serializable {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -2150284828406095184L;
+
+    /**
+     * 
+     */
+    private CustomerConfirmPage customerConfirmPage;
+
+    private CustomerService customerService;
+
+    private CustomerDxo customerDxo;
+
+    public Class<?> initialize() {
+        return null;
+    }
+
+    public Class<?> prerender() {
+        if (getCustomerConfirmPage().getCustomerId() != null
+                && (isUpdate() || isDelete())) {
+            if (isDelete()) {
+                // address book
+                AddressBook addressBook = getCustomerService()
+                        .getDefaultAddressBook(
+                                getCustomerConfirmPage().getCustomerId());
+                getCustomerDxo().convert(addressBook, getCustomerConfirmPage());
+
+                // customer
+                Customer customer = getCustomerService().getCustomer(
+                        getCustomerConfirmPage().getCustomerId());
+                getCustomerDxo().convert(customer, getCustomerConfirmPage());
+            }
+        } else {
+            // TODO put message
+            return CustomerListPage.class;
+        }
+        return null;
+    }
+
+    public Class<?> doFinish() {
+        if (isUpdate()) {
+            if (getCustomerConfirmPage().getCustomerId() == null) {
+                //TODO put message
+                return CustomerListPage.class;
+            }
+            Customer customer = getCustomerService().getCustomer(
+                    getCustomerConfirmPage().getCustomerId());
+            if (customer == null) {
+                //TODO put message
+                return CustomerListPage.class;
+            }
+
+            getCustomerDxo().convert(getCustomerConfirmPage(), customer);
+
+            AddressBook addressBook = null;
+            if (getCustomerConfirmPage().getAddressBookId() != null) {
+                addressBook = getCustomerService().getAddressBook(
+                        getCustomerConfirmPage().getAddressBookId());
+                getCustomerDxo().convert(getCustomerConfirmPage(), addressBook);
+            }
+
+            getCustomerService().updateCustomer(customer, addressBook);
+
+            //TODO put message success
+            return CustomerListPage.class;
+        } else if (isDelete()) {
+            if (getCustomerConfirmPage().getCustomerId() == null) {
+                //TODO put message
+                return CustomerListPage.class;
+            }
+
+            getCustomerService().deleteCustomer(
+                    getCustomerConfirmPage().getCustomerId());
+
+            //TODO put message success
+            return CustomerListPage.class;
+        } else {
+            //TODO put message
+            return null;
+        }
+    }
+
+    private boolean isUpdate() {
+        return PompeiConstants.UPDATE_MODE.equals(getCustomerConfirmPage()
+                .getMode());
+    }
+
+    private boolean isDelete() {
+        return PompeiConstants.DELETE_MODE.equals(getCustomerConfirmPage()
+                .getMode());
+    }
+
+    /**
+     * @return customerConfirmPage
+     */
+    public CustomerConfirmPage getCustomerConfirmPage() {
+        return customerConfirmPage;
+    }
+
+    /**
+     * @param customerConfirmPage 設定する customerConfirmPage
+     */
+    public void setCustomerConfirmPage(CustomerConfirmPage customerConfirmPage) {
+        this.customerConfirmPage = customerConfirmPage;
+    }
+
+    /**
+     * @return customerService
+     */
+    public CustomerService getCustomerService() {
+        return customerService;
+    }
+
+    /**
+     * @param customerService 設定する customerService
+     */
+    public void setCustomerService(CustomerService customerService) {
+        this.customerService = customerService;
+    }
+
+    /**
+     * @return customerDxo
+     */
+    public CustomerDxo getCustomerDxo() {
+        return customerDxo;
+    }
+
+    /**
+     * @param customerDxo 設定する customerDxo
+     */
+    public void setCustomerDxo(CustomerDxo customerDxo) {
+        this.customerDxo = customerDxo;
+    }
+
+}

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmPage.java	2007-09-25 07:09:39 UTC (rev 582)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmPage.java	2007-09-25 09:12:34 UTC (rev 583)
@@ -1,304 +1,13 @@
-package jp.sf.pal.pompei.web.admin.customer;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-import jp.sf.pal.pompei.web.util.PageUtil;
-
-import org.seasar.teeda.extension.annotation.scope.SubapplicationScope;
-
-public class CustomerConfirmPage implements Serializable {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = -2946943974630142860L;
-
-    private BigDecimal customersId;
-
-    @SubapplicationScope
-    private String mode;
-
-    @SubapplicationScope
-    private String customersFirstname;
-
-    @SubapplicationScope
-    private String customersLastname;
-
-    @SubapplicationScope
-    private String customersPassword;
-
-    @SubapplicationScope
-    private String entryPostcode1;
-
-    @SubapplicationScope
-    private String entryPostcode2;
-
-    @SubapplicationScope
-    private String customersDob;
-
-    @SubapplicationScope
-    private String customersEmailAddress;
-
-    @SubapplicationScope
-    private String customersFax;
-
-    @SubapplicationScope
-    private String customersTelephone;
-
-    @SubapplicationScope
-    private String entryCity;
-
-    @SubapplicationScope
-    private String entryCompany;
-
-    @SubapplicationScope
-    private String entryPostcode;
-
-    @SubapplicationScope
-    private String entryStreetAddress;
-
-    @SubapplicationScope
-    private String entrySuburb;
-
-    @SubapplicationScope
-    private String entryZoneName;
-
-    @SubapplicationScope
-    private BigDecimal entryZoneId;
-
-    @SubapplicationScope
-    private List entryZoneIdItems;
-
-    @SubapplicationScope
-    private String genderLabel;
-
-    @SubapplicationScope
-    private String newsLetterLabel;
-
-    @SubapplicationScope
-    private String title;
-
-    private String usersName;
-
-    @SubapplicationScope
-    private String gender;
-
-    @SubapplicationScope
-    private List<Map> genderItems;
-
-    public String getCustomersDob() {
-        return customersDob;
-    }
-
-    public void setCustomersDob(String customersDob) {
-        this.customersDob = customersDob;
-    }
-
-    public String getCustomersEmailAddress() {
-        return customersEmailAddress;
-    }
-
-    public void setCustomersEmailAddress(String customersEmailAddress) {
-        this.customersEmailAddress = customersEmailAddress;
-    }
-
-    public String getCustomersFax() {
-        return customersFax;
-    }
-
-    public void setCustomersFax(String customersFax) {
-        this.customersFax = customersFax;
-    }
-
-    public String getCustomersTelephone() {
-        return customersTelephone;
-    }
-
-    public void setCustomersTelephone(String customersTelephone) {
-        this.customersTelephone = customersTelephone;
-    }
-
-    public String getEntryCity() {
-        return entryCity;
-    }
-
-    public void setEntryCity(String entryCity) {
-        this.entryCity = entryCity;
-    }
-
-    public String getEntryCompany() {
-        return entryCompany;
-    }
-
-    public void setEntryCompany(String entryCompany) {
-        this.entryCompany = entryCompany;
-    }
-
-    public String getEntryPostcode() {
-        return entryPostcode1 + "-" + entryPostcode2;
-        //		return entryPostcode;
-    }
-
-    public void setEntryPostcode(String entryPostcode) {
-        this.entryPostcode = entryPostcode;
-    }
-
-    public String getEntryStreetAddress() {
-        return entryStreetAddress;
-    }
-
-    public void setEntryStreetAddress(String entryStreetAddress) {
-        this.entryStreetAddress = entryStreetAddress;
-    }
-
-    public String getEntrySuburb() {
-        return entrySuburb;
-    }
-
-    public void setEntrySuburb(String entrySuburb) {
-        this.entrySuburb = entrySuburb;
-    }
-
-    public String getEntryZoneName() {
-        return PageUtil.getLabelOfValue(entryZoneIdItems, entryZoneId
-                .toString());
-        //		return entryZoneName;
-    }
-
-    public void setEntryZoneName(String entryZoneName) {
-        this.entryZoneName = entryZoneName;
-    }
-
-    public String getGenderLabel() {
-        return PageUtil.getLabelOfValue(genderItems, gender);
-        //return genderLabel;
-    }
-
-    public void setGenderLabel(String genderLabel) {
-        this.genderLabel = genderLabel;
-    }
-
-    public String getNewsLetterLabel() {
-        return this.newsLetterLabel;
-    }
-
-    public void setNewsLetterLabel(String newsLetterLabel) {
-        this.newsLetterLabel = newsLetterLabel;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getUsersName() {
-        return this.customersFirstname + " " + this.customersLastname;
-    }
-
-    public void setUsersName(String usersName) {
-        this.usersName = usersName;
-    }
-
-    public Class initialize() {
-        return null;
-    }
-
-    public Class prerender() {
-        return null;
-    }
-
-    public String getCustomersFirstname() {
-        return customersFirstname;
-    }
-
-    public void setCustomersFirstname(String customersFirstname) {
-        this.customersFirstname = customersFirstname;
-    }
-
-    public String getCustomersLastname() {
-        return customersLastname;
-    }
-
-    public void setCustomersLastname(String customersLastname) {
-        this.customersLastname = customersLastname;
-    }
-
-    public String getCustomersPassword() {
-        return customersPassword;
-    }
-
-    public void setCustomersPassword(String customersPassword) {
-        this.customersPassword = customersPassword;
-    }
-
-    public String getEntryPostcode1() {
-        return entryPostcode1;
-    }
-
-    public void setEntryPostcode1(String entryPostcode1) {
-        this.entryPostcode1 = entryPostcode1;
-    }
-
-    public String getEntryPostcode2() {
-        return entryPostcode2;
-    }
-
-    public void setEntryPostcode2(String entryPostcode2) {
-        this.entryPostcode2 = entryPostcode2;
-    }
-
-    public List<Map> getGenderItems() {
-        return genderItems;
-    }
-
-    public void setGenderItems(List<Map> genderItems) {
-        this.genderItems = genderItems;
-    }
-
-    public String getGender() {
-        return gender;
-    }
-
-    public void setGender(String gender) {
-        this.gender = gender;
-    }
-
-    public BigDecimal getEntryZoneId() {
-        return entryZoneId;
-    }
-
-    public void setEntryZoneId(BigDecimal entryZoneId) {
-        this.entryZoneId = entryZoneId;
-    }
-
-    public List getEntryZoneIdItems() {
-        return entryZoneIdItems;
-    }
-
-    public void setEntryZoneIdItems(List entryZoneIdItems) {
-        this.entryZoneIdItems = entryZoneIdItems;
-    }
-
-    public String getMode() {
-        return mode;
-    }
-
-    public void setMode(String mode) {
-        this.mode = mode;
-    }
-
-    public BigDecimal getCustomersId() {
-        return customersId;
-    }
-
-    public void setCustomersId(BigDecimal customersId) {
-        this.customersId = customersId;
-    }
-
-}
+package jp.sf.pal.pompei.web.admin.customer;
+
+
+public class CustomerConfirmPage extends AbstractCustomerEditPage {
+
+    public String getGenderStr() {
+        if (getLabelHelper() != null && getGender() != null) {
+            return getLabelHelper().getLabelValue(getGender());
+        }
+        return "";
+    }
+
+}

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditAction.java	2007-09-25 07:09:39 UTC (rev 582)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditAction.java	2007-09-25 09:12:34 UTC (rev 583)
@@ -1,154 +1,101 @@
-package jp.sf.pal.pompei.web.admin.customer;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import jp.sf.pal.pompei.PompeiConstants;
-import jp.sf.pal.pompei.dxo.CustomerDxo;
-import jp.sf.pal.pompei.exentity.Customer;
-import jp.sf.pal.pompei.service.CustomerService;
-
-public class CustomerEditAction implements Serializable {
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 111723657530085205L;
-
-    /**
-     *
-     */
-    private CustomerEditPage memberEditPage;
-
-    /**
-     *
-     */
-    private CustomerService memberService;
-
-    private CustomerDxo memberDxo;
-
-    public Class initialize() {
-        List genderItems = createGenderItems();
-        memberEditPage.setGenderItems(genderItems);
-
-        List zoneItems = createZoneItems();
-        memberEditPage.setEntryZoneIdItems(zoneItems);
-
-        return null;
-    }
-
-    private List<Map> createZoneItems() {
-        List<Map> list = new ArrayList<Map>();
-        list.add(setValue("北海道", "1"));
-        list.add(setValue("青森", "2"));
-        list.add(setValue("秋田", "3"));
-        list.add(setValue("宮城", "4"));
-        list.add(setValue("山形", "5"));
-        list.add(setValue("福島", "6"));
-        list.add(setValue("茨城", "7"));
-        list.add(setValue("群馬", "8"));
-        list.add(setValue("栃木", "9"));
-        list.add(setValue("東京", "10"));
-        list.add(setValue("神奈川", "11"));
-        return list;
-    }
-
-    public Class prerender() {
-        if (isUpdate()) {
-            Customer customers = memberService.getCustomer(memberEditPage
-                    .getCustomersId());
-            memberDxo.convert(customers, memberEditPage);
-
-            String s = memberEditPage.getEntryPostcode1();
-
-        } else {
-            memberEditPage.setMode(PompeiConstants.INSERT_MODE);
-            setDefaultValue();
-        }
-        return null;
-    }
-
-    private Map setValue(String lavel, String value) {
-        Map map = new HashMap();
-        map.put("label", lavel);
-        map.put("value", value);
-        return map;
-    }
-
-    private List createGenderItems() {
-        List list = new ArrayList();
-        Map map = new HashMap();
-        map.put("label", "男");
-        map.put("value", "1");
-        list.add(map);
-        map = new HashMap();
-        map.put("label", "女");
-        map.put("value", "2");
-        list.add(map);
-        return list;
-    }
-
-    private void setDefaultValue() {
-        memberEditPage.setCustomersLastname("佐藤");
-        memberEditPage.setCustomersFirstname("浩一");
-        memberEditPage.setCustomersDob("20070101");
-        memberEditPage.setCustomersEmailAddress("aaa****@aaa*****");
-        memberEditPage.setCustomersTelephone("999-9999-9999");
-        memberEditPage.setEntryCity("豊島区");
-        memberEditPage.setEntryPostcode1("999");
-        memberEditPage.setEntryPostcode2("9999");
-        memberEditPage.setEntryStreetAddress("1-1-1");
-        memberEditPage.setEntryZoneId(new BigDecimal("1"));
-
-    }
-
-    private boolean isUpdate() {
-        String mode = memberEditPage.getMode();
-        return mode != null && mode.equals(PompeiConstants.UPDATE_MODE);
-    }
-
-    private boolean isInsert() {
-        String mode = memberEditPage.getMode();
-        return mode != null && mode.equals(PompeiConstants.INSERT_MODE);
-    }
-
-    /**
-     * @return memberEditPage
-     */
-    public CustomerEditPage getCustomerEditPage() {
-        return memberEditPage;
-    }
-
-    /**
-     * @param memberEditPage 設定する memberEditPage
-     */
-    public void setCustomerEditPage(CustomerEditPage memberEditPage) {
-        this.memberEditPage = memberEditPage;
-    }
-
-    /**
-     * @return memberService
-     */
-    public CustomerService getCustomerService() {
-        return memberService;
-    }
-
-    /**
-     * @param memberService 設定する memberService
-     */
-    public void setCustomerService(CustomerService memberService) {
-        this.memberService = memberService;
-    }
-
-    public CustomerDxo getCustomerDxo() {
-        return memberDxo;
-    }
-
-    public void setCustomerDxo(CustomerDxo memberDxo) {
-        this.memberDxo = memberDxo;
-    }
-
-}
+package jp.sf.pal.pompei.web.admin.customer;
+
+import java.io.Serializable;
+
+import jp.sf.pal.pompei.PompeiConstants;
+import jp.sf.pal.pompei.dxo.CustomerDxo;
+import jp.sf.pal.pompei.exentity.AddressBook;
+import jp.sf.pal.pompei.exentity.Customer;
+import jp.sf.pal.pompei.service.CustomerService;
+
+public class CustomerEditAction implements Serializable {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1427442393860756060L;
+
+    /**
+     * 
+     */
+    private CustomerEditPage customerEditPage;
+
+    private CustomerService customerService;
+
+    private CustomerDxo customerDxo;
+
+    public Class<?> initialize() {
+        return null;
+    }
+
+    public Class<?> prerender() {
+        if (getCustomerEditPage().getCustomerId() == null || !isUpdate()) {
+            // TODO put message
+            return CustomerListPage.class;
+        }
+
+        // address book
+        AddressBook addressBook = getCustomerService().getDefaultAddressBook(
+                getCustomerEditPage().getCustomerId());
+        getCustomerDxo().convert(addressBook, getCustomerEditPage());
+
+        // customer
+        Customer customer = getCustomerService().getCustomer(
+                getCustomerEditPage().getCustomerId());
+        getCustomerDxo().convert(customer, getCustomerEditPage());
+
+        return null;
+    }
+
+    public Class<?> doConfirm() {
+        return CustomerConfirmPage.class;
+    }
+
+    private boolean isUpdate() {
+        return PompeiConstants.UPDATE_MODE.equals(getCustomerEditPage()
+                .getMode());
+    }
+
+    /**
+     * @return customerService
+     */
+    public CustomerService getCustomerService() {
+        return customerService;
+    }
+
+    /**
+     * @param customerService 設定する customerService
+     */
+    public void setCustomerService(CustomerService customerService) {
+        this.customerService = customerService;
+    }
+
+    /**
+     * @return customerDxo
+     */
+    public CustomerDxo getCustomerDxo() {
+        return customerDxo;
+    }
+
+    /**
+     * @param customerDxo 設定する customerDxo
+     */
+    public void setCustomerDxo(CustomerDxo customerDxo) {
+        this.customerDxo = customerDxo;
+    }
+
+    /**
+     * @return customerEditPage
+     */
+    public CustomerEditPage getCustomerEditPage() {
+        return customerEditPage;
+    }
+
+    /**
+     * @param customerEditPage 設定する customerEditPage
+     */
+    public void setCustomerEditPage(CustomerEditPage customerEditPage) {
+        this.customerEditPage = customerEditPage;
+    }
+
+}

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditPage.java	2007-09-25 07:09:39 UTC (rev 582)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditPage.java	2007-09-25 09:12:34 UTC (rev 583)
@@ -1,276 +1,10 @@
-package jp.sf.pal.pompei.web.admin.customer;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-import org.seasar.teeda.extension.annotation.scope.SubapplicationScope;
-
-public class CustomerEditPage implements Serializable {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 7616443380048617561L;
-
-    public static final String customersEmailAddress_TRequiredValidator = null;
-
-    public static final String customersFirstname_TRequiredValidator = null;
-
-    public static final String customersLastname_TRequiredValidator = null;
-
-    public static final String customersDob_TRequiredValidator = null;
-
-    public static final String customersPassword_TRequiredValidator = null;
-
-    public static final String customersTelephone_TRequiredValidator = null;
-
-    public static final String entryCity_TRequiredValidator = null;
-
-    public static final String entryPostcode1_TRequiredValidator = null;
-
-    public static final String entryPostcode2_TRequiredValidator = null;
-
-    public static final String entryStreetAddress_TRequiredValidator = null;
-
-    public static final String entryZoneId_TRequiredValidator = null;
-
-    public static final String gender_TRequiredValidator = null;
-
-    @SubapplicationScope
-    private BigDecimal customersId;
-
-    @SubapplicationScope
-    private String customersDob;
-
-    @SubapplicationScope
-    private String customersEmailAddress;
-
-    @SubapplicationScope
-    private String customersFax;
-
-    @SubapplicationScope
-    private String customersFirstname;
-
-    @SubapplicationScope
-    private String customersLastname;
-
-    @SubapplicationScope
-    private String customersPassword;
-
-    @SubapplicationScope
-    private String customersTelephone;
-
-    @SubapplicationScope
-    private String entryCity;
-
-    @SubapplicationScope
-    private String entryCompany;
-
-    @SubapplicationScope
-    private String entryPostcode;
-
-    @SubapplicationScope
-    private String entryPostcode1;
-
-    @SubapplicationScope
-    private String entryPostcode2;
-
-    @SubapplicationScope
-    private String entryStreetAddress;
-
-    @SubapplicationScope
-    private String entrySuburb;
-
-    @SubapplicationScope
-    private BigDecimal entryZoneId;
-
-    @SubapplicationScope
-    private List entryZoneIdItems;
-
-    @SubapplicationScope
-    private String gender;
-
-    @SubapplicationScope
-    private List<Map> genderItems;
-
-    private String title;
-
-    private String mode;
-
-    public String getCustomersDob() {
-        return customersDob;
-    }
-
-    public void setCustomersDob(String customersDob) {
-        this.customersDob = customersDob;
-    }
-
-    public String getCustomersEmailAddress() {
-        return customersEmailAddress;
-    }
-
-    public void setCustomersEmailAddress(String customersEmailAddress) {
-        this.customersEmailAddress = customersEmailAddress;
-    }
-
-    public String getCustomersFax() {
-        return customersFax;
-    }
-
-    public void setCustomersFax(String customersFax) {
-        this.customersFax = customersFax;
-    }
-
-    public String getCustomersFirstname() {
-        return customersFirstname;
-    }
-
-    public void setCustomersFirstname(String customersFirstname) {
-        this.customersFirstname = customersFirstname;
-    }
-
-    public String getCustomersLastname() {
-        return customersLastname;
-    }
-
-    public void setCustomersLastname(String customersLastname) {
-        this.customersLastname = customersLastname;
-    }
-
-    public String getCustomersPassword() {
-        return customersPassword;
-    }
-
-    public void setCustomersPassword(String customersPassword) {
-        this.customersPassword = customersPassword;
-    }
-
-    public String getCustomersTelephone() {
-        return customersTelephone;
-    }
-
-    public void setCustomersTelephone(String customersTelephone) {
-        this.customersTelephone = customersTelephone;
-    }
-
-    public String getEntryCity() {
-        return entryCity;
-    }
-
-    public void setEntryCity(String entryCity) {
-        this.entryCity = entryCity;
-    }
-
-    public String getEntryCompany() {
-        return entryCompany;
-    }
-
-    public void setEntryCompany(String entryCompany) {
-        this.entryCompany = entryCompany;
-    }
-
-    public String getEntryPostcode1() {
-        return entryPostcode1;
-    }
-
-    public void setEntryPostcode1(String entryPostcode1) {
-        this.entryPostcode1 = entryPostcode1;
-    }
-
-    public String getEntryPostcode2() {
-        return entryPostcode2;
-    }
-
-    public void setEntryPostcode2(String entryPostcode2) {
-        this.entryPostcode2 = entryPostcode2;
-    }
-
-    public String getEntryStreetAddress() {
-        return entryStreetAddress;
-    }
-
-    public void setEntryStreetAddress(String entryStreetAddress) {
-        this.entryStreetAddress = entryStreetAddress;
-    }
-
-    public String getEntrySuburb() {
-        return entrySuburb;
-    }
-
-    public void setEntrySuburb(String entrySuburb) {
-        this.entrySuburb = entrySuburb;
-    }
-
-    public BigDecimal getEntryZoneId() {
-        return entryZoneId;
-    }
-
-    public void setEntryZoneId(BigDecimal entryZoneId) {
-        this.entryZoneId = entryZoneId;
-    }
-
-    public List getEntryZoneIdItems() {
-        return entryZoneIdItems;
-    }
-
-    public void setEntryZoneIdItems(List entryZoneIdItems) {
-        this.entryZoneIdItems = entryZoneIdItems;
-    }
-
-    public String getGender() {
-        return gender;
-    }
-
-    public void setGender(String gender) {
-        this.gender = gender;
-    }
-
-    public List getGenderItems() {
-        return genderItems;
-    }
-
-    public void setGenderItems(List<Map> genderItems) {
-        this.genderItems = genderItems;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getMode() {
-        return mode;
-    }
-
-    public void setMode(String mode) {
-        this.mode = mode;
-    }
-
-    public BigDecimal getCustomersId() {
-        return customersId;
-    }
-
-    public void setCustomersId(BigDecimal customersId) {
-        this.customersId = customersId;
-    }
-
-    public String getEntryPostcode() {
-        return entryPostcode1 + entryPostcode2;
-    }
-
-    public void setEntryPostcode(String entryPostcode) {
-        if (entryPostcode != null) {
-            String[] s = entryPostcode.split("-");
-            if (s.length == 2) {
-                this.entryPostcode1 = s[0];
-                this.entryPostcode2 = s[1];
-            }
-        }
-        this.entryPostcode = entryPostcode;
-    }
-}
+package jp.sf.pal.pompei.web.admin.customer;
+
+public class CustomerEditPage extends AbstractCustomerEditPage {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 5782672253630576575L;
+
+}

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListAction.java	2007-09-25 07:09:39 UTC (rev 582)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListAction.java	2007-09-25 09:12:34 UTC (rev 583)
@@ -1,81 +1,80 @@
-package jp.sf.pal.pompei.web.admin.customer;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import jp.sf.pal.pompei.dxo.CustomerDxo;
-import jp.sf.pal.pompei.service.CustomerService;
-
-public class CustomerListAction implements Serializable {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 3320789446397915285L;
-
-    /**
-     *
-     */
-    private CustomerListPage memberListPage;
-
-    /**
-     *
-     */
-    private CustomerService memberService;
-
-    private CustomerDxo memberDxo;
-
-    public Class initialize() {
-        return null;
-    }
-
-    public Class prerender() {
-        if (memberListPage.isDelete()) {
-            memberService.deleteCustomer(memberListPage.getCustomersId());
-        }
-
-        List memberItems = memberService.getCustomerList();
-
-        List<Map<String, Object>> items = memberDxo.convertMap(memberItems);
-        memberListPage.setCustomerItems(items);
-
-        return null;
-    }
-
-    /**
-     * @return memberListPage
-     */
-    public CustomerListPage getCustomerListPage() {
-        return memberListPage;
-    }
-
-    /**
-     * @param memberListPage 設定する memberListPage
-     */
-    public void setCustomerListPage(CustomerListPage memberListPage) {
-        this.memberListPage = memberListPage;
-    }
-
-    public CustomerService getCustomerService() {
-        return memberService;
-    }
-
-    public void setCustomerService(CustomerService memberService) {
-        this.memberService = memberService;
-    }
-
-    public CustomerDxo getCustomerDxo() {
-        return memberDxo;
-    }
-
-    public void setCustomerDxo(CustomerDxo memberDxo) {
-        this.memberDxo = memberDxo;
-    }
-
-    public Class doSearch() {
-
-        return null;
-    }
-
-}
+package jp.sf.pal.pompei.web.admin.customer;
+
+import java.io.Serializable;
+import java.util.List;
+
+import jp.sf.pal.pompei.dxo.CustomerDxo;
+import jp.sf.pal.pompei.exentity.Customer;
+import jp.sf.pal.pompei.service.CustomerService;
+
+public class CustomerListAction implements Serializable {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 8532394606295152264L;
+
+    /**
+     * 
+     */
+    private CustomerListPage customerListPage;
+
+    private CustomerService customerService;
+
+    private CustomerDxo customerDxo;
+
+    public Class<?> initialize() {
+        return null;
+    }
+
+    public Class<?> prerender() {
+        // customer list
+        List<Customer> customerList = getCustomerService().getCustomerList();
+        getCustomerListPage().setCustomerItems(
+                getCustomerDxo().convert(customerList));
+        return null;
+    }
+
+    /**
+     * @return customerListPage
+     */
+    public CustomerListPage getCustomerListPage() {
+        return customerListPage;
+    }
+
+    /**
+     * @param customerListPage 設定する customerListPage
+     */
+    public void setCustomerListPage(CustomerListPage customerListPage) {
+        this.customerListPage = customerListPage;
+    }
+
+    /**
+     * @return customerService
+     */
+    public CustomerService getCustomerService() {
+        return customerService;
+    }
+
+    /**
+     * @param customerService 設定する customerService
+     */
+    public void setCustomerService(CustomerService customerService) {
+        this.customerService = customerService;
+    }
+
+    /**
+     * @return customerDxo
+     */
+    public CustomerDxo getCustomerDxo() {
+        return customerDxo;
+    }
+
+    /**
+     * @param customerDxo 設定する customerDxo
+     */
+    public void setCustomerDxo(CustomerDxo customerDxo) {
+        this.customerDxo = customerDxo;
+    }
+
+}

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListPage.java	2007-09-25 07:09:39 UTC (rev 582)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListPage.java	2007-09-25 09:12:34 UTC (rev 583)
@@ -1,124 +1,102 @@
-package jp.sf.pal.pompei.web.admin.customer;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
-
-public class CustomerListPage implements Serializable {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 6026492917522102392L;
-
-    private BigDecimal customersId;
-
-    private String entryCity;
-
-    private String entryCompany;
-
-    private String entryState;
-
-    private String firstName;
-
-    private String lastName;
-
-    private String searchParams;
-
-    private String title;
-
-    private boolean delete;
-
-    private int memberIndex;
-
-    private List memberItems;
-
-    public BigDecimal getCustomersId() {
-        return customersId;
-    }
-
-    public void setCustomersId(BigDecimal customersId) {
-        this.customersId = customersId;
-    }
-
-    public String getEntryCity() {
-        return entryCity;
-    }
-
-    public void setEntryCity(String entryCity) {
-        this.entryCity = entryCity;
-    }
-
-    public String getEntryCompany() {
-        return entryCompany;
-    }
-
-    public void setEntryCompany(String entryCompany) {
-        this.entryCompany = entryCompany;
-    }
-
-    public String getEntryState() {
-        return entryState;
-    }
-
-    public void setEntryState(String entryState) {
-        this.entryState = entryState;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public String getSearchParams() {
-        return searchParams;
-    }
-
-    public void setSearchParams(String searchParams) {
-        this.searchParams = searchParams;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public List getCustomerItems() {
-        return memberItems;
-    }
-
-    public void setCustomerItems(List member) {
-        this.memberItems = member;
-    }
-
-    public int getCustomerIndex() {
-        return memberIndex;
-    }
-
-    public void setCustomerIndex(int memberIndex) {
-        this.memberIndex = memberIndex;
-    }
-
-    public boolean isDelete() {
-        return delete;
-    }
-
-    public void setDelete(boolean delete) {
-        this.delete = delete;
-    }
-
-}
+package jp.sf.pal.pompei.web.admin.customer;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+public class CustomerListPage implements Serializable {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -7603304026216388367L;
+
+    private BigDecimal customerId;
+
+    private int customerIndex;
+
+    private List<Map<String, Object>> customerItems;
+
+    private String emailAddress;
+
+    private String firstName;
+
+    private String lastName;
+
+    private String portalId;
+
+    private Date dateAdded;
+
+    public BigDecimal getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(BigDecimal customerId) {
+        this.customerId = customerId;
+    }
+
+    public int getCustomerIndex() {
+        return customerIndex;
+    }
+
+    public void setCustomerIndex(int customerIndex) {
+        this.customerIndex = customerIndex;
+    }
+
+    public List<Map<String, Object>> getCustomerItems() {
+        return customerItems;
+    }
+
+    public void setCustomerItems(List<Map<String, Object>> customerItems) {
+        this.customerItems = customerItems;
+    }
+
+    public String getEmailAddress() {
+        return emailAddress;
+    }
+
+    public void setEmailAddress(String emailAddress) {
+        this.emailAddress = emailAddress;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getPortalId() {
+        return portalId;
+    }
+
+    public void setPortalId(String portalId) {
+        this.portalId = portalId;
+    }
+
+    /**
+     * @return dateAdded
+     */
+    public Date getDateAdded() {
+        return dateAdded;
+    }
+
+    /**
+     * @param dateAdded 設定する dateAdded
+     */
+    public void setDateAdded(Date dateAdded) {
+        this.dateAdded = dateAdded;
+    }
+
+}

Modified: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/customer/label.properties
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/customer/label.properties	2007-09-25 07:09:39 UTC (rev 582)
+++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/customer/label.properties	2007-09-25 09:12:34 UTC (rev 583)
@@ -1,3 +1,6 @@
 memberList.title=\u4f1a\u54e1\u7ba1\u7406\u3000\u4e00\u89a7\u753b\u9762
 memberEdit.title=\u4f1a\u54e1\u7ba1\u7406\u3000\u767b\u9332\u753b\u9762
 memberConfirm.title=\u4f1a\u54e1\u7ba1\u7406\u3000\u78ba\u8a8d\u753b\u9762
+
+M=\u7537\u6027
+F=\u5973\u6027
\ No newline at end of file

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerConfirm.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerConfirm.html	2007-09-25 07:09:39 UTC (rev 582)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerConfirm.html	2007-09-25 09:12:34 UTC (rev 583)
@@ -1,72 +1,154 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title id="title-head">会員情報編集画面</title>
-</head>
-<body>
-<form id="form" method="post">
-<table border="1">
-	<tr style="dummy" height="20px">
-		<th>氏名</th>
-		<td><span id="usersName"></span></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>性別</th>
-		<td><span id="genderLabel">男</span></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>生年月日</th>
-		<td><span id="customersDob"></span></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>Eメールアドレス</th>
-		<td><span id="customersEmailAddress"></span></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>電話番号</th>
-		<td><span id="customersTelephone"></span></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>FAX番号</th>
-		<td><span id="customersFax"></span></td>
-	</tr>
-<!--
-	<tr style="dummy" height="20px">
-		<th>メルマガ配信</th>
-		<td><span id="newsLetterLabel"></span></td>
-	</tr>
--->
-</table>
-
-<hr/>
-<strong><label>会員住所</label></strong>
-<table border="1">
-	<tr style="dummy" height="20px">
-		<th>会社名</th><td><span id="entryCompany"></span></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>郵便番号*</th>
-		<td><span id="entryPostcode"></span></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>都道府県*</th>
-		<td><span id="entryZoneName"></span>
-		</td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>市区町村*</th><td><span id="entryCity"></span></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>住所1*</th><td><span id="entryStreetAddress"></span></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>住所2</th><td><span id="entrySuburb"></span></td>
-	</tr>
-</table>
-<hr/>
-<input type="submit" id="doUpdate" value="登録する" onclick="location.href='./memberConfirm.html'"/>
-<input type="submit" id="jumpMemberEdit" value="編集画面に戻る" onclick="location.href='./memberConfirm.html'"/>
-</form>
-</body></html>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title id="title-head">会員情報編集画面</title>
+  </head>
+  <body>
+    <form id="customerEditForm" method="post">
+      <input type="hidden" id="mode" />
+      <input type="hidden" id="customerId" />
+      <input type="hidden" id="addressBookId" />
+      <div>
+        <span id="allMessages"></span>
+      </div>
+      <div>
+        <div class="portlet-section-header">ユーザー登録情報</div>
+        <table>
+          <tbody>
+            <tr>
+              <th>
+                <label>氏名(姓):</label>
+              </th>
+              <td>
+                <span id="lastname">ABC</span>
+                <input id="lastname-hidden" type="hidden" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>氏名(名):</label>
+              </th>
+              <td>
+                <span id="firstname">ABC</span>
+                <input id="firstname-hidden" type="hidden" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>性別:</label>
+              </th>
+              <td>
+                <span id="genderStr">ABC</span>
+                <input id="gender-hidden" type="hidden" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>メールアドレス:</label>
+              </th>
+              <td>
+                <span id="emailAddress">ABC</span>
+                <input id="emailAddress-hidden" type="hidden" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>生年月日:</label>
+              </th>
+              <td>
+                <span id="dayOfBirth">ABC</span>
+                <input id="dayOfBirth-hidden" type="hidden" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>電話番号:</label>
+              </th>
+              <td>
+                <span id="telephone">ABC</span>
+                <input id="telephone-hidden" type="hidden" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>FAX:</label>
+              </th>
+              <td>
+                <span id="fax">ABC</span>
+                <input id="fax-hidden" type="hidden" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>携帯電話番号:</label>
+              </th>
+              <td>
+                <span id="cellphone">ABC</span>
+                <input id="cellphone-hidden" type="hidden" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>郵便番号:</label>
+              </th>
+              <td>
+                <span id="postcode">ABC</span>
+                <input id="postcode-hidden" type="hidden" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>都道府県:</label>
+              </th>
+              <td>
+                <span id="state">ABC</span>
+                <input id="state-hidden" type="hidden" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>郡市区 (島、国):</label>
+              </th>
+              <td>
+                <span id="city">ABC</span>
+                <input id="city-hidden" type="hidden" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>それ以降の住所:</label>
+              </th>
+              <td>
+                <span id="streetAddress">ABC</span>
+                <input id="streetAddress-hidden" type="hidden" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>会社名・団体名:</label>
+              </th>
+              <td>
+                <span id="company">ABC</span>
+                <input id="company-hidden" type="hidden" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>部署名・役職:</label>
+              </th>
+              <td>
+                <span id="department">ABC</span>
+                <input id="department-hidden" type="hidden" class="portlet-form-input-field" />
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <hr />
+      <input type="submit" id="doFinish" value="完了" onclick="location.href='./customerList.html'" />
+      <input type="button" id="jumpCustomerList" value="一覧に戻る" onclick="location.href='./customerList.html'" />
+    </form>
+  </body>
+</html>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerEdit.html	2007-09-25 07:09:39 UTC (rev 582)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerEdit.html	2007-09-25 09:12:34 UTC (rev 583)
@@ -1,90 +1,142 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title id="title-head">会員情報編集画面</title>
-</head>
-<body>
-<form id="form" method="post">
-<input type="hidden" id="mode"/>
-<input type="hidden" id="customersId"/>
-<div><span id="allMessages"></span></div>
-<table border="1">
-	<tr style="dummy" height="20px">
-		<th>氏名*</th>
-		<td>姓<input type="text" id="customersLastname" size="6" maxlength="32" /> 名<input type="text" id="customersFirstname" size="6" maxlength="32"/></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>性別*</th>
-		<td><select id="gender"><option value="1">男</option><option value="2">女</option></select></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>パスワード*</th>
-		<td><input type="password" id="customersPassword" maxlength="40"/></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>パスワード(再入力)*</th>
-		<td><input type="password" id="customersPassword-retype" maxlength="40"/></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>生年月日*</th>
-		<td>(例)19760408<br/><input type="text" id="customersDob" size="6" maxlength="8"/></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>Eメールアドレス*</th>
-		<td>hoge****@hoge*****<br/><input type="text" id="customersEmailAddress" size="40" maxlength="96"/></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>電話番号*</th>
-		<td>(例)99-9999-9999<br/><input type="text" id="customersTelephone" size="34" maxlength="32"/></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>FAX番号</th>
-		<td>(例)99-9999-9999<br/><input type="text" id="customersFax" size="34" maxlength="32"/></td>
-	</tr>
-<!--
-	<tr style="dummy" height="20px">
-		<th>メルマガ配信</th>
-		<td><select id="newsLetter"><option value="0">希望しない</option><option value="1">希望する</option></select></td>
-	</tr>
--->
-</table>
-<hr/>
-<strong><label>会員住所</label></strong>
-<table border="1">
-	<tr style="dummy" height="20px">
-		<th>会社名</th><td><input type="text" id="entryCompany" /></td>
-	</tr>
-<!--
-	<tr style="dummy" height="20px">
-		<th>部署名</th><td><input type="text" id="" /></td>
-	</tr>
--->
-	<tr style="dummy" height="20px">
-		<th>郵便番号*</th>
-		<td><input type="text" id="entryPostcode1" size="1" maxlength="3" />-<input type="text" id="entryPostcode2" size="1" maxlength="4"/></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>都道府県*</th>
-		<td>
-		<select id="entryZoneId">
-			<option value="1">北海道</option>
-		</select>
-		</td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>市区町村*</th><td><input type="text" id="entryCity" size="20" maxlength="40" /></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>住所1*</th><td><input type="text" id="entryStreetAddress" /></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>住所2</th><td><input type="text" id="entrySuburb" /></td>
-	</tr>
-</table>
-<hr/>
-<input type="submit" id="goMemberConfirm" value="確認画面へ" onclick="location.href='./memberConfirm.html'"/>
-<input type="button" id="jumpMemberList" value="一覧に戻る" onclick="location.href='./memberConfirm.html'"/>
-</form>
-</body></html>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title id="title-head">会員情報編集画面</title>
+  </head>
+  <body>
+    <form id="customerEditForm" method="post">
+      <input type="hidden" id="mode" />
+      <input type="hidden" id="customerId" />
+      <input type="hidden" id="addressBookId" />
+      <div>
+        <span id="allMessages"></span>
+      </div>
+      <div>
+        <div class="portlet-section-header">ユーザー登録情報</div>
+        <table>
+          <tbody>
+            <tr>
+              <th>
+                <label>氏名(姓):</label>
+              </th>
+              <td>
+                <input id="lastname" type="text" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>氏名(名):</label>
+              </th>
+              <td>
+                <input id="firstname" type="text" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>性別:</label>
+              </th>
+              <td>
+                <span id="gender"><input type="radio" name="gender" value="M" class="portlet-form-field-label" />男性
+                  <input type="radio" name="gender" value="F" class="portlet-form-field-label" />女性
+                </span>
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>メールアドレス:</label>
+              </th>
+              <td>
+                <input id="emailAddress" type="text" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>生年月日:</label>
+              </th>
+              <td>
+                <input id="dayOfBirth" type="text" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>電話番号:</label>
+              </th>
+              <td>
+                <input id="telephone" type="text" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>FAX:</label>
+              </th>
+              <td>
+                <input id="fax" type="text" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>携帯電話番号:</label>
+              </th>
+              <td>
+                <input id="cellphone" type="text" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>郵便番号:</label>
+              </th>
+              <td>
+                <input id="postcode" type="text" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>都道府県:</label>
+              </th>
+              <td>
+                <input id="state" type="text" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>郡市区 (島、国):</label>
+              </th>
+              <td>
+                <input id="city" type="text" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>それ以降の住所:</label>
+              </th>
+              <td>
+                <input id="streetAddress" type="text" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>会社名・団体名:</label>
+              </th>
+              <td>
+                <input id="company" type="text" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <label>部署名・役職:</label>
+              </th>
+              <td>
+                <input id="department" type="text" class="portlet-form-input-field" />
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <hr />
+      <input type="submit" id="doConfirm" value="確認画面へ" onclick="location.href='./customerConfirm.html'" />
+      <input type="button" id="jumpCustomerList" value="一覧に戻る" onclick="location.href='./customerList.html'" />
+    </form>
+  </body>
+</html>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerList.html	2007-09-25 07:09:39 UTC (rev 582)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerList.html	2007-09-25 09:12:34 UTC (rev 583)
@@ -6,52 +6,41 @@
 <title id="title-head">会員一覧</title>
 </head>
 <body>
-<script language="JavaScript">
-<!--
-function confirmDelete(obj){
-	if(confirm('削除します。よろしいですか?')){
-		obj.href = obj.href+'&delete=true';
-		return true;
-	}
-	return false;
-}
--->
-</script>
-<form id="form" method="post">
+<form id="customerListForm" method="post">
+<!-- 
 <div id="searchParams">
-	<label>購入区分</label><select><option value="0">指定なし</option><option value="1">個人</option><option value="2">法人</option></select>
-	<br />
-	<label>名前</label><input type="text" id="" />
-	<input type="button" id="doSearch" value="検索" />
+	<label>ID</label><input type="text" id="" />
+	<br />
+	<label>名前</label><input type="text" id="" />
+	<input type="button" id="doSearch" value="検索" />
 </div>
 <hr />
+ -->
 <table border="1">
 	<thead>
 		<tr>
-			<th>ID</th>
+			<th>ID</th>
+			<th>ポータルID</th>
 			<th>氏名</th>
-			<th>会社名</th>
-			<th>都道府県</th>
-			<th>市区町村</th>
+			<th>メール</th>
+			<th>登録日</th>
 			<th>&nbsp;</th>
 		</tr>
 	</thead>
-	<tbody id="memberItems">
+	<tbody id="customerItems">
 		<tr>
-			<td><span id="customersId">0001</span></td>
+			<td><span id="customerId">0001</span></td>
+			<td><span id="portalId">0001</span></td>
 			<td><span id="lastName">山田</span> <span id="firstName">太郎</span></td>
-			<td><span id="entryCompany">会社名</span></td>
-			<td><span id="entryState">東京都</span></td>
-			<td><span id="entryCity">葛飾区</span></td>
+			<td><span id="emailAddress">メール</span></td>
+			<td><span id="dateAdded">メール</span></td>
 			<td>
-				<a id="goMemberEdit" href="./memberEdit.html?customersId=0&mode=update">編集</a>
-				<a id="goMemberDelete" href="./memberList.html?customersId=0" onClick="if(!confirmDelete(this)){return false;}">削除</a>
+				<a id="goCustomerEdit" href="./customerEdit.html?customerId=0&fixed_mode=update">編集</a>
+				<a id="goCustomerConfirm" href="./customerConfirm.html?customerId=0&fixed_mode=delete">削除</a>
 			</td>
 		</tr>
 	</tbody>
 	<tfoot></tfoot>
 </table>
-<br/>
-<input type="submit" id="goMemberEdit" value="会員を追加する" onclick="location.href='./memberEdit.html'"/>
 </form>
 </body></html>
\ No newline at end of file

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/index.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/index.html	2007-09-25 07:09:39 UTC (rev 582)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/index.html	2007-09-25 09:12:34 UTC (rev 583)
@@ -9,20 +9,18 @@
 <div><span id="messages"></span></div>
 管理者向けメニュー
 <ul>
-<li><a href="#">ショップ設定(未)</a></li>
 <li>商品管理</li>
 <ul>
 <li><a href="./admin/product/categoryList.html">カテゴリ管理</a></li>
 <li><a href="./admin/product/manufacturerList.html">メーカー管理</a></li>
 <li><a href="./admin/product/productList.html">商品管理</a></li>
 </ul>
-<li><a href="./admin/member/memberList.html">会員管理</a></li>
+<li><a href="./admin/customer/customerList.html">会員管理</a></li>
 <li><a href="./admin/order/orderList.html">注文管理</a></li>
 <li><a href="./admin/order/deliveryMethodList.html">配送方法管理</a></li>
 </ul>
 ユーザー向けメニュー
 <ul>
-<li><a href="#">会員登録(未)</a></li>
 <li><a href="./user/product/productList.html">商品一覧</a></li>
 <li><a href="./user/cart/productList.html">カート確認</a></li>
 <li><a href="./user/checkout/userInfoEdit.html">注文</a></li>


pal-cvs メーリングリストの案内