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

r27 - trunk
by tchemit＠users.chorem.org 18 Dec '09

18 Dec '09

Author: tchemit Date: 2009-12-18 14:38:14 +0100 (Fri, 18 Dec 2009) New Revision: 27 Modified: trunk/pom.xml Log: use mavenpom 1.1.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-16 21:41:38 UTC (rev 26) +++ trunk/pom.xml 2009-12-18 13:38:14 UTC (rev 27) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.2</version> + <version>1.1.3</version> </parent> <groupId>org.chorem</groupId>

1 0

r26 - trunk
by tchemit＠users.chorem.org 16 Dec '09

16 Dec '09

Author: tchemit Date: 2009-12-16 22:41:38 +0100 (Wed, 16 Dec 2009) New Revision: 26 Modified: trunk/pom.xml Log: use mavenpom 1.1.2 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 04:26:55 UTC (rev 25) +++ trunk/pom.xml 2009-12-16 21:41:38 UTC (rev 26) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0</version> + <version>1.1.2</version> </parent> <groupId>org.chorem</groupId>

1 0

r25 - trunk
by tchemit＠users.chorem.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 05:26:55 +0100 (Mon, 02 Nov 2009) New Revision: 25 Modified: trunk/pom.xml Log: - use mavenpom 1.1.0 - reformat poms Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 04:24:29 UTC (rev 24) +++ trunk/pom.xml 2009-11-02 04:26:55 UTC (rev 25) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion>  @@ -9,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </parent> <groupId>org.chorem</groupId> @@ -148,7 +149,7 @@  <topia.version>2.2.0</topia.version> <generator.version>1.0.0</generator.version> - +  <choreg.version>1.0.0-alpha-2-SNAPSHOT</choreg.version> @@ -193,7 +194,8 @@ <scm> <connection>scm:svn:http://svn.chorem.org/svn/billy/trunk</connection> - <developerConnection>scm:svn:svn+ssh://publish@svn.chorem.org/var/lib/svn/svn-chorem/billy/trunk</developerConnection> + <developerConnection>scm:svn:svn+ssh://publish@svn.chorem.org/var/lib/svn/svn-chorem/billy/trunk + </developerConnection> <url>http://www.chorem.org/repositories/browse/billy/trunk</url> </scm>

1 0

r24 - in trunk: . billy-business billy-ui
by tchemit＠users.chorem.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 05:24:29 +0100 (Mon, 02 Nov 2009) New Revision: 24 Modified: trunk/ trunk/billy-business/ trunk/billy-ui/ Log: svn ignore idea files Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target + target *.ipr *.iws *.iml Property changes on: trunk/billy-business ___________________________________________________________________ Modified: svn:ignore - target + target *.ipr *.iws *.iml Property changes on: trunk/billy-ui ___________________________________________________________________ Modified: svn:ignore - target + target *.ipr *.iws *.iml

1 0

r23 - trunk
by tchemit＠users.chorem.org 11 Oct '09

11 Oct '09

Author: tchemit Date: 2009-10-11 14:14:54 +0200 (Sun, 11 Oct 2009) New Revision: 23 Modified: trunk/pom.xml Log: update mavenpom, junit, i18n and processor versions expect for JTimer which is NOT a mavenpom project (what a shame... must be changed) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-25 08:01:40 UTC (rev 22) +++ trunk/pom.xml 2009-10-11 12:14:54 UTC (rev 23) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.2</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.chorem</groupId> @@ -158,7 +158,7 @@ <hibernate.version>3.3.1.GA</hibernate.version>  - <junit.version>4.6</junit.version> + <junit.version>4.7</junit.version>  <tapestry.version>5.1.0.5</tapestry.version>

1 0

r22 - trunk/src/site
by jcouteau＠users.chorem.org 25 Sep '09

25 Sep '09

Author: jcouteau Date: 2009-09-25 10:01:40 +0200 (Fri, 25 Sep 2009) New Revision: 22 Modified: trunk/src/site/site.xml Log: Remove modules from maven-site Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-09-25 07:47:57 UTC (rev 21) +++ trunk/src/site/site.xml 2009-09-25 08:01:40 UTC (rev 22) @@ -21,9 +21,7 @@ <menu name="Utilisateurs"> <item name="Accueil" href="index.html"/> </menu> - - <menu ref="modules"/> - + <menu name="Downloads"> <item name="Downloads" href="http://chorem.org/projects/list_files/billy"/> </menu>

1 0

r21 - trunk/src/site
by jcouteau＠users.chorem.org 25 Sep '09

25 Sep '09

Author: jcouteau Date: 2009-09-25 09:47:57 +0200 (Fri, 25 Sep 2009) New Revision: 21 Modified: trunk/src/site/site.xml Log: Download link point on files list on redmine instead of maven repo Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-09-24 13:55:19 UTC (rev 20) +++ trunk/src/site/site.xml 2009-09-25 07:47:57 UTC (rev 21) @@ -25,8 +25,7 @@ <menu ref="modules"/> <menu name="Downloads"> - <item name="Stable" href="http://maven.chorem.org/release/org/chorem/billy"/> - <item name="Snapshot" href="http://maven.chorem.org/snapshot/org/chorem/billy"/> + <item name="Downloads" href="http://chorem.org/projects/list_files/billy"/> </menu> <menu name="Trackers">

1 0

r20 - trunk/src/site
by jcouteau＠users.chorem.org 24 Sep '09

24 Sep '09

Author: jcouteau Date: 2009-09-24 15:55:19 +0200 (Thu, 24 Sep 2009) New Revision: 20 Modified: trunk/src/site/site.xml Log: Add snapshot download link on maven-site Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-09-24 13:50:23 UTC (rev 19) +++ trunk/src/site/site.xml 2009-09-24 13:55:19 UTC (rev 20) @@ -25,7 +25,8 @@ <menu ref="modules"/> <menu name="Downloads"> - <item name="Downloads" href="http://maven.chorem.org/release/org/chorem/billy"/> + <item name="Stable" href="http://maven.chorem.org/release/org/chorem/billy"/> + <item name="Snapshot" href="http://maven.chorem.org/snapshot/org/chorem/billy"/> </menu> <menu name="Trackers">

1 0

r19 - trunk/src/site
by jcouteau＠users.chorem.org 24 Sep '09

24 Sep '09

Author: jcouteau Date: 2009-09-24 15:50:23 +0200 (Thu, 24 Sep 2009) New Revision: 19 Modified: trunk/src/site/site.xml Log: Add download link on maven-site Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-09-21 09:33:44 UTC (rev 18) +++ trunk/src/site/site.xml 2009-09-24 13:50:23 UTC (rev 19) @@ -23,6 +23,10 @@ </menu> <menu ref="modules"/> + + <menu name="Downloads"> + <item name="Downloads" href="http://maven.chorem.org/release/org/chorem/billy"/> + </menu> <menu name="Trackers"> <item name="Bugs" href="${project.issueManagement.url}?query_id=1"/>

1 0

r18 - in trunk/billy-ui/src/main: java/org/chorem/billy/ui/pages webapp
by fdesbois＠users.chorem.org 21 Sep '09

21 Sep '09

Author: fdesbois Date: 2009-09-21 11:33:44 +0200 (Mon, 21 Sep 2009) New Revision: 18 Modified: trunk/billy-ui/src/main/java/org/chorem/billy/ui/pages/InvoiceForm.java trunk/billy-ui/src/main/webapp/InvoiceForm.tml Log: Cleaning code and add javadoc Modified: trunk/billy-ui/src/main/java/org/chorem/billy/ui/pages/InvoiceForm.java =================================================================== --- trunk/billy-ui/src/main/java/org/chorem/billy/ui/pages/InvoiceForm.java 2009-09-21 08:46:39 UTC (rev 17) +++ trunk/billy-ui/src/main/java/org/chorem/billy/ui/pages/InvoiceForm.java 2009-09-21 09:33:44 UTC (rev 18) @@ -62,15 +62,21 @@ @Inject private Logger log; + @InjectComponent + private Layout layout; + + /******************* DATA MANAGMENT FROM BUSINESS MODULE *******************************/ + @Inject private ServiceInvoice serviceInvoice; @Inject private ServiceClient serviceClient; - @InjectComponent - private Layout layout; - + /** + * Clients List from Billy-business (contains hierarchy of companies, services and persons). + * Initialized in loadData method. + */ @Persist private List<Client> clients; @@ -79,18 +85,10 @@ private String invoiceId; - @InjectComponent - private Form monForm; - - @Inject - private PropertyAccess propertyAccess; - - private GenericSelectModel<Client> companiesSelectModel; - - private SelectModel servicesSelectModel; - - private GenericSelectModel<ClientPerson> personsSelectModel; - + /** + * Preserve InvoiceId in page url (activate/passivate parameter) + * @param ec context to get the invoiceId + */ void onActivate(EventContext ec) { if (ec.getCount() > 0) { this.invoiceId = ec.get(String.class, 0); @@ -101,6 +99,9 @@ return this.invoiceId; } + /** + * Initialize of persist contents (to not surcharge billy-business access) + */ @Override @Log public void loadData() { @@ -153,6 +154,34 @@ this.invoice = invoice; } + /******************* FORM MANAGMENT *******************************/ + + @InjectComponent + private Form invoiceForm; + + /** + * Used for knowing wich submit button is clicked by user. + */ + private boolean editSelected; + + @Inject + private PropertyAccess propertyAccess; + + private GenericSelectModel<Client> companiesSelectModel; + + private SelectModel servicesSelectModel; + + private GenericSelectModel<ClientPerson> personsSelectModel; + + @Property + private String personName; + + @Property + private String clientName; + + @Property + private String serviceName; + public GenericSelectModel<Client> getCompaniesSelectModel() { if (companiesSelectModel == null) { companiesSelectModel = new GenericSelectModel<Client>(getClients(), Client.class, "name", "name", propertyAccess); @@ -175,9 +204,7 @@ options.add(new OptionModelImpl(serviceName)); } - } /*else { - options.add(new OptionModelImpl("Sélectionnez une société !", "")); - }*/ + } servicesSelectModel = new SelectModelImpl(null, options); } @@ -194,61 +221,17 @@ if (serviceName != null && !serviceName.isEmpty()) { Client client = getCompaniesSelectModel().findObject(clientName); persons = client.getServices().get(serviceName); - //personsSelectModel = new GenericSelectModel<ClientPerson>(persons, ClientPerson.class, "name", "id", propertyAccess); - } /*else { - personsSelectModel = new GenericSelectModel<ClientPerson>(new ArrayList<ClientPerson>(), ClientPerson.class, "name", "id", propertyAccess); - personsSelectModel.getOptions().add(new OptionModelImpl("Sélectionnez un service !", "")); - } */ + } personsSelectModel = new GenericSelectModel<ClientPerson>(persons, ClientPerson.class, "name", "name", propertyAccess); } return personsSelectModel; } - /*@InjectComponent - private Zone clientFormZone; - - @Persist - @Property - private String companyName; - - @Persist - @Property - private String serviceName; - - @Persist - @Property - private String personId; - - @Log - Object onChangeFromCompanies(String value) { - Client client = getCompaniesSelectModel().findObject(value); - getInvoice().getClientPerson().setClient(client); - return clientFormZone.getBody(); - } - - @Log - Object onChangeFromServices(String value) { - getInvoice().getClientPerson().setSubDivisionName(value); - return clientFormZone.getBody(); - } - - @Log - void onChangeFromPersons(String value) { - ClientPerson person = getPersonsSelectModel().findObject(value); - getInvoice().setClientPerson(person); - }*/ - - @Property - private String personName; - - @Property - private String clientName; - - @Property - private String serviceName; - - void onPrepareFromMonForm() { + /** + * Preparation for InvoiceForm (Event from Tapestry). + */ + void onPrepareFromInvoiceForm() { if (clientName == null) { clientName = getInvoice().getClientPerson().getClient().getName(); } @@ -260,8 +243,6 @@ } } - private boolean editSelected; - void onSelectedFromCompanyChange() { editSelected = true; } @@ -271,7 +252,7 @@ } @Log - Object onSuccessFromMonForm() { + Object onSuccessFromInvoiceForm() { if (clientName != null) { Client client = getCompaniesSelectModel().findObject(clientName); if (log.isDebugEnabled()) { @@ -297,20 +278,16 @@ } catch (BillyException eee) { List<String> errors = ErrorHelper.getMessages("Un erreur est survenue, sauvegarde impossible de la facture !",eee); for (String error : errors) { - monForm.recordError(error); + invoiceForm.recordError(error); } } - return monForm.getHasErrors() ? monForm : InvoiceList.class; + return invoiceForm.getHasErrors() ? invoiceForm : InvoiceList.class; } else { if (log.isDebugEnabled()) { log.debug("CHANGE ACTION"); } - - - - } - return monForm; + return invoiceForm; } } Modified: trunk/billy-ui/src/main/webapp/InvoiceForm.tml =================================================================== --- trunk/billy-ui/src/main/webapp/InvoiceForm.tml 2009-09-21 08:46:39 UTC (rev 17) +++ trunk/billy-ui/src/main/webapp/InvoiceForm.tml 2009-09-21 09:33:44 UTC (rev 18) @@ -11,7 +11,7 @@ <h1>${message:h1}</h1> <t:zone t:id="invoiceFormZone" id="invoiceFormZone" update="show"> - <form t:type="form" t:id="monForm" t:zone="invoiceFormZone"><t:errors /> + <form t:type="form" t:id="invoiceForm" t:zone="invoiceFormZone"><t:errors /> <div class="clearfix" id="billy-form-invoice"> <div class="fleft"> <p><t:label for="companies" /> : </p> @@ -42,30 +42,6 @@ </div> <p><input t:type="submit" class="ico save" t:id="saveInvoice" t:value="${message:submit-label}" /></p> </form> - - - - - - - -  </t:zone> </t:layout>

1 0