Author: bbrossaud Date: 2010-07-12 18:00:23 +0200 (Mon, 12 Jul 2010) New Revision: 103 Url: http://chorem.org/repositories/revision/bonzoms/103 Log: addition company form Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressesModel.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeFormController.java trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul trunk/bonzoms-ui-zk/transaction.log Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressesModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressesModel.java 2010-07-12 13:31:49 UTC (rev 102) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressesModel.java 2010-07-12 16:00:23 UTC (rev 103) @@ -35,7 +35,7 @@ return _addresses.indexOf(obj); } - public void setEmployees(List<Address> addresses) { + public void setAddresses(List<Address> addresses) { _addresses = addresses; fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java 2010-07-12 13:31:49 UTC (rev 102) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java 2010-07-12 16:00:23 UTC (rev 103) @@ -5,14 +5,23 @@ package org.chorem.bonzoms.ui; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Set; import org.chorem.data.bonzoms.Company; +import org.chorem.data.bonzoms.Phone; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.SuspendNotAllowedException; +import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zul.Button; import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; +import org.zkoss.zul.Window; /** * @@ -20,6 +29,7 @@ */ public class CompanyController extends GenericForwardComposer { protected Model _model = new Model(); + protected CompanyModel _companyModel = new CompanyModel(); public CompanyController() { @@ -27,10 +37,25 @@ _companyModel.setCompanies(companies); } + public void createWindowCompanyForm(Company company) throws SuspendNotAllowedException, InterruptedException { + Map<String, Object> map = new HashMap<String, Object>(); + if (company != null) { + map.put("company", company); + } + Window win = (Window) Executions.createComponents("companyFormPage.zul", null, map); + win.setPage(page); +// win.doHighlighted(); + win.setPosition("center"); +// win.doOverlapped(); + win.doModal(); + } + /* * Events */ - + public void onClick$newCompany() throws SuspendNotAllowedException, InterruptedException { + createWindowCompanyForm(null); + } /* * Renderers */ @@ -44,20 +69,25 @@ Listcell nameCell = new Listcell(company.getName()); Listcell webSiteCell = new Listcell(company.getWebSite()); - Listcell phoneFaxCell = new Listcell(company.getPhone()+"/"+company.getFax()); + String phoneFax = "Fax: " + company.getFax() + "\n"; + List<Phone> phones = _model.retrievePhonesByPhoneIds(new ArrayList<String>(company.getPhone())); + for (Phone phone : phones) { + phoneFax += "tel: " + phone.getNumber() + "(" + phone.getName() + ")\n"; + } + Listcell phoneFaxCell = new Listcell(phoneFax); Listcell addressCell = new Listcell("address"); Listcell typeCell = new Listcell(company.getType()); Listcell detailsCell = new Listcell(); Button details = new Button("details"); detailsCell.appendChild(details); -// details.addEventListener("onClick", new EventListener() { -// -// @Override -// public void onEvent(Event event) throws Exception { -// createWindowEmployeeForm(employee); -// } -// }); + details.addEventListener("onClick", new EventListener() { + @Override + public void onEvent(Event event) throws Exception { + createWindowCompanyForm(company); + } + }); + item.appendChild(nameCell); item.appendChild(webSiteCell); item.appendChild(phoneFaxCell); Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java 2010-07-12 13:31:49 UTC (rev 102) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java 2010-07-12 16:00:23 UTC (rev 103) @@ -43,7 +43,6 @@ } Window win = (Window) Executions.createComponents("employeeFormPage.zul", null, map); win.setPage(page); - win.doHighlighted(); win.setPosition("center"); // win.doOverlapped(); win.doModal(); Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeFormController.java 2010-07-12 13:31:49 UTC (rev 102) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeFormController.java 2010-07-12 16:00:23 UTC (rev 103) @@ -6,7 +6,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import org.chorem.data.bonzoms.Address; import org.chorem.data.bonzoms.AddressImpl; import org.chorem.data.bonzoms.Email; @@ -16,10 +15,8 @@ import org.chorem.data.bonzoms.Phone; import org.chorem.data.bonzoms.PhoneImpl; import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.event.CreateEvent; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; -import org.zkoss.zk.ui.event.ForwardEvent; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zkplus.databind.AnnotateDataBinder; import org.zkoss.zkplus.databind.DataBinder; @@ -88,13 +85,13 @@ protected void initEmployee(Employee employee) { _employee = employee; List<Address> addresses = _model.retrieveAddressesByAddressIds(new ArrayList<String>(employee.getAddress())); - _addressesModel.setEmployees(addresses); + _addressesModel.setAddresses(addresses); List<Phone> phones = _model.retrievePhonesByPhoneIds(new ArrayList<String>(employee.getPhone())); _phonesModel.setPhones(phones); List<Email> emails = _model.retrieveEmailsByEmailIds(new ArrayList<String>(employee.getEmail())); - _emailsModel.setemails(emails); + _emailsModel.setEmails(emails); _workingAddress = _model.retrieveAddressByAddressId(employee.getWorkingAddress()); Modified: trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul 2010-07-12 13:31:49 UTC (rev 102) +++ trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul 2010-07-12 16:00:23 UTC (rev 103) @@ -1,8 +1,7 @@ <?page id="employeeForm" title="Employee form" cacheable="false" language="xul/html" zscriptLanguage="Java"?> <?meta content="text/html; charset=UTF-8" pageEncoding="UTF-8"?> -<window closable="true" minimizable="true" minimized="false" maximizable="true" - sizable="true" height="500px" width="400" contentStyle="overflow:auto" apply="org.chorem.bonzoms.ui.EmployeeFormController"> +<window closable="true" maximizable="true" sizable="true" height="500px" width="400" contentStyle="overflow:auto" apply="org.chorem.bonzoms.ui.EmployeeFormController"> <caption label="Employee"/> <groupbox> Modified: trunk/bonzoms-ui-zk/transaction.log =================================================================== --- trunk/bonzoms-ui-zk/transaction.log 2010-07-12 13:31:49 UTC (rev 102) +++ trunk/bonzoms-ui-zk/transaction.log 2010-07-12 16:00:23 UTC (rev 103) @@ -348,3 +348,24 @@ 2010-07-12 15:25:44,083 [http-8080-3] WARN com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.lastResource.disallow] Adding multiple last resources is disallowed. Current resource is com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord@1254e47 2010-07-12 15:25:44,610 [http-8080-3] WARN com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.lastResource.disallow] Adding multiple last resources is disallowed. Current resource is com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord@1e776cc 2010-07-12 15:25:45,017 [http-8080-3] WARN com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.lastResource.disallow] Adding multiple last resources is disallowed. Current resource is com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord@1d93f39 +2010-07-12 15:54:37,200 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 57798 +2010-07-12 15:54:37,202 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 57 798 +2010-07-12 15:54:37,255 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 57798 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-12 17:37:11,812 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 38886 +2010-07-12 17:37:11,816 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 38 886 +2010-07-12 17:37:11,876 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 38886 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-12 17:39:43,735 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 47890 +2010-07-12 17:39:43,737 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 47 890 +2010-07-12 17:39:43,787 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 47890 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-12 17:42:41,890 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 52889 +2010-07-12 17:42:41,892 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 52 889 +2010-07-12 17:42:41,973 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 52889 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-12 17:45:39,917 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 48348 +2010-07-12 17:45:39,919 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 48 348 +2010-07-12 17:45:39,977 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 48348 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-12 17:49:17,173 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 42715 +2010-07-12 17:49:17,177 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 42 715 +2010-07-12 17:49:17,229 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 42715 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-12 17:52:25,242 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 54158 +2010-07-12 17:52:25,244 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 54 158 +2010-07-12 17:52:25,322 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 54158 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService