Author: bbrossaud Date: 2010-08-23 17:57:38 +0200 (Mon, 23 Aug 2010) New Revision: 59 Url: http://chorem.org/repositories/revision/billy/59 Log: can reset the invoice search Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/InvoiceController.java trunk/billy-ui-zk/src/main/webapp/invoicePage.zul Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/InvoiceController.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/InvoiceController.java 2010-08-23 15:43:01 UTC (rev 58) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/InvoiceController.java 2010-08-23 15:57:38 UTC (rev 59) @@ -1,6 +1,5 @@ package org.chorem.billy.ui; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; @@ -242,7 +241,7 @@ invoiceModel.setActivePage(activePage); } - public void onClick$searchAll() throws ParseException { + public void onClick$searchAll() { Search search = Search.query(); search = search.eq(Element.ELT_EXTENSION, Invoice.EXT_INVOICE); dateSearchMacro.getSearch(search); @@ -255,6 +254,13 @@ initPaging(); } + public void onClick$newSearch() { + dateSearchMacro.clearAll(); + projectSearchMacro.clearAll(); + companySearchMacro.clearAll(); + categorySearchMacro.clearAll(); + } + /* * Getters */ Modified: trunk/billy-ui-zk/src/main/webapp/invoicePage.zul =================================================================== --- trunk/billy-ui-zk/src/main/webapp/invoicePage.zul 2010-08-23 15:43:01 UTC (rev 58) +++ trunk/billy-ui-zk/src/main/webapp/invoicePage.zul 2010-08-23 15:57:38 UTC (rev 59) @@ -12,7 +12,10 @@ <categorySearchMacro id="categorySearchMacro" /> <companySearchMacro id="companySearchMacro" /> <projectSearchMacro id="projectSearchMacro" /> - <button id="searchAll" label="Search" /> + <hbox> + <button id="searchAll" label="Search" /> + <button id="newSearch" label="New search" /> + </hbox> <separator /> </vbox>