Author: vbriand Date: 2011-04-28 10:10:35 +0200 (Thu, 28 Apr 2011) New Revision: 111 Url: http://chorem.org/repositories/revision/chorem/111 Log: Added missing date formatting and reduced some fields' size Modified: trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addPerson.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.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 15:39:17 UTC (rev 110) +++ trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java 2011-04-28 08:10:35 UTC (rev 111) @@ -2,6 +2,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.List; import java.util.UUID; @@ -392,4 +393,18 @@ public void setCustomerId(String customerId) { this.customerId = customerId; } + + /** + * Returns the current date + * + * @return the current date in a string + */ + public String getDayDate() { + Calendar calendar = Calendar.getInstance(); + SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); + String dayDate; + + dayDate = formatter.format(calendar.getTime()); + return dayDate; + } } 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 15:39:17 UTC (rev 110) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 2011-04-28 08:10:35 UTC (rev 111) @@ -184,6 +184,7 @@ result = INPUT; addFieldError("estimatedEndDate", getText(n_("chorem.date.wrongFormat"))); } + //TODO:tester si la date de fin est > à la date de début projectOrder.setType(type); if (result.equals(SUCCESS)) { proxy.store(projectOrder); 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 15:39:17 UTC (rev 110) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp 2011-04-28 08:10:35 UTC (rev 111) @@ -3,6 +3,7 @@ <%@page import="org.chorem.bonzoms.EmployeeFull" %> <%@page import="org.chorem.entities.Person" %> <%@page import="org.chorem.billy.action.QuotationAction" %> +<%@page import="org.chorem.JspUtils" %> <%@taglib prefix="s" uri="/struts-tags" %> <html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" @@ -34,7 +35,7 @@ <br /> <s:textfield key="chorem.billy.quotation.vta" name="vta" labelSeparator=": " size="2" />% <br /> - <s:textfield key="chorem.billy.quotation.postedDate" name="postedDate" labelSeparator=": " size="7" /> + <s:textfield key="chorem.billy.quotation.postedDate" name="postedDate" labelSeparator=": " size="7" value="%{dayDate}" /> <br /> <label for="supplierId" class="label"><s:text name="chorem.billy.quotation.supplier" />: </label> <select name="supplierId" id="supplierId"> @@ -43,7 +44,7 @@ for (EmployeeFull employee : employees) { %> - <option value="<%= employee.getEmployee().getWikittyId() %>"><%= employee.getCompany().getName() %> - <%= employee.getPerson().getLastName() %> <%= employee.getPerson().getFirstName() %> (<%= employee.getPerson().getBirthDate() %>)</option> + <option value="<%= employee.getEmployee().getWikittyId() %>"><%= employee.getCompany().getName() %> - <%= employee.getPerson().getLastName() %> <%= employee.getPerson().getFirstName() %> (<%= JspUtils.dateFormat(employee.getPerson().getBirthDate()) %>)</option> <% } %> </select> <br /> @@ -52,7 +53,7 @@ <% for (EmployeeFull employee : employees) { %> - <option value="<%= employee.getEmployee().getWikittyId() %>"><%= employee.getCompany().getName() %> - <%= employee.getPerson().getLastName() %> <%= employee.getPerson().getFirstName() %> (<%= employee.getPerson().getBirthDate() %>)</option> + <option value="<%= employee.getEmployee().getWikittyId() %>"><%= employee.getCompany().getName() %> - <%= employee.getPerson().getLastName() %> <%= employee.getPerson().getFirstName() %> (<%= JspUtils.dateFormat(employee.getPerson().getBirthDate()) %>)</option> <% } %> </select> <br /> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addPerson.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addPerson.jsp 2011-04-22 15:39:17 UTC (rev 110) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addPerson.jsp 2011-04-28 08:10:35 UTC (rev 111) @@ -20,21 +20,21 @@ <br /> <s:textfield key="chorem.bonzoms.person.email" name="email" labelSeparator=": " /> <br /> - <s:textfield key="chorem.bonzoms.person.birthDate" name="birthDate" labelSeparator=": " /> + <s:textfield key="chorem.bonzoms.person.birthDate" name="birthDate" labelSeparator=": " size="7" /> <br /> <br /> <s:textfield key="chorem.bonzoms.person.addressLine1" name="addressLine1" labelSeparator=": " /> <br /> <s:textfield key="chorem.bonzoms.person.addressLine2" name="addressLine2" labelSeparator=": " /> <br /> - <s:textfield key="chorem.bonzoms.person.postcode" name="postcode" labelSeparator=": " /> + <s:textfield key="chorem.bonzoms.person.postcode" name="postcode" labelSeparator=": " size="5" /> <br /> <s:textfield key="chorem.bonzoms.person.city" name="city" labelSeparator=": " /> <br /> <s:textfield key="chorem.bonzoms.person.country" name="country" labelSeparator=": " /> <br /> <br /> - <s:textfield key="chorem.bonzoms.person.phoneNb" name="phoneNb" labelSeparator=": " /> + <s:textfield key="chorem.bonzoms.person.phoneNb" name="phoneNb" labelSeparator=": " size="8" /> </fieldset> <br /> <fieldset> @@ -54,13 +54,13 @@ <br /> <s:textarea key="chorem.bonzoms.employmentContract.description" name="contractDescription" rows="10" cols="50" labelposition="top" /> <br /> - <s:textfield key="chorem.bonzoms.employmentContract.salary" name="contractSalary" labelSeparator=": " /> + <s:textfield key="chorem.bonzoms.employmentContract.salary" name="contractSalary" labelSeparator=": " size="4" /> <br /> - <s:textfield key="chorem.bonzoms.employmentContract.workingTime" name="contractWorkingTime" labelSeparator=": " /> + <s:textfield key="chorem.bonzoms.employmentContract.workingTime" name="contractWorkingTime" labelSeparator=": " size="1" /> <br /> - <s:textfield key="chorem.bonzoms.employmentContract.beginDate" name="contractBeginDate" labelSeparator=": " /> + <s:textfield key="chorem.bonzoms.employmentContract.beginDate" name="contractBeginDate" labelSeparator=": " size="7" /> <br /> - <s:textfield key="chorem.bonzoms.employmentContract.endDate" name="contractEndDate" labelSeparator=": " /> + <s:textfield key="chorem.bonzoms.employmentContract.endDate" name="contractEndDate" labelSeparator=": " size="7" /> </fieldset> </fieldset> <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 15:39:17 UTC (rev 110) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp 2011-04-28 08:10:35 UTC (rev 111) @@ -112,7 +112,7 @@ </s:url> <s:text name="chorem.gepeto.projectDetails.quotation"> <s:param> - <%= quotation.getPostedDate() %> + <%= JspUtils.dateFormat(quotation.getPostedDate()) %> </s:param> <s:param> <a href="${quotationDetails}"><%= quotation.getReference() %></a>