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