Author: bpoussin Date: 2012-05-24 15:21:04 +0200 (Thu, 24 May 2012) New Revision: 155 Url: http://chorem.org/repositories/revision/chorem/155 Log: ajout du customer et supplier dans les tableaux Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp 2012-05-24 00:08:16 UTC (rev 154) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp 2012-05-24 13:21:04 UTC (rev 155) @@ -9,6 +9,8 @@ <th>Project</th> <th>Type</th> <th>Description</th> + <th>Customer</th> + <th>Supplier</th> <th>estimatedDays</th> <th>workingDays</th> <th>task opened</th> @@ -28,6 +30,8 @@ <td><a href="<c:url value="/wikitty/Project/view/${q.project}"/>">${q.getProject(false).getName()}</a></td> <td>${q.type}</td> <td><a href="<c:url value="/wikitty/Quotation/view/${q.wikittyId}"/>">${q.description}</a></td> + <td><a href="<c:url value="/wikitty/Employee/view/${q.customer}"/>">${q.getCustomer(false)}</a></td> + <td><a href="<c:url value="/wikitty/Employee/view/${q.supplier}"/>">${q.getSupplier(false)}</a></td> <td>${q.estimatedDays}</td> <td>${taskInfos.get(q.wikittyId).workingDays}</td> <td>${taskInfos.get(q.wikittyId).opened}</td> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp 2012-05-24 00:08:16 UTC (rev 154) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp 2012-05-24 13:21:04 UTC (rev 155) @@ -9,6 +9,8 @@ <th>Project</th> <th>Type</th> <th>Description</th> + <th>Customer</th> + <th>Supplier</th> <th>estimatedDays</th> <th>convsersionHope</th> <th>Price days Hope</th> @@ -23,6 +25,8 @@ <td><a href="<c:url value="/wikitty/Project/view/${q.project}"/>">${q.getProject(false).getName()}</a></td> <td>${q.type}</td> <td><a href="<c:url value="/wikitty/Quotation/view/${q.wikittyId}"/>">${q.description}</a></td> + <td><a href="<c:url value="/wikitty/Employee/view/${q.customer}"/>">${q.getCustomer(false)}</a></td> + <td><a href="<c:url value="/wikitty/Employee/view/${q.supplier}"/>">${q.getSupplier(false)}</a></td> <td>${q.estimatedDays}</td> <td>${q.conversionHope}</td> <td>${q.amount / q.estimatedDays}</td>