Author: vbriand Date: 2011-04-22 17:39:17 +0200 (Fri, 22 Apr 2011) New Revision: 110 Url: http://chorem.org/repositories/revision/chorem/110 Log: The dates are now formatted and easier to read Added: trunk/chorem-web/src/main/java/org/chorem/JspUtils.java Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp Added: trunk/chorem-web/src/main/java/org/chorem/JspUtils.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/JspUtils.java (rev 0) +++ trunk/chorem-web/src/main/java/org/chorem/JspUtils.java 2011-04-22 15:39:17 UTC (rev 110) @@ -0,0 +1,25 @@ +package org.chorem; + +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * Convenient static methods to format output on jsp pages + * + * @author vbriand + */ +public class JspUtils { + /** + * Formats a full date to something easily readable + * + * @param date + * @return the formatted date + */ + public static String dateFormat(Date date) { + String dateReturn; + SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); + + dateReturn = formatter.format(date); + return dateReturn; + } +} Property changes on: trunk/chorem-web/src/main/java/org/chorem/JspUtils.java ___________________________________________________________________ Added: svn:mime-type + text/plain 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 15:06:34 UTC (rev 109) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp 2011-04-22 15:39:17 UTC (rev 110) @@ -1,6 +1,7 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@page import="org.chorem.billy.action.QuotationAction" %> <%@page import="org.chorem.entities.ProjectOrder" %> +<%@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" @@ -52,10 +53,10 @@ <a href="${projectOrderDetails}"> <s:text name="chorem.gepeto.projectDetails.projectOrder"> <s:param> - <%= projectOrder.getBeginDate() %> + <%= JspUtils.dateFormat(projectOrder.getBeginDate()) %> </s:param> <s:param> - <%= projectOrder.getEndDate() %> + <%= JspUtils.dateFormat(projectOrder.getEndDate()) %> </s:param> </s:text> </a> 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 15:06:34 UTC (rev 109) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp 2011-04-22 15:39:17 UTC (rev 110) @@ -2,6 +2,7 @@ <%@page import="java.util.List" %> <%@page import="org.chorem.entities.Person" %> <%@page import="org.chorem.bonzoms.action.CompanyAction" %> +<%@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" @@ -50,7 +51,7 @@ for (Person employee : employees) { %> <%= employee.getFirstName() %> <%= employee.getLastName() %><br /> - <%= employee.getBirthDate() %><br /> + <%= JspUtils.dateFormat(employee.getBirthDate()) %><br /> <%= employee.getEmail() %><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:06:34 UTC (rev 109) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp 2011-04-22 15:39:17 UTC (rev 110) @@ -3,6 +3,7 @@ <%@page import="org.chorem.entities.ProjectOrder" %> <%@page import="org.chorem.entities.Quotation" %> <%@page import="org.chorem.gepeto.action.ProjectAction" %> +<%@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" @@ -56,10 +57,10 @@ <a href="${projectOrderDetails}"> <s:text name="chorem.gepeto.projectDetails.projectOrder"> <s:param> - <%= projectOrder.getBeginDate() %> + <%= JspUtils.dateFormat(projectOrder.getBeginDate()) %> </s:param> <s:param> - <%= projectOrder.getEndDate() %> + <%= JspUtils.dateFormat(projectOrder.getEndDate()) %> </s:param> </s:text> </a> @@ -84,7 +85,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> 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 15:06:34 UTC (rev 109) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp 2011-04-22 15:39:17 UTC (rev 110) @@ -2,6 +2,7 @@ <%@page import="java.util.List" %> <%@page import="org.chorem.entities.Task" %> <%@page import="org.chorem.gepeto.action.ProjectOrderAction" %> +<%@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" @@ -74,11 +75,11 @@ </s:text> <br /> <s:text name="chorem.gepeto.projectOrderDetails.task.beginDate"> - <s:param><%= task.getBeginDate() %></s:param> + <s:param><%= JspUtils.dateFormat(task.getBeginDate()) %></s:param> </s:text> <br /> <s:text name="chorem.gepeto.projectOrderDetails.task.endDate"> - <s:param><%= task.getEndDate() %></s:param> + <s:param><%= JspUtils.dateFormat(task.getEndDate()) %></s:param> </s:text> <br /> <br /> 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-22 15:06:34 UTC (rev 109) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp 2011-04-22 15:39:17 UTC (rev 110) @@ -4,6 +4,7 @@ <%@page import="org.chorem.entities.Project" %> <%@page import="org.chorem.gepeto.ProjectOrderFull" %> <%@page import="org.chorem.gepeto.action.ProjectAction" %> +<%@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" @@ -59,8 +60,8 @@ } %> </td> - <td><%= project.getProjectOrder().getBeginDate() %></td> - <td><%= project.getProjectOrder().getEndDate() %></td> + <td><%= JspUtils.dateFormat(project.getProjectOrder().getBeginDate()) %></td> + <td><%= JspUtils.dateFormat(project.getProjectOrder().getEndDate()) %></td> </tr> <% } %> </tbody>