Author: bpoussin Date: 2012-08-13 12:20:44 +0200 (Mon, 13 Aug 2012) New Revision: 238 Url: http://chorem.org/repositories/revision/chorem/238 Log: - formattage de toutes les colonnes des dashboards Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp trunk/chorem-webmotion/src/main/webapp/css/chorem.less Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp 2012-08-12 11:39:19 UTC (rev 237) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp 2012-08-13 10:20:44 UTC (rev 238) @@ -22,6 +22,7 @@ --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="f" %> <%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> <h1>Budget</h1> @@ -46,7 +47,7 @@ <tr> <td><span class="level level${c.level}" level="${c.level}">${c.userObject}</span></td> <c:forEach var="d" items="${dates}"> - <td><span>${values.get(d).get(c.userObject)}</span></td> + <td class="currency"><span><f:formatNumber type="currency" value="${values.get(d).get(c.userObject)}"/></span></td> </c:forEach> </tr> </c:forEach> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2012-08-12 11:39:19 UTC (rev 237) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2012-08-13 10:20:44 UTC (rev 238) @@ -22,6 +22,7 @@ --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="f" %> <%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> <h1>Invoices</h1> @@ -49,10 +50,10 @@ <td><w:display wikitty="${q.wikitty}" fqfield="Invoice.description" label=""/></td> <td><w:display wikitty="${q.wikitty}" fqfield="Invoice.customer" label=""/></td> <td><w:display wikitty="${q.wikitty}" fqfield="Invoice.supplier" label=""/></td> - <td><w:display wikitty="${q.wikitty}" fqfield="Invoice.amount" label=""/></td> - <td><w:display wikitty="${q.wikitty}" fqfield="Invoice.postedDate" label=""/></td> - <td><w:display wikitty="${q.wikitty}" fqfield="Invoice.expectedDate" label=""/></td> - <td><w:display wikitty="${q.wikitty}" fqfield="Invoice.paymentDate" label=""/></td> + <td class="currency"><w:display wikitty="${q.wikitty}" fqfield="Invoice.amount" label=""/></td> + <td class="date"><w:display wikitty="${q.wikitty}" fqfield="Invoice.postedDate" label=""/></td> + <td class="date"><w:display wikitty="${q.wikitty}" fqfield="Invoice.expectedDate" label=""/></td> + <td class="date"><w:display wikitty="${q.wikitty}" fqfield="Invoice.paymentDate" label=""/></td> <td>${attachments.get(q.wikittyId)}</td> </tr> </tbody> @@ -61,7 +62,7 @@ <dl class="dl-horizontal"> - <dt>Total</dt><dd>${amount}</dd> - <dt>Total paid</dt><dd>${amountPaid}</dd> - <dt>Total expected</dt><dd>${amountExpected}</dd> + <dt>Total</dt><dd><f:formatNumber type="currency" value="${amount}"/></dd> + <dt>Total paid</dt><dd><f:formatNumber type="currency" value="${amountPaid}"/></dd> + <dt>Total expected</dt><dd><f:formatNumber type="currency" value="${amountExpected}"/></dd> </dl> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp 2012-08-12 11:39:19 UTC (rev 237) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp 2012-08-13 10:20:44 UTC (rev 238) @@ -22,6 +22,8 @@ --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="f" %> +<%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> <h1>${title}</h1> @@ -48,14 +50,14 @@ <td><w:display wikitty="${q.wikitty}" fqfield="Quotation.project" label=""/></td> <td><w:display wikitty="${q.wikitty}" fqfield="Quotation.category" label=""/></td> <td><w:display wikitty="${q.wikitty}" toString="%Quotation.description$s" label=""/></td> - <td><w:display wikitty="${q.wikitty}" fqfield="Quotation.estimatedDays" label=""/></td> - <td><w:display wikitty="${q.wikitty}" fqfield="Quotation.amount" label=""/></td> - <td>${taskInfos.get(q.wikittyId).workingDays}</td> - <td>${taskInfos.get(q.wikittyId).hopedPriceDay}</td> - <td>${taskInfos.get(q.wikittyId).realPriceDay}</td> - <td>${taskInfos.get(q.wikittyId).hopedProfit}</td> - <td>${taskInfos.get(q.wikittyId).realProfit}</td> - <td><w:display wikitty="${q.wikitty}" fqfield="Quotation.status" label=""/></td> + <td class="number"><w:display wikitty="${q.wikitty}" fqfield="Quotation.estimatedDays" label=""/></td> + <td class="currency"><w:display wikitty="${q.wikitty}" fqfield="Quotation.amount" label=""/></td> + <td class="number"><f:formatNumber type="number" value="${taskInfos.get(q.wikittyId).workingDays}"/></td> + <td class="currency"><f:formatNumber type="currency" value="${taskInfos.get(q.wikittyId).hopedPriceDay}"/></td> + <td class="currency"><f:formatNumber type="currency" value="${taskInfos.get(q.wikittyId).realPriceDay}"/></td> + <td class="currency"><f:formatNumber type="currency" value="${taskInfos.get(q.wikittyId).hopedProfit}"/></td> + <td class="currency"><f:formatNumber type="currency" value="${taskInfos.get(q.wikittyId).realProfit}"/></td> + <td class="nowrap"><w:display wikitty="${q.wikitty}" fqfield="Quotation.status" label=""/></td> <td>${attachments.get(q.wikittyId)}</td> </tr> </tbody> @@ -63,8 +65,8 @@ </table> <dl class="dl-horizontal"> - <dt>Total amount</dt><dd>${amount}</dd> - <dt>Total hoped profit</dt><dd>${hopedProfit}</dd> - <dt>Total real profit</dt><dd>${realProfit}</dd> - <dt>Profit discordance</dt><dd>${realProfit - hopedProfit}</dd> + <dt>Total amount</dt><dd><f:formatNumber type="currency" value="${amount}"/></dd> + <dt>Total hoped profit</dt><dd><f:formatNumber type="currency" value="${hopedProfit}"/></dd> + <dt>Total real profit</dt><dd><f:formatNumber type="currency" value="${realProfit}"/></dd> + <dt>Profit discordance</dt><dd><f:formatNumber type="currency" value="${realProfit - hopedProfit}"/></dd> </dl> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp 2012-08-12 11:39:19 UTC (rev 237) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp 2012-08-13 10:20:44 UTC (rev 238) @@ -22,6 +22,7 @@ --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="f" %> <%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> <h1>${title}</h1> @@ -51,12 +52,12 @@ <td><w:display wikitty="${q.wikitty}" toString="%Quotation.description$s" label=""/></td> <td><w:display wikitty="${q.wikitty}" fqfield="Quotation.customer" label=""/></td> <td><w:display wikitty="${q.wikitty}" fqfield="Quotation.supplier" label=""/></td> - <td><w:display wikitty="${q.wikitty}" fqfield="Quotation.estimatedDays" label=""/></td> - <td>${taskInfos.get(q.wikittyId).workingDays}</td> - <td>${taskInfos.get(q.wikittyId).opened}</td> - <td>${taskInfos.get(q.wikittyId).closed}</td> - <td><w:display wikitty="${q.wikitty}" fqfield="Quotation.amount" label=""/></td> - <td><w:display wikitty="${q.wikitty}" fqfield="Quotation.status" label=""/></td> + <td class="number"><w:display wikitty="${q.wikitty}" fqfield="Quotation.estimatedDays" label=""/></td> + <td class="number"><f:formatNumber type="number" value="${taskInfos.get(q.wikittyId).workingDays}"/></td> + <td class="number"><f:formatNumber type="number" value="${taskInfos.get(q.wikittyId).opened}"/></td> + <td class="number"><f:formatNumber type="number" value="${taskInfos.get(q.wikittyId).closed}"/></td> + <td class="currency"><w:display wikitty="${q.wikitty}" fqfield="Quotation.amount" label=""/></td> + <td class="currency"><w:display wikitty="${q.wikitty}" fqfield="Quotation.status" label=""/></td> <td>${attachments.get(q.wikittyId)}</td> </tr> </tbody> @@ -65,7 +66,7 @@ <dl class="dl-horizontal"> - <dt>Total amount</dt><dd>${amount}</dd> - <dt>Total task opened</dt><dd>${opened}</dd> - <dt>Total task closed</dt><dd>${closed}</dd> + <dt>Total amount</dt><dd><f:formatNumber type="currency" value="${amount}"/></dd> + <dt>Total task opened</dt><dd><f:formatNumber type="number" value="${opened}"/></dd> + <dt>Total task closed</dt><dd><f:formatNumber type="number" value="${closed}"/></dd> </dl> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp 2012-08-12 11:39:19 UTC (rev 237) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp 2012-08-13 10:20:44 UTC (rev 238) @@ -22,6 +22,7 @@ --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="f" %> <%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> <h1>${title}</h1> @@ -50,11 +51,11 @@ <td><w:display wikitty="${q.wikitty}" toString="%Quotation.description$s" label=""/></td> <td><w:display wikitty="${q.wikitty}" fqfield="Quotation.customer" label=""/></td> <td><w:display wikitty="${q.wikitty}" fqfield="Quotation.supplier" label=""/></td> - <td><w:display wikitty="${q.wikitty}" fqfield="Quotation.estimatedDays" label=""/></td> - <td><w:display wikitty="${q.wikitty}" fqfield="Quotation.conversionHope" label=""/></td> - <td>${q.amount / q.estimatedDays}</td> - <td><w:display wikitty="${q.wikitty}" fqfield="Quotation.amount" label=""/></td> - <td><w:display wikitty="${q.wikitty}" fqfield="Quotation.status" label=""/></td> + <td class="number"><w:display wikitty="${q.wikitty}" fqfield="Quotation.estimatedDays" label=""/></td> + <td class="percent"><w:display wikitty="${q.wikitty}" fqfield="Quotation.conversionHope" label=""/></td> + <td class="currency"><f:formatNumber type="currency" value="${q.amount / q.estimatedDays}"/></td> + <td class="currency"><w:display wikitty="${q.wikitty}" fqfield="Quotation.amount" label=""/></td> + <td class="nowrap"><w:display wikitty="${q.wikitty}" fqfield="Quotation.status" label=""/></td> <td>${attachments.get(q.wikittyId)}</td> </tr> </tbody> @@ -63,6 +64,6 @@ <dl class="dl-horizontal"> - <dt>Total</dt><dd>${amount}</dd> - <dt>Hope</dt><dd>${amountHope}</dd> + <dt>Total</dt><dd><f:formatNumber type="currency" value="${amount}"/></dd> + <dt>Hope</dt><dd><f:formatNumber type="currency" value="${amountHope}"/></dd> </dl> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp 2012-08-12 11:39:19 UTC (rev 237) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp 2012-08-13 10:20:44 UTC (rev 238) @@ -22,6 +22,8 @@ --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="f" %> +<%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> <h1>Vacances</h1> @@ -41,12 +43,12 @@ <c:forEach var="q" items="${vacations}"> <tbody> <tr> - <td><a href="<c:url value="/wikitty/Employee/view/${q.employee}"/>">${q.getEmployee(false)}</a></td> - <td><a href="<c:url value="/wikitty/Vacation/view/${q.wikittyId}"/>">${q.beginDate}</a></td> - <td>${q.endDate}</td> - <td>${days.get(q.wikittyId)}</td> - <td>${q.type}</td> - <td>${q.description}</td> + <td><w:display wikitty="${q.wikitty}" fqfield="Vacation.employee" label=""/></td> + <td class="date"><w:display wikitty="${q.wikitty}" fqfield="Vacation.beginDate" label=""/></td> + <td class="date"><w:display wikitty="${q.wikitty}" fqfield="Vacation.endDate" label=""/></td> + <td class="number"><w:display wikitty="${q.wikitty}" toString="${days.get(q.wikittyId)}" label=""/></td> + <td><w:display wikitty="${q.wikitty}" fqfield="Vacation.type" label=""/></td> + <td><w:display wikitty="${q.wikitty}" fqfield="Vacation.description" label=""/></td> </tr> </tbody> </c:forEach> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp 2012-08-12 11:39:19 UTC (rev 237) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp 2012-08-13 10:20:44 UTC (rev 238) @@ -22,6 +22,8 @@ --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="f" %> +<%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> <h1>Vacances en attente d'agrément</h1> @@ -39,12 +41,12 @@ <c:forEach var="q" items="${vacations}"> <tbody> <tr> - <td><a href="<c:url value="/wikitty/Employee/view/${q.employee}"/>">${q.getEmployee(false)}</a></td> - <td><a href="<c:url value="/wikitty/Vacation/view/${q.wikittyId}"/>">${q.beginDate}</a></td> - <td>${q.endDate}</td> - <td>${days.get(q.wikittyId)}</td> - <td>${q.type}</td> - <td>${q.description}</td> + <td><w:display wikitty="${q.wikitty}" fqfield="Vacation.employee" label=""/></td> + <td class="date"><w:display wikitty="${q.wikitty}" fqfield="Vacation.beginDate" label=""/></td> + <td class="date"><w:display wikitty="${q.wikitty}" fqfield="Vacation.endDate" label=""/></td> + <td class="number"><w:display wikitty="${q.wikitty}" toString="${days.get(q.wikittyId)}" label=""/></td> + <td><w:display wikitty="${q.wikitty}" fqfield="Vacation.type" label=""/></td> + <td><w:display wikitty="${q.wikitty}" fqfield="Vacation.description" label=""/></td> </tr> </tbody> </c:forEach> Modified: trunk/chorem-webmotion/src/main/webapp/css/chorem.less =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/chorem.less 2012-08-12 11:39:19 UTC (rev 237) +++ trunk/chorem-webmotion/src/main/webapp/css/chorem.less 2012-08-13 10:20:44 UTC (rev 238) @@ -28,6 +28,9 @@ font-weight: bolder; } +td.number, td.currency, td.percent, td.date, td.nowrap { + white-space: nowrap; +} .categorylevel (@level) { margin-left: @level * 10px; } @@ -47,4 +50,3 @@ span.level5 { .categorylevel (5); } -