Author: vbriand Date: 2011-04-21 18:30:26 +0200 (Thu, 21 Apr 2011) New Revision: 100 Url: http://chorem.org/repositories/revision/chorem/100 Log: Added the projects begin and end dates Added: trunk/chorem-web/src/main/java/org/chorem/gepeto/ProjectOrderFull.java Modified: trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java 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/billy/action/QuotationAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java 2011-04-21 15:30:39 UTC (rev 99) +++ trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java 2011-04-21 16:30:26 UTC (rev 100) @@ -2,7 +2,6 @@ import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -11,7 +10,6 @@ import org.chorem.ChoremProxy; import org.chorem.action.BaseAction; import org.chorem.bonzoms.EmployeeFull; -import org.chorem.entities.Company; import org.chorem.entities.Employee; import org.chorem.entities.Person; import org.chorem.entities.Project; Added: trunk/chorem-web/src/main/java/org/chorem/gepeto/ProjectOrderFull.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/gepeto/ProjectOrderFull.java (rev 0) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/ProjectOrderFull.java 2011-04-21 16:30:26 UTC (rev 100) @@ -0,0 +1,72 @@ +package org.chorem.gepeto; + +import org.chorem.entities.Company; +import org.chorem.entities.Project; +import org.chorem.entities.ProjectOrder; +import org.chorem.entities.Quotation; + +/** + * @author vbriand + */ +public class ProjectOrderFull { + protected ProjectOrder projectOrder; + protected Quotation quotation; + protected Project project; + protected Company company; + + /** + * @return the projectOrder + */ + public ProjectOrder getProjectOrder() { + return projectOrder; + } + + /** + * @param projectOrder the projectOrder to set + */ + public void setProjectOrder(ProjectOrder projectOrder) { + this.projectOrder = projectOrder; + } + + /** + * @return the quotation + */ + public Quotation getQuotation() { + return quotation; + } + + /** + * @param quotation the quotation to set + */ + public void setQuotation(Quotation quotation) { + this.quotation = quotation; + } + + /** + * @return the project + */ + public Project getProject() { + return project; + } + + /** + * @param project the project to set + */ + public void setProject(Project project) { + this.project = project; + } + + /** + * @return the company + */ + public Company getCompany() { + return company; + } + + /** + * @param company the company to set + */ + public void setCompany(Company company) { + this.company = company; + } +} Property changes on: trunk/chorem-web/src/main/java/org/chorem/gepeto/ProjectOrderFull.java ___________________________________________________________________ Added: svn:mime-type + text/plain 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-21 15:30:39 UTC (rev 99) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-04-21 16:30:26 UTC (rev 100) @@ -18,6 +18,7 @@ import org.chorem.entities.ProjectImpl; import org.chorem.entities.ProjectOrder; import org.chorem.entities.Quotation; +import org.chorem.gepeto.ProjectOrderFull; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; @@ -202,6 +203,40 @@ return projects; } + public List<ProjectOrderFull> getProjectOrdersByYear() { + ChoremProxy proxy = getChoremProxy(); + Calendar cal = Calendar.getInstance(); + Search search = Search.query(); + Criteria criteria = search.exteq(ProjectOrder.EXT_PROJECTORDER).criteria(); + PagedResult<ProjectOrder> result = proxy. + findAllByCriteria(ProjectOrder.class, criteria); + List<ProjectOrder> projectOrders = result.getAll(); + List<ProjectOrderFull> projects = new ArrayList<ProjectOrderFull>(); + Quotation quotation; + Project project; + ProjectOrderFull projectFull; + 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) { + projectFull = new ProjectOrderFull(); + projectFull.setProjectOrder(projectOrder); + quotation = proxy.restore(Quotation.class, + projectOrder.getQuotation()); + projectFull.setQuotation(quotation); + project = proxy.restore(Project.class, quotation.getProject()); + projectFull.setProject(project); + System.out.println(project.getName()+"]]]"+project.getWikittyId()); + projects.add(projectFull); + } + } + return projects; + } + /** * Gets the projects without project order but with quotation by year * 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-21 15:30:39 UTC (rev 99) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp 2011-04-21 16:30:26 UTC (rev 100) @@ -2,6 +2,7 @@ <%@page import="java.util.List" %> <%@page import="org.chorem.entities.Company" %> <%@page import="org.chorem.entities.Project" %> +<%@page import="org.chorem.gepeto.ProjectOrderFull" %> <%@page import="org.chorem.gepeto.action.ProjectAction" %> <%@taglib prefix="s" uri="/struts-tags" %> @@ -35,18 +36,18 @@ </thead> <tbody> <% - List<Project> projects = ProjectAction.getAction().getProjectsByYear(); + List<ProjectOrderFull> projectsFull = ProjectAction.getAction().getProjectOrdersByYear(); - for (Project project : projects) { + for (ProjectOrderFull project : projectsFull) { %> <tr> <s:url action="projectDetails" var="projectDetails"> - <s:param name="projectId"><%= project.getWikittyId() %></s:param> + <s:param name="projectId"><%= project.getProject().getWikittyId() %></s:param> </s:url> - <td><a href="${projectDetails}"><%= project.getName() %></a></td> + <td><a href="${projectDetails}"><%= project.getProject().getName() %></a></td> <td> <% - List<Company> customers = ProjectAction.getAction().getCustomersByYear(project.getWikittyId()); + List<Company> customers = ProjectAction.getAction().getCustomersByYear(project.getProject().getWikittyId()); for (Company customer : customers) { %> @@ -58,8 +59,8 @@ } %> </td> - <td></td> - <td></td> + <td><%= project.getProjectOrder().getBeginDate() %></td> + <td><%= project.getProjectOrder().getEndDate() %></td> </tr> <% } %> </tbody> @@ -76,7 +77,7 @@ </thead> <tbody> <% - projects = ProjectAction.getAction().getProjectsWithoutProjectOrderByYear(); + List<Project> projects = ProjectAction.getAction().getProjectsWithoutProjectOrderByYear(); for (Project project : projects) { %>