- Lima-commits - mailman.cloud.codelutin.com

r3578 - trunk/lima-swing
by tchemit＠users.chorem.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 16:19:59 +0200 (Wed, 08 Aug 2012) New Revision: 3578 Url: http://chorem.org/repositories/revision/lima/3578 Log: site configuration 2 Modified: trunk/lima-swing/pom.xml Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2012-08-08 14:19:31 UTC (rev 3577) +++ trunk/lima-swing/pom.xml 2012-08-08 14:19:59 UTC (rev 3578) @@ -469,6 +469,42 @@ </plugins> </build> </profile> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + + </profile> </profiles> </project>

1 0

r3577 - in trunk: . lima-business lima-business/src lima-business/src/site lima-business-api lima-business-api/src lima-business-api/src/site lima-callao lima-callao/src lima-callao/src/site lima-swing/src/site
by tchemit＠users.chorem.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 16:19:31 +0200 (Wed, 08 Aug 2012) New Revision: 3577 Url: http://chorem.org/repositories/revision/lima/3577 Log: back to jaxx snapshot + improve generaited site configuration (why modules have no site ? :() Added: trunk/lima-business-api/src/site/ trunk/lima-business-api/src/site/site_fr.xml trunk/lima-business/src/site/ trunk/lima-business/src/site/site_fr.xml trunk/lima-callao/src/site/ trunk/lima-callao/src/site/site_fr.xml trunk/lima-swing/src/site/site_fr.xml Modified: trunk/lima-business-api/pom.xml trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-08-08 13:55:42 UTC (rev 3576) +++ trunk/lima-business/pom.xml 2012-08-08 14:19:31 UTC (rev 3577) @@ -198,5 +198,42 @@ </plugins> </build> </profile> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + + </profile> + </profiles> </project> Added: trunk/lima-business/src/site/site_fr.xml =================================================================== --- trunk/lima-business/src/site/site_fr.xml (rev 0) +++ trunk/lima-business/src/site/site_fr.xml 2012-08-08 14:19:31 UTC (rev 3577) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="${project.name}"> + + <body> + + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/maven-site-chorem.org.css"/> + </head> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Property changes on: trunk/lima-business/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2012-08-08 13:55:42 UTC (rev 3576) +++ trunk/lima-business-api/pom.xml 2012-08-08 14:19:31 UTC (rev 3577) @@ -34,17 +34,46 @@ <name>Lima :: business API</name> <description>Business API module for lima</description> - <properties> - </properties> -    - <build> - </build> + <profiles> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> - <profiles> + <reporting> + <plugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + + </profile> </profiles> </project> Added: trunk/lima-business-api/src/site/site_fr.xml =================================================================== --- trunk/lima-business-api/src/site/site_fr.xml (rev 0) +++ trunk/lima-business-api/src/site/site_fr.xml 2012-08-08 14:19:31 UTC (rev 3577) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="${project.name}"> + + <body> + + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/maven-site-chorem.org.css"/> + </head> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Property changes on: trunk/lima-business-api/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-08-08 13:55:42 UTC (rev 3576) +++ trunk/lima-callao/pom.xml 2012-08-08 14:19:31 UTC (rev 3577) @@ -117,4 +117,44 @@ </plugins> </build> + <profiles> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + + </profile> + + </profiles> + </project> Added: trunk/lima-callao/src/site/site_fr.xml =================================================================== --- trunk/lima-callao/src/site/site_fr.xml (rev 0) +++ trunk/lima-callao/src/site/site_fr.xml 2012-08-08 14:19:31 UTC (rev 3577) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="${project.name}"> + + <body> + + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/maven-site-chorem.org.css"/> + </head> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Property changes on: trunk/lima-callao/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/lima-swing/src/site/site_fr.xml =================================================================== --- trunk/lima-swing/src/site/site_fr.xml (rev 0) +++ trunk/lima-swing/src/site/site_fr.xml 2012-08-08 14:19:31 UTC (rev 3577) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="${project.name}"> + + <body> + + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/maven-site-chorem.org.css"/> + </head> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Property changes on: trunk/lima-swing/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-08 13:55:42 UTC (rev 3576) +++ trunk/pom.xml 2012-08-08 14:19:31 UTC (rev 3577) @@ -359,7 +359,7 @@ <nuitonUtilsVersion>2.5.3-SNAPSHOT</nuitonUtilsVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <topiaVersion>2.6.11</topiaVersion> - <jaxxVersion>2.5.3</jaxxVersion> + <jaxxVersion>2.5.4-SNAPSHOT</jaxxVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <openEjbVersion>4.0.0</openEjbVersion> <slf4jVersion>1.6.6</slf4jVersion> @@ -466,4 +466,43 @@ </releases> </pluginRepository> </pluginRepositories> + + <profiles> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + + </profile> + + </profiles> </project>

1 0

r3576 - in trunk: lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/resources
by mallon＠users.chorem.org 08 Aug '12

08 Aug '12

Author: mallon Date: 2012-08-08 15:55:42 +0200 (Wed, 08 Aug 2012) New Revision: 3576 Url: http://chorem.org/repositories/revision/lima/3576 Log: refs #747 Correction conernant le probleme de format sur les BigDecimal, pour le montant recherche. Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java trunk/lima-swing/src/main/resources/log4j.properties Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-08-08 13:37:46 UTC (rev 3575) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-08-08 13:55:42 UTC (rev 3576) @@ -26,12 +26,16 @@ package org.chorem.lima.entity; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.FinancialStatementWayEnum; import org.chorem.lima.beans.FinancialTransactionSearch; import org.hibernate.HibernateException; import org.nuiton.topia.TopiaException; import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.text.ParsePosition; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -47,6 +51,8 @@ */ public class FinancialTransactionDAOImpl<E extends FinancialTransaction> extends FinancialTransactionDAOAbstract<FinancialTransaction> { + private static final Log log = LogFactory.getLog(FinancialTransactionDAOImpl.class); + /** * FIXME echatellier, remove this method when implemented in topia * just overriden to use merge() instead of saveOrUpdate() @@ -274,7 +280,7 @@ List<Account> accounts) throws TopiaException { String query = "SELECT T FROM " + FinancialTransaction.class.getName() + " T"+ " LEFT JOIN T.entry AS E" + - " WHERE TRUE "; // to not manage first where in all condition + " WHERE 1=1 "; // to not manage first where in all condition List<Object> args = new ArrayList<Object>(); @@ -320,7 +326,7 @@ // accounts Account account = financialTransactionSearch.getAccount(); - String accountsList = financialTransactionSearch.getAccountList(); + //String accountsList = financialTransactionSearch.getAccountList(); if (account != null) { query += " AND E.account = :account"; args.add("account"); @@ -353,18 +359,26 @@ String operator = financialTransactionSearch.getOperator(); FinancialStatementWayEnum fStWayEnum = financialTransactionSearch.getAmountWayEnum(); if (amount != null) { + DecimalFormat decimalFormat = new DecimalFormat(); + BigDecimal amountBigDecimal = new BigDecimal(decimalFormat.parse(amount, new ParsePosition(0)).toString()); + if (log.isDebugEnabled()) { + log.debug("Value of first amount : " + amount); + log.debug("Value of first amount - BigDecimal : " + amountBigDecimal); + } if (amount2 != null) { - BigDecimal value1 = new BigDecimal(amount); - BigDecimal value2 = new BigDecimal(amount2); + BigDecimal secondAmountBigDecimal = new BigDecimal(decimalFormat.parse(amount2, new ParsePosition(0)).toString()); + if (log.isDebugEnabled()) { + log.debug("Value of second amount : " + secondAmountBigDecimal); + } query += " AND :amount <= E.amount AND E.amount <= :amount2"; args.add("amount"); - args.add(amount); + args.add(amountBigDecimal); args.add("amount2"); - args.add(amount2); + args.add(secondAmountBigDecimal); } else if (operator != null) { query += " AND E.amount " + operator + " :amount"; args.add("amount"); - args.add(amount); + args.add(amountBigDecimal); } switch (fStWayEnum) { case CREDIT: Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-08-08 13:37:46 UTC (rev 3575) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-08-08 13:55:42 UTC (rev 3576) @@ -49,4 +49,5 @@ log4j.logger.org.chorem.lima.business.ui.celleditor.BigDecimalTableCellEditor=DEBUG log4j.logger.org.chorem.lima.business.ui.financialtransaction.FinancialTransactionTableModel=DEBUG log4j.logger.org.chorem.lima.entity.EntryDAOImpl=DEBUG -log4j.logger.org.chorem.lima.ui.financialtransaction.FinancialTransactionViewHandler=DEBUG \ No newline at end of file +log4j.logger.org.chorem.lima.ui.financialtransaction.FinancialTransactionViewHandler=DEBUG +log4j.logger.org.chorem.lima.entity.FinancialTransactionDAOImpl=DEBUG \ No newline at end of file

1 0

r3575 - in trunk: . lima-business lima-business-api lima-callao lima-swing
by echatellier＠users.chorem.org 08 Aug '12

08 Aug '12

Author: echatellier Date: 2012-08-08 15:37:46 +0200 (Wed, 08 Aug 2012) New Revision: 3575 Url: http://chorem.org/repositories/revision/lima/3575 Log: Set version to alpha for release Modified: trunk/lima-business-api/pom.xml trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-08-08 13:04:04 UTC (rev 3574) +++ trunk/lima-business/pom.xml 2012-08-08 13:37:46 UTC (rev 3575) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6-alpha-1-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2012-08-08 13:04:04 UTC (rev 3574) +++ trunk/lima-business-api/pom.xml 2012-08-08 13:37:46 UTC (rev 3575) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6-alpha-1-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-08-08 13:04:04 UTC (rev 3574) +++ trunk/lima-callao/pom.xml 2012-08-08 13:37:46 UTC (rev 3575) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6-alpha-1-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2012-08-08 13:04:04 UTC (rev 3574) +++ trunk/lima-swing/pom.xml 2012-08-08 13:37:46 UTC (rev 3575) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6-alpha-1-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-08 13:04:04 UTC (rev 3574) +++ trunk/pom.xml 2012-08-08 13:37:46 UTC (rev 3575) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6-alpha-1-SNAPSHOT</version> <modules> <module>lima-callao</module>

1 0

r3574 - in trunk: lima-business/src/main/resources/i18n lima-callao lima-callao/src/main/java/org/chorem/lima lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch lima-swing/src/main/resources/i18n
by mallon＠users.chorem.org 08 Aug '12

08 Aug '12

Author: mallon Date: 2012-08-08 15:04:04 +0200 (Wed, 08 Aug 2012) New Revision: 3574 Url: http://chorem.org/repositories/revision/lima/3574 Log: fixes #745 Apres modification du fichier pom de lima-callao, afin de prendre en compte le plugin i18n, les valeurs s'affichent correctement. Added: trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java Removed: trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties trunk/lima-callao/pom.xml trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-08-08 13:04:04 UTC (rev 3574) @@ -100,3 +100,4 @@ lima.config.rulesnationality.description=Rules Nationality lima.config.scale.description=Scale lima.config.serveraddress.description=Server Address +lima.ui.lettering.accountRegularization= Modified: trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-08-08 13:04:04 UTC (rev 3574) @@ -100,3 +100,4 @@ lima.config.rulesnationality.description=Règles nationales lima.config.scale.description=Précision lima.config.serveraddress.description=Addresse serveur +lima.ui.lettering.accountRegularization= Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-callao/pom.xml 2012-08-08 13:04:04 UTC (rev 3574) @@ -102,6 +102,18 @@ </dependency> </dependencies> </plugin> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> Deleted: trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java 2012-08-08 13:04:04 UTC (rev 3574) @@ -1,68 +0,0 @@ -/* - * #%L - * Lima callao - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima; - -import static org.nuiton.i18n.I18n._; - -public enum FinancialStatementWayEnum { - - BOTH(_("lima.enum.comboboxamount.both")), - DEBIT(_("lima.enum.comboboxamount.debit")), - CREDIT(_("lima.enum.comboboxamount.credit")); - - private final String description; - - FinancialStatementWayEnum(String description) { - this.description = description; - } - - public String getDescription() { - return description; - } - - public static String[] descriptions(){ - int nbElts = FinancialStatementWayEnum.values().length; - String[] descriptions = new String[nbElts]; - FinancialStatementWayEnum[] enums = FinancialStatementWayEnum.values(); - for (int i = 0; i < nbElts; i++) { - descriptions[i] = enums[i].getDescription(); - } - return descriptions; - } - - public static FinancialStatementWayEnum valueOfDescription(String description){ - FinancialStatementWayEnum value = null; - - for (FinancialStatementWayEnum enums : FinancialStatementWayEnum.values()) { - if (description.equals(enums.description)){ - value = enums; - break; - } - } - return value; - } - -} Added: trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java (rev 0) +++ trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java 2012-08-08 13:04:04 UTC (rev 3574) @@ -0,0 +1,68 @@ +/* + * #%L + * Lima callao + * + * $Id: FinancialStatementWayEnum.java 3289 2011-09-17 12:55:16Z tchemit $ + * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-callao/src/main/java/org/chorem/l… $ + * %% + * Copyright (C) 2008 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package org.chorem.lima; + +import static org.nuiton.i18n.I18n._; + +public enum FinancialStatementWayEnum { + + BOTH(_("lima.enum.comboboxamount.both")), + DEBIT(_("lima.enum.comboboxamount.debit")), + CREDIT(_("lima.enum.comboboxamount.credit")); + + private final String description; + + FinancialStatementWayEnum(String description) { + this.description = description; + } + + public String getDescription() { + return description; + } + + public static String[] descriptions(){ + int nbElts = FinancialStatementWayEnum.values().length; + String[] descriptions = new String[nbElts]; + FinancialStatementWayEnum[] enums = FinancialStatementWayEnum.values(); + for (int i = 0; i < nbElts; i++) { + descriptions[i] = enums[i].getDescription(); + } + return descriptions; + } + + public static FinancialStatementWayEnum valueOfDescription(String description){ + FinancialStatementWayEnum value = null; + + for (FinancialStatementWayEnum enums : FinancialStatementWayEnum.values()) { + if (description.equals(enums.description)){ + value = enums; + break; + } + } + return value; + } + +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx 2012-08-08 13:04:04 UTC (rev 3574) @@ -28,10 +28,10 @@ onWindowClosing="performCancel();"> <import> - javax.swing.text.Document - org.chorem.lima.FinancialStatementWayEnum - org.chorem.lima.entity.FinancialStatement - org.chorem.lima.entity.FinancialStatementImpl + javax.swing.text.Document + org.chorem.lima.FinancialStatementWayEnum + org.chorem.lima.entity.FinancialStatement + org.chorem.lima.entity.FinancialStatementImpl </import> <FinancialStatement id="financialStatement" javaBean='null'/> <Boolean id="addState" javaBean='true'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx 2012-08-08 13:04:04 UTC (rev 3574) @@ -25,17 +25,17 @@ <Table> <import> - java.awt.Dimension - javax.swing.ListSelectionModel - javax.swing.text.Document - org.chorem.lima.enums.ComboBoxPeriodEnum - org.chorem.lima.enums.ComboBoxAccountsEnum - org.chorem.lima.enums.ComboBoxEntryBooksEnum - org.chorem.lima.enums.ComboBoxLetterEnum - org.chorem.lima.FinancialStatementWayEnum - org.chorem.lima.enums.ComboBoxOperatorsEnum - org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchTableModel - org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchTable + java.awt.Dimension + javax.swing.ListSelectionModel + javax.swing.text.Document + org.chorem.lima.enums.ComboBoxPeriodEnum + org.chorem.lima.enums.ComboBoxAccountsEnum + org.chorem.lima.enums.ComboBoxEntryBooksEnum + org.chorem.lima.enums.ComboBoxLetterEnum + org.chorem.lima.FinancialStatementWayEnum + org.chorem.lima.enums.ComboBoxOperatorsEnum + org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchTableModel + org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchTable </import> <FinancialTransactionSearchViewHandler id="handler" javaBean="new FinancialTransactionSearchViewHandler(this)"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2012-08-08 13:04:04 UTC (rev 3574) @@ -37,7 +37,6 @@ import org.chorem.lima.FinancialStatementWayEnum; import org.chorem.lima.beans.FinancialTransactionSearch; import org.chorem.lima.beans.FinancialTransactionSearchImpl; -import org.chorem.lima.business.LimaException; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; @@ -67,8 +66,6 @@ protected FinancialTransactionSearchTableModel tableModel; - protected FiscalPeriodComboBoxModel comboBoxModel; - /** Transaction service. */ protected final FinancialTransactionService financialTransactionService; Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-08-08 13:04:04 UTC (rev 3574) @@ -104,6 +104,9 @@ lima.enum.comboboxaccount.account=Account lima.enum.comboboxaccount.accountlist=Account list lima.enum.comboboxaccount.allaccount=All accounts +lima.enum.comboboxamount.both=All +lima.enum.comboboxamount.credit=Credit +lima.enum.comboboxamount.debit=Debit lima.enum.comboboxentrybook.all=All entrybooks lima.enum.comboboxentrybook.select_one=EntryBook lima.enum.comboboxletter.all=All letters Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-08-08 13:04:04 UTC (rev 3574) @@ -104,6 +104,9 @@ lima.enum.comboboxaccount.account=Compte lima.enum.comboboxaccount.accountlist=Liste de comptes lima.enum.comboboxaccount.allaccount=Tous les comptes +lima.enum.comboboxamount.both=Tous +lima.enum.comboboxamount.credit=Crédit +lima.enum.comboboxamount.debit=Débit lima.enum.comboboxentrybook.all=Tous les journaux lima.enum.comboboxentrybook.select_one=Journal lima.enum.comboboxletter.all=Toutes les lettres

1 0

r3573 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by mallon＠users.chorem.org 08 Aug '12

08 Aug '12

Author: mallon Date: 2012-08-08 12:12:31 +0200 (Wed, 08 Aug 2012) New Revision: 3573 Url: http://chorem.org/repositories/revision/lima/3573 Log: refs #705 Correction sur l editeur, concernant la gestion de la virgule. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-07 16:58:51 UTC (rev 3572) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-08 10:12:31 UTC (rev 3573) @@ -30,13 +30,18 @@ import javax.swing.DefaultCellEditor; import javax.swing.JTextField; +import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.event.AncestorEvent; import javax.swing.event.AncestorListener; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; import java.math.BigDecimal; import java.math.RoundingMode; +import java.text.DecimalFormat; +import java.text.ParsePosition; /** * @author sletellier <letellier(a)codelutin.com> @@ -45,12 +50,30 @@ public class BigDecimalTableCellEditor extends DefaultCellEditor { protected int row; + protected String comma = ""; private static final Log log = LogFactory.getLog(BigDecimalTableCellEditor.class); public BigDecimalTableCellEditor() { super(new JTextField()); setClickCountToStart(1); + getComponent().setHorizontalAlignment(SwingConstants.RIGHT); + getComponent().addKeyListener(new KeyListener() { + @Override + public void keyTyped(KeyEvent e) { + // nothing to do + } + + @Override + public void keyPressed(KeyEvent e) { + // nothing to do + } + + @Override + public void keyReleased(KeyEvent e) { + limitComma(e); + } + }); getComponent().addFocusListener(new FocusListener() { @Override @@ -87,6 +110,9 @@ return (JTextField) super.getComponent(); } + /** + * Two kinds of edition, with LimaConfig value + * */ public void runEdition() { String comportmentEditingCell = LimaConfig.getInstance().getComportmentEditingCell(); if (comportmentEditingCell.equals("ALL")) { @@ -97,17 +123,36 @@ } } + /** + * Round the value to higher, and the number of decimal to 2; + * Parse string value to BigDecimal when it contains comma + * @return bigDecimal value + * */ @Override public BigDecimal getCellEditorValue() { String editorStringValue = super.getCellEditorValue().toString(); if (StringUtils.isBlank(editorStringValue)) { editorStringValue = "0"; } - BigDecimal cellEditorValue = (BigDecimal.valueOf(Double.valueOf(editorStringValue))); + BigDecimal cellEditorValue; + DecimalFormat decimalFormat = new DecimalFormat(); + cellEditorValue = new BigDecimal(decimalFormat.parse(editorStringValue,new ParsePosition(0)).doubleValue()); if (super.getCellEditorValue() != BigDecimal.ZERO) { return cellEditorValue.setScale(2, RoundingMode.HALF_UP); } return cellEditorValue; } + /** + * Limit number of comma to one + * @param e keyEvent starting control of comma + * */ + protected void limitComma(KeyEvent e) { + if ( (String.valueOf(e.getKeyChar()).equals(",") && comma.equals(","))) { + getComponent().setText(getComponent().getText().substring(0, getComponent().getText().length()-1)); + } else if (String.valueOf(e.getKeyChar()).equals(",") && !comma.equals(",")) { + comma = ","; + } + } + }

1 0

r3572 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: celleditor financialtransaction
by mallon＠users.chorem.org 07 Aug '12

07 Aug '12

Author: mallon Date: 2012-08-07 18:58:51 +0200 (Tue, 07 Aug 2012) New Revision: 3572 Url: http://chorem.org/repositories/revision/lima/3572 Log: fixes #705 Avec cette correction sur l editeur, il est d?\195?\169sormais possible d entrer une valeur directement (Sans avoir, donc, a la taper deux fois.). Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-07 13:49:13 UTC (rev 3571) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-07 16:58:51 UTC (rev 3572) @@ -23,55 +23,91 @@ * #L% */ -import jaxx.runtime.swing.editor.cell.NumberCellEditor; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaConfig; -import javax.swing.JTable; +import javax.swing.DefaultCellEditor; import javax.swing.JTextField; -import java.awt.Component; +import javax.swing.SwingUtilities; +import javax.swing.event.AncestorEvent; +import javax.swing.event.AncestorListener; import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; import java.math.BigDecimal; import java.math.RoundingMode; /** * @author sletellier <letellier(a)codelutin.com> + * @author mallon <mallon(a)codelutin.com> */ -public class BigDecimalTableCellEditor extends NumberCellEditor<BigDecimal> { +public class BigDecimalTableCellEditor extends DefaultCellEditor { protected int row; + private static final Log log = LogFactory.getLog(BigDecimalTableCellEditor.class); + public BigDecimalTableCellEditor() { - super(BigDecimal.class, false); - } + super(new JTextField()); + setClickCountToStart(1); + getComponent().addFocusListener(new FocusListener() { - @Override - public void focusGained(FocusEvent e) { - //super.getNumberEditor().getTextField().setText(super.getCellEditorValue().toString()); - runEdition(); + @Override + public void focusGained(FocusEvent event) { + runEdition(); + } + + @Override + public void focusLost(FocusEvent event) { + // nothing to do + } + }); + getComponent().addAncestorListener(new AncestorListener() { + + @Override + public void ancestorAdded(AncestorEvent event) { + runEdition(); + } + + @Override + public void ancestorRemoved(AncestorEvent event) { + // nothing to do + } + + @Override + public void ancestorMoved(AncestorEvent event) { + // nothing to do + } + }); } @Override - public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - this.row = row; - return super.getTableCellEditorComponent(table, value, isSelected, row, column); + public JTextField getComponent() { + return (JTextField) super.getComponent(); } public void runEdition() { String comportmentEditingCell = LimaConfig.getInstance().getComportmentEditingCell(); - JTextField numberEditorTextField = super.getNumberEditor().getTextField(); if (comportmentEditingCell.equals("ALL")) { - numberEditorTextField.selectAll(); + getComponent().selectAll(); } else { - int textFieldSize = numberEditorTextField.getText().length(); - numberEditorTextField.select(textFieldSize, textFieldSize); + int textFieldSize = getComponent().getText().length(); + getComponent().select(textFieldSize, textFieldSize); } } @Override public BigDecimal getCellEditorValue() { + String editorStringValue = super.getCellEditorValue().toString(); + if (StringUtils.isBlank(editorStringValue)) { + editorStringValue = "0"; + } + BigDecimal cellEditorValue = (BigDecimal.valueOf(Double.valueOf(editorStringValue))); if (super.getCellEditorValue() != BigDecimal.ZERO) { - return super.getCellEditorValue().setScale(2, RoundingMode.HALF_UP); + return cellEditorValue.setScale(2, RoundingMode.HALF_UP); } - return super.getCellEditorValue(); + return cellEditorValue; } + } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-08-07 13:49:13 UTC (rev 3571) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-08-07 16:58:51 UTC (rev 3572) @@ -42,6 +42,7 @@ import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; +import javax.swing.DefaultCellEditor; import javax.swing.SwingWorker; import java.awt.Color; import java.awt.Component; @@ -166,25 +167,8 @@ FinancialTransactionTable table = FinancialTransactionTable.this; - /* @Override - public void keyTyped(KeyEvent e) { - if ( (getSelectedColumn() == 4 || getSelectedColumn() == 5) ) { - editCellAt(getSelectedRow(), getSelectedColumn()); - } - }*/ - - /*@Override - public void keyReleased(KeyEvent e) { - if ( (getSelectedColumn() == 4 || getSelectedColumn() == 5) ) { - editCellAt(getSelectedRow(), getSelectedColumn()); - } - }*/ - @Override public void keyPressed(KeyEvent e) { - /*if ( (getSelectedColumn() == 4 || getSelectedColumn() == 5) ) { - editCellAt(getSelectedRow(), getSelectedColumn()); - }*/ final FinancialTransactionViewHandler handler = getHandler(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-08-07 13:49:13 UTC (rev 3571) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-08-07 16:58:51 UTC (rev 3572) @@ -25,6 +25,8 @@ package org.chorem.lima.ui.financialtransaction; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; @@ -50,6 +52,8 @@ /** serialVersionUID. */ private static final long serialVersionUID = -7495388454688562991L; + private static final Log log = LogFactory.getLog(FinancialTransactionViewHandler.class); + /** Service (just to update setValueAt(). */ protected FinancialTransactionService financialTransactionService; @@ -290,8 +294,10 @@ financialTransactionService.updateFinancialTransaction(currentFinancialTransaction); } else if (currentRow instanceof Entry) { + /*To stay with one value in debit or credit*/ - if ( !value.equals(BigDecimal.ZERO) && !value.equals(BigDecimal.valueOf(Double.valueOf("00.00")))) { + if ( !value.equals(BigDecimal.ZERO) && !value.equals(new BigDecimal("0.00"))) { + Entry currentEntry = (Entry) currentRow; currentFinancialTransaction = currentEntry.getFinancialTransaction(); boolean updateTransaction = false; @@ -304,10 +310,10 @@ // let's update the voucher of all entries of // the transaction - for (Entry entry : currentFinancialTransaction.getEntry()) { entry.setVoucher(voucher); } + updateTransaction = true; } else {

1 0

r3571 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by mallon＠users.chorem.org 07 Aug '12

07 Aug '12

Author: mallon Date: 2012-08-07 15:49:13 +0200 (Tue, 07 Aug 2012) New Revision: 3571 Url: http://chorem.org/repositories/revision/lima/3571 Log: fixes #699 La touche tabulation fonctionne d?\195?\169sormais correctement en fin de tableau (Ajout d'une entr?\195?\169e ou d'une transaction). Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-08-07 13:33:19 UTC (rev 3570) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-08-07 13:49:13 UTC (rev 3571) @@ -166,25 +166,25 @@ FinancialTransactionTable table = FinancialTransactionTable.this; - @Override + /* @Override public void keyTyped(KeyEvent e) { if ( (getSelectedColumn() == 4 || getSelectedColumn() == 5) ) { editCellAt(getSelectedRow(), getSelectedColumn()); } - } + }*/ - @Override + /*@Override public void keyReleased(KeyEvent e) { if ( (getSelectedColumn() == 4 || getSelectedColumn() == 5) ) { editCellAt(getSelectedRow(), getSelectedColumn()); } - } + }*/ @Override public void keyPressed(KeyEvent e) { - if ( (getSelectedColumn() == 4 || getSelectedColumn() == 5) ) { + /*if ( (getSelectedColumn() == 4 || getSelectedColumn() == 5) ) { editCellAt(getSelectedRow(), getSelectedColumn()); - } + }*/ final FinancialTransactionViewHandler handler = getHandler(); @@ -252,6 +252,9 @@ * sinon rajoute une transaction */ if (e.getKeyChar() == KeyEvent.VK_TAB) { + if (log.isDebugEnabled()) { + log.debug("Key tab used"); + } int max_x = getColumnCount(); int max_y = getRowCount(); x_tab = getSelectedColumn();

1 0

r3570 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by mallon＠users.chorem.org 07 Aug '12

07 Aug '12

Author: mallon Date: 2012-08-07 15:33:19 +0200 (Tue, 07 Aug 2012) New Revision: 3570 Url: http://chorem.org/repositories/revision/lima/3570 Log: refs #699 Il existait aussi une erreur concernant l'utilisation de la touche entree en fin de tableau. Lors de l utilisation de celle-ci, la selection reste donc bien sur la derniere ligne, sans generer d erreur. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-08-07 12:57:47 UTC (rev 3569) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-08-07 13:33:19 UTC (rev 3570) @@ -68,6 +68,8 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; + private static final Log log = LogFactory.getLog(FinancialTransactionTable.class); + protected FinancialTransactionViewHandler handler; private int x_tab; @@ -190,8 +192,9 @@ * last row*/ if (e.getKeyCode() == KeyEvent.VK_ENTER){ int selectedRow = table.getSelectedRow(); - if(selectedRow != table.getRowCount()){ - table.setRowSelectionInterval(selectedRow+1, selectedRow+1); + if( selectedRow == table.getRowCount()-1){ + /*-2, cause we have a row count beginning at one and we want to back to the line before*/ + table.setRowSelectionInterval(table.getRowCount()-2, table.getRowCount()-2); } else { table.setRowSelectionInterval(selectedRow, selectedRow); }

1 0

r3569 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/main/java/org/chorem/lima/business/ejb lima-business-api/src/main/java/org/chorem/lima/business/api lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction lima-swing/src/main/resources
by mallon＠users.chorem.org 07 Aug '12

07 Aug '12

Author: mallon Date: 2012-08-07 14:57:47 +0200 (Tue, 07 Aug 2012) New Revision: 3569 Url: http://chorem.org/repositories/revision/lima/3569 Log: fixes #741 Desormais, lors de l ajout d une entree, celle-ci porte les memes descriptions et pieces comptables que la derniere ajoutee (Soit, la precedente), et les lignes ajoutees ne sont donc plus vides. La demande 741 est li?\195?\169e aussi a la #730 et a la #699. Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java trunk/lima-swing/src/main/resources/log4j.properties Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-08-06 16:03:49 UTC (rev 3568) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-08-07 12:57:47 UTC (rev 3569) @@ -258,11 +258,6 @@ try { - if (log.isDebugEnabled()) { - log.debug("entry : " + entry); - log.debug("entryOld : " + entryOld); - } - FinancialPeriodDAO financialPeriodDAO = getDaoHelper().getFinancialPeriodDAO(); FinancialPeriod financialPeriod = financialPeriodDAO.findByDate(entry.getFinancialTransaction().getTransactionDate()); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-08-06 16:03:49 UTC (rev 3568) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-08-07 12:57:47 UTC (rev 3569) @@ -451,6 +451,21 @@ return entries; } + @Override + public Entry getLastEntry(FinancialTransaction financialTransaction) throws LimaException { + Entry lastEntry; + + try { + EntryDAO entryDAO = getDaoHelper().getEntryDAO(); + lastEntry = entryDAO.getLastEntry(financialTransaction); + + } catch (Exception ex) { + throw new LimaException("Can't get entries", ex); + } + + return lastEntry; + } + /** * Method used by update entry and remove entry for update amounts. */ Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java 2012-08-06 16:03:49 UTC (rev 3568) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java 2012-08-07 12:57:47 UTC (rev 3569) @@ -95,4 +95,10 @@ * @throws LimaException * */ List<Entry> getAllEntrieByDatesAndAccountAndLettering(LetteringFilter filter) throws LimaException; + + /** + * Retourne la dernière entrée d'une transaction + * @param financialTransaction transaction sur laquelle la derniere entree est selectionnee + * */ + Entry getLastEntry(FinancialTransaction financialTransaction) throws LimaException; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-08-06 16:03:49 UTC (rev 3568) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-08-07 12:57:47 UTC (rev 3569) @@ -25,6 +25,8 @@ package org.chorem.lima.entity; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.LetteringFilter; import org.nuiton.topia.TopiaException; @@ -34,6 +36,8 @@ public class EntryDAOImpl<E extends Entry> extends EntryDAOAbstract<Entry> { + private static final Log log = LogFactory.getLog(EntryDAOImpl.class); + /** * Requete generique qui recupere les entrees equilibrées portant entre * deux dates. @@ -203,6 +207,26 @@ } /** + * Retourne la dernière entrée d'une transaction + * @param financialTransaction transaction sur laquelle la derniere entree est selectionnee + * */ + public Entry getLastEntry(FinancialTransaction financialTransaction) throws TopiaException { + List<Entry> entries; + String query = "Select E from " + Entry.class.getName() + " E" + + " where E.financialTransaction.transactionDate = :financialTransactionDate " + + " and E.financialTransaction = :financialTransaction" + + " order by E.topiaCreateDate desc"; + + entries = context.findAll(query, "financialTransactionDate", financialTransaction.getTransactionDate(), "financialTransaction", financialTransaction); + + Entry lastEntry = entries.get(0); + if (log.isDebugEnabled()) { + log.debug("Last entry description : " + lastEntry.getDescription() ); + } + return lastEntry; + } + + /** * Retourne la somme des entrées des transaction entre * deux dates pour un journal donné. * Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-08-06 16:03:49 UTC (rev 3568) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-08-07 12:57:47 UTC (rev 3569) @@ -263,23 +263,6 @@ return result; } - /**Get the precedent entry of the entry passed in parameter*/ - public Entry getPrecedentEntry(Entry entry) { - for (Object transactionOrEntry : transactionAndEntries) { - if(transactionOrEntry instanceof Entry) { - if (transactionOrEntry.equals(entry)) { - Object objectAt = getObjectAt(transactionAndEntries.indexOf(transactionOrEntry) - 1); - if (objectAt instanceof Entry){ - return (Entry) objectAt; - } else { - return null; - } - } - } - } - return null; - } - public Object getObjectAt(int row) { if (row == -1) { return null; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-08-06 16:03:49 UTC (rev 3568) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-08-07 12:57:47 UTC (rev 3569) @@ -265,12 +265,11 @@ financialTransactionRow = tableModel.indexOf(((Entry) currentRow). getFinancialTransaction()); } + //create it entry.setFinancialTransaction(currentTransaction); Entry newEntry = financialTransactionService.createEntry(entry); currentTransaction.addEntry(entry); - //FIXME echatellier 20120413 what is fired here ? - //fireTableRowsUpdated(financialTransactionRow, financialTransactionRow + currentTransaction.getEntry().size() - 1); // on met a jour l'ui int newRow = financialTransactionRow + currentTransaction.getEntry().size() /*+ 1*/; @@ -350,27 +349,35 @@ // real selected row or selected transaction row ? int indexSelectedRow = table.getSelectedRow(); if (indexSelectedRow != -1) { - //int firstentryBookrow = tableModel.getFirstEntry(indexSelectedRow); - Entry precedentEntry = null; - if (tableModel.getObjectAt(indexSelectedRow) instanceof Entry) { - precedentEntry = tableModel.getPrecedentEntry((Entry)tableModel.getObjectAt(indexSelectedRow)); + Entry lastEntryOfTransaction; + + //First case, where line selected is an entry : take its transaction + //to select the last entry of the transaction + Object entryOrTransaction = tableModel.getObjectAt(indexSelectedRow); + if (entryOrTransaction instanceof Entry) { + lastEntryOfTransaction = financialTransactionService.getLastEntry(((Entry) entryOrTransaction).getFinancialTransaction()); + } else { //Second case, we have an instance of transaction, so select the last entry of it + lastEntryOfTransaction = financialTransactionService.getLastEntry((FinancialTransaction)entryOrTransaction); } - if (log.isInfoEnabled()) { - log.info("Selected row : " + indexSelectedRow); + if (log.isDebugEnabled()) { + log.debug("Selected row : " + indexSelectedRow); } String defaultVoucher = null; String defaultDescription = null; - if (precedentEntry != null) { - defaultVoucher = precedentEntry.getVoucher(); - defaultDescription = precedentEntry.getDescription(); + if (lastEntryOfTransaction != null) { + defaultVoucher = lastEntryOfTransaction.getVoucher(); + defaultDescription = lastEntryOfTransaction.getDescription(); } // creates the new entry Entry entry = new EntryImpl(); entry.setVoucher(defaultVoucher); + if (log.isDebugEnabled()) { + log.debug("Description of precedent entry : " + defaultDescription); + } entry.setDescription(defaultDescription); String defaultAccount; @@ -379,10 +386,10 @@ BigDecimal tvaTax = null; //Calculation of tva tax only if first entry is a sale - if (precedentEntry != null && precedentEntry.getAccount()!= null){ - defaultAccount = precedentEntry.getAccount().getAccountNumber(); + if (lastEntryOfTransaction != null && lastEntryOfTransaction.getAccount()!= null){ + defaultAccount = lastEntryOfTransaction.getAccount().getAccountNumber(); if (defaultAccount.equals("410") || defaultAccount.equals("418")){ - tvaTax = (precedentEntry.getAmount()).multiply(tvaPercentAdd); + tvaTax = (lastEntryOfTransaction.getAmount()).multiply(tvaPercentAdd); } } @@ -406,6 +413,7 @@ //get back the parent transaction of the entry currentTransaction = currentEntry.getFinancialTransaction(); } + // create it in service entry.setFinancialTransaction(currentTransaction); Entry newEntry = financialTransactionService.createEntry(entry); Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-08-06 16:03:49 UTC (rev 3568) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-08-07 12:57:47 UTC (rev 3569) @@ -46,4 +46,7 @@ log4j.logger.org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor=DEBUG log4j.logger.org.chorem.lima.business.accountingrules.DefaultAccountingRules=DEBUG log4j.logger.org.chorem.lima.business.ejb.FinancialTransactionServiceImpl=DEBUG -log4j.logger.org.chorem.lima.business.ui.celleditor.BigDecimalTableCellEditor=DEBUG \ No newline at end of file +log4j.logger.org.chorem.lima.business.ui.celleditor.BigDecimalTableCellEditor=DEBUG +log4j.logger.org.chorem.lima.business.ui.financialtransaction.FinancialTransactionTableModel=DEBUG +log4j.logger.org.chorem.lima.entity.EntryDAOImpl=DEBUG +log4j.logger.org.chorem.lima.ui.financialtransaction.FinancialTransactionViewHandler=DEBUG \ No newline at end of file

1 0