Author: bpoussin Date: 2013-06-28 16:35:23 +0200 (Fri, 28 Jun 2013) New Revision: 350 Url: http://chorem.org/projects/chorem/repository/revisions/350 Log: on ne prend pas en compte les proposition rejetee Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2013-06-28 10:20:50 UTC (rev 349) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2013-06-28 14:35:23 UTC (rev 350) @@ -52,6 +52,7 @@ import org.chorem.entities.Invoice; import org.chorem.entities.InvoiceStatus; import org.chorem.entities.Quotation; +import org.chorem.entities.Rejected; import org.chorem.entities.Sent; import org.chorem.entities.Started; import org.chorem.entities.Task; @@ -471,7 +472,7 @@ */ protected Render quotationFilter(ChoremClient client, Date start, Date end, String query, - String statusStart, String statusEnd, String jspRender, + String statusStart, String statusEnd, boolean excludeRejected, String jspRender, String title, boolean computeTask) { if (start == null) { @@ -491,6 +492,10 @@ .parse(query) .exteq(statusStart); + if (excludeRejected) { + quotationQueryMaker = quotationQueryMaker.extne(Rejected.EXT_REJECTED); + } + if (statusEnd != null){ quotationQueryMaker = quotationQueryMaker.extne(statusEnd); } @@ -596,21 +601,21 @@ Date start, Date end, String query) { String jsp = "dashboardQuotation.jsp"; String title = "Les propositions en attente de réponse"; - return quotationFilter(client, start, end, query, Quotation.EXT_QUOTATION, Accepted.EXT_ACCEPTED, jsp, title, false); + return quotationFilter(client, start, end, query, Quotation.EXT_QUOTATION, Accepted.EXT_ACCEPTED, true, jsp, title, false); } public Render projectOpen(ChoremClient client, Date start, Date end, String query) { String jsp = "dashboardProject.jsp"; String title = "Les projets en cours"; - return quotationFilter(client, start, end, query, Accepted.EXT_ACCEPTED, Warranty.EXT_WARRANTY, jsp, title, true); + return quotationFilter(client, start, end, query, Accepted.EXT_ACCEPTED, Warranty.EXT_WARRANTY, true, jsp, title, true); } public Render projectClosed(ChoremClient client, Date start, Date end, String query) { String jsp = "dashboardProject.jsp"; String title = "Les projets clos"; - return quotationFilter(client, start, end, query, Warranty.EXT_WARRANTY, null, jsp, title, true); + return quotationFilter(client, start, end, query, Warranty.EXT_WARRANTY, null, true, jsp, title, true); } static public class TaskInfo implements Cloneable { @@ -808,7 +813,7 @@ Date start, Date end, String query) { String jsp = "dashboardProfitability.jsp"; String title = "Profitability"; - return quotationFilter(client, start, end, query, Started.EXT_STARTED, null, jsp, title, true); + return quotationFilter(client, start, end, query, Started.EXT_STARTED, null, true, jsp, title, true); } /**