- Chorem-commits - mailman.cloud.codelutin.com

r89 - in trunk/chorem-entities: . src src/test src/test/java src/test/java/org src/test/java/org/chorem src/test/java/org/chorem/entities
by bpoussin＠users.chorem.org 15 Apr '11

15 Apr '11

Author: bpoussin Date: 2011-04-15 11:22:37 +0200 (Fri, 15 Apr 2011) New Revision: 89 Url: http://chorem.org/repositories/revision/chorem/89 Log: add test for IncoiceableUtil Added: trunk/chorem-entities/src/test/ trunk/chorem-entities/src/test/java/ trunk/chorem-entities/src/test/java/org/ trunk/chorem-entities/src/test/java/org/chorem/ trunk/chorem-entities/src/test/java/org/chorem/entities/ trunk/chorem-entities/src/test/java/org/chorem/entities/InvoiceableUtilTest.java Modified: trunk/chorem-entities/pom.xml Modified: trunk/chorem-entities/pom.xml =================================================================== --- trunk/chorem-entities/pom.xml 2011-04-15 08:54:28 UTC (rev 88) +++ trunk/chorem-entities/pom.xml 2011-04-15 09:22:37 UTC (rev 89) @@ -91,7 +91,12 @@ <artifactId>commons-io</artifactId> <scope>compile</scope> </dependency> - + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.2</version> + <scope>test</scope> + </dependency> </dependencies> <build> Added: trunk/chorem-entities/src/test/java/org/chorem/entities/InvoiceableUtilTest.java =================================================================== --- trunk/chorem-entities/src/test/java/org/chorem/entities/InvoiceableUtilTest.java (rev 0) +++ trunk/chorem-entities/src/test/java/org/chorem/entities/InvoiceableUtilTest.java 2011-04-15 09:22:37 UTC (rev 89) @@ -0,0 +1,57 @@ +package org.chorem.entities; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import static org.junit.Assert.*; +import org.nuiton.wikitty.WikittyProxy; + +/** + * + * @author poussin + */ +public class InvoiceableUtilTest { + + /** + * Test of evalCondition method, of class InvoiceableUtil. + */ + @Test + public void testEvalCondition() { + System.out.println("evalCondition"); + + WikittyProxy proxy = null; + Invoiceable invoiceable = new InvoiceableImpl(); + invoiceable.setMimetype("application/javascript"); + invoiceable.setCondition("'coucou'.equals(invoiceable.getName())"); + + { + invoiceable.setName("coucou"); + boolean expResult = true; + boolean result = InvoiceableUtil.evalCondition(proxy, invoiceable); + assertEquals(expResult, result); + } + { + invoiceable.setName("not coucou"); + boolean expResult = false; + boolean result = InvoiceableUtil.evalCondition(proxy, invoiceable); + assertEquals(expResult, result); + } + } + + /** + * Test of evalValue method, of class InvoiceableUtil. + */ + @Test + public void testEvalValue() { + System.out.println("evalValue"); + + WikittyProxy proxy = null; + Invoiceable invoiceable = new InvoiceableImpl(); + invoiceable.setMimetype("application/javascript"); + invoiceable.setValue("10*10"); + + double expResult = 100; + double result = InvoiceableUtil.evalValue(proxy, invoiceable); + assertEquals(expResult, result, 0.0); + } +}

1 0

r88 - in trunk/chorem-web/src/main: java/org/chorem/gepeto/action resources/i18n webapp/WEB-INF/jsp/gepeto
by vbriand＠users.chorem.org 15 Apr '11

15 Apr '11

Author: vbriand Date: 2011-04-15 10:54:28 +0200 (Fri, 15 Apr 2011) New Revision: 88 Url: http://chorem.org/repositories/revision/chorem/88 Log: Added a list of projects with quotation but without project order on the page listing the projects by year Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp 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 16:08:29 UTC (rev 87) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-04-15 08:54:28 UTC (rev 88) @@ -203,6 +203,74 @@ } /** + * Gets the projects without project order but with quotation by year + * + * @return the list of projects + */ + public List<Project> getProjectsWithoutProjectOrderByYear() { + ChoremProxy proxy = getChoremProxy(); + Calendar cal = Calendar.getInstance(); + Collection<Quotation> allQuotations = new ArrayList<Quotation>( + getAllQuotations()); + + allQuotations.removeAll(getQuotationsWithProjectOrder()); + List<Project> projects = new ArrayList<Project>(); + Project project; + int quotationYear; + + for (Quotation quotation : allQuotations) { + cal.setTime(quotation.getPostedDate()); + quotationYear = cal.get(Calendar.YEAR); + if (yearInt == quotationYear) { + project = proxy.restore(Project.class, quotation.getProject()); + //If the project isn't already in the list + if (!projects.contains(project)) { + projects.add(project); + } + } + } + return projects; + } + + /** + * Gets all quotations with project order + * + * @return all quotations with project order + */ + public List<Quotation> getQuotationsWithProjectOrder() { + ChoremProxy proxy = getChoremProxy(); + 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<Quotation> quotations = new ArrayList<Quotation>(); + Quotation quotation; + + for (ProjectOrder projectOrder : projectOrders) { + quotation = proxy.restore(Quotation.class, + projectOrder.getQuotation()); + quotations.add(quotation); + } + return quotations; + } + + /** + * Gets all quotations, whether they have a project order or not + * + * @return all quotations + */ + public List<Quotation> getAllQuotations() { + ChoremProxy proxy = getChoremProxy(); + Search search = Search.query(); + Criteria criteria = search.exteq(Quotation.EXT_QUOTATION).criteria(); + PagedResult<Quotation> result = proxy.findAllByCriteria(Quotation.class, + criteria); + List<Quotation> quotations = result.getAll(); + return quotations; + } + + /** * Gets the quotations attached with this project * * @return the quotations linked with this project @@ -241,7 +309,8 @@ * @return the quotations without a project order */ public List<Quotation> getAttachedQuotationsWithoutProjectOrder() { - Collection<Quotation> allQuotations = new ArrayList<Quotation>(getAttachedQuotations()); + Collection<Quotation> allQuotations = new ArrayList<Quotation>( + getAttachedQuotations()); //Gets all quotations and removes the ones with a project order allQuotations.removeAll(getAttachedQuotationsWithProjectOrder()); @@ -261,8 +330,8 @@ Criteria criteria = search.exteq(ProjectOrder.EXT_PROJECTORDER). associated(ProjectOrder.FQ_FIELD_PROJECTORDER_QUOTATION). eq(Quotation.FQ_FIELD_QUOTATION_PROJECT, projectId).criteria(); - PagedResult<ProjectOrder> result = proxy.findAllByCriteria(ProjectOrder.class, - criteria); + PagedResult<ProjectOrder> result = proxy. + findAllByCriteria(ProjectOrder.class, criteria); List<ProjectOrder> projectOrders = result.getAll(); return projectOrders; @@ -280,8 +349,8 @@ Criteria criteria = search.exteq(ProjectOrder.EXT_PROJECTORDER). associated(ProjectOrder.FQ_FIELD_PROJECTORDER_QUOTATION). eq(Quotation.FQ_FIELD_QUOTATION_PROJECT, projectId).criteria(); - PagedResult<ProjectOrder> result = proxy.findAllByCriteria(ProjectOrder.class, - criteria); + PagedResult<ProjectOrder> result = proxy. + findAllByCriteria(ProjectOrder.class, criteria); List<ProjectOrder> projectOrders = result.getAll(); return projectOrders; Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-14 16:08:29 UTC (rev 87) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-15 08:54:28 UTC (rev 88) @@ -142,6 +142,7 @@ chorem.gepeto.projectsByYear.thead.name=Name chorem.gepeto.projectsByYear.thead.start=Start chorem.gepeto.projectsByYear.title=Projects of year {0} +chorem.gepeto.projectsWithoutQuotation= chorem.gepeto.results.title=Results by year chorem.gepeto.task=Task {0} chorem.gepeto.task.add=Add a new task Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-14 16:08:29 UTC (rev 87) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-15 08:54:28 UTC (rev 88) @@ -138,6 +138,7 @@ chorem.gepeto.projectsByYear.thead.name=Nom chorem.gepeto.projectsByYear.thead.start=D\u00E9but chorem.gepeto.projectsByYear.title=Projets de l''ann\u00E9e {0} +chorem.gepeto.projectsWithoutQuotation= chorem.gepeto.results.title=R\u00E9sultats par ann\u00E0e chorem.gepeto.task=T\u00E2che {0} chorem.gepeto.task.add=Ajouter une nouvelle t\u00E2che Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp 2011-04-14 16:08:29 UTC (rev 87) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp 2011-04-15 08:54:28 UTC (rev 88) @@ -14,6 +14,7 @@ <s:param name="year">2011</s:param> </s:url> <a href="${getProjectsByYear}"><s:text name="chorem.gepeto.projects" /></a><br /> + <s:a action="getProjectsWithoutQuotation"><s:text name="chorem.gepeto.projectsWithoutQuotation" /></s:a><br /> </p> </body> </html> 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 16:08:29 UTC (rev 87) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp 2011-04-15 08:54:28 UTC (rev 88) @@ -22,6 +22,9 @@ </s:text> </h2> <table> + <caption> + <s:text name="chorem.gepeto.projectsByYear.withProjectOrder" /> + </caption> <thead> <tr> <th><s:text name="chorem.gepeto.projectsByYear.thead.name" /></th> @@ -61,5 +64,50 @@ <% } %> </tbody> </table> + <br /> + <table> + <caption> + <s:text name="chorem.gepeto.projectsByYear.withoutProjectOrder" /> + </caption> + <thead> + <tr> + <th><s:text name="chorem.gepeto.projectsByYear.thead.name" /></th> + <th><s:text name="chorem.gepeto.projectsByYear.thead.company" /></th> + <th><s:text name="chorem.gepeto.projectsByYear.thead.start" /></th> + <th><s:text name="chorem.gepeto.projectsByYear.thead.end" /></th> + </tr> + </thead> + <tbody> + <% + projects = ProjectAction.getAction().getProjectsWithoutProjectOrderByYear(); + + for (Project project : projects) { + %> + <tr> + <s:url action="projectDetails" var="projectDetails"> + <s:param name="projectId"><%= project.getWikittyId() %></s:param> + </s:url> + <td><a href="${projectDetails}"><%= project.getName() %></a></td> + <td> + <% + List<Company> customers = ProjectAction.getAction().getCustomersByYear(project.getWikittyId()); + + for (Company customer : customers) { + %> + <s:url namespace="/bonzoms" action="companyDetails" var="companyDetails"> + <s:param name="companyId"><%= customer.getWikittyId() %></s:param> + </s:url> + <a href="${companyDetails}"><%= customer.getName() %></a> + <% + } + %> + </td> + <td></td> + <td></td> + </tr> + <% } %> + </tbody> + </table> + <br /> </body> </html>

1 0

r87 - in trunk/chorem-web/src/main: java/org/chorem/gepeto/action webapp/WEB-INF/jsp/gepeto
by vbriand＠users.chorem.org 14 Apr '11

14 Apr '11

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) { %>

1 0

r86 - in trunk/chorem-web/src/main: java/org/chorem/gepeto/action resources webapp/WEB-INF/jsp/gepeto
by vbriand＠users.chorem.org 14 Apr '11

14 Apr '11

Author: vbriand Date: 2011-04-14 17:51:02 +0200 (Thu, 14 Apr 2011) New Revision: 86 Url: http://chorem.org/repositories/revision/chorem/86 Log: The projects can now be displayed by year Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java trunk/chorem-web/src/main/resources/struts.xml trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp 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 13:38:04 UTC (rev 85) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-04-14 15:51:02 UTC (rev 86) @@ -1,7 +1,11 @@ package org.chorem.gepeto.action; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Calendar; import java.util.Collection; +import java.util.Date; import java.util.List; import java.util.UUID; @@ -95,6 +99,31 @@ return result; } + /** + * Tests whether the year is valid or not + * + * @return true if the year is valid, false otherwise + */ + public String projectsByYear() { + String result = SUCCESS; + Calendar cal = Calendar.getInstance(); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy"); + + if (year != null) { + try { + Date date = formatter.parse(year); + cal.setTime(date); + yearInt = cal.get(Calendar.YEAR); + } catch (ParseException e) { + result = ERROR; + } + } else { + result = ERROR; + } + return result; + } + + protected int yearInt; protected String year; protected String name; protected String description; @@ -133,8 +162,7 @@ public List<Project> getAllProjects() { ChoremProxy proxy = getChoremProxy(); Search search = Search.query(); - Criteria criteria = search.isNotNull(Project.FQ_FIELD_PROJECT_NAME). - criteria(); + Criteria criteria = search.exteq(Project.EXT_PROJECT).criteria(); PagedResult<Project> result = proxy.findAllByCriteria(Project.class, criteria); List<Project> projects = result.getAll(); @@ -142,6 +170,39 @@ } /** + * Gets the projects by year + * + * @return the list of projects + */ + public List<Project> getProjectsByYear() { + 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<Project> projects = new ArrayList<Project>(); + Quotation quotation; + Project project; + 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) { + quotation = proxy.restore(Quotation.class, + projectOrder.getQuotation()); + project = proxy.restore(Project.class, quotation.getProject()); + projects.add(project); + } + } + return projects; + } + + /** * Gets the quotations attached with this project * * @return the quotations linked with this project Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-04-14 13:38:04 UTC (rev 85) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-04-14 15:51:02 UTC (rev 86) @@ -106,7 +106,8 @@ <result name="error" type="redirectAction">home</result> <result>/WEB-INF/jsp/gepeto/projectOrderDetails.jsp</result> </action> - <action name="getProjectsByYear" class="org.chorem.gepeto.action.ProjectAction"> + <action name="getProjectsByYear" class="org.chorem.gepeto.action.ProjectAction" method="projectsByYear"> + <result name="error" type="redirectAction">home</result> <result>/WEB-INF/jsp/gepeto/projectsByYear.jsp</result> </action> <action name="projectDetails" class="org.chorem.gepeto.action.ProjectAction" method="projectDetails"> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp 2011-04-14 13:38:04 UTC (rev 85) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp 2011-04-14 15:51:02 UTC (rev 86) @@ -10,7 +10,10 @@ <body> <p> <s:a action="addProjectInput"><s:text name="chorem.gepeto.project.add" /></s:a><br /> - <s:a action="getProjectsByYear"><s:text name="chorem.gepeto.projects" /></s:a><br /> + <s:url action="getProjectsByYear" var="getProjectsByYear"> + <s:param name="year">2011</s:param> + </s:url> + <a href="${getProjectsByYear}"><s:text name="chorem.gepeto.projects" /></a><br /> </p> </body> </html> 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 13:38:04 UTC (rev 85) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp 2011-04-14 15:51:02 UTC (rev 86) @@ -32,7 +32,7 @@ </thead> <tbody> <% - List<Project> projects = ProjectAction.getAction().getAllProjects(); + List<Project> projects = ProjectAction.getAction().getProjectsByYear(); for (Project project : projects) { %>

1 0

r85 - in trunk/chorem-web/src/main: java/org/chorem/bonzoms/action resources/i18n webapp/WEB-INF/jsp/bonzoms
by vbriand＠users.chorem.org 14 Apr '11

14 Apr '11

Author: vbriand Date: 2011-04-14 15:38:04 +0200 (Thu, 14 Apr 2011) New Revision: 85 Url: http://chorem.org/repositories/revision/chorem/85 Log: Added more details on company's page Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java 2011-04-14 13:11:27 UTC (rev 84) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java 2011-04-14 13:38:04 UTC (rev 85) @@ -1,5 +1,6 @@ package org.chorem.bonzoms.action; +import java.util.List; import java.util.UUID; import org.apache.commons.logging.Log; @@ -9,6 +10,7 @@ import org.chorem.action.BaseAction; import org.chorem.entities.Company; import org.chorem.entities.CompanyImpl; +import org.chorem.entities.ContactDetails; import org.chorem.entities.ContactDetailsImpl; import com.opensymphony.xwork2.ActionContext; @@ -72,6 +74,25 @@ if (company != null) { //If the companyId exists setName(company.getName()); setType(company.getType()); + + List<ContactDetails> contactDetailsList = ChoremProxy. + getContactDetails(companyId); + + for (ContactDetails contactDetails : contactDetailsList) { + if (contactDetails.getName().equals( + CONTACT_DETAILS_POSTAL_ADDRESS + + " of company \"" + company.getName() + "\"")) { + setAddress(contactDetails.getValue()); + } else if (contactDetails.getName().equals( + CONTACT_DETAILS_PHONE + " of company \"" + + name + "\"")) { + setPhoneNb(contactDetails.getValue()); + } else if (contactDetails.getName().equals( + CONTACT_DETAILS_WEBSITE + " of company \"" + + name + "\"")) { + setWebsite(contactDetails.getValue()); + } + } } else { result = ERROR; } @@ -93,6 +114,7 @@ protected String phoneNb; protected String website; protected String companyId; + protected String address; /** * Stores the new company through the proxy @@ -290,4 +312,18 @@ public void setCompanyId(String companyId) { this.companyId = companyId; } + + /** + * @return the address + */ + public String getAddress() { + return address; + } + + /** + * @param address the address to set + */ + public void setAddress(String address) { + this.address = address; + } } Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-14 13:11:27 UTC (rev 84) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-14 13:38:04 UTC (rev 85) @@ -20,6 +20,7 @@ chorem.billy.quotationDetails.title= chorem.bonzoms.company=Company {0} chorem.bonzoms.company.add=Add a new company +chorem.bonzoms.company.address= chorem.bonzoms.company.addressLine1=Address chorem.bonzoms.company.addressLine1.required=You must enter the first address line chorem.bonzoms.company.addressLine2=Address line 2 (opt.) Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-14 13:11:27 UTC (rev 84) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-14 13:38:04 UTC (rev 85) @@ -19,6 +19,7 @@ chorem.billy.quotationDetails.title= chorem.bonzoms.company=Soci\u00E9t\u00E9 chorem.bonzoms.company.add=Ajouter une nouvelle soci\u00E9t\u00E9 +chorem.bonzoms.company.address= chorem.bonzoms.company.addressLine1=Adresse chorem.bonzoms.company.addressLine1.required=Vous devez donner l'adresse de l''entreprise chorem.bonzoms.company.addressLine2=Adresse ligne 2 (opt.) Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp 2011-04-14 13:11:27 UTC (rev 84) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp 2011-04-14 13:38:04 UTC (rev 85) @@ -19,6 +19,13 @@ </s:text> </h2> <s:actionerror /> - <s:textfield key="chorem.bonzoms.company.type" name="type" labelSeparator=": " readonly="true" /><br /> + <s:textfield key="chorem.bonzoms.company.type" name="type" labelSeparator=": " readonly="true" /> + <br /> + <br /> + <s:textarea key="chorem.bonzoms.company.address" name="address" readonly="true" cols="50" rows="3" labelposition="top" /> + <br /> + <s:textfield key="chorem.bonzoms.company.phoneNb" name="phoneNb" labelSeparator=": " readonly="true" /> + <br /> + <s:textfield key="chorem.bonzoms.company.website" name="website" labelSeparator=": " readonly="true" /> </body> </html>

1 0

r84 - in trunk/chorem-web/src/main: java/org/chorem/bonzoms/action java/org/chorem/gepeto/action resources resources/i18n resources/org/chorem/bonzoms/action webapp/WEB-INF/jsp/bonzoms webapp/WEB-INF/jsp/gepeto
by vbriand＠users.chorem.org 14 Apr '11

14 Apr '11

Author: vbriand Date: 2011-04-14 15:11:27 +0200 (Thu, 14 Apr 2011) New Revision: 84 Url: http://chorem.org/repositories/revision/chorem/84 Log: Added a page to display company's details (very simple for now) Added: trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-addCompany-validation.xml trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp Removed: trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-validation.xml Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties trunk/chorem-web/src/main/resources/struts.xml trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java 2011-04-14 12:32:04 UTC (rev 83) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java 2011-04-14 13:11:27 UTC (rev 84) @@ -1,10 +1,13 @@ package org.chorem.bonzoms.action; +import java.util.UUID; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.ChoremProxy; import org.chorem.ContactDetailsConstants; import org.chorem.action.BaseAction; +import org.chorem.entities.Company; import org.chorem.entities.CompanyImpl; import org.chorem.entities.ContactDetailsImpl; import com.opensymphony.xwork2.ActionContext; @@ -46,6 +49,40 @@ return result; } + /** + * Retrieves the information of the company referenced by the + * companyId + * + * @return SUCCESS if the information have been retrieved, + * ERROR either if the UUID is invalid or the companyId doesn't exist + */ + public String companyDetails() { + String result = SUCCESS; + ChoremProxy proxy = getChoremProxy(); + + try { + if (companyId == null) { + result = ERROR; + } else { + //If companyId isn't a valid UUID, an exception is thrown + UUID.fromString(companyId); + + Company company = proxy.restore(Company.class, companyId); + + if (company != null) { //If the companyId exists + setName(company.getName()); + setType(company.getType()); + } else { + result = ERROR; + } + } + } catch (IllegalArgumentException e) { + //companyId is invalid + result = ERROR; + } + return result; + } + protected String name; protected String type; protected String addressLine1; @@ -55,6 +92,7 @@ protected String country; protected String phoneNb; protected String website; + protected String companyId; /** * Stores the new company through the proxy @@ -238,4 +276,18 @@ public void setWebsite(String website) { this.website = website; } + + /** + * @return the companyId + */ + public String getCompanyId() { + return companyId; + } + + /** + * @param companyId the companyId to set + */ + public void setCompanyId(String companyId) { + this.companyId = companyId; + } } 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 12:32:04 UTC (rev 83) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-04-14 13:11:27 UTC (rev 84) @@ -232,15 +232,15 @@ * @param projectId the project's id * @return the customers */ - public List<String> getCustomers(String projectId) { + public List<Company> getCustomers(String projectId) { ChoremProxy proxy = getChoremProxy(); List<ProjectOrder> projectOrders = getProjectOrders(projectId); - List<String> customers = new ArrayList<String>(); + List<Company> customers = new ArrayList<Company>(); Company company; for (ProjectOrder projectOrder : projectOrders) { company = proxy.restore(Company.class, projectOrder.getCompany()); - customers.add(company.getName()); + customers.add(company); } return customers; } Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-14 12:32:04 UTC (rev 83) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-14 13:11:27 UTC (rev 84) @@ -36,6 +36,8 @@ chorem.bonzoms.company.type=Company''s type chorem.bonzoms.company.type.required=You must enter the company''s type chorem.bonzoms.company.website=Website (opt.) +chorem.bonzoms.companyDetails.name= +chorem.bonzoms.companyDetails.title= chorem.bonzoms.contactDetails=Contact details chorem.bonzoms.contactDetails.add=Add a new contact details chorem.bonzoms.contactDetails.create.error=An error occurred while creating your new contact details, please try again. If the problem persists, please contact an administrator Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-14 12:32:04 UTC (rev 83) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-14 13:11:27 UTC (rev 84) @@ -35,6 +35,8 @@ chorem.bonzoms.company.type=Type de la soci\u00E9t\u00E9 chorem.bonzoms.company.type.required=Vous devez entrer le type de la soci\u00E9t\u00E9 chorem.bonzoms.company.website=Site internet (opt.) +chorem.bonzoms.companyDetails.name=Entreprise "{0}" +chorem.bonzoms.companyDetails.title=D\u00E9tails de l''entreprise "{0}" chorem.bonzoms.contactDetails=M\u00E9thode de contact chorem.bonzoms.contactDetails.add=Ajouter une nouvelle m\u00E9thode de contact chorem.bonzoms.contactDetails.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouvelle m\u00E9thode de contact, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur Copied: trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-addCompany-validation.xml (from rev 80, trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-validation.xml) =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-addCompany-validation.xml (rev 0) +++ trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-addCompany-validation.xml 2011-04-14 13:11:27 UTC (rev 84) @@ -0,0 +1,36 @@ +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + +<validators> + <field name="name"> + <field-validator type="requiredstring"> + <message key="chorem.bonzoms.company.name.required" /> + </field-validator> + </field> + <field name="type"> + <field-validator type="requiredstring"> + <message key="chorem.bonzoms.company.type.required" /> + </field-validator> + </field> + <field name="addressLine1"> + <field-validator type="requiredstring"> + <message key="chorem.bonzoms.company.addressLine1.required" /> + </field-validator> + </field> + <field name="postcode"> + <field-validator type="requiredstring"> + <message key="chorem.bonzoms.company.postcode.required" /> + </field-validator> + </field> + <field name="city"> + <field-validator type="requiredstring"> + <message key="chorem.bonzoms.company.city.required" /> + </field-validator> + </field> + <field name="country"> + <field-validator type="requiredstring"> + <message key="chorem.bonzoms.company.country.required" /> + </field-validator> + </field> +</validators> Property changes on: trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-addCompany-validation.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-validation.xml 2011-04-14 12:32:04 UTC (rev 83) +++ trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-validation.xml 2011-04-14 13:11:27 UTC (rev 84) @@ -1,36 +0,0 @@ -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> - -<validators> - <field name="name"> - <field-validator type="requiredstring"> - <message key="chorem.bonzoms.company.name.required" /> - </field-validator> - </field> - <field name="type"> - <field-validator type="requiredstring"> - <message key="chorem.bonzoms.company.type.required" /> - </field-validator> - </field> - <field name="addressLine1"> - <field-validator type="requiredstring"> - <message key="chorem.bonzoms.company.addressLine1.required" /> - </field-validator> - </field> - <field name="postcode"> - <field-validator type="requiredstring"> - <message key="chorem.bonzoms.company.postcode.required" /> - </field-validator> - </field> - <field name="city"> - <field-validator type="requiredstring"> - <message key="chorem.bonzoms.company.city.required" /> - </field-validator> - </field> - <field name="country"> - <field-validator type="requiredstring"> - <message key="chorem.bonzoms.company.country.required" /> - </field-validator> - </field> -</validators> Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-04-14 12:32:04 UTC (rev 83) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-04-14 13:11:27 UTC (rev 84) @@ -26,6 +26,10 @@ <result name="error">/WEB-INF/jsp/bonzoms/addCompany.jsp</result> <result type="redirectAction">home</result> </action> + <action name="companyDetails" class="org.chorem.bonzoms.action.CompanyAction" method="companyDetails"> + <result name="error" type="redirectAction">home</result> + <result>/WEB-INF/jsp/bonzoms/companyDetails.jsp</result> + </action> <action name="addPersonInput"> <result>/WEB-INF/jsp/bonzoms/addPerson.jsp</result> </action> Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp 2011-04-14 13:11:27 UTC (rev 84) @@ -0,0 +1,24 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="org.chorem.bonzoms.action.CompanyAction" %> +<%@taglib prefix="s" uri="/struts-tags" %> + +<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <head> + <title> + <s:text name="chorem.bonzoms.companyDetails.title"> + <s:param><%= CompanyAction.getAction().getName() %></s:param> + </s:text> + </title> + <s:head /> + </head> + <body> + <h2> + <s:text name="chorem.bonzoms.companyDetails.name"> + <s:param><%= CompanyAction.getAction().getName() %></s:param> + </s:text> + </h2> + <s:actionerror /> + <s:textfield key="chorem.bonzoms.company.type" name="type" labelSeparator=": " readonly="true" /><br /> + </body> +</html> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp 2011-04-14 12:32:04 UTC (rev 83) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp 2011-04-14 13:11:27 UTC (rev 84) @@ -26,8 +26,11 @@ <s:param><%= ProjectOrderAction.getAction().getType() %></s:param> </s:text> <br /> + <s:url namespace="/bonzoms" action="companyDetails" var="companyDetails"> + <s:param name="companyId"><%= ProjectOrderAction.getAction().getCompany().getWikittyId() %></s:param> + </s:url> <s:text name="chorem.gepeto.projectOrderDetails.companyName"> - <s:param><%= ProjectOrderAction.getAction().getCompany().getName() %></s:param> + <s:param><a href="${companyDetails}"><%= ProjectOrderAction.getAction().getCompany().getName() %></a></s:param> </s:text> <br /> <s:text name="chorem.gepeto.projectOrderDetails.quotation"> 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 12:32:04 UTC (rev 83) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp 2011-04-14 13:11:27 UTC (rev 84) @@ -1,5 +1,6 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="java.util.List" %> +<%@page import="org.chorem.entities.Company" %> <%@page import="org.chorem.entities.Project" %> <%@page import="org.chorem.gepeto.action.ProjectAction" %> <%@taglib prefix="s" uri="/struts-tags" %> @@ -42,11 +43,14 @@ <td><a href="${projectDetails}"><%= project.getName() %></a></td> <td> <% - List<String> customers = ProjectAction.getAction().getCustomers(project.getWikittyId()); + List<Company> customers = ProjectAction.getAction().getCustomers(project.getWikittyId()); - for (String customer : customers) { + for (Company customer : customers) { %> - <%= customer %> + <s:url namespace="/bonzoms" action="companyDetails" var="companyDetails"> + <s:param name="companyId"><%= customer.getWikittyId() %></s:param> + </s:url> + <a href="${companyDetails}"><%= customer.getName() %></a> <% } %>

1 0

r83 - in trunk/chorem-web/src/main: java/org/chorem/gepeto/action webapp/WEB-INF/jsp/gepeto
by vbriand＠users.chorem.org 14 Apr '11

14 Apr '11

Author: vbriand Date: 2011-04-14 14:32:04 +0200 (Thu, 14 Apr 2011) New Revision: 83 Url: http://chorem.org/repositories/revision/chorem/83 Log: Added the customer(s) on the projects' page 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 09:42:59 UTC (rev 82) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-04-14 12:32:04 UTC (rev 83) @@ -9,6 +9,7 @@ import org.apache.commons.logging.LogFactory; import org.chorem.ChoremProxy; import org.chorem.action.BaseAction; +import org.chorem.entities.Company; import org.chorem.entities.Project; import org.chorem.entities.ProjectImpl; import org.chorem.entities.ProjectOrder; @@ -207,6 +208,44 @@ } /** + * Gets the project orders of the given project + * + * @param projectId the project's id + * @return the project orders + */ + public List<ProjectOrder> getProjectOrders(String projectId) { + ChoremProxy proxy = getChoremProxy(); + Search search = Search.query(); + Criteria criteria = search.exteq(ProjectOrder.EXT_PROJECTORDER). + associated(ProjectOrder.FQ_FIELD_PROJECTORDER_QUOTATION). + eq(Quotation.FQ_FIELD_QUOTATION_PROJECT, projectId).criteria(); + PagedResult<ProjectOrder> result = proxy.findAllByCriteria(ProjectOrder.class, + criteria); + List<ProjectOrder> projectOrders = result.getAll(); + + return projectOrders; + } + + /** + * Gets the customers of a project + * + * @param projectId the project's id + * @return the customers + */ + public List<String> getCustomers(String projectId) { + ChoremProxy proxy = getChoremProxy(); + List<ProjectOrder> projectOrders = getProjectOrders(projectId); + List<String> customers = new ArrayList<String>(); + Company company; + + for (ProjectOrder projectOrder : projectOrders) { + company = proxy.restore(Company.class, projectOrder.getCompany()); + customers.add(company.getName()); + } + 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 09:42:59 UTC (rev 82) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp 2011-04-14 12:32:04 UTC (rev 83) @@ -40,9 +40,19 @@ <s:param name="projectId"><%= project.getWikittyId() %></s:param> </s:url> <td><a href="${projectDetails}"><%= project.getName() %></a></td> + <td> + <% + List<String> customers = ProjectAction.getAction().getCustomers(project.getWikittyId()); + + for (String customer : customers) { + %> + <%= customer %> + <% + } + %> + </td> <td></td> <td></td> - <td></td> </tr> <% } %> </tbody>

1 0

r82 - in trunk/chorem-web/src/main: java/org/chorem/bonzoms/action java/org/chorem/gepeto/action resources/i18n resources/org/chorem/gepeto/action webapp/WEB-INF/jsp/gepeto
by vbriand＠users.chorem.org 14 Apr '11

14 Apr '11

Author: vbriand Date: 2011-04-14 11:42:59 +0200 (Thu, 14 Apr 2011) New Revision: 82 Url: http://chorem.org/repositories/revision/chorem/82 Log: Added the list of existing companies on the page used to add a project order Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java 2011-04-14 08:44:10 UTC (rev 81) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java 2011-04-14 09:42:59 UTC (rev 82) @@ -1,18 +1,12 @@ package org.chorem.bonzoms.action; -import java.util.List; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.ChoremProxy; import org.chorem.ContactDetailsConstants; import org.chorem.action.BaseAction; -import org.chorem.entities.Company; import org.chorem.entities.CompanyImpl; import org.chorem.entities.ContactDetailsImpl; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.Search; - import com.opensymphony.xwork2.ActionContext; import static org.nuiton.i18n.I18n.n_; Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 2011-04-14 08:44:10 UTC (rev 81) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 2011-04-14 09:42:59 UTC (rev 82) @@ -11,7 +11,6 @@ import org.chorem.ChoremProxy; import org.chorem.action.BaseAction; import org.chorem.entities.Company; -import org.chorem.entities.CompanyImpl; import org.chorem.entities.ProjectOrder; import org.chorem.entities.ProjectOrderImpl; import org.chorem.entities.Quotation; @@ -21,6 +20,7 @@ import org.nuiton.wikitty.search.Search; import com.opensymphony.xwork2.ActionContext; + import static org.nuiton.i18n.I18n.n_; /** @@ -64,8 +64,8 @@ } else { quotationReference = quotation.getReference(); if (type != null && description != null && - beginDate != null && estimatedEndDate != null && - companyName != null && companyType != null) { + beginDate != null && estimatedEndDate != null && + companyId != null) { //If the project order has been added successfully if (addProjectOrder()) { result = SUCCESS; @@ -106,12 +106,10 @@ if (projectOrder != null) { //If the projectOrderId exists setBeginDate(projectOrder.getBeginDate().toString()); - Company company; - - company = proxy.restore(Company.class, + Company company = proxy.restore(Company.class, projectOrder.getCompany()); - setCompanyName(company.getName()); - setCompanyType(company.getType()); + + setCompany(company); setDescription(projectOrder.getDescription()); setEstimatedEndDate(projectOrder.getEndDate().toString()); setStatus(projectOrder.getStatus()); @@ -141,8 +139,8 @@ protected String estimatedEndDate; protected String quotationId; protected String quotationReference; - protected String companyName; - protected String companyType; + protected String companyId; + protected Company company; protected String projectOrderId; /** @@ -187,7 +185,6 @@ try { ChoremProxy proxy = getChoremProxy(); ProjectOrderImpl newProjectOrder = new ProjectOrderImpl(); - CompanyImpl newCompany = new CompanyImpl(); SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); newProjectOrder.setType(type); @@ -195,11 +192,13 @@ newProjectOrder.setQuotation(quotationId); newProjectOrder.setStatus(status); - newCompany.setName(companyName); - newCompany.setType(companyType); - newProjectOrder.setCompany(newCompany.getWikittyId()); + if (proxy.restore(Company.class, companyId) != null) { + newProjectOrder.setCompany(companyId); + } else { //If the id doesn't exist or is invalid + addActionError(getText(n_("chorem.gepeto.projectOrder.invalidCompany"))); + result = false; + } - //Lenient mode disabled because results may be very odd formatter.setLenient(false); try { @@ -231,7 +230,6 @@ //If everything went smoothly if (result) { - proxy.store(newCompany); proxy.store(newProjectOrder); } } catch (Exception e) { @@ -358,44 +356,44 @@ } /** - * @return the companyName + * @return the projectOrderId */ - public String getCompanyName() { - return companyName; + public String getProjectOrderId() { + return projectOrderId; } /** - * @param companyName the companyName to set + * @param projectOrderId the projectOrderId to set */ - public void setCompanyName(String companyName) { - this.companyName = companyName; + public void setProjectOrderId(String projectOrderId) { + this.projectOrderId = projectOrderId; } /** - * @return the companyType + * @return the companyId */ - public String getCompanyType() { - return companyType; + public String getCompanyId() { + return companyId; } /** - * @param companyType the companyType to set + * @param companyId the companyId to set */ - public void setCompanyType(String companyType) { - this.companyType = companyType; + public void setCompanyId(String companyId) { + this.companyId = companyId; } /** - * @return the projectOrderId + * @return the company */ - public String getProjectOrderId() { - return projectOrderId; + public Company getCompany() { + return company; } /** - * @param projectOrderId the projectOrderId to set + * @param company the company to set */ - public void setProjectOrderId(String projectOrderId) { - this.projectOrderId = projectOrderId; + public void setCompany(Company company) { + this.company = company; } } \ No newline at end of file Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-14 08:44:10 UTC (rev 81) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-14 09:42:59 UTC (rev 82) @@ -117,6 +117,7 @@ chorem.gepeto.projectOrder.description.required=You must describe the project order chorem.gepeto.projectOrder.estimatedEndDate=Estimated end date (dd/mm/yyyy) chorem.gepeto.projectOrder.estimatedEndDate.required=You must enter the estimated end date for this project order +chorem.gepeto.projectOrder.invalidCompany= chorem.gepeto.projectOrder.status= chorem.gepeto.projectOrder.type=Type chorem.gepeto.projectOrder.type.required=You must specify the project order''s type Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-14 08:44:10 UTC (rev 81) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-14 09:42:59 UTC (rev 82) @@ -105,6 +105,7 @@ chorem.gepeto.projectOrder.backToQuotationDetails=Retourner sur le devis chorem.gepeto.projectOrder.beginDate=Date de d\u00E9but chorem.gepeto.projectOrder.beginDate.required=Vous devez renseigner une date de d\u00E9but pour le contrat +chorem.gepeto.projectOrder.company=Entreprise chorem.gepeto.projectOrder.company.name= chorem.gepeto.projectOrder.company.type= chorem.gepeto.projectOrder.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouveau contrat de projet, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur @@ -112,6 +113,7 @@ chorem.gepeto.projectOrder.description.required=Vous devez d\u00E9crire le contrat chorem.gepeto.projectOrder.estimatedEndDate=Date de fin estim\u00E9e chorem.gepeto.projectOrder.estimatedEndDate.required=Vous devez renseigner la date de fin estim\u00E9e du contrat +chorem.gepeto.projectOrder.invalidCompany= chorem.gepeto.projectOrder.status= chorem.gepeto.projectOrder.type=Type chorem.gepeto.projectOrder.type.required=Vous devez sp\u00E9cifier le type du contrat Modified: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml 2011-04-14 08:44:10 UTC (rev 81) +++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml 2011-04-14 09:42:59 UTC (rev 82) @@ -36,14 +36,4 @@ <message key="chorem.date.wrongFormat" /> </field-validator> </field> - <field name="companyName"> - <field-validator type="requiredstring"> - <message key="chorem.gepeto.projectOrder.companyName.required" /> - </field-validator> - </field> - <field name="companyType"> - <field-validator type="requiredstring"> - <message key="chorem.gepeto.projectOrder.companyType.required" /> - </field-validator> - </field> </validators> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp 2011-04-14 08:44:10 UTC (rev 81) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp 2011-04-14 09:42:59 UTC (rev 82) @@ -1,4 +1,7 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="java.util.List" %> +<%@page import="org.chorem.entities.Company" %> +<%@page import="org.chorem.bonzoms.action.CompanyAction" %> <%@page import="org.chorem.gepeto.action.ProjectOrderAction" %> <%@taglib prefix="s" uri="/struts-tags" %> @@ -33,10 +36,8 @@ <br /> <s:textfield key="chorem.gepeto.projectOrder.estimatedEndDate" name="estimatedEndDate" labelSeparator=": " /> <br /> - <s:textfield key="chorem.gepeto.projectOrder.company.name" name="companyName" labelSeparator=": " /> + <s:select label="%{getText('chorem.gepeto.projectOrder.company')}" list="allCompanies" name="companyId" listKey="wikittyId" listValue="name" /> <br /> - <s:textfield key="chorem.gepeto.projectOrder.company.type" name="companyType" labelSeparator=": " /> - <br /> <s:submit key="chorem.gepeto.projectOrder.add" name="submit" /> </fieldset> </form> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp 2011-04-14 08:44:10 UTC (rev 81) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp 2011-04-14 09:42:59 UTC (rev 82) @@ -27,7 +27,7 @@ </s:text> <br /> <s:text name="chorem.gepeto.projectOrderDetails.companyName"> - <s:param><%= ProjectOrderAction.getAction().getCompanyName() %></s:param> + <s:param><%= ProjectOrderAction.getAction().getCompany().getName() %></s:param> </s:text> <br /> <s:text name="chorem.gepeto.projectOrderDetails.quotation">

1 0

r81 - in trunk/chorem-web/src/main/java/org/chorem: billy/action bonzoms/action gepeto/action
by vbriand＠users.chorem.org 14 Apr '11

14 Apr '11

Author: vbriand Date: 2011-04-14 10:44:10 +0200 (Thu, 14 Apr 2011) New Revision: 81 Url: http://chorem.org/repositories/revision/chorem/81 Log: Fixed multiple @returns in Javadoc Modified: trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/ContactDetailsAction.java trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/EmploymentContractAction.java trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java 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-14 01:44:18 UTC (rev 80) +++ trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java 2011-04-14 08:44:10 UTC (rev 81) @@ -37,9 +37,9 @@ /** * Adds a new quotation * - * @return INPUT if the mandatory fields haven't all been filled in - * @return SUCCESS if the quotation has been added - * @return ERROR if an error occurred + * @return INPUT if the mandatory fields haven't all been filled in, + * SUCCESS if the quotation has been added, + * ERROR if an error occurred */ public String add() { String result = INPUT; @@ -79,9 +79,8 @@ * Retrieves the information of the quotation referenced by the * quotationId * - * @return SUCCESS if the information have been retrieved - * @return ERROR either if the UUID is invalid or the quotationId doesn't - * exist + * @return SUCCESS if the information have been retrieved, + * ERROR either if the UUID is invalid or the quotationId doesn't exist */ public String quotationDetails() { String result = SUCCESS; @@ -126,8 +125,7 @@ /** * Returns the project order linked with the quotation (if it exists) * - * @return the project order if it exists - * @return null if it doesn't exist + * @return the project order if it exists, null otherwise */ public ProjectOrder getProjectOrder() { ChoremProxy proxy = getChoremProxy(); @@ -142,8 +140,8 @@ /** * Stores the new quotation through the proxy * - * @return true if the quotation has been stored properly - * @return false if a problem occurred + * @return true if the quotation has been stored properly, + * false if a problem occurred */ protected boolean addQuotation() { boolean result = true; Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java 2011-04-14 01:44:18 UTC (rev 80) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java 2011-04-14 08:44:10 UTC (rev 81) @@ -1,13 +1,20 @@ package org.chorem.bonzoms.action; +import java.util.List; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.ChoremProxy; import org.chorem.ContactDetailsConstants; import org.chorem.action.BaseAction; +import org.chorem.entities.Company; import org.chorem.entities.CompanyImpl; import org.chorem.entities.ContactDetailsImpl; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.Search; +import com.opensymphony.xwork2.ActionContext; + import static org.nuiton.i18n.I18n.n_; /** @@ -20,7 +27,11 @@ private static final long serialVersionUID = 2266576941588474102L; private static final Log log = LogFactory.getLog(CompanyAction.class); - + + static public CompanyAction getAction() { + return (CompanyAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); + } + public String add() { String result = INPUT; @@ -54,8 +65,8 @@ /** * Stores the new company through the proxy * - * @return true if the company has been stored properly - * @return false if a problem occurred + * @return true if the company has been stored properly, + * false if a problem occurred */ protected boolean addCompany() { boolean result = true; Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/ContactDetailsAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/ContactDetailsAction.java 2011-04-14 01:44:18 UTC (rev 80) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/ContactDetailsAction.java 2011-04-14 08:44:10 UTC (rev 81) @@ -22,9 +22,9 @@ /** * Adds new contact details * - * @return INPUT if the mandatory fields haven't all been filled in - * @return SUCCESS if the contact details have been added successfully - * @return ERROR if an error occurred + * @return INPUT if the mandatory fields haven't all been filled in, + * SUCCESS if the contact details have been added successfully, + * ERROR if an error occurred */ public String add() { String result = INPUT; @@ -49,8 +49,8 @@ /** * Stores the new contact details through the proxy * - * @return true if the contact details have been stored properly - * @return false if a problem occurred + * @return true if the contact details have been stored properly, + * false if a problem occurred */ protected boolean addContactDetails() { boolean result = true; Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/EmploymentContractAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/EmploymentContractAction.java 2011-04-14 01:44:18 UTC (rev 80) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/EmploymentContractAction.java 2011-04-14 08:44:10 UTC (rev 81) @@ -26,9 +26,9 @@ /** * Adds a new employment contract * - * @return INPUT if the mandatory fields haven't all been filled in - * @return SUCCESS if the employment contract has been added successfully - * @return ERROR if an error occurred + * @return INPUT if the mandatory fields haven't all been filled in, + * SUCCESS if the employment contract has been added successfully, + * ERROR if an error occurred */ public String add() { String result = INPUT; @@ -59,8 +59,8 @@ /** * Stores the new employment contract through the proxy * - * @return true if the employment contract has been stored properly - * @return false if a problem occurred + * @return true if the employment contract has been stored properly, + * false if a problem occurred */ protected boolean addEmploymentContract() { boolean result = true; Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java 2011-04-14 01:44:18 UTC (rev 80) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java 2011-04-14 08:44:10 UTC (rev 81) @@ -27,9 +27,9 @@ /** * Adds a new person * - * @return INPUT if the mandatory fields haven't all been filled in - * @return SUCCESS if the person has been added successfully - * @return ERROR if an error occurred + * @return INPUT if the mandatory fields haven't all been filled in, + * SUCCESS if the person has been added successfully, + * ERROR if an error occurred */ public String add() { String result = INPUT; @@ -63,8 +63,8 @@ /** * Stores the new person through the proxy * - * @return true if the person has been stored properly - * @return false if a problem occurred + * @return true if the person has been stored properly, + * false if a problem occurred */ protected boolean addPerson() { boolean result = true; 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 01:44:18 UTC (rev 80) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-04-14 08:44:10 UTC (rev 81) @@ -39,9 +39,9 @@ /** * Adds a new project * - * @return INPUT if the mandatory fields haven't all been filled in - * @return SUCCESS if the project has been added - * @return ERROR if an error occurred + * @return INPUT if the mandatory fields haven't all been filled in, + * SUCCESS if the project has been added, + * ERROR if an error occurred */ public String add() { String result = INPUT; @@ -64,9 +64,8 @@ * Retrieves the name and the description of the project referenced by the * projectId * - * @return SUCCESS if the name and the description have been retrieved - * @return ERROR either if the UUID is invalid or the projectId doesn't - * exist + * @return SUCCESS if the name and the description have been retrieved, + * ERROR either if the UUID is invalid or the projectId doesn't exist */ public String projectDetails() { String result = SUCCESS; @@ -103,8 +102,8 @@ /** * Stores the new project through the proxy * - * @return true if the project has been stored properly - * @return false if a problem occurred + * @return true if the project has been stored properly, + * false if a problem occurred */ protected boolean addProject() { boolean result = true; Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 2011-04-14 01:44:18 UTC (rev 80) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 2011-04-14 08:44:10 UTC (rev 81) @@ -41,9 +41,9 @@ /** * Adds a new project order * - * @return INPUT if the mandatory fields haven't all been filled in - * @return SUCCESS if the project order has been added successfully - * @return ERROR if an error occurred + * @return INPUT if the mandatory fields haven't all been filled in, + * SUCCESS if the project order has been added successfully, + * ERROR if an error occurred */ public String add() { String result = INPUT; @@ -86,9 +86,8 @@ * Retrieves the information of the projectOrder referenced by the * projectOrderId * - * @return SUCCESS if the information have been retrieved - * @return ERROR either if the UUID is invalid or the projectOrderId doesn't - * exist + * @return SUCCESS if the information have been retrieved, + * ERROR either if the UUID is invalid or the projectOrderId doesn't exist */ public String projectOrderDetails() { String result = SUCCESS; @@ -163,10 +162,24 @@ } /** + * Gets the list of all companies + * + * @return a list containing all companies + */ + public List<Company> getAllCompanies() { + ChoremProxy proxy = getChoremProxy(); + Search search = Search.query().exteq(Company.EXT_COMPANY); + Criteria criteria = search.criteria(); + PagedResult<Company> result = proxy.findAllByCriteria(Company.class, criteria); + List<Company> companies = result.getAll(); + return companies; + } + + /** * Stores the new project order through the proxy * - * @return true if the project order has been stored properly - * @return false if a problem occurred + * @return true if the project order has been stored properly, + * false if a problem occurred */ protected boolean addProjectOrder() { boolean result = true; Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java 2011-04-14 01:44:18 UTC (rev 80) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java 2011-04-14 08:44:10 UTC (rev 81) @@ -34,9 +34,9 @@ /** * Adds a new task * - * @return INPUT if the mandatory fields haven't all been filled in - * @return SUCCESS if the task has been added successfully - * @return ERROR if an error occurred + * @return INPUT if the mandatory fields haven't all been filled in, + * SUCCESS if the task has been added successfully, + * ERROR if an error occurred */ public String add() { String result = INPUT; @@ -85,8 +85,8 @@ /** * Stores the new task through the proxy * - * @return true if the task has been stored properly - * @return false if a problem occurred + * @return true if the task has been stored properly, + * false if a problem occurred */ protected boolean addTask() { boolean result = true;

1 0

r80 - trunk/chorem-entities/src/main/java/org/chorem/entities
by bpoussin＠users.chorem.org 14 Apr '11

14 Apr '11

Author: bpoussin Date: 2011-04-14 03:44:18 +0200 (Thu, 14 Apr 2011) New Revision: 80 Url: http://chorem.org/repositories/revision/chorem/80 Log: test commit Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceableUtil.java Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceableUtil.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceableUtil.java 2011-04-14 01:26:33 UTC (rev 79) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceableUtil.java 2011-04-14 01:44:18 UTC (rev 80) @@ -21,7 +21,7 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(InvoiceableUtil.class); - + static public boolean evalCondition(WikittyProxy proxy, Invoiceable invoiceable) { Map<String, Object> bindings = new HashMap<String, Object>(); bindings.put("proxy", proxy);

1 0