October 2012 - Chorem-commits - mailman.cloud.codelutin.com

r275 - trunk
by tchemit＠users.chorem.org 30 Oct '12

30 Oct '12

Author: tchemit Date: 2012-10-30 08:45:28 +0100 (Tue, 30 Oct 2012) New Revision: 275 Url: http://chorem.org/repositories/revision/chorem/275 Log: Update mavenpom4redmine to 3.4.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-26 11:45:02 UTC (rev 274) +++ trunk/pom.xml 2012-10-30 07:45:28 UTC (rev 275) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.2</version> + <version>3.4.3</version> </parent> <groupId>org.chorem</groupId>

1 0

r274 - trunk
by tchemit＠users.chorem.org 26 Oct '12

26 Oct '12

Author: tchemit Date: 2012-10-26 13:45:02 +0200 (Fri, 26 Oct 2012) New Revision: 274 Url: http://chorem.org/repositories/revision/chorem/274 Log: Update mavenpom4redmine to 3.4.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-17 13:26:35 UTC (rev 273) +++ trunk/pom.xml 2012-10-26 11:45:02 UTC (rev 274) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4</version> + <version>3.4.2</version> </parent> <groupId>org.chorem</groupId>

1 0

r273 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions webapp/WEB-INF/jsp
by mble＠users.chorem.org 17 Oct '12

17 Oct '12

Author: mble Date: 2012-10-17 15:26:35 +0200 (Wed, 17 Oct 2012) New Revision: 273 Url: http://chorem.org/repositories/revision/chorem/273 Log: added Invoice.execptedDate< in dashboardSummary.jsp line 44 and static final public String solRDateFormat in DashboardAction.java Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-10-17 13:22:20 UTC (rev 272) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-10-17 13:26:35 UTC (rev 273) @@ -82,6 +82,7 @@ static final public String budgetDateFormat = "MM/yyyy"; static final public String summaryDateFormat = "dd/MM/yyyy hh:mm"; + static final public String solRDateFormat = "yyyy-MM-dd'T'hh:mm:ss'Z'"; protected <E> Map<String, List<Attachment>> prepareAttachment(ChoremClient client, Collection<E> ids) { // recherche des attachments de chaque quotation trouvee @@ -294,7 +295,7 @@ return renderView("dashboardSummary.jsp", "date", now, - "now", DateFormatUtils.format(now, summaryDateFormat), + "now", DateFormatUtils.format(now, solRDateFormat), "inOneWeek", DateFormatUtils.format(inOneWeek, summaryDateFormat), "invoiceDebtNb", invoiceDebtNb, "invoiceDebt", invoiceDebt, Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp 2012-10-17 13:22:20 UTC (rev 272) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp 2012-10-17 13:26:35 UTC (rev 273) @@ -41,7 +41,7 @@ factures à payer</a> pour un montant de <f:formatNumber type="currency" value="${invoiceDebt}"/></li> <li>Il y a ${invoiceIncomeNb} - <a href='<c:url value="/report?report=invoiceIncome&end=${now}&query=Invoice.paymentDate=null"/>'> + <a href='<c:url value="/report?report=invoiceIncome&query=Invoice.paymentDate=null Invoice.expectedDate<${now}"/>'> factures impayées</a> pour un montant de <f:formatNumber type="currency" value="${invoiceIncome}"/></li> <li>Il y a ${touchNb} <a href='<c:url value="/wikitty/search?query=${touchQueryString}"/>'>

1 0

r272 - trunk/chorem-webmotion
by jcouteau＠users.chorem.org 17 Oct '12

17 Oct '12

Author: jcouteau Date: 2012-10-17 15:22:20 +0200 (Wed, 17 Oct 2012) New Revision: 272 Url: http://chorem.org/repositories/revision/chorem/272 Log: Test commit Modified: trunk/chorem-webmotion/pom.xml Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2012-10-11 02:52:13 UTC (rev 271) +++ trunk/chorem-webmotion/pom.xml 2012-10-17 13:22:20 UTC (rev 272) @@ -273,4 +273,5 @@ </build> + </project>

1 0

r271 - trunk
by tchemit＠users.chorem.org 11 Oct '12

11 Oct '12

Author: tchemit Date: 2012-10-11 04:52:13 +0200 (Thu, 11 Oct 2012) New Revision: 271 Url: http://chorem.org/repositories/revision/chorem/271 Log: updates to mavenpom 3.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-15 12:39:27 UTC (rev 270) +++ trunk/pom.xml 2012-10-11 02:52:13 UTC (rev 271) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.6</version> + <version>3.4</version> </parent> <groupId>org.chorem</groupId>

1 0