Author: bpoussin Date: 2012-08-13 12:51:21 +0200 (Mon, 13 Aug 2012) New Revision: 239 Url: http://chorem.org/repositories/revision/chorem/239 Log: - correction de champs dans la table des vacances - amelioration des affichages Modified: 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/WEB-INF/jsp/dashboardVacationByEmployee.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp 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-13 10:20:44 UTC (rev 238) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp 2012-08-13 10:51:21 UTC (rev 239) @@ -44,8 +44,8 @@ <tbody> <tr> <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="date"><w:display wikitty="${q.wikitty}" fqfield="Interval.beginDate" label=""/></td> + <td class="date"><w:display wikitty="${q.wikitty}" fqfield="Interval.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> 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-13 10:20:44 UTC (rev 238) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp 2012-08-13 10:51:21 UTC (rev 239) @@ -42,8 +42,8 @@ <tbody> <tr> <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="date"><w:display wikitty="${q.wikitty}" fqfield="Interval.beginDate" label=""/></td> + <td class="date"><w:display wikitty="${q.wikitty}" fqfield="Interval.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> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp 2012-08-13 10:20:44 UTC (rev 238) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp 2012-08-13 10:51:21 UTC (rev 239) @@ -22,13 +22,14 @@ --%> <%@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" %> <h1>Vacances par employé</h1> <ul> <c:forEach var="q" items="${vacationByEmployee.keySet()}"> - <li><strong>${q}:</strong> <span>${vacationByEmployee.get(q)}</span></li> + <li><strong>${q}:</strong> <span><f:formatNumber type="number" value="${vacationByEmployee.get(q)}"/></span></li> </c:forEach> </ul> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp 2012-08-13 10:20:44 UTC (rev 238) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp 2012-08-13 10:51:21 UTC (rev 239) @@ -22,11 +22,12 @@ --%> <%@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" %> <h1>Jour de travail sur des projets client par employé</h1> <ul> <c:forEach var="q" items="${workingProjectDaysByEmployee.keySet()}"> - <li><strong>${q}:</strong> <span>${workingProjectDaysByEmployee.get(q)}</span></li> + <li><strong>${q}:</strong> <span><f:formatNumber type="number" value="${workingProjectDaysByEmployee.get(q)}"/></span></li> </c:forEach> </ul>