Author: vbriand Date: 2011-04-08 17:25:28 +0200 (Fri, 08 Apr 2011) New Revision: 74 Url: http://chorem.org/repositories/revision/chorem/74 Log: The tasks are now displayed on the project order's page 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/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp 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-08 14:51:52 UTC (rev 73) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-08 15:25:28 UTC (rev 74) @@ -124,6 +124,12 @@ chorem.gepeto.projectOrderDetails.companyName= chorem.gepeto.projectOrderDetails.endDate= chorem.gepeto.projectOrderDetails.quotation= +chorem.gepeto.projectOrderDetails.task.beginDate= +chorem.gepeto.projectOrderDetails.task.endDate= +chorem.gepeto.projectOrderDetails.task.name= +chorem.gepeto.projectOrderDetails.task.price= +chorem.gepeto.projectOrderDetails.task.status= +chorem.gepeto.projectOrderDetails.tasks= chorem.gepeto.projectOrderDetails.title= chorem.gepeto.projectOrderDetails.type= chorem.gepeto.projects=Get the projects list @@ -151,4 +157,5 @@ 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-08 14:51:52 UTC (rev 73) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-08 15:25:28 UTC (rev 74) @@ -119,6 +119,12 @@ chorem.gepeto.projectOrderDetails.companyName=Nom de la soci\u00E9t\u00E9 \: {0} chorem.gepeto.projectOrderDetails.endDate=Date de fin \: {0} 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} +chorem.gepeto.projectOrderDetails.task.name=Nom de la t\u00E2che \: {0} +chorem.gepeto.projectOrderDetails.task.price=Prix de la t\u00E2che \: {0} +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.projects=Obtenir la liste des projets @@ -146,4 +152,5 @@ 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/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp 2011-04-08 14:51:52 UTC (rev 73) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp 2011-04-08 15:25:28 UTC (rev 74) @@ -49,5 +49,37 @@ <s:text name="chorem.gepeto.task.add" /> </a> </p> + <p> + <s:text name="chorem.gepeto.projectOrderDetails.tasks" /> + <br /> + <br /> + <% + List<Task> tasks = ProjectOrderAction.getAction().getTasks(); + + for (Task task : tasks) { + %> + <s:text name="chorem.gepeto.projectOrderDetails.task.name"> + <s:param><%= task.getName() %></s:param> + </s:text> + <br /> + <s:text name="chorem.gepeto.projectOrderDetails.task.status"> + <s:param><%= task.getStatus() %></s:param> + </s:text> + <br /> + <s:text name="chorem.gepeto.projectOrderDetails.task.price"> + <s:param><%= task.getPrice() %></s:param> + </s:text> + <br /> + <s:text name="chorem.gepeto.projectOrderDetails.task.beginDate"> + <s:param><%= task.getBeginDate() %></s:param> + </s:text> + <br /> + <s:text name="chorem.gepeto.projectOrderDetails.task.endDate"> + <s:param><%= task.getEndDate() %></s:param> + </s:text> + <br /> + <br /> + <% } %> + </p> </body> </html>