Author: bbrossaud Date: 2010-08-23 17:43:01 +0200 (Mon, 23 Aug 2010) New Revision: 58 Url: http://chorem.org/repositories/revision/billy/58 Log: can clear the invoice search Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CategorySearchMacro.java trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CompanySearchMacro.java trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/DateSearchMacro.java trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/ProjectSearchMacro.java Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CategorySearchMacro.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CategorySearchMacro.java 2010-08-23 15:14:47 UTC (rev 57) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CategorySearchMacro.java 2010-08-23 15:43:01 UTC (rev 58) @@ -122,6 +122,10 @@ final SubCategory subCategory = (SubCategory) data; final String name = subCategory.getName(); final Checkbox checkbox = new Checkbox(name); + String id = subCategory.getWikittyId(); + if (subCategories.contains(id)) { + checkbox.setChecked(true); + } Listcell cell = new Listcell(); cell.appendChild(checkbox); item.appendChild(cell); @@ -163,6 +167,9 @@ }; } + /* + * Getters + */ public void getSearch(Search search) { if (search == null) { search = Search.query(); @@ -174,4 +181,9 @@ } } } + + public void clearAll() { + subCategories.clear(); + categoryModel.reload(); + } } Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CompanySearchMacro.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CompanySearchMacro.java 2010-08-23 15:14:47 UTC (rev 57) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CompanySearchMacro.java 2010-08-23 15:43:01 UTC (rev 58) @@ -98,6 +98,10 @@ final Company company = (Company) data; final String name = company.getName(); final Checkbox checkbox = new Checkbox(name); + String id = company.getWikittyId(); + if (companies.contains(id)) { + checkbox.setChecked(true); + } Listcell cell1 = new Listcell(); cell1.appendChild(checkbox); item.appendChild(cell1); @@ -134,4 +138,9 @@ } } } + + public void clearAll() { + companies.clear(); + companyModel.reload(); + } } Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/DateSearchMacro.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/DateSearchMacro.java 2010-08-23 15:14:47 UTC (rev 57) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/DateSearchMacro.java 2010-08-23 15:43:01 UTC (rev 58) @@ -162,4 +162,15 @@ } } } + + public void clearAll() { + initDates(); + Checkbox check = (Checkbox) getFellow("postedDate"); + check.setChecked(false); + check = (Checkbox) getFellow("expectedDate"); + check.setChecked(false); + check = (Checkbox) getFellow("paymentDate"); + check.setChecked(false); + isCheck = 0; + } } Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/ProjectSearchMacro.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/ProjectSearchMacro.java 2010-08-23 15:14:47 UTC (rev 57) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/ProjectSearchMacro.java 2010-08-23 15:43:01 UTC (rev 58) @@ -98,6 +98,10 @@ final Project project = (Project) data; final String name = project.getName(); final Checkbox checkbox = new Checkbox(name); + String id = project.getWikittyId(); + if (projects.contains(id)) { + checkbox.setChecked(true); + } Listcell cell = new Listcell(); cell.appendChild(checkbox); item.appendChild(cell); @@ -121,6 +125,9 @@ }; } + /* + * Getters + */ public void getSearch(Search search) { if (search == null) { search = Search.query(); @@ -132,4 +139,9 @@ } } } + + public void clearAll() { + projects.clear(); + projectModel.reload(); + } }