Author: vbriand Date: 2011-04-14 18:08:29 +0200 (Thu, 14 Apr 2011) New Revision: 87 Url: http://chorem.org/repositories/revision/chorem/87 Log: The customers are now displayed by year on the projects list Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-04-14 15:51:02 UTC (rev 86) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-04-14 16:08:29 UTC (rev 87) @@ -307,6 +307,33 @@ } /** + * Gets the customers of a project by year + * + * @param projectId the project's id + * @return the customers + */ + public List<Company> getCustomersByYear(String projectId) { + ChoremProxy proxy = getChoremProxy(); + Calendar cal = Calendar.getInstance(); + List<ProjectOrder> projectOrders = getProjectOrders(projectId); + List<Company> customers = new ArrayList<Company>(); + Company company; + int beginYear, endYear; + + for (ProjectOrder projectOrder : projectOrders) { + cal.setTime(projectOrder.getBeginDate()); + beginYear = cal.get(Calendar.YEAR); + cal.setTime(projectOrder.getEndDate()); + endYear = cal.get(Calendar.YEAR); + if (beginYear <= yearInt && yearInt <= endYear) { + company = proxy.restore(Company.class, projectOrder.getCompany()); + customers.add(company); + } + } + return customers; + } + + /** * @return the name */ public String getName() { Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp 2011-04-14 15:51:02 UTC (rev 86) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp 2011-04-14 16:08:29 UTC (rev 87) @@ -43,7 +43,7 @@ <td><a href="${projectDetails}"><%= project.getName() %></a></td> <td> <% - List<Company> customers = ProjectAction.getAction().getCustomers(project.getWikittyId()); + List<Company> customers = ProjectAction.getAction().getCustomersByYear(project.getWikittyId()); for (Company customer : customers) { %>