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

r67 - trunk
by tchemit＠users.chorem.org 17 Oct '10

17 Oct '10

Author: tchemit Date: 2010-10-17 03:41:39 +0200 (Sun, 17 Oct 2010) New Revision: 67 Url: http://chorem.org/repositories/revision/billy/67 Log: Update mavenpom4redmine to 2.3.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-08 23:52:11 UTC (rev 66) +++ trunk/pom.xml 2010-10-17 01:41:39 UTC (rev 67) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> </parent> <groupId>org.chorem</groupId>

1 0

r66 - trunk
by tchemit＠users.chorem.org 08 Oct '10

08 Oct '10

Author: tchemit Date: 2010-10-09 01:52:11 +0200 (Sat, 09 Oct 2010) New Revision: 66 Url: http://chorem.org/repositories/revision/billy/66 Log: Update mavenpom4redmine to 2.3.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-03 15:57:21 UTC (rev 65) +++ trunk/pom.xml 2010-10-08 23:52:11 UTC (rev 66) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.3</version> + <version>2.3.1</version> </parent> <groupId>org.chorem</groupId>

1 0

r65 - trunk
by tchemit＠users.chorem.org 03 Oct '10

03 Oct '10

Author: tchemit Date: 2010-10-03 17:57:21 +0200 (Sun, 03 Oct 2010) New Revision: 65 Url: http://chorem.org/repositories/revision/billy/65 Log: Update mavenpom4redmine to 2.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 08:12:16 UTC (rev 64) +++ trunk/pom.xml 2010-10-03 15:57:21 UTC (rev 65) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.6</version> + <version>2.3</version> </parent> <groupId>org.chorem</groupId>

1 0

r64 - trunk
by tchemit＠users.chorem.org 29 Sep '10

29 Sep '10

Author: tchemit Date: 2010-09-29 10:12:16 +0200 (Wed, 29 Sep 2010) New Revision: 64 Url: http://chorem.org/repositories/revision/billy/64 Log: Utilisation de mavenpom4redmine 2.2.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-09 09:33:58 UTC (rev 63) +++ trunk/pom.xml 2010-09-29 08:12:16 UTC (rev 64) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.5</version> + <version>2.2.6</version> </parent> <groupId>org.chorem</groupId>

1 0

r63 - trunk
by tchemit＠users.chorem.org 09 Sep '10

09 Sep '10

Author: tchemit Date: 2010-09-09 11:33:58 +0200 (Thu, 09 Sep 2010) New Revision: 63 Url: http://chorem.org/repositories/revision/billy/63 Log: Utilisation de mavenpom4redmine 2.2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 14:22:23 UTC (rev 62) +++ trunk/pom.xml 2010-09-09 09:33:58 UTC (rev 63) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.4</version> + <version>2.2.5</version> </parent> <groupId>org.chorem</groupId>

1 0

r62 - trunk
by tchemit＠users.chorem.org 29 Aug '10

29 Aug '10

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 24 Aug '10

24 Aug '10

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 24 Aug '10

24 Aug '10

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 23 Aug '10

23 Aug '10

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 23 Aug '10

23 Aug '10

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