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

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

22 Apr '11

Author: vbriand Date: 2011-04-22 14:36:51 +0200 (Fri, 22 Apr 2011) New Revision: 106 Url: http://chorem.org/repositories/revision/chorem/106 Log: The project's description can now be modified Added: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-modifyProject-validation.xml 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/bonzoms/companyDetails.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.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-22 12:21:24 UTC (rev 105) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-04-22 12:36:51 UTC (rev 106) @@ -124,6 +124,17 @@ return result; } + public String modify() { + String result = SUCCESS; + Project project; + ChoremProxy proxy = getChoremProxy(); + + project = proxy.restore(Project.class, projectId); + project.setDescription(description); + proxy.store(project); + return result; + } + protected int yearInt; protected String year; protected String name; Added: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-modifyProject-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-modifyProject-validation.xml (rev 0) +++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-modifyProject-validation.xml 2011-04-22 12:36:51 UTC (rev 106) @@ -0,0 +1,11 @@ +<!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="description"> + <field-validator type="requiredstring"> + <message key="chorem.field.required" /> + </field-validator> + </field> +</validators> Property changes on: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-modifyProject-validation.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-04-22 12:21:24 UTC (rev 105) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-04-22 12:36:51 UTC (rev 106) @@ -122,6 +122,14 @@ <result name="error" type="redirectAction">home</result> <result>/WEB-INF/jsp/gepeto/projectDetails.jsp</result> </action> + <action name="modifyProject" class="org.chorem.gepeto.action.ProjectAction" method="modify"> + <result name="input">/WEB-INF/jsp/gepeto/projectDetails.jsp</result> + <result type="redirectAction"> + <param name="actionName">projectDetails</param> + <param name="namespace">/gepeto</param> + <param name="projectId">${projectId}</param> + </result> + </action> </package> <package name="billy" namespace="/billy" extends="struts-default"> 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-22 12:21:24 UTC (rev 105) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp 2011-04-22 12:36:51 UTC (rev 106) @@ -25,17 +25,19 @@ <s:param name="companyId"><%= CompanyAction.getAction().getCompanyId() %></s:param> </s:url> <form action="${modifyCompany}" method="post"> - <s:textfield key="chorem.bonzoms.company.type" name="type" labelSeparator=": " /> - <br /> - <br /> - <s:textarea key="chorem.bonzoms.company.address" name="address" cols="30" rows="3" labelposition="top" /> - <br /> - <s:textfield key="chorem.bonzoms.company.phoneNb" name="phoneNb" labelSeparator=": " /> - <br /> - <s:textfield key="chorem.bonzoms.company.website" name="website" labelSeparator=": " /> - <br /> - <br /> - <s:submit key="chorem.misc.modify" name="modify" /> + <p> + <s:textfield key="chorem.bonzoms.company.type" name="type" labelSeparator=": " /> + <br /> + <br /> + <s:textarea key="chorem.bonzoms.company.address" name="address" cols="30" rows="3" labelposition="top" /> + <br /> + <s:textfield key="chorem.bonzoms.company.phoneNb" name="phoneNb" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.bonzoms.company.website" name="website" labelSeparator=": " /> + <br /> + <br /> + <s:submit key="chorem.misc.modify" name="modify" /> + </p> </form> <br /> <br /> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp 2011-04-22 12:21:24 UTC (rev 105) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp 2011-04-22 12:36:51 UTC (rev 106) @@ -21,16 +21,22 @@ <s:param><%= ProjectAction.getAction().getName() %></s:param> </s:text> </h2> + <s:url namespace="/gepeto" action="modifyProject" var="modifyProject"> + <s:param name="projectId"><%= ProjectAction.getAction().getProjectId() %></s:param> + </s:url> + <form action="${modifyProject}" method="post"> + <p> + <s:textarea name="description" key="chorem.gepeto.project.description" cols="50" rows="10" labelposition="top" /> + <br /> + <br /> + <s:url namespace="/billy" action="addQuotationInput" var="addQuotation"> + <s:param name="projectId"><%= ProjectAction.getAction().getProjectId() %></s:param> + </s:url> + <s:submit key="chorem.misc.modify" name="modify" /> + </p> + </form> + <a href="${addQuotation}"><s:text name="chorem.billy.quotation.add" /></a> <p> - <s:textarea readonly="true" name="description" key="chorem.gepeto.project.description" cols="50" rows="10" labelposition="top" /> - <br /> - <br /> - <s:url namespace="/billy" action="addQuotationInput" var="addQuotation"> - <s:param name="projectId"><%= ProjectAction.getAction().getProjectId() %></s:param> - </s:url> - <a href="${addQuotation}"><s:text name="chorem.billy.quotation.add" /></a> - </p> - <p> <s:text name="chorem.gepeto.projectDetails.projectOrders" /> <br /> <br />

1 0

r105 - in trunk/chorem-web/src/main/resources: . org/chorem/bonzoms/action
by vbriand＠users.chorem.org 22 Apr '11

22 Apr '11

Author: vbriand Date: 2011-04-22 14:21:24 +0200 (Fri, 22 Apr 2011) New Revision: 105 Url: http://chorem.org/repositories/revision/chorem/105 Log: Added field validation on company modification Added: trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-modifyCompany-validation.xml Modified: trunk/chorem-web/src/main/resources/struts.xml Added: trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-modifyCompany-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-modifyCompany-validation.xml (rev 0) +++ trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-modifyCompany-validation.xml 2011-04-22 12:21:24 UTC (rev 105) @@ -0,0 +1,16 @@ +<!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="type"> + <field-validator type="requiredstring"> + <message key="chorem.field.required" /> + </field-validator> + </field> + <field name="address"> + <field-validator type="requiredstring"> + <message key="chorem.field.required" /> + </field-validator> + </field> +</validators> Property changes on: trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-modifyCompany-validation.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-04-22 10:23:48 UTC (rev 104) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-04-22 12:21:24 UTC (rev 105) @@ -55,6 +55,7 @@ <result type="redirectAction">home</result> </action> <action name="modifyCompany" class="org.chorem.bonzoms.action.CompanyAction" method="modify"> + <result name="input">/WEB-INF/jsp/bonzoms/companyDetails.jsp</result> <result type="redirectAction"> <param name="actionName">companyDetails</param> <param name="namespace">/bonzoms</param>

1 0

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

22 Apr '11

Author: vbriand Date: 2011-04-22 12:23:48 +0200 (Fri, 22 Apr 2011) New Revision: 104 Url: http://chorem.org/repositories/revision/chorem/104 Log: The company details can now be modified 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/resources/struts.xml trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp 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-22 08:40:03 UTC (rev 103) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java 2011-04-22 10:23:48 UTC (rev 104) @@ -88,11 +88,11 @@ setAddress(contactDetails.getValue()); } else if (contactDetails.getName().equals( CONTACT_DETAILS_PHONE + " of company \"" + - name + "\"")) { + company.getName() + "\"")) { setPhoneNb(contactDetails.getValue()); } else if (contactDetails.getName().equals( CONTACT_DETAILS_WEBSITE + " of company \"" + - name + "\"")) { + company.getName() + "\"")) { setWebsite(contactDetails.getValue()); } } @@ -107,6 +107,74 @@ return result; } + /** + * Modifies the company information + * + * @return SUCCESS if the modification was successful, + * ERROR otherwise + */ + public String modify() { + String result = SUCCESS; + ChoremProxy proxy = getChoremProxy(); + Company company; + + company = proxy.restore(Company.class, companyId); + company.setType(type); + proxy.store(company); + + List<ContactDetails> contactDetailsList = ChoremProxy. + getContactDetails(companyId); + boolean newPhone = true, newWebsite = true; + + //Modification of existing contact details + for (ContactDetails contactDetails : contactDetailsList) { + if (contactDetails.getName().equals( + CONTACT_DETAILS_POSTAL_ADDRESS + + " of company \"" + company.getName() + "\"")) { + contactDetails.setValue(address); + } else if (contactDetails.getName().equals( + CONTACT_DETAILS_PHONE + " of company \"" + + company.getName() + "\"")) { + contactDetails.setValue(phoneNb); + newPhone = false; + } else if (contactDetails.getName().equals( + CONTACT_DETAILS_WEBSITE + " of company \"" + + company.getName() + "\"")) { + contactDetails.setValue(website); + newWebsite = false; + } + proxy.store(contactDetails); + } + + //Phone number added + if (newPhone && !phoneNb.isEmpty()) { + ContactDetailsImpl newContactDetails = new ContactDetailsImpl(); + + newContactDetails = new ContactDetailsImpl(); + newContactDetails.setName(CONTACT_DETAILS_PHONE + + " of company \"" + company.getName() + "\""); + newContactDetails.setType(CONTACT_DETAILS_PHONE); + newContactDetails.setValue(phoneNb); + newContactDetails.setTarget(company.getWikittyId()); + proxy.store(newContactDetails); + System.out.println(newContactDetails); + } + + //Website added + if (newWebsite && !website.isEmpty()) { + ContactDetailsImpl newContactDetails = new ContactDetailsImpl(); + + newContactDetails = new ContactDetailsImpl(); + newContactDetails.setName(CONTACT_DETAILS_WEBSITE + + " of company \"" + company.getName() + "\""); + newContactDetails.setType(CONTACT_DETAILS_WEBSITE); + newContactDetails.setValue(website); + newContactDetails.setTarget(company.getWikittyId()); + proxy.store(newContactDetails); + } + return result; + } + protected String name; protected String type; protected String addressLine1; 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-22 08:40:03 UTC (rev 103) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-22 10:23:48 UTC (rev 104) @@ -137,3 +137,4 @@ chorem.gepeto.task.price.wrongFormat=The price must be a positive integer or floating point number (the decimal mark may be either a dot or a comma) chorem.gepeto.tasksList= chorem.home=Home +chorem.misc.modify=Modify 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-22 08:40:03 UTC (rev 103) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-22 10:23:48 UTC (rev 104) @@ -54,7 +54,7 @@ chorem.bonzoms.employmentContract.allFieldsRequired= chorem.bonzoms.employmentContract.beginDate=Date de d\u00E9but chorem.bonzoms.employmentContract.description=Description -chorem.bonzoms.employmentContract.endDate=Date de fin +chorem.bonzoms.employmentContract.endDate=Date de fin (opt.) chorem.bonzoms.employmentContract.salary=Salaire chorem.bonzoms.employmentContract.salary.wrongFormat=Le salaire doit \u00EAtre un entier positif ou un nombre \u00E0 virgule flottante positif (le s\u00E9parateur d\u00E9cimal peut \u00EAtre un point ou une virgule) chorem.bonzoms.employmentContract.type=Type @@ -142,3 +142,4 @@ chorem.gepeto.task.price.wrongFormat=Le prix doit \u00EAtre un entier positif ou un nombre \u00E0 virgule flottante positif (le s\u00E9parateur d\u00E9cimal peut \u00EAtre un point ou une virgule) chorem.gepeto.tasksList= chorem.home=Accueil +chorem.misc.modify=Modifier Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-04-22 08:40:03 UTC (rev 103) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-04-22 10:23:48 UTC (rev 104) @@ -54,6 +54,13 @@ <result name="error">/WEB-INF/jsp/bonzoms/addEmploymentContract.jsp</result> <result type="redirectAction">home</result> </action> + <action name="modifyCompany" class="org.chorem.bonzoms.action.CompanyAction" method="modify"> + <result type="redirectAction"> + <param name="actionName">companyDetails</param> + <param name="namespace">/bonzoms</param> + <param name="companyId">${companyId}</param> + </result> + </action> </package> <package name="gepeto" namespace="/gepeto" extends="struts-default"> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp 2011-04-22 08:40:03 UTC (rev 103) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp 2011-04-22 10:23:48 UTC (rev 104) @@ -30,11 +30,11 @@ <br /> <s:textarea key="chorem.billy.quotation.description" name="description" cols="50" rows="10" labelposition="top" labelSeparator=": " /> <br /> - <s:textfield key="chorem.billy.quotation.amount" name="amount" labelSeparator=": " /> + <s:textfield key="chorem.billy.quotation.amount" name="amount" labelSeparator=": " size="6" /> <br /> - <s:textfield key="chorem.billy.quotation.vta" name="vta" labelSeparator=": " /> + <s:textfield key="chorem.billy.quotation.vta" name="vta" labelSeparator=": " size="2" />% <br /> - <s:textfield key="chorem.billy.quotation.postedDate" name="postedDate" labelSeparator=": " /> + <s:textfield key="chorem.billy.quotation.postedDate" name="postedDate" labelSeparator=": " size="7" /> <br /> <label for="supplierId" class="label"><s:text name="chorem.billy.quotation.supplier" />: </label> <select name="supplierId" id="supplierId"> 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-22 08:40:03 UTC (rev 103) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp 2011-04-22 10:23:48 UTC (rev 104) @@ -21,16 +21,24 @@ </s:text> </h2> <s:actionerror /> - <s:textfield key="chorem.bonzoms.company.type" name="type" labelSeparator=": " readonly="true" /> + <s:url action="modifyCompany" var="modifyCompany"> + <s:param name="companyId"><%= CompanyAction.getAction().getCompanyId() %></s:param> + </s:url> + <form action="${modifyCompany}" method="post"> + <s:textfield key="chorem.bonzoms.company.type" name="type" labelSeparator=": " /> + <br /> + <br /> + <s:textarea key="chorem.bonzoms.company.address" name="address" cols="30" rows="3" labelposition="top" /> + <br /> + <s:textfield key="chorem.bonzoms.company.phoneNb" name="phoneNb" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.bonzoms.company.website" name="website" labelSeparator=": " /> + <br /> + <br /> + <s:submit key="chorem.misc.modify" name="modify" /> + </form> <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" /> - <br /> - <br /> <s:text name="chorem.bonzoms.company.employees" /> <br /> <br />

1 0

r103 - in trunk/chorem-web/src/main: java/org/chorem/billy/action java/org/chorem/bonzoms/action java/org/chorem/gepeto/action resources/i18n
by vbriand＠users.chorem.org 22 Apr '11

22 Apr '11

Author: vbriand Date: 2011-04-22 10:40:03 +0200 (Fri, 22 Apr 2011) New Revision: 103 Url: http://chorem.org/repositories/revision/chorem/103 Log: Replaced other messages by a more generic one 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 trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 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-22 08:25:31 UTC (rev 102) +++ trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java 2011-04-22 08:40:03 UTC (rev 103) @@ -209,7 +209,7 @@ } } catch (Exception e) { result = false; - addActionError(getText(n_("chorem.billy.quotation.create.error"))); + addActionError(getText(n_("chorem.create.error"))); log.error("An error occurred while creating a new quotation", e); } return result; 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-22 08:25:31 UTC (rev 102) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java 2011-04-22 08:40:03 UTC (rev 103) @@ -170,7 +170,7 @@ } } catch (Exception e) { result = false; - addActionError(getText(n_("chorem.bonzoms.company.create.error"))); + addActionError(getText(n_("chorem.create.error"))); log.error("An error occurred while creating a new company", e); } return result; 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-22 08:25:31 UTC (rev 102) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/ContactDetailsAction.java 2011-04-22 08:40:03 UTC (rev 103) @@ -65,7 +65,7 @@ proxy.store(newContactDetails); } catch (Exception e) { result = false; - addActionError(getText(n_("chorem.bonzoms.contactDetails.create.error"))); + addActionError(getText(n_("chorem.create.error"))); log.error("An error occurred while creating new contact details", e); } return result; 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-22 08:25:31 UTC (rev 102) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/EmploymentContractAction.java 2011-04-22 08:40:03 UTC (rev 103) @@ -111,7 +111,7 @@ } } catch (Exception e) { result = false; - addActionError(getText(n_("chorem.bonzoms.employmentContract.create.error"))); + addActionError(getText(n_("chorem.create.error"))); log.error("An error occurred while creating a new employment contract", e); } return result; 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-22 08:25:31 UTC (rev 102) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java 2011-04-22 08:40:03 UTC (rev 103) @@ -137,7 +137,7 @@ } } catch (Exception e) { result = false; - addActionError(getText(n_("chorem.bonzoms.person.create.error"))); + addActionError(getText(n_("chorem.create.error"))); log.error("An error occurred while creating a new person", e); } return result; 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-22 08:25:31 UTC (rev 102) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-04-22 08:40:03 UTC (rev 103) @@ -149,7 +149,7 @@ proxy.store(newProject); } catch (Exception e) { result = false; - addActionError(getText(n_("chorem.gepeto.project.create.error"))); + addActionError(getText(n_("chorem.create.error"))); log.error("An error occurred while creating a new project", e); } return result; 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-22 08:25:31 UTC (rev 102) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 2011-04-22 08:40:03 UTC (rev 103) @@ -234,7 +234,7 @@ } } catch (Exception e) { result = false; - addActionError(getText(n_("chorem.gepeto.projectOrder.create.error"))); + addActionError(getText(n_("chorem.create.error"))); log.error("An error occurred while creating a new project order", e); } return result; 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-22 08:25:31 UTC (rev 102) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java 2011-04-22 08:40:03 UTC (rev 103) @@ -141,7 +141,7 @@ } } catch (Exception e) { result = false; - addActionError(getText(n_("chorem.gepeto.task.create.error"))); + addActionError(getText(n_("chorem.create.error"))); log.error("An error occurred while creating a new task", e); } return result; 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-22 08:25:31 UTC (rev 102) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-22 08:40:03 UTC (rev 103) @@ -6,7 +6,6 @@ chorem.billy.quotation.addToProject=Add a new quotation to the project "{0}" chorem.billy.quotation.amount=Amount chorem.billy.quotation.backToProjectDetails=Get back to project -chorem.billy.quotation.create.error=An error occurred while creating your new quotation, please try again. If the problem persists, please contact an administrator chorem.billy.quotation.description=Description chorem.billy.quotation.invalidCustomer= chorem.billy.quotation.invalidSupplier= @@ -28,7 +27,6 @@ chorem.bonzoms.company.addressLine2=Address line 2 (opt.) chorem.bonzoms.company.city=City chorem.bonzoms.company.country=Country -chorem.bonzoms.company.create.error=An error occurred while creating your new company, please try again. If the problem persists, please contact an administrator chorem.bonzoms.company.list= chorem.bonzoms.company.name=Company''s name chorem.bonzoms.company.phoneNb=Phone number (opt.) @@ -39,7 +37,6 @@ 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 chorem.bonzoms.contactDetails.name=Contact details'' name chorem.bonzoms.contactDetails.type=Contact details'' type chorem.bonzoms.contactDetails.value=Contact details'' value @@ -54,7 +51,6 @@ chorem.bonzoms.employmentContract.add=Add a new employment contract chorem.bonzoms.employmentContract.allFieldsRequired= chorem.bonzoms.employmentContract.beginDate=Begin date (dd/mm/yyyy) -chorem.bonzoms.employmentContract.create.error=An error occurred while creating your new employment contract, please try again. If the problem persists, please contact an administrator chorem.bonzoms.employmentContract.description=Description chorem.bonzoms.employmentContract.endDate=End date (dd/mm/yyyy) chorem.bonzoms.employmentContract.salary=Salary @@ -70,7 +66,6 @@ chorem.bonzoms.person.birthDate=Birth date (dd/mm/yyyy) chorem.bonzoms.person.city=City chorem.bonzoms.person.country=Country -chorem.bonzoms.person.create.error=An error occurred while adding the person, please try again. If the problem persists, please contact an administrator chorem.bonzoms.person.email=Email chorem.bonzoms.person.email.wrongFormat=The email format is invalid chorem.bonzoms.person.firstName=First name @@ -78,6 +73,7 @@ chorem.bonzoms.person.phoneNb=Phone number (opt.) chorem.bonzoms.person.postcode=Postcode chorem.config.configFileName.description=chorem''s configuration filename +chorem.create.error=An error occurred, please try again. If the problem persists, please contact an administrator chorem.date.wrongFormat=The date must be in the following format \: dd/mm/yyyy chorem.endDate.afterBegin=The end date cannot be posterior to the begin date chorem.error.internal=An internal error occurred @@ -85,7 +81,6 @@ chorem.gepeto.home=Home chorem.gepeto.project=Project {0} chorem.gepeto.project.add=New project -chorem.gepeto.project.create.error=An error occurred while creating your new project, please try again. If the problem persists, please contact an administrator chorem.gepeto.project.description=Description chorem.gepeto.project.name=Project''s name chorem.gepeto.projectDetails.noProjectOrder= @@ -103,7 +98,6 @@ chorem.gepeto.projectOrder.beginDate=Begin date (dd/mm/yyyy) chorem.gepeto.projectOrder.company.name= chorem.gepeto.projectOrder.company.type= -chorem.gepeto.projectOrder.create.error=An error occurred while creating your new project order, please try again. If the problem persists, please contact an administrator chorem.gepeto.projectOrder.description=Description chorem.gepeto.projectOrder.estimatedEndDate=Estimated end date (dd/mm/yyyy) chorem.gepeto.projectOrder.invalidCompany= @@ -134,7 +128,6 @@ chorem.gepeto.task.add=Add a new task chorem.gepeto.task.backToProjectDetails= chorem.gepeto.task.beginDate=Begin date (dd/mm/yyyy) -chorem.gepeto.task.create.error=An error occurred while creating your new task, please try again. If the problem persists, please contact an administrator chorem.gepeto.task.description=Description chorem.gepeto.task.estimatedDays=Estimated days chorem.gepeto.task.estimatedDays.wrongFormat=The estimated days must be a positive integer 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-22 08:25:31 UTC (rev 102) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-22 08:40:03 UTC (rev 103) @@ -6,7 +6,6 @@ chorem.billy.quotation.addToProject=Ajouter un nouveau devis au projet "{0}" chorem.billy.quotation.amount=Montant chorem.billy.quotation.backToProjectDetails=Retourner sur le projet -chorem.billy.quotation.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouveau devis, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.billy.quotation.customer=Client chorem.billy.quotation.description=Description chorem.billy.quotation.invalidCustomer= @@ -29,7 +28,6 @@ chorem.bonzoms.company.addressLine2=Adresse ligne 2 (opt.) chorem.bonzoms.company.city=Ville chorem.bonzoms.company.country=Pays -chorem.bonzoms.company.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouvelle soci\u00E9t\u00E9, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.bonzoms.company.employees=Liste des employ\u00E9s chorem.bonzoms.company.list=Obtenir la liste des soci\u00E9t\u00E9s chorem.bonzoms.company.name=Nom de la soci\u00E9t\u00E9 @@ -41,7 +39,6 @@ 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 chorem.bonzoms.contactDetails.name=Nom de la m\u00E9thode de contact chorem.bonzoms.contactDetails.type=Type de la m\u00E9thode de contact chorem.bonzoms.contactDetails.value=Valeur de la m\u00E9thode de contact @@ -56,7 +53,6 @@ chorem.bonzoms.employmentContract.add=Ajouter un nouveau contrat de travail chorem.bonzoms.employmentContract.allFieldsRequired= chorem.bonzoms.employmentContract.beginDate=Date de d\u00E9but -chorem.bonzoms.employmentContract.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouveau contrat de travail, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.bonzoms.employmentContract.description=Description chorem.bonzoms.employmentContract.endDate=Date de fin chorem.bonzoms.employmentContract.salary=Salaire @@ -72,7 +68,6 @@ chorem.bonzoms.person.birthDate=Date de naissance chorem.bonzoms.person.city=Ville chorem.bonzoms.person.country=Pays -chorem.bonzoms.person.create.error=Une erreur s''est produite lors de l''ajout de la personne, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.bonzoms.person.email=Email chorem.bonzoms.person.email.wrongFormat=L''adresse email que vous avez entr\u00E9e est incorrecte chorem.bonzoms.person.firstName=Pr\u00E9nom @@ -80,6 +75,7 @@ chorem.bonzoms.person.phoneNb=Num\u00E9ro de t\u00E9l\u00E9phone (opt.) chorem.bonzoms.person.postcode=Code postal chorem.config.configFileName.description=Nom du fichier de configuration de chorem +chorem.create.error=Une erreur s''est produite, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.date.wrongFormat=La date doit respecter le format suivant \: jj/mm/yyyy chorem.endDate.afterBegin=La date de fin ne doit pas pas \u00EAtre ant\u00E9rieure \u00E0 la date de d\u00E9but chorem.error.internal=Une erreur interne s''est produite @@ -87,7 +83,6 @@ chorem.gepeto.home=Accueil chorem.gepeto.project=Projet {0} chorem.gepeto.project.add=Nouveau projet -chorem.gepeto.project.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouveau projet, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.gepeto.project.description=Description chorem.gepeto.project.name=Nom du projet chorem.gepeto.projectDetails.noProjectOrder=Pas de contrat @@ -106,7 +101,6 @@ 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 chorem.gepeto.projectOrder.description=Description chorem.gepeto.projectOrder.estimatedEndDate=Date de fin estim\u00E9e chorem.gepeto.projectOrder.invalidCompany= @@ -139,7 +133,6 @@ chorem.gepeto.task.add=Ajouter une nouvelle t\u00E2che chorem.gepeto.task.backToProjectDetails=Retourner sur le contrat chorem.gepeto.task.beginDate=Date de d\u00E9but -chorem.gepeto.task.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouvelle t\u00E2che, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.gepeto.task.description=Description chorem.gepeto.task.estimatedDays=Nombre de jours estim\u00E9s chorem.gepeto.task.estimatedDays.wrongFormat=Le nombre de jours estim\u00E9 doit \u00EAtre un entier positif

1 0

r102 - in trunk/chorem-web/src/main: java/org/chorem/bonzoms/action resources/i18n resources/org/chorem/billy/action resources/org/chorem/bonzoms/action resources/org/chorem/gepeto/action
by vbriand＠users.chorem.org 22 Apr '11

22 Apr '11

Author: vbriand Date: 2011-04-22 10:25:31 +0200 (Fri, 22 Apr 2011) New Revision: 102 Url: http://chorem.org/repositories/revision/chorem/102 Log: Replaced specific i18n messages when a field is required by a generic one so no time is lost on translating every message Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.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/billy/action/QuotationAction-addQuotation-validation.xml trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-addCompany-validation.xml trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/ContactDetailsAction-validation.xml trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/EmploymentContractAction-validation.xml trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/PersonAction-addPerson-validation.xml trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-addProject-validation.xml trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-addTask-validation.xml 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-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java 2011-04-22 08:25:31 UTC (rev 102) @@ -201,8 +201,14 @@ } else { result = false; - addActionError(getText( - n_("chorem.bonzoms.employee.required"))); + if (employeeDiploma.isEmpty()) { + addFieldError("employeeDiploma", + getText(n_("chorem.field.required"))); + } + if (employeePaidLeave.isEmpty()) { + addFieldError("employeePaidLeave", + getText(n_("chorem.field.required"))); + } } } return result; 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-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-22 08:25:31 UTC (rev 102) @@ -25,21 +25,15 @@ 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.) chorem.bonzoms.company.city=City -chorem.bonzoms.company.city.required=You must enter the city chorem.bonzoms.company.country=Country -chorem.bonzoms.company.country.required=You must enter the country chorem.bonzoms.company.create.error=An error occurred while creating your new company, please try again. If the problem persists, please contact an administrator chorem.bonzoms.company.list= chorem.bonzoms.company.name=Company''s name -chorem.bonzoms.company.name.required=You must enter the company''s name chorem.bonzoms.company.phoneNb=Phone number (opt.) chorem.bonzoms.company.postcode=Postcode -chorem.bonzoms.company.postcode.required=You must enter the postcode 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= @@ -47,72 +41,53 @@ 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 chorem.bonzoms.contactDetails.name=Contact details'' name -chorem.bonzoms.contactDetails.name.required=You must enter the contact details'' name chorem.bonzoms.contactDetails.type=Contact details'' type -chorem.bonzoms.contactDetails.type.required=You must enter the contact details'' type chorem.bonzoms.contactDetails.value=Contact details'' value -chorem.bonzoms.contactDetails.value.required=You must enter the contact details'' value chorem.bonzoms.employee= chorem.bonzoms.employee.diploma= chorem.bonzoms.employee.invalidCompany= chorem.bonzoms.employee.paidLeave= chorem.bonzoms.employee.paidLeave.wrongFormat= -chorem.bonzoms.employee.required= chorem.bonzoms.employee.rtt= chorem.bonzoms.employee.rtt.wrongFormat= chorem.bonzoms.employmentContract=Employment contract chorem.bonzoms.employmentContract.add=Add a new employment contract chorem.bonzoms.employmentContract.allFieldsRequired= chorem.bonzoms.employmentContract.beginDate=Begin date (dd/mm/yyyy) -chorem.bonzoms.employmentContract.beginDate.required=You must enter the employment contract''s begin date chorem.bonzoms.employmentContract.create.error=An error occurred while creating your new employment contract, please try again. If the problem persists, please contact an administrator chorem.bonzoms.employmentContract.description=Description -chorem.bonzoms.employmentContract.description.required=You must enter the employment contract''s description chorem.bonzoms.employmentContract.endDate=End date (dd/mm/yyyy) chorem.bonzoms.employmentContract.salary=Salary -chorem.bonzoms.employmentContract.salary.required=You must enter the employee''s salary chorem.bonzoms.employmentContract.salary.wrongFormat=The salary must be a positive integer or floating point number (the decimal mark may be either a dot or a comma) chorem.bonzoms.employmentContract.type=Type -chorem.bonzoms.employmentContract.type.required=You must enter the employment contract''s type chorem.bonzoms.employmentContract.workingTime=Working time -chorem.bonzoms.employmentContract.workingTime.required=You must enter the employee''s working time chorem.bonzoms.employmentContract.workingTime.wrongFormat=The working time must be a positive integer chorem.bonzoms.home=Home chorem.bonzoms.person=Person chorem.bonzoms.person.add=Add a new person chorem.bonzoms.person.addressLine1=Address -chorem.bonzoms.person.addressLine1.required=You must enter the first address line chorem.bonzoms.person.addressLine2=Address line 2 (opt.) chorem.bonzoms.person.birthDate=Birth date (dd/mm/yyyy) -chorem.bonzoms.person.birthDate.required=You must enter the person''s birth date chorem.bonzoms.person.city=City -chorem.bonzoms.person.city.required=You must enter the city chorem.bonzoms.person.country=Country -chorem.bonzoms.person.country.required=You must enter the country chorem.bonzoms.person.create.error=An error occurred while adding the person, please try again. If the problem persists, please contact an administrator chorem.bonzoms.person.email=Email -chorem.bonzoms.person.email.required=You must enter the person''s email chorem.bonzoms.person.email.wrongFormat=The email format is invalid chorem.bonzoms.person.firstName=First name -chorem.bonzoms.person.firstName.required=You must enter the person''s first name chorem.bonzoms.person.lastName=Last name -chorem.bonzoms.person.lastName.required=You must enter the person''s last name chorem.bonzoms.person.phoneNb=Phone number (opt.) chorem.bonzoms.person.postcode=Postcode -chorem.bonzoms.person.postcode.required=You must enter the postcode chorem.config.configFileName.description=chorem''s configuration filename chorem.date.wrongFormat=The date must be in the following format \: dd/mm/yyyy chorem.endDate.afterBegin=The end date cannot be posterior to the begin date chorem.error.internal=An internal error occurred -chorem.field.mandatory=You must fill in this field +chorem.field.required=You must fill in this field chorem.gepeto.home=Home chorem.gepeto.project=Project {0} chorem.gepeto.project.add=New project chorem.gepeto.project.create.error=An error occurred while creating your new project, please try again. If the problem persists, please contact an administrator chorem.gepeto.project.description=Description -chorem.gepeto.project.description.required=You must describe the project chorem.gepeto.project.name=Project''s name -chorem.gepeto.project.name.required=You must enter the project''s name chorem.gepeto.projectDetails.noProjectOrder= chorem.gepeto.projectDetails.noQuotations=No quotations chorem.gepeto.projectDetails.projectOrder= @@ -126,18 +101,14 @@ chorem.gepeto.projectOrder.addToQuotation=Add a new project order to the quotation \#{0} chorem.gepeto.projectOrder.backToQuotationDetails=Get back to the quotation chorem.gepeto.projectOrder.beginDate=Begin date (dd/mm/yyyy) -chorem.gepeto.projectOrder.beginDate.required=You must provide a begin date for this project order chorem.gepeto.projectOrder.company.name= chorem.gepeto.projectOrder.company.type= chorem.gepeto.projectOrder.create.error=An error occurred while creating your new project order, please try again. If the problem persists, please contact an administrator chorem.gepeto.projectOrder.description=Description -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 chorem.gepeto.projectOrderDetails.beginDate= chorem.gepeto.projectOrderDetails.companyName= chorem.gepeto.projectOrderDetails.endDate= @@ -163,19 +134,13 @@ chorem.gepeto.task.add=Add a new task chorem.gepeto.task.backToProjectDetails= chorem.gepeto.task.beginDate=Begin date (dd/mm/yyyy) -chorem.gepeto.task.beginDate.required=You must enter the begin date for this task chorem.gepeto.task.create.error=An error occurred while creating your new task, please try again. If the problem persists, please contact an administrator chorem.gepeto.task.description=Description -chorem.gepeto.task.description.required=You must describe the task chorem.gepeto.task.estimatedDays=Estimated days -chorem.gepeto.task.estimatedDays.required=You must enter the estimated number of days for this task chorem.gepeto.task.estimatedDays.wrongFormat=The estimated days must be a positive integer chorem.gepeto.task.estimatedEndDate=Estimated end date (dd/mm/yyyy) -chorem.gepeto.task.estimatedEndDate.required=You must enter the estimated end date for this task chorem.gepeto.task.name=Task name -chorem.gepeto.task.name.required=You must enter the task''s name chorem.gepeto.task.price=Price -chorem.gepeto.task.price.required=You must enter the task''s price chorem.gepeto.task.price.wrongFormat=The price must be a positive integer or floating point number (the decimal mark may be either a dot or a comma) chorem.gepeto.tasksList= chorem.home=Home 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-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-22 08:25:31 UTC (rev 102) @@ -26,22 +26,16 @@ chorem.bonzoms.company.add=Ajouter une nouvelle soci\u00E9t\u00E9 chorem.bonzoms.company.address=Adresse 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.) chorem.bonzoms.company.city=Ville -chorem.bonzoms.company.city.required=Vous devez renseigner la ville chorem.bonzoms.company.country=Pays -chorem.bonzoms.company.country.required=Vous devez indiquer le pays chorem.bonzoms.company.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouvelle soci\u00E9t\u00E9, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.bonzoms.company.employees=Liste des employ\u00E9s chorem.bonzoms.company.list=Obtenir la liste des soci\u00E9t\u00E9s chorem.bonzoms.company.name=Nom de la soci\u00E9t\u00E9 -chorem.bonzoms.company.name.required=Vous devez entrer le nom de la soci\u00E9t\u00E9 chorem.bonzoms.company.phoneNb=Num\u00E9ro de t\u00E9l\u00E9phone (opt.) chorem.bonzoms.company.postcode=Code postal -chorem.bonzoms.company.postcode.required=Vous devez renseigner le code postal de la soci\u00E9t\u00E9 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}" @@ -49,35 +43,26 @@ 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 chorem.bonzoms.contactDetails.name=Nom de la m\u00E9thode de contact -chorem.bonzoms.contactDetails.name.required=Vous devez indiquer le nom de la m\u00E9thode de contact chorem.bonzoms.contactDetails.type=Type de la m\u00E9thode de contact -chorem.bonzoms.contactDetails.type.required=Vous devez saisir le type de la m\u00E9thode de contact chorem.bonzoms.contactDetails.value=Valeur de la m\u00E9thode de contact -chorem.bonzoms.contactDetails.value.required=Vous devez entrer la valeur de la m\u00E9thode de contact chorem.bonzoms.employee=Employ\u00E9 chorem.bonzoms.employee.diploma=Dipl\u00F4me (opt.) chorem.bonzoms.employee.invalidCompany= chorem.bonzoms.employee.paidLeave=Cong\u00E9s pay\u00E9s chorem.bonzoms.employee.paidLeave.wrongFormat=Les cong\u00E9s pay\u00E9s doivent \u00EAtre \u00EAtre un entier positif ou un nombre \u00E0 virgule flottante positif -chorem.bonzoms.employee.required=Vous devez remplir le nombre de cong\u00E9s pay\u00E9s et les RTT chorem.bonzoms.employee.rtt=RTT chorem.bonzoms.employee.rtt.wrongFormat=Les RTT doivent \u00EAtre \u00EAtre un entier positif ou un nombre \u00E0 virgule flottante positif chorem.bonzoms.employmentContract=Contrat de travail chorem.bonzoms.employmentContract.add=Ajouter un nouveau contrat de travail chorem.bonzoms.employmentContract.allFieldsRequired= chorem.bonzoms.employmentContract.beginDate=Date de d\u00E9but -chorem.bonzoms.employmentContract.beginDate.required=Vous devez renseigner la date de d\u00E9but du contrat de travail chorem.bonzoms.employmentContract.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouveau contrat de travail, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.bonzoms.employmentContract.description=Description -chorem.bonzoms.employmentContract.description.required=Vous devez d\u00E9crire le contrat de travail chorem.bonzoms.employmentContract.endDate=Date de fin chorem.bonzoms.employmentContract.salary=Salaire -chorem.bonzoms.employmentContract.salary.required=Vous devez entrer le salaire de l'employ\u00E9 chorem.bonzoms.employmentContract.salary.wrongFormat=Le salaire doit \u00EAtre un entier positif ou un nombre \u00E0 virgule flottante positif (le s\u00E9parateur d\u00E9cimal peut \u00EAtre un point ou une virgule) chorem.bonzoms.employmentContract.type=Type -chorem.bonzoms.employmentContract.type.required=Vous devez sp\u00E9cifier le type du contrat de travail chorem.bonzoms.employmentContract.workingTime=Temps de travail -chorem.bonzoms.employmentContract.workingTime.required=Vous devez saisir le temps de travail de l'employ\u00E9 chorem.bonzoms.employmentContract.workingTime.wrongFormat=Le temps de travail doit \u00EAtre un entier positif chorem.bonzoms.home=Accueil chorem.bonzoms.person=Personne @@ -85,32 +70,26 @@ chorem.bonzoms.person.addressLine1=Adresse chorem.bonzoms.person.addressLine2=Adresse ligne 2 (opt.) chorem.bonzoms.person.birthDate=Date de naissance -chorem.bonzoms.person.birthDate.required=Vous devez entrer la date de naissance de la personne chorem.bonzoms.person.city=Ville chorem.bonzoms.person.country=Pays chorem.bonzoms.person.create.error=Une erreur s''est produite lors de l''ajout de la personne, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.bonzoms.person.email=Email -chorem.bonzoms.person.email.required=Vous devez entrer l''adresse email de la personne chorem.bonzoms.person.email.wrongFormat=L''adresse email que vous avez entr\u00E9e est incorrecte chorem.bonzoms.person.firstName=Pr\u00E9nom -chorem.bonzoms.person.firstName.required=Vous devez entrer le pr\u00E9nom de la personne chorem.bonzoms.person.lastName=Nom -chorem.bonzoms.person.lastName.required=Vous devez entrer le nom de la personne chorem.bonzoms.person.phoneNb=Num\u00E9ro de t\u00E9l\u00E9phone (opt.) chorem.bonzoms.person.postcode=Code postal chorem.config.configFileName.description=Nom du fichier de configuration de chorem chorem.date.wrongFormat=La date doit respecter le format suivant \: jj/mm/yyyy chorem.endDate.afterBegin=La date de fin ne doit pas pas \u00EAtre ant\u00E9rieure \u00E0 la date de d\u00E9but chorem.error.internal=Une erreur interne s''est produite -chorem.field.mandatory=Vous devez remplir ce champ +chorem.field.required=Vous devez remplir ce champ chorem.gepeto.home=Accueil chorem.gepeto.project=Projet {0} chorem.gepeto.project.add=Nouveau projet chorem.gepeto.project.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouveau projet, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.gepeto.project.description=Description -chorem.gepeto.project.description.required=Vous devez d\u00E9crire le projet chorem.gepeto.project.name=Nom du projet -chorem.gepeto.project.name.required=Vous devez renseigner un nom pour le projet chorem.gepeto.projectDetails.noProjectOrder=Pas de contrat chorem.gepeto.projectDetails.noQuotations=Pas de devis chorem.gepeto.projectDetails.projectOrder=Contrat du {0} au {1} @@ -124,19 +103,15 @@ chorem.gepeto.projectOrder.addToQuotation=Lier un nouveau contrat au devis \#{0} 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 chorem.gepeto.projectOrder.description=Description -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=Statut chorem.gepeto.projectOrder.type=Type -chorem.gepeto.projectOrder.type.required=Vous devez sp\u00E9cifier le type du contrat chorem.gepeto.projectOrderDetails.beginDate=Date de d\u00E9but \: {0} chorem.gepeto.projectOrderDetails.companyName=Nom de la soci\u00E9t\u00E9 \: {0} chorem.gepeto.projectOrderDetails.endDate=Date de fin \: {0} @@ -164,19 +139,13 @@ chorem.gepeto.task.add=Ajouter une nouvelle t\u00E2che chorem.gepeto.task.backToProjectDetails=Retourner sur le contrat chorem.gepeto.task.beginDate=Date de d\u00E9but -chorem.gepeto.task.beginDate.required=Vous devez renseigner la date de d\u00E9but de la t\u00E2che chorem.gepeto.task.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouvelle t\u00E2che, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.gepeto.task.description=Description -chorem.gepeto.task.description.required=Vous devez d\u00E9crire la t\u00E2che chorem.gepeto.task.estimatedDays=Nombre de jours estim\u00E9s -chorem.gepeto.task.estimatedDays.required=Vous devez renseigner le nombre de jours estim\u00E9s chorem.gepeto.task.estimatedDays.wrongFormat=Le nombre de jours estim\u00E9 doit \u00EAtre un entier positif chorem.gepeto.task.estimatedEndDate=Date de fin estim\u00E9e -chorem.gepeto.task.estimatedEndDate.required=Vous devez renseigner la date de fin de la t\u00E2che chorem.gepeto.task.name=Nom de la t\u00E2che -chorem.gepeto.task.name.required=Vous devez donner un nom \u00E0 cette t\u00E2che chorem.gepeto.task.price=Prix -chorem.gepeto.task.price.required=Vous devez donner un prix \u00E0 cette t\u00E2che chorem.gepeto.task.price.wrongFormat=Le prix doit \u00EAtre un entier positif ou un nombre \u00E0 virgule flottante positif (le s\u00E9parateur d\u00E9cimal peut \u00EAtre un point ou une virgule) chorem.gepeto.tasksList= chorem.home=Accueil Modified: trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-addQuotation-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-addQuotation-validation.xml 2011-04-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-addQuotation-validation.xml 2011-04-22 08:25:31 UTC (rev 102) @@ -5,17 +5,17 @@ <validators> <field name="reference"> <field-validator type="requiredstring"> - <message key="chorem.billy.quotation.reference.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="description"> <field-validator type="requiredstring"> - <message key="chorem.billy.quotation.description.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="amount"> <field-validator type="requiredstring"> - <message key="chorem.billy.quotation.amount.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]+)([\.,][0-9]+)?]]></param> @@ -24,7 +24,7 @@ </field> <field name="vta"> <field-validator type="requiredstring"> - <message key="chorem.billy.quotation.vta.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]+)([\.,][0-9]+)?]]></param> @@ -33,7 +33,7 @@ </field> <field name="postedDate"> <field-validator type="requiredstring"> - <message key="chorem.billy.quotation.postedDate.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param> Modified: trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-addCompany-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-addCompany-validation.xml 2011-04-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/CompanyAction-addCompany-validation.xml 2011-04-22 08:25:31 UTC (rev 102) @@ -5,32 +5,32 @@ <validators> <field name="name"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.company.name.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="type"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.company.type.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="addressLine1"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.company.addressLine1.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="postcode"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.company.postcode.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="city"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.company.city.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="country"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.company.country.required" /> + <message key="chorem.field.required" /> </field-validator> </field> </validators> Modified: trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/ContactDetailsAction-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/ContactDetailsAction-validation.xml 2011-04-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/ContactDetailsAction-validation.xml 2011-04-22 08:25:31 UTC (rev 102) @@ -5,17 +5,17 @@ <validators> <field name="name"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.contactDetails.name.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="type"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.contactDetails.type.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="value"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.contactDetails.value.required" /> + <message key="chorem.field.required" /> </field-validator> </field> </validators> Modified: trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/EmploymentContractAction-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/EmploymentContractAction-validation.xml 2011-04-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/EmploymentContractAction-validation.xml 2011-04-22 08:25:31 UTC (rev 102) @@ -5,17 +5,17 @@ <validators> <field name="type"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.employmentContract.type.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="description"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.employmentContract.description.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="salary"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.employmentContract.salary.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]+)([\.,][0-9]+)?]]></param> @@ -24,7 +24,7 @@ </field> <field name="workingTime"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.employmentContract.workingTime.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]+)]]></param> @@ -33,7 +33,7 @@ </field> <field name="beginDate"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.employmentContract.beginDate.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param> Modified: trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/PersonAction-addPerson-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/PersonAction-addPerson-validation.xml 2011-04-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/org/chorem/bonzoms/action/PersonAction-addPerson-validation.xml 2011-04-22 08:25:31 UTC (rev 102) @@ -5,17 +5,17 @@ <validators> <field name="firstName"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.person.firstName.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="lastName"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.person.lastName.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="email"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.person.email.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="email"> <message key="chorem.bonzoms.person.email.wrongFormat" /> @@ -23,27 +23,27 @@ </field> <field name="birthDate"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.person.birthDate.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="addressLine1"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.person.addressLine1.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="postcode"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.person.postcode.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="city"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.person.city.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="country"> <field-validator type="requiredstring"> - <message key="chorem.bonzoms.person.country.required" /> + <message key="chorem.field.required" /> </field-validator> </field> </validators> Modified: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-addProject-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-addProject-validation.xml 2011-04-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-addProject-validation.xml 2011-04-22 08:25:31 UTC (rev 102) @@ -5,12 +5,12 @@ <validators> <field name="name"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.project.name.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="description"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.project.description.required" /> + <message key="chorem.field.required" /> </field-validator> </field> </validators> 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-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml 2011-04-22 08:25:31 UTC (rev 102) @@ -5,22 +5,22 @@ <validators> <field name="type"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.projectOrder.type.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="description"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.projectOrder.description.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="status"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.projectOrder.status.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="beginDate"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.projectOrder.beginDate.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param> @@ -29,7 +29,7 @@ </field> <field name="estimatedEndDate"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.projectOrder.estimatedEndDate.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param> Modified: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-addTask-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-addTask-validation.xml 2011-04-22 07:49:02 UTC (rev 101) +++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-addTask-validation.xml 2011-04-22 08:25:31 UTC (rev 102) @@ -5,17 +5,17 @@ <validators> <field name="name"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.task.name.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="description"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.task.description.required" /> + <message key="chorem.field.required" /> </field-validator> </field> <field name="price"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.task.price.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]+)([\.,][0-9]+)?]]></param> @@ -24,7 +24,7 @@ </field> <field name="estimatedDays"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.task.estimatedDays.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]+)]]></param> @@ -33,7 +33,7 @@ </field> <field name="beginDate"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.task.beginDate.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param> @@ -42,7 +42,7 @@ </field> <field name="estimatedEndDate"> <field-validator type="requiredstring"> - <message key="chorem.gepeto.task.estimatedEndDate.required" /> + <message key="chorem.field.required" /> </field-validator> <field-validator type="regex"> <param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param>

1 0

r101 - in trunk/chorem-web/src/main/resources: i18n org/chorem/billy/action
by vbriand＠users.chorem.org 22 Apr '11

22 Apr '11

Author: vbriand Date: 2011-04-22 09:49:02 +0200 (Fri, 22 Apr 2011) New Revision: 101 Url: http://chorem.org/repositories/revision/chorem/101 Log: Added a date format check when adding a quotation Modified: 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/billy/action/QuotationAction-addQuotation-validation.xml 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-21 16:30:26 UTC (rev 100) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-22 07:49:02 UTC (rev 101) @@ -104,6 +104,7 @@ chorem.date.wrongFormat=The date must be in the following format \: dd/mm/yyyy chorem.endDate.afterBegin=The end date cannot be posterior to the begin date chorem.error.internal=An internal error occurred +chorem.field.mandatory=You must fill in this field chorem.gepeto.home=Home chorem.gepeto.project=Project {0} chorem.gepeto.project.add=New project 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-21 16:30:26 UTC (rev 100) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-22 07:49:02 UTC (rev 101) @@ -102,6 +102,7 @@ chorem.date.wrongFormat=La date doit respecter le format suivant \: jj/mm/yyyy chorem.endDate.afterBegin=La date de fin ne doit pas pas \u00EAtre ant\u00E9rieure \u00E0 la date de d\u00E9but chorem.error.internal=Une erreur interne s''est produite +chorem.field.mandatory=Vous devez remplir ce champ chorem.gepeto.home=Accueil chorem.gepeto.project=Projet {0} chorem.gepeto.project.add=Nouveau projet Modified: trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-addQuotation-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-addQuotation-validation.xml 2011-04-21 16:30:26 UTC (rev 100) +++ trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-addQuotation-validation.xml 2011-04-22 07:49:02 UTC (rev 101) @@ -35,5 +35,9 @@ <field-validator type="requiredstring"> <message key="chorem.billy.quotation.postedDate.required" /> </field-validator> + <field-validator type="regex"> + <param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param> + <message key="chorem.date.wrongFormat" /> + </field-validator> </field> </validators>

1 0

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

21 Apr '11

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

1 0

r99 - trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy
by vbriand＠users.chorem.org 21 Apr '11

21 Apr '11

Author: vbriand Date: 2011-04-21 17:30:39 +0200 (Thu, 21 Apr 2011) New Revision: 99 Url: http://chorem.org/repositories/revision/chorem/99 Log: Added company and birth date to be able to distinguish employees with the same name Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp 2011-04-21 15:01:53 UTC (rev 98) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp 2011-04-21 15:30:39 UTC (rev 99) @@ -43,7 +43,7 @@ for (EmployeeFull employee : employees) { %> - <option value="<%= employee.getEmployee().getWikittyId() %>"><%= employee.getPerson().getLastName() %> <%= employee.getPerson().getFirstName() %></option> + <option value="<%= employee.getEmployee().getWikittyId() %>"><%= employee.getCompany().getName() %> - <%= employee.getPerson().getLastName() %> <%= employee.getPerson().getFirstName() %> (<%= employee.getPerson().getBirthDate() %>)</option> <% } %> </select> <br /> @@ -52,7 +52,7 @@ <% for (EmployeeFull employee : employees) { %> - <option value="<%= employee.getEmployee().getWikittyId() %>"><%= employee.getPerson().getLastName() %> <%= employee.getPerson().getFirstName() %></option> + <option value="<%= employee.getEmployee().getWikittyId() %>"><%= employee.getCompany().getName() %> - <%= employee.getPerson().getLastName() %> <%= employee.getPerson().getFirstName() %> (<%= employee.getPerson().getBirthDate() %>)</option> <% } %> </select> <br />

1 0

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

21 Apr '11

Author: vbriand Date: 2011-04-21 17:01:53 +0200 (Thu, 21 Apr 2011) New Revision: 98 Url: http://chorem.org/repositories/revision/chorem/98 Log: Added the supplier and the customer for a quotation Added: trunk/chorem-web/src/main/java/org/chorem/bonzoms/EmployeeFull.java Modified: trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.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/billy/addQuotation.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 12:49:11 UTC (rev 97) +++ trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java 2011-04-21 15:01:53 UTC (rev 98) @@ -2,17 +2,24 @@ import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; import java.util.UUID; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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; import org.chorem.entities.ProjectOrder; import org.chorem.entities.Quotation; import org.chorem.entities.QuotationImpl; import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; import com.opensymphony.xwork2.ActionContext; @@ -25,7 +32,7 @@ * @author vbriand */ public class QuotationAction extends BaseAction { - + private static final long serialVersionUID = -8773692389143447193L; private static final Log log = LogFactory.getLog(BaseAction.class); @@ -66,7 +73,7 @@ } else { result = ERROR; } - } + } } } } catch (IllegalArgumentException e) { @@ -121,6 +128,8 @@ protected String vta; protected String postedDate; protected String quotationId; + protected String supplierId; + protected String customerId; /** * Returns the project order linked with the quotation (if it exists) @@ -132,11 +141,24 @@ Search search = Search.query(); Criteria criteria = search.eq(ProjectOrder.FQ_FIELD_PROJECTORDER_QUOTATION, quotationId).criteria(); - ProjectOrder projectOrder = proxy.findByCriteria(ProjectOrder.class, criteria); + ProjectOrder projectOrder = proxy.findByCriteria(ProjectOrder.class, + criteria); return projectOrder; } + public List<EmployeeFull> getAllEmployees() { + ChoremProxy proxy = getChoremProxy(); + Search search = Search.query(); + Criteria criteria = search.exteq(Employee.EXT_EMPLOYEE).criteria(); + PagedResult<Employee> result = proxy.findAllByCriteria(Employee.class, + criteria); + List<Employee> employees = result.getAll(); + List<EmployeeFull> employeesFullList = EmployeeFull. + initEmployeeFullList(employees, proxy); + return employeesFullList; + } + /** * Stores the new quotation through the proxy * @@ -168,7 +190,21 @@ result = false; addActionError(getText(n_("chorem.date.wrongFormat"))); } + + if (proxy.restore(Person.class, supplierId) != null) { + newQuotation.setSupplier(supplierId); + } else { //If the id doesn't exist or is invalid + addActionError(getText(n_("chorem.billy.quotation.invalidSupplier"))); + result = false; + } + if (proxy.restore(Person.class, customerId) != null) { + newQuotation.setSupplier(customerId); + } else { //If the id doesn't exist or is invalid + addActionError(getText(n_("chorem.billy.quotation.invalidCustomer"))); + result = false; + } + //If everything went smoothly if (result) { proxy.store(newQuotation); @@ -292,4 +328,32 @@ public void setQuotationId(String quotationId) { this.quotationId = quotationId; } + + /** + * @return the supplierId + */ + public String getSupplierId() { + return supplierId; + } + + /** + * @param supplierId the supplierId to set + */ + public void setSupplierId(String supplierId) { + this.supplierId = supplierId; + } + + /** + * @return the customerId + */ + public String getCustomerId() { + return customerId; + } + + /** + * @param customerId the customerId to set + */ + public void setCustomerId(String customerId) { + this.customerId = customerId; + } } Added: trunk/chorem-web/src/main/java/org/chorem/bonzoms/EmployeeFull.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/bonzoms/EmployeeFull.java (rev 0) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/EmployeeFull.java 2011-04-21 15:01:53 UTC (rev 98) @@ -0,0 +1,84 @@ +package org.chorem.bonzoms; + +import java.util.ArrayList; +import java.util.List; + +import org.chorem.ChoremProxy; +import org.chorem.entities.Company; +import org.chorem.entities.Employee; +import org.chorem.entities.Person; + +/** + * @author vbriand + */ +public class EmployeeFull { + protected Employee employee; + protected Company company; + protected Person person; + + /** + * Returns an employee with its links + * + * @param employees the list of employees + * @param proxy + * @return the list of employees + */ + public static List<EmployeeFull> initEmployeeFullList(List<Employee> employees, ChoremProxy proxy) { + Person person; + Company company; + EmployeeFull employeeTmp = new EmployeeFull(); + List<EmployeeFull> employeesFullList = new ArrayList<EmployeeFull>(); + + for (Employee employee : employees) { + employeeTmp.setEmployee(employee); + person = proxy.restore(Person.class, employee.getPerson()); + employeeTmp.setPerson(person); + company = proxy.restore(Company.class, employee.getCompany()); + employeeTmp.setCompany(company); + employeesFullList.add(employeeTmp); + } + return employeesFullList; + } + + /** + * @return the employee + */ + public Employee getEmployee() { + return employee; + } + + /** + * @param employee the employee to set + */ + public void setEmployee(Employee employee) { + this.employee = employee; + } + + /** + * @return the company + */ + public Company getCompany() { + return company; + } + + /** + * @param company the company to set + */ + public void setCompany(Company company) { + this.company = company; + } + + /** + * @return the person + */ + public Person getPerson() { + return person; + } + + /** + * @param person the person to set + */ + public void setPerson(Person person) { + this.person = person; + } +} \ No newline at end of file Property changes on: trunk/chorem-web/src/main/java/org/chorem/bonzoms/EmployeeFull.java ___________________________________________________________________ Added: svn:mime-type + text/plain 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-21 12:49:11 UTC (rev 97) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-21 15:01:53 UTC (rev 98) @@ -8,6 +8,8 @@ chorem.billy.quotation.backToProjectDetails=Get back to project chorem.billy.quotation.create.error=An error occurred while creating your new quotation, please try again. If the problem persists, please contact an administrator chorem.billy.quotation.description=Description +chorem.billy.quotation.invalidCustomer= +chorem.billy.quotation.invalidSupplier= chorem.billy.quotation.postedDate=Posted date chorem.billy.quotation.projectOrder= chorem.billy.quotation.projectOrder.beginDate= 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-21 12:49:11 UTC (rev 97) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-21 15:01:53 UTC (rev 98) @@ -7,7 +7,10 @@ chorem.billy.quotation.amount=Montant chorem.billy.quotation.backToProjectDetails=Retourner sur le projet chorem.billy.quotation.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouveau devis, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur +chorem.billy.quotation.customer=Client chorem.billy.quotation.description=Description +chorem.billy.quotation.invalidCustomer= +chorem.billy.quotation.invalidSupplier= chorem.billy.quotation.postedDate=Date de d\u00E9p\u00F4t chorem.billy.quotation.projectOrder=Contrat r\u00E9alis\u00E9 sur la base de ce devis chorem.billy.quotation.projectOrder.beginDate=Date de d\u00E9but \: {0} @@ -15,6 +18,7 @@ chorem.billy.quotation.projectOrder.endDate=Date de fin \: {0} chorem.billy.quotation.projectOrder.type=Type \: {0} chorem.billy.quotation.reference=R\u00E9f\u00E9rence +chorem.billy.quotation.supplier=Fournisseur chorem.billy.quotation.vta=TVA chorem.billy.quotationDetails.title=D\u00E9tails du devis "{0}" chorem.bonzoms.companies=Liste des entreprises Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp 2011-04-21 12:49:11 UTC (rev 97) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp 2011-04-21 15:01:53 UTC (rev 98) @@ -1,4 +1,7 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="java.util.List" %> +<%@page import="org.chorem.bonzoms.EmployeeFull" %> +<%@page import="org.chorem.entities.Person" %> <%@page import="org.chorem.billy.action.QuotationAction" %> <%@taglib prefix="s" uri="/struts-tags" %> @@ -33,6 +36,27 @@ <br /> <s:textfield key="chorem.billy.quotation.postedDate" name="postedDate" labelSeparator=": " /> <br /> + <label for="supplierId" class="label"><s:text name="chorem.billy.quotation.supplier" />: </label> + <select name="supplierId" id="supplierId"> + <% + List<EmployeeFull> employees = QuotationAction.getAction().getAllEmployees(); + + for (EmployeeFull employee : employees) { + %> + <option value="<%= employee.getEmployee().getWikittyId() %>"><%= employee.getPerson().getLastName() %> <%= employee.getPerson().getFirstName() %></option> + <% } %> + </select> + <br /> + <label for="customerId" class="label"><s:text name="chorem.billy.quotation.customer" />: </label> + <select name="customerId" id="customerId"> + <% + for (EmployeeFull employee : employees) { + %> + <option value="<%= employee.getEmployee().getWikittyId() %>"><%= employee.getPerson().getLastName() %> <%= employee.getPerson().getFirstName() %></option> + <% } %> + </select> + <br /> + <br /> <s:submit key="chorem.billy.quotation.add" name="submit" /> </fieldset> </form>

1 0

r97 - in trunk/chorem-web/src/main: java/org/chorem/billy/action resources/i18n webapp/WEB-INF/decorators webapp/WEB-INF/jsp/billy webapp/WEB-INF/jsp/gepeto webapp/css
by vbriand＠users.chorem.org 21 Apr '11

21 Apr '11

Author: vbriand Date: 2011-04-21 14:49:11 +0200 (Thu, 21 Apr 2011) New Revision: 97 Url: http://chorem.org/repositories/revision/chorem/97 Log: Added a few links for an easier navigation Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/menu.jsp Modified: trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties trunk/chorem-web/src/main/webapp/WEB-INF/decorators/billy.jsp trunk/chorem-web/src/main/webapp/WEB-INF/decorators/bonzoms.jsp trunk/chorem-web/src/main/webapp/WEB-INF/decorators/cash.jsp trunk/chorem-web/src/main/webapp/WEB-INF/decorators/gepeto.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsWithoutQuotation.jsp trunk/chorem-web/src/main/webapp/css/style.css 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 09:31:10 UTC (rev 96) +++ trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java 2011-04-21 12:49:11 UTC (rev 97) @@ -154,6 +154,9 @@ newQuotation.setReference(reference); newQuotation.setDescription(description); newQuotation.setAmount(Double.parseDouble(amount)); + //Replaces the (possible) comma by a dot, so the string can be + //parsed successfully as a double + vta = vta.replace(',', '.'); newQuotation.setVTA(Double.parseDouble(vta)); newQuotation.setProject(projectId); 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-21 09:31:10 UTC (rev 96) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-21 12:49:11 UTC (rev 97) @@ -16,7 +16,7 @@ chorem.billy.quotation.projectOrder.type=Type \: {0} chorem.billy.quotation.reference=R\u00E9f\u00E9rence chorem.billy.quotation.vta=TVA -chorem.billy.quotationDetails.title= +chorem.billy.quotationDetails.title=D\u00E9tails du devis "{0}" chorem.bonzoms.companies=Liste des entreprises chorem.bonzoms.company=Soci\u00E9t\u00E9 chorem.bonzoms.company.add=Ajouter une nouvelle soci\u00E9t\u00E9 @@ -106,7 +106,7 @@ chorem.gepeto.project.description.required=Vous devez d\u00E9crire le projet chorem.gepeto.project.name=Nom du projet chorem.gepeto.project.name.required=Vous devez renseigner un nom pour le projet -chorem.gepeto.projectDetails.noProjectOrder= +chorem.gepeto.projectDetails.noProjectOrder=Pas de contrat chorem.gepeto.projectDetails.noQuotations=Pas de devis chorem.gepeto.projectDetails.projectOrder=Contrat du {0} au {1} chorem.gepeto.projectDetails.projectOrders=Contrats du projet @@ -129,7 +129,7 @@ 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.status=Statut chorem.gepeto.projectOrder.type=Type chorem.gepeto.projectOrder.type.required=Vous devez sp\u00E9cifier le type du contrat chorem.gepeto.projectOrderDetails.beginDate=Date de d\u00E9but \: {0} @@ -157,7 +157,7 @@ chorem.gepeto.results.title=R\u00E9sultats par ann\u00E0e chorem.gepeto.task=T\u00E2che {0} chorem.gepeto.task.add=Ajouter une nouvelle t\u00E2che -chorem.gepeto.task.backToProjectDetails= +chorem.gepeto.task.backToProjectDetails=Retourner sur le contrat chorem.gepeto.task.beginDate=Date de d\u00E9but chorem.gepeto.task.beginDate.required=Vous devez renseigner la date de d\u00E9but de la t\u00E2che chorem.gepeto.task.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouvelle t\u00E2che, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur Modified: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/billy.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/decorators/billy.jsp 2011-04-21 09:31:10 UTC (rev 96) +++ trunk/chorem-web/src/main/webapp/WEB-INF/decorators/billy.jsp 2011-04-21 12:49:11 UTC (rev 97) @@ -8,7 +8,7 @@ xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:decorator="http://www.opensymphony.com/sitemesh/decorator"> <head> - <title>Chorem : <decorator:title default="no title" /></title> + <title>Chorem - billy : <decorator:title default="no title" /></title> <decorator:head /> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta name="description" content="" /> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/bonzoms.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/decorators/bonzoms.jsp 2011-04-21 09:31:10 UTC (rev 96) +++ trunk/chorem-web/src/main/webapp/WEB-INF/decorators/bonzoms.jsp 2011-04-21 12:49:11 UTC (rev 97) @@ -8,7 +8,7 @@ xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:decorator="http://www.opensymphony.com/sitemesh/decorator"> <head> - <title>Chorem : <decorator:title default="no title" /></title> + <title>Chorem - bonzoms : <decorator:title default="no title" /></title> <decorator:head /> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta name="description" content="" /> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/cash.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/decorators/cash.jsp 2011-04-21 09:31:10 UTC (rev 96) +++ trunk/chorem-web/src/main/webapp/WEB-INF/decorators/cash.jsp 2011-04-21 12:49:11 UTC (rev 97) @@ -8,7 +8,7 @@ xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:decorator="http://www.opensymphony.com/sitemesh/decorator"> <head> - <title>Chorem : <decorator:title default="no title" /></title> + <title>Chorem - cash : <decorator:title default="no title" /></title> <decorator:head /> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta name="description" content="" /> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/gepeto.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/decorators/gepeto.jsp 2011-04-21 09:31:10 UTC (rev 96) +++ trunk/chorem-web/src/main/webapp/WEB-INF/decorators/gepeto.jsp 2011-04-21 12:49:11 UTC (rev 97) @@ -8,7 +8,7 @@ xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:decorator="http://www.opensymphony.com/sitemesh/decorator"> <head> - <title>Chorem : <decorator:title default="no title" /></title> + <title>Chorem - gepeto : <decorator:title default="no title" /></title> <decorator:head /> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta name="description" content="" /> Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/menu.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/menu.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/menu.jsp 2011-04-21 12:49:11 UTC (rev 97) @@ -0,0 +1,12 @@ +<%@taglib prefix="s" uri="/struts-tags" %> + +<div id="menu"> + <ul> + <li><s:a namespace="/gepeto" action="addProjectInput"><s:text name="chorem.gepeto.project.add" /></s:a></li> + <s:url namespace="/gepeto" action="projectsByYear" var="projectsByYear"> + <s:param name="year">2011</s:param> + </s:url> + <li><a href="${projectsByYear}"><s:text name="chorem.gepeto.projects" /></a></li> + <li><s:a namespace="/gepeto" action="projectsWithoutQuotation"><s:text name="chorem.gepeto.projectsWithoutQuotation" /></s:a></li> + </ul> +</div> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/menu.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp 2011-04-21 09:31:10 UTC (rev 96) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp 2011-04-21 12:49:11 UTC (rev 97) @@ -39,7 +39,7 @@ if (projectOrders.isEmpty()) { %> - <s:text name="chorem.gepeto.projectDetails.noProjectOrder" /> + <em><s:text name="chorem.gepeto.projectDetails.noProjectOrder" /></em><br /> <% } for (ProjectOrder projectOrder : projectOrders) { @@ -68,7 +68,7 @@ if (quotationsProjectOrder.isEmpty()) { %> - <s:text name="chorem.gepeto.projectDetails.noQuotations" /><br /> + <em><s:text name="chorem.gepeto.projectDetails.noQuotations" /></em><br /> <% } for (Quotation quotation : quotationsProjectOrder) { @@ -95,7 +95,7 @@ if (quotations.isEmpty()) { %> - <s:text name="chorem.gepeto.projectDetails.noQuotations" /><br /> + <em><s:text name="chorem.gepeto.projectDetails.noQuotations" /></em><br /> <% } for (Quotation quotation : quotations) { @@ -110,7 +110,11 @@ <s:param> <a href="${quotationDetails}"><%= quotation.getReference() %></a> </s:param> - </s:text> + </s:text> - + <s:url namespace="/gepeto" action="addProjectOrderInput" var="addProjectOrder"> + <s:param name="quotationId"><%= quotation.getWikittyId() %></s:param> + </s:url> + <a href="${addProjectOrder}"><s:text name="chorem.billy.quotation.addProjectOrder" /></a> <br /> <% } %> </p> 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 09:31:10 UTC (rev 96) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp 2011-04-21 12:49:11 UTC (rev 97) @@ -72,9 +72,6 @@ <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> @@ -88,22 +85,6 @@ <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> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsWithoutQuotation.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsWithoutQuotation.jsp 2011-04-21 09:31:10 UTC (rev 96) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsWithoutQuotation.jsp 2011-04-21 12:49:11 UTC (rev 97) @@ -21,7 +21,10 @@ <s:url action="projectDetails" var="projectDetails"> <s:param name="projectId"><%= project.getWikittyId() %></s:param> </s:url> - <a href="${projectDetails}"><%= project.getName() %></a><br /> + <s:url namespace="/billy" action="addQuotationInput" var="addQuotation"> + <s:param name="projectId"><%= project.getWikittyId() %></s:param> + </s:url> + <a href="${projectDetails}"><%= project.getName() %></a> (<a href="${addQuotation}"><s:text name="chorem.billy.quotation.add" /></a>)<br /> <% } %> </p> </body> Modified: trunk/chorem-web/src/main/webapp/css/style.css =================================================================== --- trunk/chorem-web/src/main/webapp/css/style.css 2011-04-21 09:31:10 UTC (rev 96) +++ trunk/chorem-web/src/main/webapp/css/style.css 2011-04-21 12:49:11 UTC (rev 97) @@ -7,12 +7,13 @@ } #header { - margin-bottom:10px; + margin-bottom:10px; + text-align:center; } #content { margin-left:220px; - margin-top:20px; + margin-top:20px; } #menu { @@ -24,5 +25,6 @@ } #footer { - clear:left; + clear:left; + text-align:center; } \ No newline at end of file

1 0