Author: bbrossaud Date: 2010-08-23 12:30:25 +0200 (Mon, 23 Aug 2010) New Revision: 54 Url: http://chorem.org/repositories/revision/billy/54 Log: changed category display Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CategoryFormController.java trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/SubCategoryModel.java trunk/billy-ui-zk/src/main/webapp/billy.zul trunk/billy-ui-zk/src/main/webapp/categoryFormPage.zul Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CategoryFormController.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CategoryFormController.java 2010-08-19 16:59:02 UTC (rev 53) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CategoryFormController.java 2010-08-23 10:30:25 UTC (rev 54) @@ -162,7 +162,7 @@ if (selectedSubCategory != null) { int rowIndex = subCategoryModel.indexOf(selectedSubCategory); if (rowIndex != -1) { - subCategoryModel.reloadContent(rowIndex); + subCategoryModel.reloadContent(rowIndex, selectedSubCategory); } } } Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/SubCategoryModel.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/SubCategoryModel.java 2010-08-19 16:59:02 UTC (rev 53) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/SubCategoryModel.java 2010-08-23 10:30:25 UTC (rev 54) @@ -53,7 +53,8 @@ fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); } - public void reloadContent(int rowIndex) { + public void reloadContent(int rowIndex, SubCategory sub) { + subCategories.set(rowIndex, sub); fireEvent(ListDataEvent.CONTENTS_CHANGED, rowIndex, rowIndex); } Modified: trunk/billy-ui-zk/src/main/webapp/billy.zul =================================================================== --- trunk/billy-ui-zk/src/main/webapp/billy.zul 2010-08-19 16:59:02 UTC (rev 53) +++ trunk/billy-ui-zk/src/main/webapp/billy.zul 2010-08-23 10:30:25 UTC (rev 54) @@ -7,9 +7,9 @@ <groupbox height="800px" > <caption label="Menu" /> <vbox> + <toolbarbutton id="cash" label="Cash" /> + <toolbarbutton id="categories" label="Categories" /> <toolbarbutton id="invoices" label="Invoices" /> - <toolbarbutton id="categories" label="Categories" /> - <toolbarbutton id="cash" label="Cash" /> </vbox> </groupbox> <vbox id="content" > Modified: trunk/billy-ui-zk/src/main/webapp/categoryFormPage.zul =================================================================== --- trunk/billy-ui-zk/src/main/webapp/categoryFormPage.zul 2010-08-19 16:59:02 UTC (rev 53) +++ trunk/billy-ui-zk/src/main/webapp/categoryFormPage.zul 2010-08-23 10:30:25 UTC (rev 54) @@ -8,10 +8,6 @@ <groupbox> <caption id="categoryCaption" label="@{composer.category.name}" /> <hbox> - <vbox> - <label value="Order"/> - <intbox id="categoryOrder" value="@{composer.category.order, save-when='save.onClick'}" /> - </vbox> <space /> <vbox> <label value="Name"/>