Author: bpoussin Date: 2013-03-23 01:22:42 +0100 (Sat, 23 Mar 2013) New Revision: 333 Url: http://chorem.org/projects/chorem/repository/revisions/333 Log: utilisation du nouveau parser de date de wikitty Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp 2013-03-22 11:58:09 UTC (rev 332) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp 2013-03-23 00:22:42 UTC (rev 333) @@ -42,16 +42,29 @@ <td class="header"><span class="level level${c.level}" level="${c.level}">${c.userObject}</span></td> <c:forEach var="d" items="${data.dates}"> <td class="currency"> + <c:url var="addDebtUrl" value="/wikitty/FinancialTransaction/edit/new"> + <c:param name="FinancialTransaction.payer" value="${companyId}"/> + <c:param name="FinancialTransaction.emittedDate" value="today"/> + <c:param name="FinancialTransaction.expectedDate" value="01/${d}"/> + <c:param name="FinancialTransaction.paymentDate" value="01/${d}"/> + <c:param name="FinancialTransaction.category" value="${c.userObject.wikittyId}"/> + </c:url> + <c:url var="addIncomeUrl" value="/wikitty/FinancialTransaction/edit/new"> + <c:param name="FinancialTransaction.beneficiary" value="${companyId}"/> + <c:param name="FinancialTransaction.emittedDate" value="today=${d.substring(3,7)}${d.substring(0,2)}"/> + <c:param name="FinancialTransaction.expectedDate" value="today=${d.substring(3,7)}${d.substring(0,2)}+30DAYS"/> + <c:param name="FinancialTransaction.category" value="${c.userObject.wikittyId}"/> + </c:url> <c:choose> <c:when test="${data.getInvoices(d, c.userObject).isEmpty()}"> <span class="withPopover" - title='Aucune entrée <span><a href="<c:url value="/wikitty/FinancialTransaction/edit/new?FinancialTransaction.payer=${companyId}&FinancialTransaction.emittedDate=today&FinancialTransaction.expectedDate=01/${d}&FinancialTransaction.paymentDate=01/${d}&FinancialTransaction.category=${c.userObject.wikittyId}"/>"><li class="icon-plus"></li>Debt</a><span> <span><a href="<c:url value="/wikitty/FinancialTransaction/edit/new?FinancialTransaction.beneficiary=${companyId}&FinancialTransaction.emittedDate=today&FinancialTransaction.expectedDate=01/${d}&FinancialTransaction.paymentDate=01/${d}&FinancialTransaction.category=${c.userObject.wikittyId}"/>"><li class="icon-plus"></li>Income</a><span>'> + title='Aucune entrée <span><a href="${addDebtUrl}"><li class="icon-plus"></li>Debt</a><span> <span><a href="${addIncomeUrl}"><li class="icon-plus"></li>Income</a><span>'> <f:formatNumber type="currency" value="${data.getAmount(d, c.userObject)}"/> </span> </c:when> <c:otherwise> <span class="withPopover" - title='Detail pour <f:formatNumber type="currency" value="${data.getAmount(d, c.userObject)}"/> <span><a href="<c:url value="/wikitty/FinancialTransaction/edit/new?FinancialTransaction.payer=${companyId}&FinancialTransaction.emittedDate=today&FinancialTransaction.expectedDate=01/${d}&FinancialTransaction.paymentDate=01/${d}&FinancialTransaction.category=${c.userObject.wikittyId}"/>"><li class="icon-plus"></li>Debt</a><span> <span><a href="<c:url value="/wikitty/FinancialTransaction/edit/new?FinancialTransaction.beneficiary=${companyId}&FinancialTransaction.emittedDate=today&FinancialTransaction.expectedDate=01/${d}&FinancialTransaction.paymentDate=01/${d}&FinancialTransaction.category=${c.userObject.wikittyId}"/>"><li class="icon-plus"></li>Income</a><span>' + title='Detail pour <f:formatNumber type="currency" value="${data.getAmount(d, c.userObject)}"/> <span><a href="${addDebtUrl}"><li class="icon-plus"></li>Debt</a><span> <span><a href="${addIncomeUrl}"><li class="icon-plus"></li>Income</a><span>' data-content='<w:display wikitties="${data.getInvoices(d, c.userObject)}" toString="<span class=\"withTooltip\" title=\"%FinancialTransaction.category$s: %FinancialTransaction.payer$s -> %FinancialTransaction.beneficiary$s\">%FinancialTransaction.reference|noref$s: %FinancialTransaction.amount|0.0$,.2f</span>"/>'> <f:formatNumber type="currency" value="${data.getAmount(d, c.userObject)}"/> </span>