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

r68 - trunk/chorem-web/src/main/java/org/chorem/gepeto/action
by vbriand＠users.chorem.org 08 Apr '11

08 Apr '11

Author: vbriand Date: 2011-04-08 11:11:46 +0200 (Fri, 08 Apr 2011) New Revision: 68 Url: http://chorem.org/repositories/revision/chorem/68 Log: Added a test to forbid access to the project order's page for a quotation if it is already linked with another project order Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 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-08 08:51:36 UTC (rev 67) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 2011-04-08 09:11:46 UTC (rev 68) @@ -9,8 +9,11 @@ import org.apache.commons.logging.LogFactory; import org.chorem.ChoremProxy; import org.chorem.action.BaseAction; +import org.chorem.entities.ProjectOrder; import org.chorem.entities.ProjectOrderImpl; import org.chorem.entities.Quotation; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.Search; import com.opensymphony.xwork2.ActionContext; import static org.nuiton.i18n.I18n.n_; @@ -50,7 +53,8 @@ Quotation quotation = proxy.restore(Quotation.class, quotationId); - if (quotation == null) { //If the quotationId doesn't exist + //If the quotationId doesn't exist or if the quotation already has a project order + if (quotation == null || quotationHasProjectOrder(quotation)) { result = ERROR; } else { quotationReference = quotation.getReference(); @@ -138,6 +142,23 @@ } return result; } + + /** + * Tests if a quotation already has a project order + * + * @param quotation + * @return true if the quotation already has a project order, false otherwise + */ + protected boolean quotationHasProjectOrder(Quotation quotation) { + ChoremProxy proxy = getChoremProxy(); + Search search = Search.query(); + Criteria criteria = search.eq(ProjectOrder.FQ_FIELD_PROJECTORDER_QUOTATION, + quotationId).criteria(); + ProjectOrder result = proxy.findByCriteria(ProjectOrder.class, criteria); + boolean hasProjectOrder = (result != null); + + return hasProjectOrder; + } /** * @return the type

1 0

r67 - in trunk/chorem-web/src/main: resources resources/i18n webapp/WEB-INF/jsp/gepeto
by vbriand＠users.chorem.org 08 Apr '11

08 Apr '11

Author: vbriand Date: 2011-04-08 10:51:36 +0200 (Fri, 08 Apr 2011) New Revision: 67 Url: http://chorem.org/repositories/revision/chorem/67 Log: When a project order is added to a quotation, the user is now redirected to the quotation's page instead of the home 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/resources/struts.xml trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.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 08:38:00 UTC (rev 66) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-08 08:51:36 UTC (rev 67) @@ -96,6 +96,7 @@ 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.noQuotations=No quotations chorem.gepeto.projectDetails.quotation=Quotation of {0} (ref. {1}) chorem.gepeto.projectDetails.quotationWithProjectOrder=Project''s quotation with project order chorem.gepeto.projectDetails.quotationsWithoutProjectOrder=Project''s quotations without project order 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 08:38:00 UTC (rev 66) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-08 08:51:36 UTC (rev 67) @@ -91,6 +91,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.noQuotations=Pas de devis chorem.gepeto.projectDetails.quotation=Devis du {0} (r\u00E9f. {1}) chorem.gepeto.projectDetails.quotationWithProjectOrder=Devis du projet avec un contrat chorem.gepeto.projectDetails.quotationsWithoutProjectOrder=Devis du projet sans contrat Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-04-08 08:38:00 UTC (rev 66) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-04-08 08:51:36 UTC (rev 67) @@ -83,7 +83,11 @@ <action name="addProjectOrder" class="org.chorem.gepeto.action.ProjectOrderAction" method="add"> <result name="input">/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result> <result name="error">/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result> - <result type="redirectAction">home</result> + <result type="redirectAction"> + <param name="actionName">quotationDetails</param> + <param name="namespace">/billy</param> + <param name="quotationId">${quotationId}</param> + </result> </action> <action name="getProjectsByYear" class="org.chorem.gepeto.action.ProjectAction"> <result>/WEB-INF/jsp/gepeto/projectsByYear.jsp</result> 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-08 08:38:00 UTC (rev 66) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp 2011-04-08 08:51:36 UTC (rev 67) @@ -36,6 +36,11 @@ <% List<Quotation> quotationsProjectOrder = ProjectAction.getAction().getAttachedQuotationsWithProjectOrder(); + if (quotationsProjectOrder.isEmpty()) { + %> + <s:text name="chorem.gepeto.projectDetails.noQuotations" /><br /> + <% + } for (Quotation quotation : quotationsProjectOrder) { %> <s:url namespace="/billy" action="quotationDetails" var="quotationDetails"> @@ -58,6 +63,11 @@ <% List<Quotation> quotations = ProjectAction.getAction().getAttachedQuotationsWithoutProjectOrder(); + if (quotations.isEmpty()) { + %> + <s:text name="chorem.gepeto.projectDetails.noQuotations" /><br /> + <% + } for (Quotation quotation : quotations) { %> <s:url namespace="/billy" action="quotationDetails" var="quotationDetails">

1 0

r66 - in trunk/chorem-web/src/main: java/org/chorem/gepeto/action webapp/WEB-INF/jsp/gepeto
by vbriand＠users.chorem.org 08 Apr '11

08 Apr '11

Author: vbriand Date: 2011-04-08 10:38:00 +0200 (Fri, 08 Apr 2011) New Revision: 66 Url: http://chorem.org/repositories/revision/chorem/66 Log: New method to get the quotations without project order Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 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-08 07:56:14 UTC (rev 65) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-04-08 08:38:00 UTC (rev 66) @@ -1,6 +1,7 @@ package org.chorem.gepeto.action; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.UUID; @@ -184,8 +185,13 @@ * @return the quotations without a project order */ public List<Quotation> getAttachedQuotationsWithoutProjectOrder() { - //TODO: implement - return null; + Collection<Quotation> allQuotations = new ArrayList<Quotation>(getAttachedQuotations()); + + //Gets all quotations and removes the ones with a project order + allQuotations.removeAll(getAttachedQuotationsWithProjectOrder()); + List<Quotation> withoutProjectOrder = (List<Quotation>)allQuotations; + + return withoutProjectOrder; } /** 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-08 07:56:14 UTC (rev 65) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp 2011-04-08 08:38:00 UTC (rev 66) @@ -56,8 +56,7 @@ <br /> <br /> <% - //TODO: change to getAttachedQuotationsWithoutProjectOrder when it will be implemented - List<Quotation> quotations = ProjectAction.getAction().getAttachedQuotations(); + List<Quotation> quotations = ProjectAction.getAction().getAttachedQuotationsWithoutProjectOrder(); for (Quotation quotation : quotations) { %>

1 0

r65 - in trunk/chorem-web/src/main/webapp/template: simple xhtml
by vbriand＠users.chorem.org 08 Apr '11

08 Apr '11

Author: vbriand Date: 2011-04-08 09:56:14 +0200 (Fri, 08 Apr 2011) New Revision: 65 Url: http://chorem.org/repositories/revision/chorem/65 Log: Added comments to explain changes in overloaded templates Modified: trunk/chorem-web/src/main/webapp/template/simple/a-close.ftl trunk/chorem-web/src/main/webapp/template/simple/form-common.ftl trunk/chorem-web/src/main/webapp/template/xhtml/controlheader-core.ftl trunk/chorem-web/src/main/webapp/template/xhtml/file.ftl trunk/chorem-web/src/main/webapp/template/xhtml/form-close.ftl trunk/chorem-web/src/main/webapp/template/xhtml/form.ftl trunk/chorem-web/src/main/webapp/template/xhtml/password.ftl trunk/chorem-web/src/main/webapp/template/xhtml/submit-close.ftl trunk/chorem-web/src/main/webapp/template/xhtml/submit.ftl trunk/chorem-web/src/main/webapp/template/xhtml/text.ftl trunk/chorem-web/src/main/webapp/template/xhtml/textarea.ftl Modified: trunk/chorem-web/src/main/webapp/template/simple/a-close.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/simple/a-close.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/simple/a-close.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -39,6 +39,7 @@ <#if parameters.title??> title="${parameters.title?html}"<#rt/> </#if> +<#-- vbriand-2001-04-08 added parameter name --> <#if parameters.name??> name="${parameters.name?html}"<#rt/> </#if> Modified: trunk/chorem-web/src/main/webapp/template/simple/form-common.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/simple/form-common.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/simple/form-common.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -29,6 +29,7 @@ <#if parameters.id??> id="${parameters.id?html}"<#rt/> </#if> +<#-- vbriand-2001-04-08 removed parameter name which isn't W3C compliant --> <#if parameters.onsubmit??> onsubmit="${parameters.onsubmit?html}"<#rt/> </#if> Modified: trunk/chorem-web/src/main/webapp/template/xhtml/controlheader-core.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/controlheader-core.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/xhtml/controlheader-core.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -25,6 +25,10 @@ This will be done if ActionSupport is used. --> <#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/> +<#-- vbriand-2001-04-08 removed all table elements and/or replaced them by their +non-table equivalents +Note: maybe it would be better if the errors messages were displayed in a list +(with <ul><li>...) rather than by using <span> --> <#if hasFieldErrors> <#list fieldErrors[parameters.name] as error> Modified: trunk/chorem-web/src/main/webapp/template/xhtml/file.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/file.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/xhtml/file.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -20,5 +20,9 @@ * under the License. */ --> +<#-- vbriand-2001-04-08 replaced /controlheader.ftl by /controlheader-core.ftl +because the first one includes the second one and only opens a new table +element --> <#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" /> <#include "/${parameters.templateDir}/simple/file.ftl" /> +<#-- vbriand-2001-04-08 removed /xhtml/controlfooter.ftl which closes a table row--> Modified: trunk/chorem-web/src/main/webapp/template/xhtml/form-close.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/form-close.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/xhtml/form-close.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -20,6 +20,7 @@ * under the License. */ --> +<#-- vbriand-2001-04-08 removed /xhtml/control-close.ftl which closes the <table> tag --> <#include "/${parameters.templateDir}/simple/form-close.ftl" /> <#include "/${parameters.templateDir}/xhtml/form-close-validate.ftl" /> <#if parameters.focusElement?if_exists != ""> Modified: trunk/chorem-web/src/main/webapp/template/xhtml/form.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/form.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/xhtml/form.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -30,3 +30,4 @@ </#if> </#if> > +<#-- vbriand-2001-04-08 removed /xhtml/control.ftl which opens the <table> tag --> Modified: trunk/chorem-web/src/main/webapp/template/xhtml/password.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/password.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/xhtml/password.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -20,5 +20,9 @@ * under the License. */ --> +<#-- vbriand-2001-04-08 replaced /controlheader.ftl by /controlheader-core.ftl +because the first one includes the second one and only opens a new table +element --> <#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" /> <#include "/${parameters.templateDir}/simple/password.ftl" /> +<#-- vbriand-2001-04-08 removed /xhtml/controlfooter.ftl which closes a table row--> Modified: trunk/chorem-web/src/main/webapp/template/xhtml/submit-close.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/submit-close.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/xhtml/submit-close.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -1 +1,3 @@ <#include "/${parameters.templateDir}/simple/submit-close.ftl" /> +<#-- vbriand-2001-04-08 removed a </div> tag and /xhtml/controlfooter.ftl which +closes a table row--> Modified: trunk/chorem-web/src/main/webapp/template/xhtml/submit.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/submit.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/xhtml/submit.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -20,4 +20,5 @@ * under the License. */ --> +<#-- vbriand-2001-04-08 removed a table row creation --> <#include "/${parameters.templateDir}/simple/submit.ftl" /> Modified: trunk/chorem-web/src/main/webapp/template/xhtml/text.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/text.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/xhtml/text.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -20,5 +20,9 @@ * under the License. */ --> +<#-- vbriand-2001-04-08 replaced /controlheader.ftl by /controlheader-core.ftl +because the first one includes the second one and only opens a new table +element --> <#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" /> <#include "/${parameters.templateDir}/simple/text.ftl" /> +<#-- vbriand-2001-04-08 removed /xhtml/controlfooter.ftl which closes a table row--> Modified: trunk/chorem-web/src/main/webapp/template/xhtml/textarea.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/textarea.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/xhtml/textarea.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -20,5 +20,9 @@ * under the License. */ --> +<#-- vbriand-2001-04-08 replaced /controlheader.ftl by /controlheader-core.ftl +because the first one includes the second one and only opens a new table +element --> <#include "/${parameters.templateDir}/${parameters.theme}/controlheader-core.ftl" /> <#include "/${parameters.templateDir}/simple/textarea.ftl" /> +<#-- vbriand-2001-04-08 removed /xhtml/controlfooter.ftl which closes a table row--> \ No newline at end of file

1 0

r64 - in trunk/chorem-entities/src: main/xmi site/rst
by bpoussin＠users.chorem.org 07 Apr '11

07 Apr '11

Author: bpoussin Date: 2011-04-08 01:10:16 +0200 (Fri, 08 Apr 2011) New Revision: 64 Url: http://chorem.org/repositories/revision/chorem/64 Log: ajout de recurrence sur Invoiceable Modified: trunk/chorem-entities/src/main/xmi/chorem.zargo trunk/chorem-entities/src/site/rst/dataModel.rst Modified: trunk/chorem-entities/src/main/xmi/chorem.zargo =================================================================== (Binary files differ) Modified: trunk/chorem-entities/src/site/rst/dataModel.rst =================================================================== --- trunk/chorem-entities/src/site/rst/dataModel.rst 2011-04-07 16:09:06 UTC (rev 63) +++ trunk/chorem-entities/src/site/rst/dataModel.rst 2011-04-07 23:10:16 UTC (rev 64) @@ -61,7 +61,16 @@ - Quotation: devis envoyé à un client en rapport avec un projet - Invoiceable: indique les conditions de facturation. Chaque facture a emettre doit avoir une condition et une valeur associee. La condition et la - valeur associee sont evaluees en fonction du type mime indique. + valeur associee sont evaluees en fonction du type mime indique. De meme il + est possible d'indique un script de recurrence qui permettra de generer + automatiquement le Invoiceable suivant lorsque le Invoiceable aura dans + le même Wikitty un Invoice. Ceci ce fera via l'enregistrement d'un Hook + (post-store). Le nouveau Invoiceable ainsi genere aura le meme ID de + depart que le wikitty courant avec un suffixe qui s'incremente. Si la + recurrence doit generer 3 Invoiceable, on aura donc le premier Invoiceable + avec l'id UUID puis les suivant avec UUID_1, UUID_2, UUID_3. De cette + facon, il est simple de savoir si l'on a deja genere le Invoiceable + suivant. - Invoice: facture envoyée à un client en rapport avec un Invoiceable Un devis accepté engendre un ProjectOrder.

1 0

r63 - in trunk/chorem-web/src/main: java/org/chorem/billy/action java/org/chorem/gepeto/action resources resources/i18n webapp/WEB-INF/jsp/billy webapp/WEB-INF/jsp/gepeto
by vbriand＠users.chorem.org 07 Apr '11

07 Apr '11

Author: vbriand Date: 2011-04-07 18:09:06 +0200 (Thu, 07 Apr 2011) New Revision: 63 Url: http://chorem.org/repositories/revision/chorem/63 Log: The project orders are visible on the quotation page and the quotations with a project order are visible on the project's page 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/java/org/chorem/gepeto/action/ProjectOrderAction.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/quotationDetails.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-07 09:42:30 UTC (rev 62) +++ trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java 2011-04-07 16:09:06 UTC (rev 63) @@ -9,8 +9,11 @@ import org.chorem.ChoremProxy; import org.chorem.action.BaseAction; import org.chorem.entities.Project; +import org.chorem.entities.ProjectOrder; import org.chorem.entities.Quotation; import org.chorem.entities.QuotationImpl; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.Search; import com.opensymphony.xwork2.ActionContext; @@ -121,6 +124,21 @@ protected String quotationId; /** + * Returns the project order linked with the quotation (if it exists) + * + * @return the project order if it exists + * @return null if it doesn't exist + */ + public ProjectOrder getProjectOrder() { + ChoremProxy proxy = getChoremProxy(); + Search search = Search.query(); + Criteria criteria = search.eq(ProjectOrder.FQ_FIELD_PROJECTORDER_QUOTATION, + quotationId).criteria(); + ProjectOrder result = proxy.findByCriteria(ProjectOrder.class, criteria); + return result; + } + + /** * Stores the new quotation through the proxy * * @return true if the quotation has been stored properly 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-07 09:42:30 UTC (rev 62) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-04-07 16:09:06 UTC (rev 63) @@ -1,5 +1,6 @@ package org.chorem.gepeto.action; +import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -9,6 +10,7 @@ import org.chorem.action.BaseAction; import org.chorem.entities.Project; import org.chorem.entities.ProjectImpl; +import org.chorem.entities.ProjectOrder; import org.chorem.entities.Quotation; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; @@ -129,7 +131,8 @@ public List<Project> getAllProjects() { ChoremProxy proxy = getChoremProxy(); Search search = Search.query(); - Criteria criteria = search.isNotNull(Project.FQ_FIELD_PROJECT_NAME).criteria(); + Criteria criteria = search.isNotNull(Project.FQ_FIELD_PROJECT_NAME). + criteria(); PagedResult<Project> result = proxy.findAllByCriteria(Project.class, criteria); List<Project> projects = result.getAll(); @@ -153,6 +156,39 @@ } /** + * Gets the quotations with a project order attached with them + * + * @return the quotations with a project order + */ + public List<Quotation> getAttachedQuotationsWithProjectOrder() { + ChoremProxy proxy = getChoremProxy(); + Search search = Search.query(); + Criteria criteria = search.exteq(ProjectOrder.EXT_PROJECTORDER). + associated(ProjectOrder.FQ_FIELD_PROJECTORDER_QUOTATION). + eq(Quotation.FQ_FIELD_QUOTATION_PROJECT, projectId).criteria(); + PagedResult<ProjectOrder> result = proxy.findAllByCriteria(ProjectOrder.class, + criteria); + List<ProjectOrder> projectOrders = result.getAll(); + List<Quotation> quotations = new ArrayList<Quotation>(); + + for (ProjectOrder projectOrder : projectOrders) { + quotations.add(proxy.restore(Quotation.class, + projectOrder.getQuotation())); + } + return quotations; + } + + /** + * Gets the quotations without a project order attached with them + * + * @return the quotations without a project order + */ + public List<Quotation> getAttachedQuotationsWithoutProjectOrder() { + //TODO: implement + return null; + } + + /** * @return the name */ public String getName() { 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-07 09:42:30 UTC (rev 62) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 2011-04-07 16:09:06 UTC (rev 63) @@ -73,30 +73,6 @@ return result; } - public String input() { - String result = INPUT; - ChoremProxy proxy = getChoremProxy(); - - try { - if (quotationId == null) { - result = ERROR; - } else { - UUID.fromString(quotationId); - - Quotation quotation = proxy.restore(Quotation.class, quotationId); - - if (quotation == null) { - result = ERROR; - } else { - quotationReference = quotation.getReference(); - } - } - } catch (IllegalArgumentException e) { - result = ERROR; - } - return result; - } - protected String type; protected String description; protected String beginDate; 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-07 09:42:30 UTC (rev 62) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-07 16:09:06 UTC (rev 63) @@ -9,6 +9,12 @@ 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.postedDate=Posted date +chorem.billy.quotation.projectOrder= +chorem.billy.quotation.projectOrder.beginDate= +chorem.billy.quotation.projectOrder.company= +chorem.billy.quotation.projectOrder.endDate= +chorem.billy.quotation.projectOrder.estimatedEndDate= +chorem.billy.quotation.projectOrder.type= chorem.billy.quotation.reference=Reference chorem.billy.quotation.vta=VTA chorem.billy.quotationDetails.title= @@ -91,7 +97,8 @@ chorem.gepeto.project.name=Project''s name chorem.gepeto.project.name.required=You must enter the project''s name chorem.gepeto.projectDetails.quotation=Quotation of {0} (ref. {1}) -chorem.gepeto.projectDetails.quotations=Project''s quotations +chorem.gepeto.projectDetails.quotationWithProjectOrder=Project''s quotation with project order +chorem.gepeto.projectDetails.quotationsWithoutProjectOrder=Project''s quotations without project order chorem.gepeto.projectDetails.title=Details of project "{0}" chorem.gepeto.projectOrder=Project order chorem.gepeto.projectOrder.add=Add a new project order 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-07 09:42:30 UTC (rev 62) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-07 16:09:06 UTC (rev 63) @@ -2,13 +2,18 @@ chorem.billy.home=Accueil chorem.billy.quotation=Devis \#{0} chorem.billy.quotation.add=Ajouter un nouveau devis -chorem.billy.quotation.addProjectOrder= +chorem.billy.quotation.addProjectOrder=Cr\u00E9er un contrat pour ce devis 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.description=Description chorem.billy.quotation.postedDate=Date de d\u00E9p\u00F4t +chorem.billy.quotation.projectOrder=Contrat r\u00E9alis\u00E9 sur la base de ce devis +chorem.billy.quotation.projectOrder.beginDate=Date de d\u00E9but \: {0} +chorem.billy.quotation.projectOrder.company=Soci\u00E9t\u00E9 \: {0} +chorem.billy.quotation.projectOrder.endDate=Date de fin \: {0} +chorem.billy.quotation.projectOrder.type=Type \: {0} chorem.billy.quotation.reference=R\u00E9f\u00E9rence chorem.billy.quotation.vta=TVA chorem.billy.quotationDetails.title= @@ -87,7 +92,8 @@ chorem.gepeto.project.name=Nom du projet chorem.gepeto.project.name.required=Vous devez renseigner un nom pour le projet chorem.gepeto.projectDetails.quotation=Devis du {0} (r\u00E9f. {1}) -chorem.gepeto.projectDetails.quotations=Devis du projet +chorem.gepeto.projectDetails.quotationWithProjectOrder=Devis du projet avec un contrat +chorem.gepeto.projectDetails.quotationsWithoutProjectOrder=Devis du projet sans contrat chorem.gepeto.projectDetails.title=D\u00E9tails du projet "{0}" chorem.gepeto.projectOrder=Contrat de commande d''un projet chorem.gepeto.projectOrder.add=Ajouter le contrat d''un projet Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-04-07 09:42:30 UTC (rev 62) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-04-07 16:09:06 UTC (rev 63) @@ -82,7 +82,7 @@ </action> <action name="addProjectOrder" class="org.chorem.gepeto.action.ProjectOrderAction" method="add"> <result name="input">/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result> - <result name="error" type="redirectAction">home</result> + <result name="error">/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result> <result type="redirectAction">home</result> </action> <action name="getProjectsByYear" class="org.chorem.gepeto.action.ProjectAction"> 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-07 09:42:30 UTC (rev 62) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp 2011-04-07 16:09:06 UTC (rev 63) @@ -1,5 +1,6 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@page import="org.chorem.billy.action.QuotationAction" %> +<%@page import="org.chorem.entities.ProjectOrder" %> <%@taglib prefix="s" uri="/struts-tags" %> <html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" @@ -35,7 +36,33 @@ <s:url namespace="/gepeto" action="projectDetails" var="projectDetails"> <s:param name="projectId"><%= QuotationAction.getAction().getProjectId() %></s:param> </s:url> - <a href="${addProjectOrder}"><s:text name="chorem.billy.quotation.addProjectOrder" /></a> + <% + ProjectOrder projectOrder = QuotationAction.getAction().getProjectOrder(); + + if (projectOrder != null) { + %> + <s:text name="chorem.billy.quotation.projectOrder" /> + <br /> + <s:text name="chorem.billy.quotation.projectOrder.beginDate"> + <s:param><%= projectOrder.getBeginDate() %></s:param> + </s:text> + <br /> + <s:text name="chorem.billy.quotation.projectOrder.endDate"> + <s:param><%= projectOrder.getEndDate() %></s:param> + </s:text> + <br /> + <s:text name="chorem.billy.quotation.projectOrder.type"> + <s:param><%= projectOrder.getType() %></s:param> + </s:text> + <br /> + <s:text name="chorem.billy.quotation.projectOrder.company"> + <s:param><%= projectOrder.getCompany() %></s:param> + </s:text> + <br /> + <% } else { %> + <a href="${addProjectOrder}"><s:text name="chorem.billy.quotation.addProjectOrder" /></a> + <br /> + <% } %> <br /> <a href="${projectDetails}"><s:text name="chorem.billy.quotation.backToProjectDetails" /></a> </p> 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-07 09:42:30 UTC (rev 62) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp 2011-04-07 16:09:06 UTC (rev 63) @@ -30,10 +30,33 @@ <a href="${addQuotation}"><s:text name="chorem.billy.quotation.add" /></a> </p> <p> - <s:text name="chorem.gepeto.projectDetails.quotations" /> + <s:text name="chorem.gepeto.projectDetails.quotationWithProjectOrder" /> <br /> <br /> + <% + List<Quotation> quotationsProjectOrder = ProjectAction.getAction().getAttachedQuotationsWithProjectOrder(); + + for (Quotation quotation : quotationsProjectOrder) { + %> + <s:url namespace="/billy" action="quotationDetails" var="quotationDetails"> + <s:param name="quotationId"><%= quotation.getWikittyId() %></s:param> + </s:url> + <s:text name="chorem.gepeto.projectDetails.quotation"> + <s:param> + <%= quotation.getPostedDate() %> + </s:param> + <s:param> + <a href="${quotationDetails}"><%= quotation.getReference() %></a> + </s:param> + </s:text> + <br /> + <% } %> + <br /> + <s:text name="chorem.gepeto.projectDetails.quotationsWithoutProjectOrder" /> + <br /> + <br /> <% + //TODO: change to getAttachedQuotationsWithoutProjectOrder when it will be implemented List<Quotation> quotations = ProjectAction.getAction().getAttachedQuotations(); for (Quotation quotation : quotations) {

1 0

r62 - trunk/chorem-web/src/main/java/org/chorem/gepeto/action
by vbriand＠users.chorem.org 07 Apr '11

07 Apr '11

Author: vbriand Date: 2011-04-07 11:42:30 +0200 (Thu, 07 Apr 2011) New Revision: 62 Url: http://chorem.org/repositories/revision/chorem/62 Log: Removed debugs Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 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-07 09:26:48 UTC (rev 61) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 2011-04-07 09:42:30 UTC (rev 62) @@ -40,7 +40,7 @@ public String add() { String result = INPUT; ChoremProxy proxy = getChoremProxy(); - System.out.println("WTF???"); + try { if (quotationId == null) { result = ERROR; @@ -72,15 +72,11 @@ } return result; } - public String execute() { - System.out.println("YAAAAAAAAAAAAAAAAAAAAA"); - return SUCCESS; - } public String input() { String result = INPUT; ChoremProxy proxy = getChoremProxy(); - System.out.println("GRRRRRRRRRRRRRRRRRRRRRRR"); + try { if (quotationId == null) { result = ERROR;

1 0

r61 - in trunk/chorem-web/src/main: java/org/chorem/gepeto/action resources resources/i18n resources/org/chorem/gepeto/action webapp/WEB-INF/jsp/billy webapp/WEB-INF/jsp/bonzoms webapp/WEB-INF/jsp/gepeto
by vbriand＠users.chorem.org 07 Apr '11

07 Apr '11

Author: vbriand Date: 2011-04-07 11:26:48 +0200 (Thu, 07 Apr 2011) New Revision: 61 Url: http://chorem.org/repositories/revision/chorem/61 Log: A project order can now be linked with a quotation Added: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml Removed: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-validation.xml Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.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/home.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/home.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp 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-06 16:43:43 UTC (rev 60) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 2011-04-07 09:26:48 UTC (rev 61) @@ -3,13 +3,16 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.UUID; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.ChoremProxy; import org.chorem.action.BaseAction; import org.chorem.entities.ProjectOrderImpl; +import org.chorem.entities.Quotation; +import com.opensymphony.xwork2.ActionContext; import static org.nuiton.i18n.I18n.n_; /** @@ -22,7 +25,11 @@ private static final long serialVersionUID = -5469320345746533520L; private static final Log log = LogFactory.getLog(ProjectOrderAction.class); - + + static public ProjectOrderAction getAction() { + return (ProjectOrderAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); + } + /** * Adds a new project order * @@ -32,17 +39,64 @@ */ public String add() { String result = INPUT; - - if (type != null && description != null && - beginDate != null && estimatedEndDate != null) { - if (!type.isEmpty() && !description.isEmpty()) { - //If the project order has been added successfully - if (addProjectOrder()) { - result = SUCCESS; + ChoremProxy proxy = getChoremProxy(); + System.out.println("WTF???"); + try { + if (quotationId == null) { + result = ERROR; + } else { + //If quotationId isn't a valid UUID, an exception is thrown + UUID.fromString(quotationId); + + Quotation quotation = proxy.restore(Quotation.class, quotationId); + + if (quotation == null) { //If the quotationId doesn't exist + result = ERROR; } else { + quotationReference = quotation.getReference(); + if (type != null && description != null && + beginDate != null && estimatedEndDate != null) { + if (!type.isEmpty() && !description.isEmpty()) { + //If the project order has been added successfully + if (addProjectOrder()) { + result = SUCCESS; + } else { + result = ERROR; + } + } + } + } + } + } catch (IllegalArgumentException e) { + result = ERROR; + } + return result; + } + public String execute() { + System.out.println("YAAAAAAAAAAAAAAAAAAAAA"); + return SUCCESS; + } + + public String input() { + String result = INPUT; + ChoremProxy proxy = getChoremProxy(); + System.out.println("GRRRRRRRRRRRRRRRRRRRRRRR"); + try { + if (quotationId == null) { + result = ERROR; + } else { + UUID.fromString(quotationId); + + Quotation quotation = proxy.restore(Quotation.class, quotationId); + + if (quotation == null) { result = ERROR; + } else { + quotationReference = quotation.getReference(); } } + } catch (IllegalArgumentException e) { + result = ERROR; } return result; } @@ -51,6 +105,8 @@ protected String description; protected String beginDate; protected String estimatedEndDate; + protected String quotationId; + protected String quotationReference; /** * Stores the new project order through the proxy @@ -68,6 +124,7 @@ newProjectOrder.setType(type); newProjectOrder.setDescription(description); + newProjectOrder.setQuotation(quotationId); //Lenient mode disabled because results may be very odd formatter.setLenient(false); @@ -165,4 +222,32 @@ public void setEstimatedEndDate(String estimatedEndDate) { this.estimatedEndDate = estimatedEndDate; } -} + + /** + * @return the quotationId + */ + public String getQuotationId() { + return quotationId; + } + + /** + * @param quotationId the quotationId to set + */ + public void setQuotationId(String quotationId) { + this.quotationId = quotationId; + } + + /** + * @return the quotationReference + */ + public String getQuotationReference() { + return quotationReference; + } + + /** + * @param quotationReference the quotationReference to set + */ + public void setQuotationReference(String quotationReference) { + this.quotationReference = quotationReference; + } +} \ No newline at end of file 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-06 16:43:43 UTC (rev 60) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-07 09:26:48 UTC (rev 61) @@ -1,9 +1,9 @@ chorem.beginDate.beforeToday=The date cannot be set before today''s date chorem.billy.home=Home -chorem.billy.quotation=Quotation +chorem.billy.quotation=Quotation \#{0} chorem.billy.quotation.add=Add a new quotation +chorem.billy.quotation.addProjectOrder= chorem.billy.quotation.addToProject=Add a new quotation to the project "{0}" -chorem.billy.quotation.amound= 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 @@ -95,6 +95,7 @@ chorem.gepeto.projectDetails.title=Details of project "{0}" chorem.gepeto.projectOrder=Project order chorem.gepeto.projectOrder.add=Add a new project order +chorem.gepeto.projectOrder.addToQuotation=Add a new project order to the quotation \#{0} 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.create.error=An error occurred while creating your new project order, please try again. If the problem persists, please contact an administrator @@ -104,6 +105,7 @@ chorem.gepeto.projectOrder.estimatedEndDate.required=You must enter the estimated end date for this project order chorem.gepeto.projectOrder.type=Type chorem.gepeto.projectOrder.type.required=You must specify the project order''s type +chorem.gepeto.projects=Get the projects list chorem.gepeto.projectsByYear.thead.company=Company chorem.gepeto.projectsByYear.thead.end=End chorem.gepeto.projectsByYear.thead.name=Name 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-06 16:43:43 UTC (rev 60) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-07 09:26:48 UTC (rev 61) @@ -1,9 +1,9 @@ chorem.beginDate.beforeToday=La date entr\u00E9e ne peut \u00EAtre ant\u00E9rieure \u00E0 la date du jour chorem.billy.home=Accueil -chorem.billy.quotation=Devis +chorem.billy.quotation=Devis \#{0} chorem.billy.quotation.add=Ajouter un nouveau devis +chorem.billy.quotation.addProjectOrder= chorem.billy.quotation.addToProject=Ajouter un nouveau devis au projet "{0}" -chorem.billy.quotation.amound= 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 @@ -91,6 +91,7 @@ chorem.gepeto.projectDetails.title=D\u00E9tails du projet "{0}" chorem.gepeto.projectOrder=Contrat de commande d''un projet chorem.gepeto.projectOrder.add=Ajouter le contrat d''un projet +chorem.gepeto.projectOrder.addToQuotation=Lier un nouveau contrat au devis \#{0} 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.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 @@ -100,6 +101,7 @@ chorem.gepeto.projectOrder.estimatedEndDate.required=Vous devez renseigner la date de fin estim\u00E9e du contrat chorem.gepeto.projectOrder.type=Type chorem.gepeto.projectOrder.type.required=Vous devez sp\u00E9cifier le type du contrat +chorem.gepeto.projects=Obtenir la liste des projets chorem.gepeto.projectsByYear.thead.company=Demandeur chorem.gepeto.projectsByYear.thead.end=Fin chorem.gepeto.projectsByYear.thead.name=Nom Copied: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml (from rev 60, trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-validation.xml) =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml (rev 0) +++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml 2011-04-07 09:26:48 UTC (rev 61) @@ -0,0 +1,34 @@ +<!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.gepeto.projectOrder.type.required" /> + </field-validator> + </field> + <field name="description"> + <field-validator type="requiredstring"> + <message key="chorem.gepeto.projectOrder.description.required" /> + </field-validator> + </field> + <field name="beginDate"> + <field-validator type="requiredstring"> + <message key="chorem.gepeto.projectOrder.beginDate.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> + <field name="estimatedEndDate"> + <field-validator type="requiredstring"> + <message key="chorem.gepeto.projectOrder.estimatedEndDate.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/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-validation.xml =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-validation.xml 2011-04-06 16:43:43 UTC (rev 60) +++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-validation.xml 2011-04-07 09:26:48 UTC (rev 61) @@ -1,34 +0,0 @@ -<!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.gepeto.projectOrder.type.required" /> - </field-validator> - </field> - <field name="description"> - <field-validator type="requiredstring"> - <message key="chorem.gepeto.projectOrder.description.required" /> - </field-validator> - </field> - <field name="beginDate"> - <field-validator type="requiredstring"> - <message key="chorem.gepeto.projectOrder.beginDate.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> - <field name="estimatedEndDate"> - <field-validator type="requiredstring"> - <message key="chorem.gepeto.projectOrder.estimatedEndDate.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> Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-04-06 16:43:43 UTC (rev 60) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-04-07 09:26:48 UTC (rev 61) @@ -18,7 +18,7 @@ <action name="home"> <result>/WEB-INF/jsp/bonzoms/home.jsp</result> </action> - <action name="addCompany_input"> + <action name="addCompanyInput"> <result>/WEB-INF/jsp/bonzoms/addCompany.jsp</result> </action> <action name="addCompany" class="org.chorem.bonzoms.action.CompanyAction" method="add"> @@ -26,7 +26,7 @@ <result name="error">/WEB-INF/jsp/bonzoms/addCompany.jsp</result> <result type="redirectAction">home</result> </action> - <action name="addPerson_input"> + <action name="addPersonInput"> <result>/WEB-INF/jsp/bonzoms/addPerson.jsp</result> </action> <action name="addPerson" class="org.chorem.bonzoms.action.PersonAction" method="add"> @@ -34,7 +34,7 @@ <result name="error">/WEB-INF/jsp/bonzoms/addPerson.jsp</result> <result type="redirectAction">home</result> </action> - <action name="addContactDetails_input"> + <action name="addContactDetailsInput"> <result>/WEB-INF/jsp/bonzoms/addContactDetails.jsp</result> </action> <action name="addContactDetails" class="org.chorem.bonzoms.action.ContactDetailsAction" method="add"> @@ -42,7 +42,7 @@ <result name="error">/WEB-INF/jsp/bonzoms/addContactDetails.jsp</result> <result type="redirectAction">home</result> </action> - <action name="addEmploymentContract_input"> + <action name="addEmploymentContractInput"> <result>/WEB-INF/jsp/bonzoms/addEmploymentContract.jsp</result> </action> <action name="addEmploymentContract" class="org.chorem.bonzoms.action.EmploymentContractAction" method="add"> @@ -57,7 +57,7 @@ <action name="home"> <result>/WEB-INF/jsp/gepeto/home.jsp</result> </action> - <action name="addProject_input"> + <action name="addProjectInput"> <result>/WEB-INF/jsp/gepeto/addProject.jsp</result> </action> <action name="addProject" class="org.chorem.gepeto.action.ProjectAction" method="add"> @@ -68,7 +68,7 @@ <action name="removeProject" class="org.chorem.gepeto.action.ProjectAction" method="delete"> <result type="redirectAction">home</result> </action> - <action name="addTask_input"> + <action name="addTaskInput"> <result>/WEB-INF/jsp/gepeto/addTask.jsp</result> </action> <action name="addTask" class="org.chorem.gepeto.action.TaskAction" method="add"> @@ -76,12 +76,13 @@ <result name="error">/WEB-INF/jsp/gepeto/addTask.jsp</result> <result type="redirectAction">home</result> </action> - <action name="addProjectOrder_input"> - <result>/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result> + <action name="addProjectOrderInput" class="org.chorem.gepeto.action.ProjectOrderAction" method="add"> + <result name="input">/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result> + <result name="error" type="redirectAction">home</result> </action> <action name="addProjectOrder" class="org.chorem.gepeto.action.ProjectOrderAction" method="add"> <result name="input">/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result> - <result name="error">/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result> + <result name="error" type="redirectAction">home</result> <result type="redirectAction">home</result> </action> <action name="getProjectsByYear" class="org.chorem.gepeto.action.ProjectAction"> @@ -100,6 +101,7 @@ </action> <action name="addQuotationInput" class="org.chorem.billy.action.QuotationAction" method="add"> <result name="input">/WEB-INF/jsp/billy/addQuotation.jsp</result> + <result name="error" type="redirectAction">home</result> </action> <action name="addQuotation" class="org.chorem.billy.action.QuotationAction" method="add"> <result name="input">/WEB-INF/jsp/billy/addQuotation.jsp</result> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/home.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/home.jsp 2011-04-06 16:43:43 UTC (rev 60) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/home.jsp 2011-04-07 09:26:48 UTC (rev 61) @@ -8,6 +8,6 @@ <s:head /> </head> <body> - <s:a action="addQuotation_input"><s:text name="chorem.billy.quotation.add" /></s:a><br /> + <s:a action="addQuotationInput"><s:text name="chorem.billy.quotation.add" /></s:a><br /> </body> </html> 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-06 16:43:43 UTC (rev 60) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp 2011-04-07 09:26:48 UTC (rev 61) @@ -29,9 +29,14 @@ <s:textfield readonly="true" name="postedDate" key="chorem.billy.quotation.postedDate" labelSeparator=": " /> <br /> <br /> + <s:url namespace="/gepeto" action="addProjectOrderInput" var="addProjectOrder"> + <s:param name="quotationId"><%= QuotationAction.getAction().getQuotationId() %></s:param> + </s:url> <s:url namespace="/gepeto" action="projectDetails" var="projectDetails"> <s:param name="projectId"><%= QuotationAction.getAction().getProjectId() %></s:param> </s:url> + <a href="${addProjectOrder}"><s:text name="chorem.billy.quotation.addProjectOrder" /></a> + <br /> <a href="${projectDetails}"><s:text name="chorem.billy.quotation.backToProjectDetails" /></a> </p> </body> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/home.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/home.jsp 2011-04-06 16:43:43 UTC (rev 60) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/home.jsp 2011-04-07 09:26:48 UTC (rev 61) @@ -8,8 +8,8 @@ <s:head /> </head> <body> - <s:a action="addCompany_input"><s:text name="chorem.bonzoms.company.add" /></s:a><br /> - <s:a action="addEmploymentContract_input"><s:text name="chorem.bonzoms.employmentContract.add" /></s:a><br /> - <s:a action="addPerson_input"><s:text name="chorem.bonzoms.person.add" /></s:a> + <s:a action="addCompanyInput"><s:text name="chorem.bonzoms.company.add" /></s:a><br /> + <s:a action="addEmploymentContractInput"><s:text name="chorem.bonzoms.employmentContract.add" /></s:a><br /> + <s:a action="addPersonInput"><s:text name="chorem.bonzoms.person.add" /></s:a> </body> </html> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp 2011-04-06 16:43:43 UTC (rev 60) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp 2011-04-07 09:26:48 UTC (rev 61) @@ -1,4 +1,5 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="org.chorem.gepeto.action.ProjectOrderAction" %> <%@taglib prefix="s" uri="/struts-tags" %> <html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" @@ -8,9 +9,16 @@ <s:head /> </head> <body> - <h2><s:text name="chorem.gepeto.projectOrder.add" /></h2> + <h2> + <s:text name="chorem.gepeto.projectOrder.addToQuotation"> + <s:param><%= ProjectOrderAction.getAction().getQuotationReference() %></s:param> + </s:text> + </h2> <s:actionerror /> - <s:form action="addProjectOrder" method="post"> + <s:url action="addProjectOrder" var="addProjectOrder"> + <s:param name="quotationId"><%= ProjectOrderAction.getAction().getQuotationId() %></s:param> + </s:url> + <form action="${addProjectOrder}" method="post"> <fieldset> <legend><s:text name="chorem.gepeto.projectOrder" /></legend> <s:textfield key="chorem.gepeto.projectOrder.type" name="type" labelSeparator=": " /> @@ -25,6 +33,6 @@ <br /> <s:submit key="chorem.gepeto.projectOrder.add" name="submit" /> </fieldset> - </s:form> + </form> </body> </html> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp 2011-04-06 16:43:43 UTC (rev 60) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp 2011-04-07 09:26:48 UTC (rev 61) @@ -8,9 +8,9 @@ <s:head /> </head> <body> - <s:a action="addProject_input"><s:text name="chorem.gepeto.project.add" /></s:a><br /> - <s:a action="addProjectOrder_input"><s:text name="chorem.gepeto.projectOrder.add" /></s:a><br /> - <s:a action="addTask_input"><s:text name="chorem.gepeto.task.add" /></s:a><br /> + <s:a action="addProjectInput"><s:text name="chorem.gepeto.project.add" /></s:a><br /> + <s:a action="addProjectOrderInput"><s:text name="chorem.gepeto.projectOrder.add" /></s:a><br /> + <s:a action="addTaskInput"><s:text name="chorem.gepeto.task.add" /></s:a><br /> <s:a action="getProjectsByYear"><s:text name="chorem.gepeto.projects" /></s:a><br /> </body> </html>

1 0

r60 - in trunk/chorem-web/src/main: java/org/chorem/action webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org 06 Apr '11

06 Apr '11

Author: bpoussin Date: 2011-04-06 18:43:43 +0200 (Wed, 06 Apr 2011) New Revision: 60 Url: http://chorem.org/repositories/revision/chorem/60 Log: renomage de state en status Modified: trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp Modified: trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java 2011-04-06 16:41:56 UTC (rev 59) +++ trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java 2011-04-06 16:43:43 UTC (rev 60) @@ -76,7 +76,7 @@ protected int nbTouchForNext7DaysForMe = 0; /** nombre de projet en cours */ - protected List<FacetTopic> nbProjectOrderState = Collections.EMPTY_LIST; + protected List<FacetTopic> nbProjectOrderStatus = Collections.EMPTY_LIST; /** nombre de tache a faire ou finir */ protected int nbTaskOpen = 0; protected int nbTaskOpenForMe = 0; @@ -169,7 +169,7 @@ nbTouchForNext7DaysForMe = results[3].getTopicCount(Touch.FQ_FIELD_TOUCH_PARTICIPANT, userId); - nbProjectOrderState = results[4].getTopic(ProjectOrder.FQ_FIELD_PROJECTORDER_STATUS); + nbProjectOrderStatus = results[4].getTopic(ProjectOrder.FQ_FIELD_PROJECTORDER_STATUS); nbTaskOpen = results[5].getNumFound(); nbTaskOpenForMe = results[6].getNumFound(); @@ -224,8 +224,8 @@ return nbPerson; } - public List<FacetTopic> getNbProjectOrderState() { - return nbProjectOrderState; + public List<FacetTopic> getNbProjectOrderStatus() { + return nbProjectOrderStatus; } public int getNbTaskOpen() { Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp 2011-04-06 16:41:56 UTC (rev 59) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp 2011-04-06 16:43:43 UTC (rev 60) @@ -39,7 +39,7 @@ <div class="block"> <ul> - <li>Project open: <%=action.getNbProjectOrderOpen()%></li> + <li>Project status: <%=action.getNbProjectOrderStatus()%></li> <li>Task: <%=action.getNbTaskOpenForMe()%>/<%=action.getNbTaskOpen()%> </li>

1 0

r59 - trunk/chorem-web/src/main/java/org/chorem/action
by bpoussin＠users.chorem.org 06 Apr '11

06 Apr '11

Author: bpoussin Date: 2011-04-06 18:41:56 +0200 (Wed, 06 Apr 2011) New Revision: 59 Url: http://chorem.org/repositories/revision/chorem/59 Log: debut de requete pour la recuperation des infos a afficher Modified: trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java Modified: trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java 2011-04-06 14:45:48 UTC (rev 58) +++ trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java 2011-04-06 16:41:56 UTC (rev 59) @@ -2,6 +2,7 @@ import com.opensymphony.xwork2.ActionContext; import java.text.ParseException; +import java.util.Collections; import java.util.Date; import java.util.HashSet; import java.util.LinkedList; @@ -13,10 +14,15 @@ import org.apache.commons.logging.LogFactory; import org.chorem.entities.Company; import org.chorem.entities.Interval; +import org.chorem.entities.Invoice; +import org.chorem.entities.Invoiceable; import org.chorem.entities.Person; import org.chorem.entities.PersonImpl; +import org.chorem.entities.ProjectOrder; +import org.chorem.entities.Task; import org.chorem.entities.Touch; import org.chorem.entities.TouchImpl; +import org.chorem.entities.Worker; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.BusinessEntity; @@ -25,6 +31,7 @@ import org.nuiton.wikitty.entities.WikittyUser; import org.nuiton.wikitty.entities.WikittyUserImpl; import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.FacetTopic; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; @@ -69,7 +76,7 @@ protected int nbTouchForNext7DaysForMe = 0; /** nombre de projet en cours */ - protected int nbProjectOrderOpen = 0; + protected List<FacetTopic> nbProjectOrderState = Collections.EMPTY_LIST; /** nombre de tache a faire ou finir */ protected int nbTaskOpen = 0; protected int nbTaskOpenForMe = 0; @@ -119,16 +126,42 @@ .gt(Touch.FQ_FIELD_INTERVAL_BEGINDATE, now) .criteria().addFacetField(Touch.FQ_FIELD_TOUCH_PARTICIPANT).setEndIndex(0); + Criteria projectOrder = Search.query().exteq(ProjectOrder.EXT_PROJECTORDER) + .criteria().addFacetField(ProjectOrder.FQ_FIELD_PROJECTORDER_STATUS).setEndIndex(0); + Criteria taskOpen = Search.query().exteq(Task.EXT_TASK) + .eq(Task.FQ_FIELD_TASK_STATUS, "") + .criteria().setEndIndex(0); + + + Search taskOpenForMeSearch = Search.query().exteq(Worker.EXT_WORKER) + .eq(Worker.FQ_FIELD_WORKER_PERSON, userId); + taskOpenForMeSearch.associated(Worker.FQ_FIELD_WORKER_TASK) + .eq(Task.FQ_FIELD_TASK_STATUS, "closed"); + Criteria taskOpenForMe = taskOpenForMeSearch.criteria().setEndIndex(0); + + + Criteria invoiceToSend = Search.query().exteq(Invoiceable.EXT_INVOICEABLE) + .extneq(Invoice.EXT_INVOICE) + .criteria().setEndIndex(0); + // FIXME poussin 20110406 il faut evaluer les conditions pour savoir + // lesquels sont reellement a facturer. idem pour les values + + PagedResult<Wikitty>[] results = proxy.multiFindAllByCriteria( company, person, touchLast7days, - touchNext7days + touchNext7days, + projectOrder, + taskOpen, + taskOpenForMe, + invoiceToSend ); nbCompany = results[0].getNumFound(); nbPerson = results[1].getNumFound(); + nbTouchForLast7Days = results[2].getNumFound(); nbTouchForLast7DaysForMe = results[2].getTopicCount(Touch.FQ_FIELD_TOUCH_PARTICIPANT, userId); @@ -136,10 +169,12 @@ nbTouchForNext7DaysForMe = results[3].getTopicCount(Touch.FQ_FIELD_TOUCH_PARTICIPANT, userId); -// nbProjectOrderOpen = results[6].getNumFound(); -// nbTaskOpen = results[7].getNumFound(); -// nbTaskOpenForMe = results[8].getNumFound(); -// nbInvoiceToSend = results[9].getNumFound(); + nbProjectOrderState = results[4].getTopic(ProjectOrder.FQ_FIELD_PROJECTORDER_STATUS); + + nbTaskOpen = results[5].getNumFound(); + nbTaskOpenForMe = results[6].getNumFound(); + + nbInvoiceToSend = results[7].getNumFound(); // invoiceAmountToSend = results[10].getNumFound(); // // cashFlow = new double[]{ @@ -189,8 +224,8 @@ return nbPerson; } - public int getNbProjectOrderOpen() { - return nbProjectOrderOpen; + public List<FacetTopic> getNbProjectOrderState() { + return nbProjectOrderState; } public int getNbTaskOpen() {

1 0