August 2010 - Billy-commits - mailman.cloud.codelutin.com

r62 - trunk
by tchemit＠users.chorem.org Aug. 29, 2010

Aug. 29, 2010

Author: tchemit Date: 2010-08-29 16:22:23 +0200 (Sun, 29 Aug 2010) New Revision: 62 Url: http://chorem.org/repositories/revision/billy/62 Log: Utilisation de mavenpom4redmine 2.2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-24 13:17:03 UTC (rev 61) +++ trunk/pom.xml 2010-08-29 14:22:23 UTC (rev 62) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.3</version> + <version>2.2.4</version> </parent> <groupId>org.chorem</groupId>

1 0

r61 - trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui
by bbrossaud＠users.chorem.org Aug. 24, 2010

Aug. 24, 2010

Author: bbrossaud Date: 2010-08-24 15:17:03 +0200 (Tue, 24 Aug 2010) New Revision: 61 Url: http://chorem.org/repositories/revision/billy/61 Log: tooltips works find Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java 2010-08-24 08:31:16 UTC (rev 60) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java 2010-08-24 13:17:03 UTC (rev 61) @@ -29,6 +29,7 @@ import org.zkoss.zul.Group; import org.zkoss.zul.Groupfoot; import org.zkoss.zul.Label; +import org.zkoss.zul.Popup; import org.zkoss.zul.Row; import org.zkoss.zul.Rows; @@ -130,19 +131,24 @@ search = search.lt(Invoice.FQ_FIELD_INVOICE_PAYMENT, last).ge(Invoice.FQ_FIELD_INVOICE_PAYMENT, first); Criteria criteria = search.criteria(); List<Invoice> invoices = proxy.findAllByCriteria(Invoice.class, criteria).getAll(); - String toolTips = ""; + String str = ""; + Popup p = new Popup(); for (Invoice invoice : invoices) { Double ttc = invoice.getTTCPrice(); Company company = proxy.restore(Company.class, invoice.getCompany()); if (company != null) { - toolTips += company.getName(); + str += company.getName(); } - toolTips += " " + invoice.getNumber() + " = " + invoice.getTTCPrice() + " | "; + str += " " + invoice.getNumber() + " = " + invoice.getTTCPrice() + "\n"; if (ttc != null) { price += ttc; } } - label.setTooltiptext(toolTips); + Label toolTips = new Label(str); + toolTips.setMultiline(true); + p.appendChild(toolTips); + p.setParent(self); + label.setTooltip(p); return price; }

1 0

r60 - trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui
by bbrossaud＠users.chorem.org Aug. 24, 2010

Aug. 24, 2010

Author: bbrossaud Date: 2010-08-24 10:31:16 +0200 (Tue, 24 Aug 2010) New Revision: 60 Url: http://chorem.org/repositories/revision/billy/60 Log: remove bug on cash Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java 2010-08-23 15:57:38 UTC (rev 59) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java 2010-08-24 08:31:16 UTC (rev 60) @@ -152,25 +152,27 @@ int startYear = Integer.valueOf(start); int endYear = Integer.valueOf(end); + int i = 0; for (int currentYear = startYear; currentYear <= endYear; ++currentYear) { int startMonth = getStartMonth(startYear, currentYear); int endMonth = getEndMonth(currentYear, endYear); - for (int count = 0; startMonth <= endMonth; ++count) { + while (startMonth <= endMonth) { Label label = new Label(); Date first = getDate(currentYear, startMonth); Date last = getDate(currentYear, startMonth + 1); Double price = createLabelPrice(first, last, sub.getWikittyId(), label); label.setValue(price.toString()); row.appendChild(label); - if (total.size() < (count + 1)) { + if (total.size() < (i + 1)) { total.add(price); } else { - Double tmp = total.get(count); + Double tmp = total.get(i); tmp += price; - total.set(count, tmp); + total.set(i, tmp); } + ++i; ++startMonth; } }

1 0

r59 - in trunk/billy-ui-zk/src/main: java/org/chorem/billy/ui webapp
by bbrossaud＠users.chorem.org Aug. 23, 2010

Aug. 23, 2010

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>

1 0

r58 - trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui
by bbrossaud＠users.chorem.org Aug. 23, 2010

Aug. 23, 2010

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(); + } }

1 0

r57 - trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui
by bbrossaud＠users.chorem.org Aug. 23, 2010

Aug. 23, 2010

Author: bbrossaud Date: 2010-08-23 17:14:47 +0200 (Mon, 23 Aug 2010) New Revision: 57 Url: http://chorem.org/repositories/revision/billy/57 Log: addition type in company listbox Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CompanySearchMacro.java 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:06:40 UTC (rev 56) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CompanySearchMacro.java 2010-08-23 15:14:47 UTC (rev 57) @@ -98,9 +98,11 @@ final Company company = (Company) data; final String name = company.getName(); final Checkbox checkbox = new Checkbox(name); - Listcell cell = new Listcell(); - cell.appendChild(checkbox); - item.appendChild(cell); + Listcell cell1 = new Listcell(); + cell1.appendChild(checkbox); + item.appendChild(cell1); + Listcell cell2 = new Listcell(company.getType()); + item.appendChild(cell2); checkbox.addEventListener(Events.ON_CHECK, new EventListener() { @Override

1 0

r56 - in trunk/billy-ui-zk/src/main: java/org/chorem/billy/ui webapp
by bbrossaud＠users.chorem.org Aug. 23, 2010

Aug. 23, 2010

Author: bbrossaud Date: 2010-08-23 17:06:40 +0200 (Mon, 23 Aug 2010) New Revision: 56 Url: http://chorem.org/repositories/revision/billy/56 Log: can delete subcategory Added: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/SubCategoryFormController.java Modified: trunk/billy-ui-zk/src/main/webapp/subCategoryFormPage.zul Added: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/SubCategoryFormController.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/SubCategoryFormController.java (rev 0) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/SubCategoryFormController.java 2010-08-23 15:06:40 UTC (rev 56) @@ -0,0 +1,55 @@ +package org.chorem.billy.ui; + +import org.chorem.data.bonzoms.SubCategory; +import org.chorem.data.bonzoms.SubCategoryImpl; +import org.nuiton.wikitty.WikittyProxy; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Events; +import org.zkoss.zk.ui.util.GenericForwardComposer; +import org.zkoss.zkplus.databind.AnnotateDataBinder; +import org.zkoss.zkplus.databind.DataBinder; +import org.zkoss.zul.Window; + +public class SubCategoryFormController extends GenericForwardComposer { + + protected WikittyProxy proxy = ChoremDataProxy.getInstance(); + + protected SubCategory subCategory = new SubCategoryImpl(); + + public static final String EVENT_ON_SAVE_SUBCATEGORY = "onSaveSubCategory"; + + @Override + public void doAfterCompose(Component comp) throws Exception { + super.doAfterCompose(comp); + Window win = (Window) self; + win.doModal(); + win.setPosition("center"); + String id = Executions.getCurrent().getParameter("subCategoryId"); + if (id == null) { + id = (String) arg.get("subCategoryId"); + } + if (id != null) { + subCategory = proxy.restore(SubCategory.class, id); + } + DataBinder binder = new AnnotateDataBinder(comp); + binder.bindBean("composer", this); + binder.loadAll(); + } + + /* + * Event + */ + public void onClick$saveSubCategory() { + subCategory = proxy.store(subCategory); + Events.postEvent(EVENT_ON_SAVE_SUBCATEGORY, this.self, subCategory.getWikittyId()); + self.detach(); + } + + /* + * Getter + */ + public SubCategory getSubCategory() { + return subCategory; + } +} Modified: trunk/billy-ui-zk/src/main/webapp/subCategoryFormPage.zul =================================================================== --- trunk/billy-ui-zk/src/main/webapp/subCategoryFormPage.zul 2010-08-23 14:59:35 UTC (rev 55) +++ trunk/billy-ui-zk/src/main/webapp/subCategoryFormPage.zul 2010-08-23 15:06:40 UTC (rev 56) @@ -1,6 +1,6 @@ <?page title="new page title" contentType="text/html;charset=UTF-8"?> -<window closable="true" maximizable="true" sizable="true" height="200px" width="200px" contentStyle="overflow:auto" apply="org.chorem.billy.ui.SubCategoryFormController"> +<window closable="true" maximizable="true" sizable="true" height="220px" width="200px" contentStyle="overflow:auto" apply="org.chorem.billy.ui.SubCategoryFormController"> <caption label="Sub category" /> <groupbox> <caption label="@{composer.subCategory.name, save-when='saveSubCategory.onClick'}" />

1 0

r55 - in trunk/billy-ui-zk/src/main: java/org/chorem/billy/ui webapp webapp/macros
by bbrossaud＠users.chorem.org Aug. 23, 2010

Aug. 23, 2010

Author: bbrossaud Date: 2010-08-23 16:59:35 +0200 (Mon, 23 Aug 2010) New Revision: 55 Url: http://chorem.org/repositories/revision/billy/55 Log: category and subcategory are in the same page Added: trunk/billy-ui-zk/src/main/webapp/subCategoryFormPage.zul Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CategoryFormController.java trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/SubCategoryListboxMacro.java trunk/billy-ui-zk/src/main/webapp/categoryFormPage.zul trunk/billy-ui-zk/src/main/webapp/macros/subCategoryListboxMacro.zul Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java 2010-08-23 10:30:25 UTC (rev 54) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java 2010-08-23 14:59:35 UTC (rev 55) @@ -240,7 +240,7 @@ protected void createGrid() throws ParseException { createHead(); - createRows(); + createRows(); } /* 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-23 10:30:25 UTC (rev 54) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CategoryFormController.java 2010-08-23 14:59:35 UTC (rev 55) @@ -1,44 +1,21 @@ package org.chorem.billy.ui; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - import org.chorem.data.bonzoms.Category; import org.chorem.data.bonzoms.CategoryImpl; -import org.chorem.data.bonzoms.SubCategory; -import org.chorem.data.bonzoms.SubCategoryImpl; import org.nuiton.wikitty.WikittyProxy; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zkplus.databind.AnnotateDataBinder; import org.zkoss.zkplus.databind.DataBinder; -import org.zkoss.zul.Bandbox; -import org.zkoss.zul.Caption; -import org.zkoss.zul.Intbox; -import org.zkoss.zul.Listbox; -import org.zkoss.zul.Listcell; -import org.zkoss.zul.Listitem; -import org.zkoss.zul.ListitemRenderer; -import org.zkoss.zul.Textbox; import org.zkoss.zul.Window; public class CategoryFormController extends GenericForwardComposer { protected WikittyProxy proxy = ChoremDataProxy.getInstance(); - protected Category category = new CategoryImpl(); - protected SubCategory selectedSubCategory = null; - protected SubCategoryModel subCategoryModel = new SubCategoryModel(); - protected List<String> removedSubCategories = new ArrayList<String>(); - protected Bandbox categoryBandbox; - protected Listbox subCategoryListbox; - public static final String EVENT_ON_SAVE_CATEGORY = "onSaveCategory"; @Override @@ -54,155 +31,24 @@ if (categoryId != null) { category = proxy.restore(Category.class, categoryId); } - initSubCategoryModel(); DataBinder binder = new AnnotateDataBinder(comp); binder.bindBean("composer", this); binder.loadAll(); } - protected void initSubCategoryModel() { - Set<String> ids = category.getSubCategory(); - if (ids != null && !ids.isEmpty()) { - List<SubCategory> subCategories = proxy.restore(SubCategory.class, new ArrayList<String>(ids)); - if (subCategories != null) { - subCategories = new ArrayList<SubCategory>(subCategories); - subCategoryModel.setSubCategories(subCategories); - selectedSubCategory = subCategories.get(0); - } - } - if (subCategoryModel.getSubCategories().size() == 0) { - onClick$addSubCategory(); - } - } - - protected void saveSubCategories() { - List<SubCategory> subcategories = proxy.store(subCategoryModel.getSubCategories()); - for (SubCategory subCategory : subcategories) { - category.addSubCategory(subCategory.getWikittyId()); - } - if (!removedSubCategories.isEmpty()) { - proxy.delete(removedSubCategories); - for (String id : removedSubCategories) { - category.removeSubCategory(id); - } - } - } - - protected void fillSubCategoryFields() { - if (selectedSubCategory != null) { - Caption caption = (Caption) self.getFellow("subCategoryCaption"); - caption.setLabel(selectedSubCategory.getName()); - - Intbox intbox = (Intbox) self.getFellow("subCategoryOrder"); - intbox.setValue(selectedSubCategory.getOrder()); - - Textbox textbox = (Textbox) self.getFellow("subCategoryName"); - textbox.setValue(selectedSubCategory.getName()); - - textbox = (Textbox) self.getFellow("subCategoryAccountNumber"); - textbox.setValue(selectedSubCategory.getAccountNumber()); - - textbox = (Textbox) self.getFellow("subCategoryTVA"); - textbox.setValue(selectedSubCategory.getTVA()); - } - } - - protected void clearSubCategoryFields() { - Caption caption = (Caption) self.getFellow("subCategoryCaption"); - caption.setLabel(""); - - Intbox intbox = (Intbox) self.getFellow("subCategoryOrder"); - intbox.setValue(-1); - - Textbox textbox = (Textbox) self.getFellow("subCategoryName"); - textbox.setValue(""); - - textbox = (Textbox) self.getFellow("subCategoryAccountNumber"); - textbox.setValue(""); - - textbox = (Textbox) self.getFellow("subCategoryTVA"); - textbox.setValue(""); - } - /* - * Renderers - */ - public ListitemRenderer getSubCategoryRenderer() { - return new ListitemRenderer() { - - @Override - public void render(Listitem item, Object data) throws Exception { - item.setValue(data); - final SubCategory sub = (SubCategory) data; - Listcell name = new Listcell(sub.getName()); - item.appendChild(name); - item.addEventListener(Events.ON_DOUBLE_CLICK, new EventListener() { - - @Override - public void onEvent(Event event) throws Exception { - selectedSubCategory = sub; - fillSubCategoryFields(); - } - }); - } - }; - } - - /* * Events */ - public void onClick$addSubCategory() { - selectedSubCategory = new SubCategoryImpl(); - selectedSubCategory.setName("New sub category"); - subCategoryModel.addData(selectedSubCategory); - fillSubCategoryFields(); - } - - public void onClick$saveSubCategory() { - if (selectedSubCategory != null) { - int rowIndex = subCategoryModel.indexOf(selectedSubCategory); - if (rowIndex != -1) { - subCategoryModel.reloadContent(rowIndex, selectedSubCategory); - } - } - } - public void onClick$save() { - saveSubCategories(); - proxy.store(category); + category = proxy.store(category); Events.postEvent(EVENT_ON_SAVE_CATEGORY, this.self, category.getWikittyId()); this.self.detach(); } - public void onClick$deleteSubCategory() { - if (subCategoryListbox.getItemCount() > 1) { - Listitem item = subCategoryListbox.getSelectedItem(); - if (item != null) { - SubCategory subCategory = (SubCategory) item.getValue(); - if (subCategory != null) { - subCategoryModel.removeData(subCategory); - String version = subCategory.getWikittyVersion(); - if (version != null && !version.equals("0.1")) { - removedSubCategories.add(subCategory.getWikittyId()); - } - clearSubCategoryFields(); - } - } - } - } - /* * Getters */ - public SubCategoryModel getSubCategoryModel() { - return subCategoryModel; - } - public Category getCategory() { return category; } - - public SubCategory getSelectedSubCategory() { - return selectedSubCategory; - } } Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/SubCategoryListboxMacro.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/SubCategoryListboxMacro.java 2010-08-23 10:30:25 UTC (rev 54) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/SubCategoryListboxMacro.java 2010-08-23 14:59:35 UTC (rev 55) @@ -1,21 +1,27 @@ package org.chorem.billy.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.Category; import org.chorem.data.bonzoms.CategoryImpl; +import org.chorem.data.bonzoms.ExpenseReportItem; import org.chorem.data.bonzoms.SubCategory; import org.nuiton.wikitty.WikittyProxy; +import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.HtmlMacroComponent; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; +import org.zkoss.zul.Button; import org.zkoss.zul.Listbox; import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; +import org.zkoss.zul.Window; public class SubCategoryListboxMacro extends HtmlMacroComponent { @@ -26,20 +32,42 @@ @Override public void afterCompose() { super.afterCompose(); -// initButton(); + initButton(); initListbox(); } -// protected void initButton() { -// Toolbarbutton button = (Toolbarbutton) getFellow("newSubCategory"); -// button.addEventListener(Events.ON_CLICK, new EventListener() { -// -// @Override -// public void onEvent(Event event) throws Exception { -// createSubCategoryFormWindow(null); -// } -// }); -// } + protected void initButton() { + Button button = (Button) getFellow("deleteSubCategory"); + button.addEventListener(Events.ON_CLICK, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + if (subModel.getSize() > 1) { + Listbox listbox = (Listbox) getFellow("subCategoryListbox"); + Listitem item = listbox.getSelectedItem(); + if (item != null) { + SubCategory sub = (SubCategory) item.getValue(); + if (sub != null) { + subModel.removeData(sub); + String id = sub.getWikittyId(); + proxy.delete(id); + category.removeSubCategory(id); + category = proxy.store(category); + listbox.setSelectedIndex(0); + } + } + } + } + }); + Button newItem = (Button) getFellow("newSubCategory"); + newItem.addEventListener(Events.ON_CLICK, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + createSubCategoryFormWindow(null); + } + }); + } protected void initListbox() { initSubCategoryModel(); @@ -66,25 +94,27 @@ } protected void createSubCategoryFormWindow(String id) { -// Map<String, Object> map = new HashMap<String, Object>(); -// if (id != null) { -// map.put("subCategoryId", id); -// } -// Window win = (Window) Executions.createComponents("subCategoryFormPage.zul", null, map); -// win.addEventListener(SubCategoryFormController.EVENT_ON_SAVE_SUBCATEGORY, new EventListener() { -// -// @Override -// public void onEvent(Event event) throws Exception { -// String id = (String) event.getData(); -// SubCategory sub = proxy.restore(SubCategory.class, id); -// int rowIndex = subModel.indexOf(sub); -// if (rowIndex != -1) { -// subModel.reloadContent(rowIndex); -// } else { -// subModel.addData(sub); -// } -// } -// }); + Map<String, Object> map = new HashMap<String, Object>(); + if (id != null) { + map.put("subCategoryId", id); + } + Window win = (Window) Executions.createComponents("subCategoryFormPage.zul", null, map); + win.addEventListener(SubCategoryFormController.EVENT_ON_SAVE_SUBCATEGORY, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + String id = (String) event.getData(); + category.addSubCategory(id); + SubCategory sub = proxy.restore(SubCategory.class, id); + int rowIndex = subModel.indexOf(sub); + if (rowIndex != -1) { + subModel.reloadContent(rowIndex, sub); + } else { + subModel.addData(sub); + category = proxy.store(category); + } + } + }); } Modified: trunk/billy-ui-zk/src/main/webapp/categoryFormPage.zul =================================================================== --- trunk/billy-ui-zk/src/main/webapp/categoryFormPage.zul 2010-08-23 10:30:25 UTC (rev 54) +++ trunk/billy-ui-zk/src/main/webapp/categoryFormPage.zul 2010-08-23 14:59:35 UTC (rev 55) @@ -1,66 +1,25 @@ <?page id="contract" title="Contract" cacheable="false" language="xul/html" zscriptLanguage="Java"?> <?meta content="text/html; charset=UTF-8" pageEncoding="UTF-8"?> -<window closable="true" maximizable="true" sizable="true" height="420px" width="460px" contentStyle="overflow:auto" apply="org.chorem.billy.ui.CategoryFormController"> -<caption label="Category" /> - <vbox> - <separator /> - <groupbox> - <caption id="categoryCaption" label="@{composer.category.name}" /> - <hbox> - <space /> - <vbox> - <label value="Name"/> - <textbox id="categoryName" value="@{composer.category.name, save-when='save.onClick'}" /> - </vbox> - <space /> - <vbox> - <label value="Type" /> - <textbox id="categoryType" value="@{composer.category.type, save-when='save.onClick'}" /> - </vbox> - </hbox> - </groupbox> - <separator /> - <groupbox> - <caption label="Sub categories" /> - <hbox> - <vbox> - <separator /> - <listbox id="subCategoryListbox" autopaging="true" mold="paging" rows="10" width="200px" model="@{composer.subCategoryModel}" - itemRenderer="@{composer.subCategoryRenderer}"> - <listhead> - <listheader label="Name" /> - </listhead> - </listbox> - <hbox> - <button id="addSubCategory" label="Add" /> - <button id="deleteSubCategory" label="Delete" /> - </hbox> - </vbox> +<window closable="true" maximizable="true" sizable="true" height="230px" width="200px" contentStyle="overflow:auto" apply="org.chorem.billy.ui.CategoryFormController"> + <caption label="Category" /> + <separator /> + <groupbox> + <caption id="categoryCaption" label="@{composer.category.name}" /> + <vbox> + <space /> + <vbox> + <label value="Name"/> + <textbox id="categoryName" value="@{composer.category.name, save-when='save.onClick'}" /> + </vbox> + <space /> + <vbox> + <label value="Type" /> + <textbox id="categoryType" value="@{composer.category.type, save-when='save.onClick'}" /> + </vbox> + </vbox> + </groupbox> - <space /> - - <groupbox> - <caption id="subCategoryCaption" label="@{composer.selectedSubCategory.name, save-when='saveSubCategory.onClick'}" /> - <vbox> - <label value="Order"/> - <intbox id="subCategoryOrder" value="@{composer.selectedSubCategory.order, save-when='saveSubCategory.onClick'}" /> - - <label value="Name"/> - <textbox id="subCategoryName" value="@{composer.selectedSubCategory.name, save-when='saveSubCategory.onClick'}" /> - - <label value="Account number" /> - <textbox id="subCategoryAccountNumber" value="@{composer.selectedSubCategory.accountNumber, save-when='saveSubCategory.onClick'}" /> - - <label value="TVA" /> - <textbox id="subCategoryTVA" value="@{composer.selectedSubCategory.TVA, save-when='saveSubCategory.onClick'}" /> - <toolbarbutton id="saveSubCategory" label="Save" /> - </vbox> - </groupbox> - </hbox> - </groupbox> - </vbox> - <button id="save" label="Save and quit" /> </window> \ No newline at end of file Modified: trunk/billy-ui-zk/src/main/webapp/macros/subCategoryListboxMacro.zul =================================================================== --- trunk/billy-ui-zk/src/main/webapp/macros/subCategoryListboxMacro.zul 2010-08-23 10:30:25 UTC (rev 54) +++ trunk/billy-ui-zk/src/main/webapp/macros/subCategoryListboxMacro.zul 2010-08-23 14:59:35 UTC (rev 55) @@ -1,8 +1,14 @@ <?page title="new page title" contentType="text/html;charset=UTF-8"?> <zk> - <listbox id="subCategoryListbox" autopaging="true" mold="paging" rows="20"> - <listhead> - <listheader label="Name" /> - </listhead> - </listbox> + <vbox> + <listbox id="subCategoryListbox" autopaging="true" mold="paging" rows="20"> + <listhead> + <listheader label="Name" /> + </listhead> + </listbox> + <hbox> + <button id="newSubCategory" label="Add new sub category" /> + <button id="deleteSubCategory" label="Delete sub category" /> + </hbox> + </vbox> </zk> \ No newline at end of file Added: trunk/billy-ui-zk/src/main/webapp/subCategoryFormPage.zul =================================================================== --- trunk/billy-ui-zk/src/main/webapp/subCategoryFormPage.zul (rev 0) +++ trunk/billy-ui-zk/src/main/webapp/subCategoryFormPage.zul 2010-08-23 14:59:35 UTC (rev 55) @@ -0,0 +1,19 @@ +<?page title="new page title" contentType="text/html;charset=UTF-8"?> + +<window closable="true" maximizable="true" sizable="true" height="200px" width="200px" contentStyle="overflow:auto" apply="org.chorem.billy.ui.SubCategoryFormController"> + <caption label="Sub category" /> + <groupbox> + <caption label="@{composer.subCategory.name, save-when='saveSubCategory.onClick'}" /> + <vbox> + <label value="Name"/> + <textbox id="subCategoryName" value="@{composer.subCategory.name, save-when='saveSubCategory.onClick'}" /> + + <label value="Account number" /> + <textbox id="subCategoryAccountNumber" value="@{composer.subCategory.accountNumber, save-when='saveSubCategory.onClick'}" /> + + <label value="TVA" /> + <textbox id="subCategoryTVA" value="@{composer.subCategory.TVA, save-when='saveSubCategory.onClick'}" /> + </vbox> + </groupbox> + <button id="saveSubCategory" label="Save" /> +</window>

1 0

r54 - in trunk/billy-ui-zk/src/main: java/org/chorem/billy/ui webapp
by bbrossaud＠users.chorem.org Aug. 23, 2010

Aug. 23, 2010

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"/>

1 0

r53 - in trunk/billy-ui-zk/src/main: java/org/chorem/billy/ui webapp webapp/WEB-INF webapp/macros
by bbrossaud＠users.chorem.org Aug. 19, 2010

Aug. 19, 2010

Author: bbrossaud Date: 2010-08-19 18:59:02 +0200 (Thu, 19 Aug 2010) New Revision: 53 Url: http://chorem.org/repositories/revision/billy/53 Log: addtion cash Added: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/SubCategoryListboxMacro.java trunk/billy-ui-zk/src/main/webapp/macros/subCategoryListboxMacro.zul Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CategoryController.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/InvoiceController.java trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/SubCategoryModel.java trunk/billy-ui-zk/src/main/webapp/WEB-INF/lang-addon.xml trunk/billy-ui-zk/src/main/webapp/categoryPage.zul trunk/billy-ui-zk/src/main/webapp/invoiceFormPage.zul trunk/billy-ui-zk/src/main/webapp/invoicePage.zul Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java 2010-08-18 15:18:43 UTC (rev 52) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java 2010-08-19 16:59:02 UTC (rev 53) @@ -9,6 +9,8 @@ import java.util.List; import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.data.bonzoms.Category; import org.chorem.data.bonzoms.Company; import org.chorem.data.bonzoms.Invoice; @@ -32,22 +34,44 @@ public class CashController extends GenericForwardComposer { + private static final Log log = LogFactory.getLog(CashController.class); + protected WikittyProxy proxy = ChoremDataProxy.getInstance(); protected Date startDate = new Date(); protected Date endDate = new Date(); + protected SimpleDateFormat sdfMM = new SimpleDateFormat("MM"); + protected SimpleDateFormat sdfyyyy = new SimpleDateFormat("yyyy"); + protected SimpleDateFormat sdfMMyyyy = new SimpleDateFormat("MMyyy"); + protected Grid cashGrid; @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); + + initDates(); } + protected void initDates() { + Date date = new Date(); + String year = sdfyyyy.format(date); + try { + Date start = sdfMMyyyy.parse("01" + year); + Date end = sdfMMyyyy.parse("12" + year); + Datebox startDate = (Datebox) self.getFellow("startDatebox"); + startDate.setValue(start); + Datebox endDate = (Datebox) self.getFellow("endDatebox"); + endDate.setValue(end); + } catch (ParseException e) { + log.warn("Cannot init dates"); + } + } + protected int getStartMonth(int currentYear, int startYear) { int startMonth = 1; if (startYear == currentYear) { - SimpleDateFormat sdf = new SimpleDateFormat("MM"); - startMonth = Integer.valueOf(sdf.format(startDate)); + startMonth = Integer.valueOf(sdfMM.format(startDate)); } return startMonth; } @@ -55,8 +79,7 @@ protected int getEndMonth(int currentYear, int endYear) { int endMonth = 12; if (endYear == currentYear) { - SimpleDateFormat sdf = new SimpleDateFormat("MM"); - endMonth = Integer.valueOf(sdf.format(endDate)); + endMonth = Integer.valueOf(sdfMM.format(endDate)); } return endMonth; } @@ -74,9 +97,8 @@ } protected void createHead() { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy"); - String start = sdf.format(startDate); - String end = sdf.format(endDate); + String start = sdfyyyy.format(startDate); + String end = sdfyyyy.format(endDate); int startYear = Integer.valueOf(start); int endYear = Integer.valueOf(end); Columns head = new Columns(); @@ -97,8 +119,7 @@ } NumberFormat nf = new DecimalFormat("00"); String monthStr = nf.format(m); - SimpleDateFormat sdf = new SimpleDateFormat("MMyyy"); - return sdf.parse(monthStr + y); + return sdfMMyyyy.parse(monthStr + y); } protected double createLabelPrice(Date start, Date end, String id, Label label) throws ParseException { @@ -126,9 +147,8 @@ } protected void createLabels(Row row, SubCategory sub, List<Double> total) throws ParseException { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy"); - String start = sdf.format(startDate); - String end = sdf.format(endDate); + String start = sdfyyyy.format(startDate); + String end = sdfyyyy.format(endDate); int startYear = Integer.valueOf(start); int endYear = Integer.valueOf(end); Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CategoryController.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CategoryController.java 2010-08-18 15:18:43 UTC (rev 52) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CategoryController.java 2010-08-19 16:59:02 UTC (rev 53) @@ -30,6 +30,7 @@ protected CategoryModel categoryModel = new CategoryModel(pageSize); protected Paging categoryPaging; + protected SubCategoryListboxMacro subCategoryListboxMacro; @Override public void doAfterCompose(Component comp) throws Exception { @@ -87,6 +88,13 @@ item.appendChild(cell1); Listcell cell2 = new Listcell(category.getType()); item.appendChild(cell2); + item.addEventListener(Events.ON_CLICK, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + subCategoryListboxMacro.setCategory(category); + } + }); item.addEventListener(Events.ON_DOUBLE_CLICK, new EventListener() { @Override 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-18 15:18:43 UTC (rev 52) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/DateSearchMacro.java 2010-08-19 16:59:02 UTC (rev 53) @@ -1,8 +1,11 @@ package org.chorem.billy.ui; import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Date; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.data.bonzoms.Invoice; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.search.Search; @@ -16,6 +19,7 @@ public class DateSearchMacro extends HtmlMacroComponent { protected int isCheck = 0; + private static final Log log = LogFactory.getLog(DateSearchMacro.class); @Override public void afterCompose() { @@ -23,6 +27,7 @@ initPostedCheck(); initExpectedCheck(); initPaymentCheck(); + initDates(); } protected void initPostedCheck() { @@ -73,6 +78,23 @@ }); } + protected void initDates() { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy"); + Date date = new Date(); + String year = sdf.format(date); + sdf.applyPattern("MMyyyy"); + try { + Date start = sdf.parse("01" + year); + Date end = sdf.parse("12" + year); + Datebox startDate = (Datebox) getFellow("startDate"); + startDate.setValue(start); + Datebox endDate = (Datebox) getFellow("endDate"); + endDate.setValue(end); + } catch (ParseException e) { + log.warn("Cannot init dates"); + } + } + protected void checkPosted(Date start, Date end, Search search) throws ParseException { Checkbox check = (Checkbox) getFellow("postedDate"); if (check.isChecked()) { @@ -118,7 +140,7 @@ } } - public void getSearch(Search search) throws ParseException { + public void getSearch(Search search) { if (search == null) { search = Search.query(); } @@ -130,9 +152,13 @@ Date end = endDate.getValue(); if (start != null || end != null) { Search searchDate = search.or(); - checkPosted(start, end, searchDate); - checkExpected(start, end, searchDate); - checkPayment(start, end, searchDate); + try { + checkPosted(start, end, searchDate); + checkExpected(start, end, searchDate); + checkPayment(start, end, searchDate); + } catch (ParseException e) { + log.warn("Cannot format date (WikittyUtil)"); + } } } } 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-18 15:18:43 UTC (rev 52) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/InvoiceController.java 2010-08-19 16:59:02 UTC (rev 53) @@ -4,6 +4,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.chorem.billy.ui.ChoremDataProxy; @@ -22,6 +23,7 @@ import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.ForwardEvent; import org.zkoss.zk.ui.util.GenericForwardComposer; +import org.zkoss.zul.Label; import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; @@ -43,6 +45,9 @@ protected Paging invoicePaging; + protected Label totalHTLabel; + protected Label totalTTCLabel; + @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); @@ -50,9 +55,29 @@ initPaging(); } + protected void initTotals(Criteria criteria) { + Double totalHT = new Double(0); + Double totalTTC = new Double(0); + boolean stop = false; + for (int index = 0; stop == false; index += 2000) { + Criteria newCriteria = criteria.setFirstIndex(index).setEndIndex(index + 2000); + List<Invoice> invoices = proxy.findAllByCriteria(Invoice.class, newCriteria).getAll(); + for (Invoice invoice : invoices) { + totalHT += invoice.getHTPrice(); + totalTTC += invoice.getTTCPrice(); + } + if (invoices.size() < 2000) { + stop = true; + } + } + totalHTLabel.setValue(totalHT.toString()); + totalTTCLabel.setValue(totalTTC.toString()); + } + protected void initInvoiceModel() { Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, Invoice.EXT_INVOICE).criteria(); invoiceModel.setCriteria(criteria); + initTotals(criteria); } protected void initPaging() { @@ -226,6 +251,7 @@ categorySearchMacro.getSearch(search); Criteria criteria = search.criteria(); invoiceModel.setCriteria(criteria); + initTotals(criteria); initPaging(); } Added: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/SubCategoryListboxMacro.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/SubCategoryListboxMacro.java (rev 0) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/SubCategoryListboxMacro.java 2010-08-19 16:59:02 UTC (rev 53) @@ -0,0 +1,120 @@ +package org.chorem.billy.ui; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import org.chorem.data.bonzoms.Category; +import org.chorem.data.bonzoms.CategoryImpl; +import org.chorem.data.bonzoms.SubCategory; +import org.nuiton.wikitty.WikittyProxy; +import org.zkoss.zk.ui.HtmlMacroComponent; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zk.ui.event.EventListener; +import org.zkoss.zk.ui.event.Events; +import org.zkoss.zul.Listbox; +import org.zkoss.zul.Listcell; +import org.zkoss.zul.Listitem; +import org.zkoss.zul.ListitemRenderer; + +public class SubCategoryListboxMacro extends HtmlMacroComponent { + + protected WikittyProxy proxy = ChoremDataProxy.getInstance(); + protected Category category = new CategoryImpl(); + protected SubCategoryModel subModel = new SubCategoryModel(); + + @Override + public void afterCompose() { + super.afterCompose(); +// initButton(); + initListbox(); + } + +// protected void initButton() { +// Toolbarbutton button = (Toolbarbutton) getFellow("newSubCategory"); +// button.addEventListener(Events.ON_CLICK, new EventListener() { +// +// @Override +// public void onEvent(Event event) throws Exception { +// createSubCategoryFormWindow(null); +// } +// }); +// } + + protected void initListbox() { + initSubCategoryModel(); + Listbox listbox = (Listbox) getFellow("subCategoryListbox"); + listbox.setModel(subModel); + ListitemRenderer renderer = getSubCategoryRenderer(); + listbox.setItemRenderer(renderer); + Set<String> ids = category.getSubCategory(); + if (ids != null) { + List<SubCategory> subs = proxy.restore(SubCategory.class, new ArrayList<String>(ids)); + subModel.setSubCategories(subs); + } + } + + protected void initSubCategoryModel() { + Set<String> ids = category.getSubCategory(); + if (ids != null && !ids.isEmpty()) { + List<SubCategory> subCategories = proxy.restore(SubCategory.class, new ArrayList<String>(ids)); + if (subCategories != null) { + subCategories = new ArrayList<SubCategory>(subCategories); + subModel.setSubCategories(subCategories); + } + } + } + + protected void createSubCategoryFormWindow(String id) { +// Map<String, Object> map = new HashMap<String, Object>(); +// if (id != null) { +// map.put("subCategoryId", id); +// } +// Window win = (Window) Executions.createComponents("subCategoryFormPage.zul", null, map); +// win.addEventListener(SubCategoryFormController.EVENT_ON_SAVE_SUBCATEGORY, new EventListener() { +// +// @Override +// public void onEvent(Event event) throws Exception { +// String id = (String) event.getData(); +// SubCategory sub = proxy.restore(SubCategory.class, id); +// int rowIndex = subModel.indexOf(sub); +// if (rowIndex != -1) { +// subModel.reloadContent(rowIndex); +// } else { +// subModel.addData(sub); +// } +// } +// }); + } + + + /* + * Renderers + */ + protected ListitemRenderer getSubCategoryRenderer() { + return new ListitemRenderer() { + + @Override + public void render(Listitem item, Object data) throws Exception { + item.setValue(data); + final SubCategory sub = (SubCategory) data; + Listcell name = new Listcell(sub.getName()); + item.appendChild(name); + item.addEventListener(Events.ON_DOUBLE_CLICK, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + createSubCategoryFormWindow(sub.getWikittyId()); + } + }); + } + }; + } + + public void setCategory(Category category) { + if (category != null) { + this.category = category; + initListbox(); + } + } +} 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-18 15:18:43 UTC (rev 52) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/SubCategoryModel.java 2010-08-19 16:59:02 UTC (rev 53) @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.List; +import org.chorem.data.bonzoms.Invoice; import org.chorem.data.bonzoms.SubCategory; import org.zkoss.zkplus.databind.BindingListModel; import org.zkoss.zul.AbstractListModel; @@ -24,7 +25,16 @@ @Override public int indexOf(Object obj) { - return subCategories.indexOf(obj); + int index = -1; + String id = ((SubCategory) obj).getWikittyId(); + for (SubCategory data : subCategories) { + String dataId = data.getWikittyId(); + if (id.equals(dataId)) { + index = subCategories.indexOf(data); + break; + } + } + return index; } public void setSubCategories(List<SubCategory> subCategories) { Modified: trunk/billy-ui-zk/src/main/webapp/WEB-INF/lang-addon.xml =================================================================== --- trunk/billy-ui-zk/src/main/webapp/WEB-INF/lang-addon.xml 2010-08-18 15:18:43 UTC (rev 52) +++ trunk/billy-ui-zk/src/main/webapp/WEB-INF/lang-addon.xml 2010-08-19 16:59:02 UTC (rev 53) @@ -49,5 +49,11 @@ <component-class>org.chorem.billy.ui.DateSearchMacro</component-class> <macro-uri>macros/dateSearchMacro.zul</macro-uri> </component> + + <component> + <component-name>subCategoryListboxMacro</component-name> + <component-class>org.chorem.billy.ui.SubCategoryListboxMacro</component-class> + <macro-uri>macros/subCategoryListboxMacro.zul</macro-uri> + </component> </language-addon> Modified: trunk/billy-ui-zk/src/main/webapp/categoryPage.zul =================================================================== --- trunk/billy-ui-zk/src/main/webapp/categoryPage.zul 2010-08-18 15:18:43 UTC (rev 52) +++ trunk/billy-ui-zk/src/main/webapp/categoryPage.zul 2010-08-19 16:59:02 UTC (rev 53) @@ -4,11 +4,20 @@ <window id="category" apply="org.chorem.billy.ui.CategoryController"> Categories: <toolbarbutton id="newCategory" label="Add new category" /> - <listbox id="categoryListbox" rows="20" model="@{category$composer.categoryModel}" itemRenderer="@{category$composer.categoryRenderer}"> - <listhead> - <listheader label="Name" /> - <listheader label="Type" /> - </listhead> - </listbox> - <paging id="categoryPaging" /> + <hbox> + <vbox> + <listbox id="categoryListbox" rows="20" model="@{category$composer.categoryModel}" itemRenderer="@{category$composer.categoryRenderer}"> + <listhead> + <listheader label="Name" /> + <listheader label="Type" /> + </listhead> + </listbox> + <paging id="categoryPaging" /> + </vbox> + + <vbox> + <subCategoryListboxMacro id="subCategoryListboxMacro" /> + </vbox> + + </hbox> </window> \ No newline at end of file Modified: trunk/billy-ui-zk/src/main/webapp/invoiceFormPage.zul =================================================================== --- trunk/billy-ui-zk/src/main/webapp/invoiceFormPage.zul 2010-08-18 15:18:43 UTC (rev 52) +++ trunk/billy-ui-zk/src/main/webapp/invoiceFormPage.zul 2010-08-19 16:59:02 UTC (rev 53) @@ -10,17 +10,18 @@ <hbox> <vbox> - <label value="Payment date" /> - <datebox format="dd/MM/yyyy" value="@{composer.invoice.payment, save-when='saveInvoice.onClick'}" /> - <label value="Expected date" /> - <datebox format="dd/MM/yyyy" value="@{composer.invoice.expected, save-when='saveInvoice.onClick'}" /> + <label value="Posted date" /> <datebox format="dd/MM/yyyy" value="@{composer.invoice.posted, save-when='saveInvoice.onClick'}" /> + <label value="Expected date" /> + <datebox format="dd/MM/yyyy" value="@{composer.invoice.expected, save-when='saveInvoice.onClick'}" /> + + <label value="Payment date" /> + <datebox format="dd/MM/yyyy" value="@{composer.invoice.payment, save-when='saveInvoice.onClick'}" /> + <categoryMacro id="categoryMacro" /> - <companyMacro id="companyMacro" /> - <projectMacro id="projectMacro" /> </vbox> Modified: trunk/billy-ui-zk/src/main/webapp/invoicePage.zul =================================================================== --- trunk/billy-ui-zk/src/main/webapp/invoicePage.zul 2010-08-18 15:18:43 UTC (rev 52) +++ trunk/billy-ui-zk/src/main/webapp/invoicePage.zul 2010-08-19 16:59:02 UTC (rev 53) @@ -3,16 +3,33 @@ <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="./invoice"?> <window id="invoice" apply="org.chorem.billy.ui.InvoiceController"> - <vbox> - <separator/> - <dateSearchMacro id="dateSearchMacro" /> - <separator /> - <categorySearchMacro id="categorySearchMacro" /> - <companySearchMacro id="companySearchMacro" /> - <projectSearchMacro id="projectSearchMacro" /> - <button id="searchAll" label="Search" /> - <separator /> - </vbox> + + <hbox> + <vbox> + <separator/> + <dateSearchMacro id="dateSearchMacro" /> + <separator /> + <categorySearchMacro id="categorySearchMacro" /> + <companySearchMacro id="companySearchMacro" /> + <projectSearchMacro id="projectSearchMacro" /> + <button id="searchAll" label="Search" /> + <separator /> + </vbox> + + <space bar="true" height="200px" spacing="50px"/> + + <vbox> + <separator /> + <hbox> + <label value="Total HT :" /> <label id="totalHTLabel"/> + </hbox> + <separator /> + <hbox> + <label value="Total TTC :" /> <label id="totalTTCLabel"/> + </hbox> + </vbox> + + </hbox> Invoices: <toolbarbutton id="newInvoice" label="Add new invoice" /> <listbox id="invoiceListbox" rows="20" model="@{invoice$composer.invoiceModel}" itemRenderer="@{invoice$composer.invoiceRenderer}"> <listhead> Added: trunk/billy-ui-zk/src/main/webapp/macros/subCategoryListboxMacro.zul =================================================================== --- trunk/billy-ui-zk/src/main/webapp/macros/subCategoryListboxMacro.zul (rev 0) +++ trunk/billy-ui-zk/src/main/webapp/macros/subCategoryListboxMacro.zul 2010-08-19 16:59:02 UTC (rev 53) @@ -0,0 +1,8 @@ +<?page title="new page title" contentType="text/html;charset=UTF-8"?> +<zk> + <listbox id="subCategoryListbox" autopaging="true" mold="paging" rows="20"> + <listhead> + <listheader label="Name" /> + </listhead> + </listbox> +</zk> \ No newline at end of file

1 0