[Bonzoms-commits] r127 - in trunk: . bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui bonzoms-ui-zk/src/main/webapp

13 Aug 2010

Author: bbrossaud
Date: 2010-08-13 10:20:26 +0200 (Fri, 13 Aug 2010)
New Revision: 127

Url: http://chorem.org/repositories/revision/bonzoms/127

Log:
bonzoms modification for wikitty 2.1 SNAPSHOT

Modified:
   trunk/
   trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressFormController.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/CompanyFormController.java
   trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java
   trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractController.java
   trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.java
   trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractModel.java
   trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.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/java/org/chorem/bonzoms/ui/EmployeeModel.java
   trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java
   trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java
   trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonFormController.java
   trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonModel.java
   trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java
   trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceController.java
   trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceFormController.java
   trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceModel.java
   trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/WikittyModel.java
   trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul
   trunk/bonzoms-ui-zk/src/main/webapp/contractsFormPage.zul
   trunk/bonzoms-ui-zk/src/main/webapp/personFormPage.zul
   trunk/bonzoms-ui-zk/src/main/webapp/personPage.zul
   trunk/pom.xml


Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
   - target
nbactions.xml
*.ipr
*.iws
*.iml

   + target
nbactions.xml
*.ipr
*.iws
*.iml
.settings
.project


Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressFormController.java
===================================================================

--- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressFormController.java	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressFormController.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -17,7 +17,7 @@
  */
 public class AddressFormController extends GenericForwardComposer {
 
-    protected WikittyProxy proxy = BonzomsProxy.getInstance();
+    protected WikittyProxy proxy = ChoremDataProxy.getInstance();
 
     protected Address address = new AddressImpl();
 

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-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -54,7 +54,7 @@
  */
 public class CompanyController extends GenericForwardComposer {
 
-	protected WikittyProxy proxy = BonzomsProxy.getInstance();
+	protected WikittyProxy proxy = ChoremDataProxy.getInstance();
     protected CompanyModel companyModel = new CompanyModel(20);
 
     @Override

Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java
===================================================================
--- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -53,7 +53,7 @@
  */
 public class CompanyFormController extends GenericForwardComposer {
     
-    protected WikittyProxy proxy = BonzomsProxy.getInstance();
+    protected WikittyProxy proxy = ChoremDataProxy.getInstance();
 
     protected Company company = new CompanyImpl();
     protected AddressModel addressModel = new AddressModel();

Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java
===================================================================
--- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -40,7 +40,7 @@
  */
 public class CompanyModel extends AbstractListModel implements BindingListModel {
 	
-	protected WikittyProxy proxy = BonzomsProxy.getInstance();
+	protected WikittyProxy proxy = ChoremDataProxy.getInstance();
 	protected Criteria criteria = null;
 	protected int itemsByPage = 1;
 	protected int currentPage = 0;

Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractController.java
===================================================================
--- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractController.java	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractController.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -1,5 +1,6 @@
 package org.chorem.bonzoms.ui;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -32,7 +33,7 @@
  */
 public class ContractController extends GenericForwardComposer {
 
-    protected WikittyProxy proxy = BonzomsProxy.getInstance();
+    protected WikittyProxy proxy = ChoremDataProxy.getInstance();
     protected ContractModel contractModel = new ContractModel(20);
     protected Checkbox checkbox1;
 
@@ -79,7 +80,7 @@
     protected Listcell getDateCell(Date date) {
     	String cellDate = "";
     	if (date != null) {
-        	SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
+        	SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
         	cellDate = sdf.format(date);
     	}
     	Listcell cell = new Listcell(cellDate);
@@ -129,12 +130,12 @@
     /*
      * Events
      */
-    public void onCheck$checkbox1() {
+    public void onCheck$checkbox1() throws ParseException {
     	if (checkbox1.isChecked()) {
     		Date date = new Date();
-    		String formatDate = WikittyUtil.solrDateFormat.format(date);
+    		String formatDate = WikittyUtil.formatDate(date);
     		Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, EmploymentContract.EXT_EMPLOYMENTCONTRACT).
-    						and().gt(EmploymentContract.FQ_FIELD_END, formatDate).criteria();
+    						and().gt(EmploymentContract.FQ_FIELD_EMPLOYMENTCONTRACT_END, formatDate).criteria();
     		contractModel.setCriteria(criteria);
     	} else {
     		Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, EmploymentContract.EXT_EMPLOYMENTCONTRACT).criteria();

Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.java
===================================================================
--- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.java	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -32,7 +32,7 @@
  */
 public class ContractFormController extends GenericForwardComposer {
 
-    protected WikittyProxy proxy = BonzomsProxy.getInstance();
+    protected WikittyProxy proxy = ChoremDataProxy.getInstance();
     protected EmploymentContract contract = new EmploymentContractImpl();
     protected EmployeeModel employeeModel = new EmployeeModel(5);
     

Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractModel.java
===================================================================
--- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractModel.java	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractModel.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -40,7 +40,7 @@
  */
 public class ContractModel extends AbstractListModel implements BindingListModel {
 
-	protected WikittyProxy proxy = BonzomsProxy.getInstance();
+	protected WikittyProxy proxy = ChoremDataProxy.getInstance();
 	protected Criteria criteria = null;
 	protected int itemsByPage = 1;
 	protected int size = 0;

Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java
===================================================================
--- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -34,7 +34,7 @@
  */
 public class ContractsFormController extends GenericForwardComposer {
 
-	protected WikittyProxy proxy = BonzomsProxy.getInstance();
+	protected WikittyProxy proxy = ChoremDataProxy.getInstance();
 	
     protected ContractsModel contractsModel = new ContractsModel();
     protected List<String> removedContracts = new ArrayList<String>();
@@ -80,7 +80,7 @@
 
     protected void initContracts() {
     	if (employeeId != null) {
-	    	Criteria criteria = Search.query().eq(EmploymentContract.FQ_FIELD_EMPLOYEE, employeeId).criteria();
+	    	Criteria criteria = Search.query().eq(EmploymentContract.FQ_FIELD_EMPLOYMENTCONTRACT_EMPLOYEE, employeeId).criteria();
 	        List<EmploymentContract> contracts = proxy.findAllByCriteria(EmploymentContract.class, criteria).getAll();
 	        contracts = new ArrayList<EmploymentContract>(contracts);
 	        contractsModel.setContracts(contracts);

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-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -50,7 +50,7 @@
  */
 public class EmployeeController extends GenericForwardComposer {
 
-    protected WikittyProxy proxy = BonzomsProxy.getInstance();
+    protected WikittyProxy proxy = ChoremDataProxy.getInstance();
     protected EmployeeModel employeeModel = new EmployeeModel(20);
 
     @Override

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-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeFormController.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -47,7 +47,6 @@
 import org.zkoss.zkplus.databind.AnnotateDataBinder;
 import org.zkoss.zkplus.databind.DataBinder;
 import org.zkoss.zul.Bandbox;
-import org.zkoss.zul.Listbox;
 import org.zkoss.zul.Listcell;
 import org.zkoss.zul.Listitem;
 import org.zkoss.zul.ListitemRenderer;
@@ -59,7 +58,7 @@
  */
 public class EmployeeFormController extends GenericForwardComposer {
 
-    protected WikittyProxy proxy = BonzomsProxy.getInstance();
+    protected WikittyProxy proxy = ChoremDataProxy.getInstance();
 
     protected Employee employee = new EmployeeImpl();
     protected Address workingAddress = new AddressImpl();
@@ -71,10 +70,6 @@
     protected Bandbox companyBandbox;
     protected Bandbox serviceBandbox;
     protected Bandbox personBandbox;
-    
-    protected Listbox companyListbox;
-    protected Listbox serviceListbox;
-    protected Listbox personListbox;
 
     public static final String EVENT_ON_SAVE_EMPLOYEE = "onSaveEmployee";
 	public static final String EVENT_ON_CLOSE_EMPLOYEE = "onCloseEmployee";

Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeModel.java
===================================================================
--- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeModel.java	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeModel.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -40,7 +40,7 @@
  */
 public class EmployeeModel extends AbstractListModel implements BindingListModel {
 	
-	protected WikittyProxy proxy = BonzomsProxy.getInstance();
+	protected WikittyProxy proxy = ChoremDataProxy.getInstance();
 	protected Criteria criteria = null;
 	protected int itemsByPage = 1;
 	protected int currentPage = 0;

Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java
===================================================================
--- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -40,6 +40,7 @@
      */
     public void onOK$searchBox() {
     	String  search = searchBox.getValue();
+    	include.setSrc(null);
     	include.setSrc("resultPage.zul?search=" + search);
     }
 
@@ -48,22 +49,27 @@
     }
 
     public void onClick$employees() {
+    	include.setSrc(null);
         include.setSrc("employeePage.zul");
     }
 
     public void onClick$persons() {
+    	include.setSrc(null);
     	include.setSrc("personPage.zul");
     }
 
     public void onClick$companies() {
+    	include.setSrc(null);
     	include.setSrc("companyPage.zul");
     }
 
     public void onClick$services() {
+    	include.setSrc(null);
     	include.setSrc("servicePage.zul");
     }
 
     public void onClick$contracts() {
+    	include.setSrc(null);
     	include.setSrc("contractPage.zul");
     }
 }

Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java
===================================================================
--- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -52,7 +52,7 @@
  */
 public class PersonController extends GenericForwardComposer {
 
-    protected WikittyProxy proxy = BonzomsProxy.getInstance();
+    protected WikittyProxy proxy = ChoremDataProxy.getInstance();
 
     protected PersonModel personModel = new PersonModel(20);
 
@@ -88,7 +88,7 @@
     /*
      * Renderers
      */
-    public ListitemRenderer getPersonDataRenderer() {
+    public ListitemRenderer getPersonRenderer() {
         return new ListitemRenderer() {
 
             @Override

Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonFormController.java
===================================================================
--- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonFormController.java	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonFormController.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -29,7 +29,7 @@
  */
 public class PersonFormController extends GenericForwardComposer {
 
-    protected WikittyProxy proxy = BonzomsProxy.getInstance();
+    protected WikittyProxy proxy = ChoremDataProxy.getInstance();
 
     protected Person person = new PersonImpl();
     protected AddressModel addressModel = new AddressModel();
@@ -206,18 +206,20 @@
 	}
 	
 	public void onClick$deleteAddress() {
-		Listitem item = addressListbox.getSelectedItem();
-		if (item != null) {
-			Address address = (Address) item.getValue();
-			if (address != null) {
-				addressModel.removeData(address);
-				String id = address.getWikittyId();
-				if (id != null && !id.isEmpty()) {
-					removedAddresses.add(id);
+		if (addressListbox.getItemCount() > 1) { 
+			Listitem item = addressListbox.getSelectedItem();
+			if (item != null) {
+				Address address = (Address) item.getValue();
+				if (address != null) {
+					addressModel.removeData(address);
+					String id = address.getWikittyId();
+					if (id != null && !id.isEmpty()) {
+						removedAddresses.add(id);
+					}
+					selectedAddress = (Address) addressModel.getElementAt(0);
+					setAddressBox();
+					addressListbox.setSelectedIndex(0);
 				}
-				selectedAddress = (Address) addressModel.getElementAt(0);
-				setAddressBox();
-				addressListbox.setSelectedIndex(0);
 			}
 		}
 	}

Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonModel.java
===================================================================
--- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonModel.java	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonModel.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -17,7 +17,7 @@
  */
 public class PersonModel extends AbstractListModel implements BindingListModel {
 
-	protected WikittyProxy proxy = BonzomsProxy.getInstance();
+	protected WikittyProxy proxy = ChoremDataProxy.getInstance();
 	protected Criteria criteria = null;
 	protected int itemsByPage = 1;
 	protected int currentPage = 0;

Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java
===================================================================
--- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -62,7 +62,7 @@
  */
 public class ResultController extends GenericForwardComposer {
 
-    protected WikittyProxy proxy = BonzomsProxy.getInstance();
+    protected WikittyProxy proxy = ChoremDataProxy.getInstance();
     protected WikittyModel wikittyModel = new WikittyModel(10);
 
     @Override

Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceController.java
===================================================================
--- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceController.java	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceController.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -27,7 +27,7 @@
  */
 public class ServiceController extends GenericForwardComposer {
 
-    protected WikittyProxy proxy = BonzomsProxy.getInstance();
+    protected WikittyProxy proxy = ChoremDataProxy.getInstance();
 
     protected ServiceModel serviceModel = new ServiceModel(20);
 

Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceFormController.java
===================================================================
--- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceFormController.java	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceFormController.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -19,7 +19,7 @@
  */
 public class ServiceFormController extends GenericForwardComposer {
 
-    protected WikittyProxy proxy = BonzomsProxy.getInstance();
+    protected WikittyProxy proxy = ChoremDataProxy.getInstance();
 
     protected Service service = new ServiceImpl();
     protected Address address = new AddressImpl();

Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceModel.java
===================================================================
--- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceModel.java	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceModel.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -17,7 +17,7 @@
  */
 public class ServiceModel extends AbstractListModel implements BindingListModel {
 
-	protected WikittyProxy proxy = BonzomsProxy.getInstance();
+	protected WikittyProxy proxy = ChoremDataProxy.getInstance();
 	protected Criteria criteria = null;
 	protected int itemsByPage = 1;
 	protected int currentPage = 0;

Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/WikittyModel.java
===================================================================
--- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/WikittyModel.java	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/WikittyModel.java	2010-08-13 08:20:26 UTC (rev 127)
@@ -18,7 +18,7 @@
  */
 public class WikittyModel extends AbstractListModel implements BindingListModel {
 
-	protected WikittyProxy proxy = BonzomsProxy.getInstance();
+	protected WikittyProxy proxy = ChoremDataProxy.getInstance();
 	protected Criteria criteria = null;
 	protected int itemsByPage = 1;
 	protected int currentPage = 0;

Modified: trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul
===================================================================
--- trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul	2010-08-13 08:20:26 UTC (rev 127)
@@ -47,10 +47,10 @@
             <vbox>
 
                 <label value="Start" />
-                <datebox format="yyyy/MM/dd" value="@{composer.contract.start, save-when='saveContract.onClick'}" />
+                <datebox format="dd/MM/yyyy" value="@{composer.contract.start, save-when='saveContract.onClick'}" />
 
                 <label value="End" />
-                <datebox format="yyyy/MM/dd" value="@{composer.contract.end, save-when='saveContract.onClick'}" />
+                <datebox format="dd/MM/yyyy" value="@{composer.contract.end, save-when='saveContract.onClick'}" />
 
                 <label value="Description" />
                 <textbox rows="5" value="@{composer.contract.description, save-when='saveContract.onClick'}" />

Modified: trunk/bonzoms-ui-zk/src/main/webapp/contractsFormPage.zul
===================================================================
--- trunk/bonzoms-ui-zk/src/main/webapp/contractsFormPage.zul	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/webapp/contractsFormPage.zul	2010-08-13 08:20:26 UTC (rev 127)
@@ -31,10 +31,10 @@
 					<space />
 					<vbox>
 			   			<label value="Start" />
-			   			<datebox id="contractStart" format="yyyy/MM/dd" value="@{composer.selectedContract.start, save-when='saveContract.onClick'}" />
+			   			<datebox id="contractStart" format="dd/MM/yyyy" value="@{composer.selectedContract.start, save-when='saveContract.onClick'}" />
 			
 			   			<label value="End" />
-			   			<datebox id="contractEnd" format="yyyy/MM/dd" value="@{composer.selectedContract.end, save-when='saveContract.onClick'}" />
+			   			<datebox id="contractEnd" format="dd/MM/yyyy" value="@{composer.selectedContract.end, save-when='saveContract.onClick'}" />
 			
 			   			<label value="Description" />
 			   			<textbox id="contractDescription" rows="5" value="@{composer.selectedContract.description, save-when='saveContract.onClick'}" />

Modified: trunk/bonzoms-ui-zk/src/main/webapp/personFormPage.zul
===================================================================
--- trunk/bonzoms-ui-zk/src/main/webapp/personFormPage.zul	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/webapp/personFormPage.zul	2010-08-13 08:20:26 UTC (rev 127)
@@ -9,7 +9,7 @@
                 <label value="Last name" />
                 <textbox value="@{composer.person.lastName, save-when='savePerson.onClick'}" />
                 <label value="Birthday" />
-                <datebox format="yyyy/MM/dd" value="@{composer.person.birthDay, save-when='savePerson.onClick'}" />
+                <datebox format="dd/MM/yyyy" value="@{composer.person.birthDay, save-when='savePerson.onClick'}" />
 
                 <separator />
 

Modified: trunk/bonzoms-ui-zk/src/main/webapp/personPage.zul
===================================================================
--- trunk/bonzoms-ui-zk/src/main/webapp/personPage.zul	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/bonzoms-ui-zk/src/main/webapp/personPage.zul	2010-08-13 08:20:26 UTC (rev 127)
@@ -5,7 +5,7 @@
 <window id="person" apply="org.chorem.bonzoms.ui.PersonController">
     Persons: <toolbarbutton id="newPerson" label="Add new person" />
     <listbox autopaging="true" mold="paging" id="personListBox" rows="20" model="@{person$composer.personModel}"
-    itemRenderer="@{person$composer.personDataRenderer}">
+    itemRenderer="@{person$composer.personRenderer}">
         <listhead>
             <listheader label="First name" />
             <listheader label="Last name" />

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-08-11 14:49:46 UTC (rev 126)
+++ trunk/pom.xml	2010-08-13 08:20:26 UTC (rev 127)
@@ -116,19 +116,19 @@
             <dependency>
                 <groupId>org.zkoss.zk</groupId>
                 <artifactId>zk</artifactId>
-                <version>5.0.2</version>
+                <version>${zk.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.zkoss.zk</groupId>
                 <artifactId>zkplus</artifactId>
-                <version>5.0.2</version>
+                <version>${zk.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.zkoss.zk</groupId>
                 <artifactId>zul</artifactId>
-                <version>5.0.2</version>
+                <version>${zk.version}</version>
             </dependency>
 
             <dependency>
@@ -141,13 +141,13 @@
             <dependency>
                 <groupId>org.nuiton.wikitty</groupId>
                 <artifactId>wikitty-api</artifactId>
-                <version>2.0-SNAPSHOT</version>
+                <version>${wikitty.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.nuiton.wikitty</groupId>
                 <artifactId>wikitty-jdbc-impl</artifactId>
-                <version>2.0-SNAPSHOT</version>
+                <version>${wikitty.version}</version>
             </dependency>
 
             <dependency>
@@ -223,6 +223,8 @@
         <projectId>bonzoms</projectId>
 
         <chorem-data.version>0.1-SNAPSHOT</chorem-data.version>
+        <zk.version>5.0.2</zk.version>
+        <wikitty.version>2.1-SNAPSHOT</wikitty.version>
 
         <!-- Nuiton librairies -->
         <topia.version>2.2.0</topia.version>
@@ -236,7 +238,7 @@
         <hibernate.version>3.3.1.GA</hibernate.version>
 
         <!-- test -->
-        <junit.version>4.7</junit.version>
+        <junit.version>4.8.1</junit.version>
 
         <!-- ui -->
         <tapestry.version>5.1.0.5</tapestry.version>

    

[Bonzoms-commits] r127 - in trunk: . bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui bonzoms-ui-zk/src/main/webapp

bbrossaud＠users.chorem.org