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

r108 - in trunk/chorem-web/src/main: java/org/chorem/billy/action java/org/chorem/bonzoms/action java/org/chorem/gepeto/action resources resources/i18n webapp/WEB-INF/jsp/billy webapp/WEB-INF/jsp/gepeto
by vbriand＠users.chorem.org April 22, 2011

April 22, 2011

Author: vbriand Date: 2011-04-22 17:00:28 +0200 (Fri, 22 Apr 2011) New Revision: 108 Url: http://chorem.org/repositories/revision/chorem/108 Log: The project order can now be modified 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/gepeto/action/ProjectAction.java trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 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/quotationDetails.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.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-22 13:20:52 UTC (rev 107) +++ trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java 2011-04-22 15:00:28 UTC (rev 108) @@ -139,6 +139,7 @@ quotation.setAmount(Double.parseDouble(amount)); quotation.setVTA(Double.parseDouble(vta)); + //Lenient mode disabled because results may be very odd formatter.setLenient(false); try { quotation.setPostedDate(formatter.parse(postedDate)); 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 13:20:52 UTC (rev 107) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java 2011-04-22 15:00:28 UTC (rev 108) @@ -159,7 +159,6 @@ newContactDetails.setValue(phoneNb); newContactDetails.setTarget(company.getWikittyId()); proxy.store(newContactDetails); - System.out.println(newContactDetails); } //Website added 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 13:20:52 UTC (rev 107) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-04-22 15:00:28 UTC (rev 108) @@ -251,7 +251,6 @@ projectFull.setQuotation(quotation); project = proxy.restore(Project.class, quotation.getProject()); projectFull.setProject(project); - System.out.println(project.getName()+"]]]"+project.getWikittyId()); projects.add(projectFull); } } 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 13:20:52 UTC (rev 107) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 2011-04-22 15:00:28 UTC (rev 108) @@ -104,14 +104,16 @@ projectOrderId); if (projectOrder != null) { //If the projectOrderId exists - setBeginDate(projectOrder.getBeginDate().toString()); + SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); + setBeginDate(formatter.format(projectOrder.getBeginDate())); + Company company = proxy.restore(Company.class, projectOrder.getCompany()); setCompany(company); setDescription(projectOrder.getDescription()); - setEstimatedEndDate(projectOrder.getEndDate().toString()); + setEstimatedEndDate(formatter.format(projectOrder.getEndDate())); setStatus(projectOrder.getStatus()); setType(projectOrder.getType()); @@ -132,6 +134,68 @@ return result; } + /** + * Modifies the project order's information + * + * @return SUCCESS if the project has been modified successfully, + * INPUT if the date format is incorrect, + * ERROR if the id is invalid + */ + public String modify() { + String result = SUCCESS; + ProjectOrder projectOrder; + ChoremProxy proxy = getChoremProxy(); + + projectOrder = proxy.restore(ProjectOrder.class, projectOrderId); + if (projectOrder != null) { //If the id exists + SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); + + //This is tested manually instead of using a validator because + //otherwise the company is not set (the validator returns INPUT and + //does not launch any method) and it leads to a null pointer + //exception + if (type.isEmpty()) { + result = INPUT; + addFieldError("type", getText(n_("chorem.field.required"))); + } + if (beginDate.isEmpty()) { + result = INPUT; + addFieldError("beginDate", getText(n_("chorem.field.required"))); + } + if (estimatedEndDate.isEmpty()) { + result = INPUT; + addFieldError("endDate", getText(n_("chorem.field.required"))); + } + + //Lenient mode disabled because results may be very odd + formatter.setLenient(false); + try { + projectOrder.setBeginDate(formatter.parse(beginDate)); + } catch (ParseException e) { + result = INPUT; + addFieldError("beginDate", getText(n_("chorem.date.wrongFormat"))); + } + try { + projectOrder.setEndDate(formatter.parse(estimatedEndDate)); + } catch (ParseException e) { + result = INPUT; + addFieldError("estimatedEndDate", getText(n_("chorem.date.wrongFormat"))); + } + projectOrder.setType(type); + if (result.equals(SUCCESS)) { + proxy.store(projectOrder); + } else if (result.equals(INPUT)) { + Company company = proxy.restore(Company.class, + projectOrder.getCompany()); + + setCompany(company); + } + } else { + result = ERROR; + } + return result; + } + protected String type; protected String description; protected String status; 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 13:20:52 UTC (rev 107) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-22 15:00:28 UTC (rev 108) @@ -106,9 +106,9 @@ chorem.gepeto.projectOrder.invalidCompany= chorem.gepeto.projectOrder.status=Statut chorem.gepeto.projectOrder.type=Type -chorem.gepeto.projectOrderDetails.beginDate=Date de d\u00E9but \: {0} +chorem.gepeto.projectOrderDetails.beginDate=Date de d\u00E9but chorem.gepeto.projectOrderDetails.companyName=Nom de la soci\u00E9t\u00E9 \: {0} -chorem.gepeto.projectOrderDetails.endDate=Date de fin \: {0} +chorem.gepeto.projectOrderDetails.endDate=Date de fin chorem.gepeto.projectOrderDetails.quotation=Contrat r\u00E9alis\u00E9 sur la base du devis \#{0} chorem.gepeto.projectOrderDetails.task.beginDate=D\u00E9but de la t\u00E2che \: {0} chorem.gepeto.projectOrderDetails.task.endDate=Fin de la t\u00E2che \: {0} @@ -117,7 +117,7 @@ chorem.gepeto.projectOrderDetails.task.status=Statut de la t\u00E2che \: {0} chorem.gepeto.projectOrderDetails.tasks=T\u00E2ches li\u00E9es au contrat chorem.gepeto.projectOrderDetails.title=D\u00E9tails du contrat -chorem.gepeto.projectOrderDetails.type=Type de contrat \: {0} +chorem.gepeto.projectOrderDetails.type=Type de contrat chorem.gepeto.projects=Liste des projets chorem.gepeto.projectsByYear.thead.company=Demandeur chorem.gepeto.projectsByYear.thead.end=Fin Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-04-22 13:20:52 UTC (rev 107) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-04-22 15:00:28 UTC (rev 108) @@ -124,12 +124,22 @@ </action> <action name="modifyProject" class="org.chorem.gepeto.action.ProjectAction" method="modify"> <result name="input">/WEB-INF/jsp/gepeto/projectDetails.jsp</result> + <result name="error" type="redirectAction">home</result> <result type="redirectAction"> <param name="actionName">projectDetails</param> <param name="namespace">/gepeto</param> <param name="projectId">${projectId}</param> </result> </action> + <action name="modifyProjectOrder" class="org.chorem.gepeto.action.ProjectOrderAction" method="modify"> + <result name="input">/WEB-INF/jsp/gepeto/projectOrderDetails.jsp</result> + <result name="error" type="redirectAction">home</result> + <result type="redirectAction"> + <param name="actionName">projectOrderDetails</param> + <param name="namespace">/gepeto</param> + <param name="projectOrderId">${projectOrderId}</param> + </result> + </action> </package> <package name="billy" namespace="/billy" extends="struts-default"> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp 2011-04-22 13:20:52 UTC (rev 107) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp 2011-04-22 15:00:28 UTC (rev 108) @@ -31,7 +31,7 @@ <br /> <s:textfield name="vta" key="chorem.billy.quotation.vta" labelSeparator=": " size="2" />% <br /> - <s:textfield name="postedDate" key="chorem.billy.quotation.postedDate" labelSeparator=": " /> + <s:textfield name="postedDate" key="chorem.billy.quotation.postedDate" labelSeparator=": " size="7" /> <br /> <s:submit key="chorem.misc.modify" name="modify" /> </p> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp 2011-04-22 13:20:52 UTC (rev 107) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp 2011-04-22 15:00:28 UTC (rev 108) @@ -14,19 +14,7 @@ </head> <body> <p> - <s:text name="chorem.gepeto.projectOrderDetails.beginDate"> - <s:param><%= ProjectOrderAction.getAction().getBeginDate() %></s:param> - </s:text> - <br /> - <s:text name="chorem.gepeto.projectOrderDetails.endDate"> - <s:param><%= ProjectOrderAction.getAction().getEstimatedEndDate() %></s:param> - </s:text> - <br /> - <s:text name="chorem.gepeto.projectOrderDetails.type"> - <s:param><%= ProjectOrderAction.getAction().getType() %></s:param> - </s:text> - <br /> - <s:url namespace="/bonzoms" action="companyDetails" var="companyDetails"> + <s:url namespace="/bonzoms" action="companyDetails" var="companyDetails"> <s:param name="companyId"><%= ProjectOrderAction.getAction().getCompany().getWikittyId() %></s:param> </s:url> <s:text name="chorem.gepeto.projectOrderDetails.companyName"> @@ -43,11 +31,23 @@ <a href="${quotationDetails}"><%= ProjectOrderAction.getAction().getQuotationReference() %></a> </s:param> </s:text> + <s:url action="modifyProjectOrder" var="modifyProjectOrder"> + <s:param name="projectOrderId"><%= ProjectOrderAction.getAction().getProjectOrderId() %></s:param> + </s:url> + <form action="${modifyProjectOrder}" method="post"> + <p> + <s:textfield name="beginDate" key="chorem.gepeto.projectOrderDetails.beginDate" labelSeparator=": " size="7" /> + <br /> + <s:textfield name="estimatedEndDate" key="chorem.gepeto.projectOrderDetails.endDate" labelSeparator=": " size="7" /> + <br /> + <s:textfield name="type" key="chorem.gepeto.projectOrderDetails.type" labelSeparator=": " size="4" /> + <br /> + <s:submit key="chorem.misc.modify" name="modify" /> + </p> + </form> <s:url namespace="/gepeto" action="addTaskInput" var="addTask"> <s:param name="projectOrderId"><%= ProjectOrderAction.getAction().getProjectOrderId() %></s:param> </s:url> - <br /> - <br /> <a href="${addTask}"> <s:text name="chorem.gepeto.task.add" /> </a>

1 0

r107 - in trunk/chorem-web/src/main: java/org/chorem/billy/action java/org/chorem/bonzoms/action java/org/chorem/gepeto/action resources resources/org/chorem/billy/action webapp/WEB-INF/jsp/billy
by vbriand＠users.chorem.org April 22, 2011

April 22, 2011

Author: vbriand Date: 2011-04-22 15:20:52 +0200 (Fri, 22 Apr 2011) New Revision: 107 Url: http://chorem.org/repositories/revision/chorem/107 Log: The quotation can now be modified Added: trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-modifyQuotation-validation.xml 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/gepeto/action/ProjectAction.java trunk/chorem-web/src/main/resources/struts.xml trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.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-22 12:36:51 UTC (rev 106) +++ trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java 2011-04-22 13:20:52 UTC (rev 107) @@ -101,11 +101,13 @@ Quotation quotation = proxy.restore(Quotation.class, quotationId); if (quotation != null) { //If the quotationId exists + SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); + setReference(quotation.getReference()); setDescription(quotation.getDescription()); setAmount(String.valueOf(quotation.getAmount())); setVta(String.valueOf(quotation.getVTA())); - setPostedDate(quotation.getPostedDate().toString()); + setPostedDate(formatter.format(quotation.getPostedDate())); setProjectId(quotation.getProject()); } else { result = ERROR; @@ -118,6 +120,41 @@ return result; } + /** + * Modifies the quotation's information + * + * @return SUCCESS if the quotation has been successfully modified, + * INPUT if the date format is incorrect, + * ERROR if the id is invalid + */ + public String modify() { + String result = SUCCESS; + Quotation quotation; + ChoremProxy proxy = getChoremProxy(); + SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); + + quotation = proxy.restore(Quotation.class, quotationId); + if (quotation != null) { //If the id exists + quotation.setDescription(description); + quotation.setAmount(Double.parseDouble(amount)); + quotation.setVTA(Double.parseDouble(vta)); + + formatter.setLenient(false); + try { + quotation.setPostedDate(formatter.parse(postedDate)); + } catch (ParseException e) { + result = INPUT; + addFieldError("postedDate", getText(n_("chorem.date.wrongFormat"))); + } + if (result.equals(SUCCESS)) { + proxy.store(quotation); + } + } else { + result = ERROR; + } + return result; + } + protected String projectId; protected String projectName; protected String reference; 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 12:36:51 UTC (rev 106) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java 2011-04-22 13:20:52 UTC (rev 107) @@ -108,10 +108,10 @@ } /** - * Modifies the company information + * Modifies the company's information * - * @return SUCCESS if the modification was successful, - * ERROR otherwise + * @return SUCCESS if the company has been modified, + * ERROR if the id is invalid */ public String modify() { String result = SUCCESS; @@ -119,58 +119,63 @@ 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( + if (company != null) { //If the id exists + 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; + 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); } - 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(); + //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); + } - 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); + //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); + } + } else { + result = ERROR; } 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 12:36:51 UTC (rev 106) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-04-22 13:20:52 UTC (rev 107) @@ -124,14 +124,24 @@ return result; } + /** + * Modifies the project's information + * + * @return SUCCESS if the project has been successfully modified, + * ERROR if the id is invalid + */ public String modify() { String result = SUCCESS; Project project; ChoremProxy proxy = getChoremProxy(); project = proxy.restore(Project.class, projectId); - project.setDescription(description); - proxy.store(project); + if (project != null) { //If the id exists + project.setDescription(description); + proxy.store(project); + } else { + result = ERROR; + } return result; } Added: trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-modifyQuotation-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-modifyQuotation-validation.xml (rev 0) +++ trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-modifyQuotation-validation.xml 2011-04-22 13:20:52 UTC (rev 107) @@ -0,0 +1,38 @@ +<!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> + <field name="amount"> + <field-validator type="requiredstring"> + <message key="chorem.field.required" /> + </field-validator> + <field-validator type="regex"> + <param name="expression"><![CDATA[([0-9]+)([\.,][0-9]+)?]]></param> + <message key="chorem.billy.quotation.amount.wrongFormat" /> + </field-validator> + </field> + <field name="vta"> + <field-validator type="requiredstring"> + <message key="chorem.field.required" /> + </field-validator> + <field-validator type="regex"> + <param name="expression"><![CDATA[([0-9]+)([\.,][0-9]+)?]]></param> + <message key="chorem.billy.quotation.vta.wrongFormat" /> + </field-validator> + </field> + <field name="postedDate"> + <field-validator type="requiredstring"> + <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> + <message key="chorem.date.wrongFormat" /> + </field-validator> + </field> +</validators> Property changes on: trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-modifyQuotation-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:36:51 UTC (rev 106) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-04-22 13:20:52 UTC (rev 107) @@ -154,6 +154,15 @@ <result name="error" type="redirectAction">home</result> <result>/WEB-INF/jsp/billy/quotationDetails.jsp</result> </action> + <action name="modifyQuotation" class="org.chorem.billy.action.QuotationAction" method="modify"> + <result name="input">/WEB-INF/jsp/billy/quotationDetails.jsp</result> + <result name="error" type="redirectAction">home</result> + <result type="redirectAction"> + <param name="actionName">quotationDetails</param> + <param name="namespace">/billy</param> + <param name="quotationId">${quotationId}</param> + </result> + </action> </package> <!--<package name="cash" namespace="/cash" extends="struts-default"> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp 2011-04-22 12:36:51 UTC (rev 106) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp 2011-04-22 13:20:52 UTC (rev 107) @@ -19,17 +19,26 @@ <s:param><%= QuotationAction.getAction().getReference() %></s:param> </s:text> </h2> + <s:url action="modifyQuotation" var="modifyQuotation"> + <s:param name="quotationId"><%= QuotationAction.getAction().getQuotationId() %></s:param> + </s:url> + <form action="${modifyQuotation}" method="post"> + <p> + <s:textarea name="description" key="chorem.billy.quotation.description" cols="50" rows="10" labelposition="top" labelSeparator=": " /> + <br /> + <br /> + <s:textfield name="amount" key="chorem.billy.quotation.amount" labelSeparator=": " size="5" /> + <br /> + <s:textfield name="vta" key="chorem.billy.quotation.vta" labelSeparator=": " size="2" />% + <br /> + <s:textfield name="postedDate" key="chorem.billy.quotation.postedDate" labelSeparator=": " /> + <br /> + <s:submit key="chorem.misc.modify" name="modify" /> + </p> + </form> <p> - <s:textarea readonly="true" name="description" key="chorem.billy.quotation.description" cols="50" rows="10" labelposition="top" labelSeparator=": " /> <br /> <br /> - <s:textfield readonly="true" name="amount" key="chorem.billy.quotation.amount" labelSeparator=": " /> - <br /> - <s:textfield readonly="true" name="vta" key="chorem.billy.quotation.vta" labelSeparator=": " /> - <br /> - <s:textfield readonly="true" name="postedDate" key="chorem.billy.quotation.postedDate" labelSeparator=": " /> - <br /> - <br /> <% ProjectOrder projectOrder = QuotationAction.getAction().getProjectOrder();

1 0

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 April 22, 2011

April 22, 2011

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 April 22, 2011

April 22, 2011

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 April 22, 2011

April 22, 2011

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 April 22, 2011

April 22, 2011

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 April 22, 2011

April 22, 2011

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 April 22, 2011

April 22, 2011

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 April 21, 2011

April 21, 2011

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 April 21, 2011

April 21, 2011

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