Author: jcouteau Date: 2013-01-23 10:39:02 +0100 (Wed, 23 Jan 2013) New Revision: 302 Url: http://chorem.org/projects/chorem/repository/revisions/302 Log: refs #862 : Fix sales report graph Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp 2013-01-22 10:49:22 UTC (rev 301) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp 2013-01-23 09:39:02 UTC (rev 302) @@ -35,11 +35,16 @@ <script type="text/javascript"> $(document).ready(function(){ var sales = [ - <c:forEach var="entry" items="${data}" varStatus="counter"> - ['${entry.key}', ${entry.value}] - <c:if test="${!counter.last}">, </c:if> - </c:forEach> - ]; + <c:forEach var="entry" items="${data}" varStatus="counter"> + [ + <c:forEach var="entry2" items="${entry.value.plotValues}" varStatus="counter2"> + ['${entry2.key}', ${entry2.value}] + <c:if test="${!counter2.last}">, </c:if> + </c:forEach> + ] + <c:if test="${!counter.last}">, </c:if> + </c:forEach> + ]; var plot1 = $.jqplot ('sales', sales, { title:'Ventes par mois',