- Wao-commits - mailman.cloud.codelutin.com

r2033 - trunk/wao-persistence/src/main/resources/db/migration
by bleny＠users.forge.codelutin.com June 13, 2014

June 13, 2014

Author: bleny Date: 2014-06-13 11:33:43 +0200 (Fri, 13 Jun 2014) New Revision: 2033 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2033 Log: fixes #5222 fixes #5223 Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-12 15:59:03 UTC (rev 2032) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-13 09:33:43 UTC (rev 2033) @@ -25,7 +25,7 @@ -- Une ligne sans société : on l'affecte à la société 'ADMIN' -update sampleRow set company=(select topiaId from company where name='ADMIN') where company is null; +update sampleRow set company=(select topiaId from company where name='IFREMER') where company is null; -- On ferme l'accès à ObsDeb

1 0

r2032 - trunk/wao-web/src/main/webapp
by bleny＠users.forge.codelutin.com June 12, 2014

June 12, 2014

Author: bleny Date: 2014-06-12 17:59:03 +0200 (Thu, 12 Jun 2014) New Revision: 2032 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2032 Log: fix aside style for webkit Modified: trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-06-12 15:52:57 UTC (rev 2031) +++ trunk/wao-web/src/main/webapp/wao.css 2014-06-12 15:59:03 UTC (rev 2032) @@ -798,9 +798,6 @@ /** * Contatcs */ -#edit-contact > fieldset { - width: 100%; -} #edit-contact > fieldset legend { padding: 0 2%; width: 96%;

1 0

r2031 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 12, 2014

June 12, 2014

Author: bleny Date: 2014-06-12 17:52:57 +0200 (Thu, 12 Jun 2014) New Revision: 2031 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2031 Log: fixes #5210 remove call to inexistent java method Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-06-12 15:28:10 UTC (rev 2030) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-06-12 15:52:57 UTC (rev 2031) @@ -195,16 +195,14 @@ cssClass="input-large" /> - <s:if test="authenticatedWaoUser.isAuthorizedToDisplayContactSecondaryObservers(updateContactCommand.contact)"> - <s:select name="updateContactCommand.secondaryObserverIds" - value="%{updateContactCommand.secondaryObserverIds}" - label="%{getText('wao.ui.field.Contact.secondaryObservers')}" - list="observers" - multiple="true" - disabled="%{!#editObservers}" - cssClass="input-xlarge" - /> - </s:if> + <s:select name="updateContactCommand.secondaryObserverIds" + value="%{updateContactCommand.secondaryObserverIds}" + label="%{getText('wao.ui.field.Contact.secondaryObservers')}" + list="observers" + multiple="true" + disabled="%{!#editObservers}" + cssClass="input-xlarge" + /> </fieldset>

1 0

r2030 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 12, 2014

June 12, 2014

Author: bleny Date: 2014-06-12 17:28:10 +0200 (Thu, 12 Jun 2014) New Revision: 2030 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2030 Log: fix link to reset action filter Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-12 13:29:26 UTC (rev 2029) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-12 15:28:10 UTC (rev 2030) @@ -153,7 +153,7 @@ <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> </s:submit> - <s:url action="reset-sample-rows-filter" id="resetFilterUrl" /> + <s:url action="reset-synthesis-filter" id="resetFilterUrl" /> <s:a href="%{resetFilterUrl}" cssClass="btn"> <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> </s:a>

1 0

r2029 - trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter
by bleny＠users.forge.codelutin.com June 12, 2014

June 12, 2014

Author: bleny Date: 2014-06-12 15:29:26 +0200 (Thu, 12 Jun 2014) New Revision: 2029 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2029 Log: refs #4493 fix titles in synthesis chart Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/JFreeChartToImgTagConverter.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/JFreeChartToImgTagConverter.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/JFreeChartToImgTagConverter.java 2014-06-12 10:08:48 UTC (rev 2028) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/JFreeChartToImgTagConverter.java 2014-06-12 13:29:26 UTC (rev 2029) @@ -36,7 +36,7 @@ String base64code = BaseEncoding.base64().encode(bytes); - String html = "<img alt=\"" + chart.getTitle() + "\" src=\"data:image/png;base64," + base64code + "\" />"; + String html = "<img alt=\"" + chart.getTitle().getText() + "\" src=\"data:image/png;base64," + base64code + "\" />"; return html;

1 0

r2028 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services wao-web/src/main/java/fr/ifremer/wao/web/converter
by bleny＠users.forge.codelutin.com June 12, 2014

June 12, 2014

Author: bleny Date: 2014-06-12 12:08:48 +0200 (Thu, 12 Jun 2014) New Revision: 2028 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2028 Log: remove BarChartData, use JFreeChart now Removed: trunk/wao-services/src/main/java/fr/ifremer/wao/services/utils/ trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/BarChartDataConverter.java Deleted: trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/BarChartDataConverter.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/BarChartDataConverter.java 2014-06-12 09:10:25 UTC (rev 2027) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/BarChartDataConverter.java 2014-06-12 10:08:48 UTC (rev 2028) @@ -1,148 +0,0 @@ -package fr.ifremer.wao.web.converter; - -import com.google.common.base.Joiner; -import com.google.common.collect.Lists; -import fr.ifremer.wao.WaoTechnicalException; -import fr.ifremer.wao.services.utils.BarChartData; -import fr.ifremer.wao.services.utils.ChartDataAxis; -import org.apache.commons.lang3.StringUtils; -import org.apache.struts2.util.StrutsTypeConverter; - -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -public class BarChartDataConverter extends StrutsTypeConverter { - - @Override - public Object convertFromString(Map context, String[] values, Class toClass) { - throw new UnsupportedOperationException(); - } - - @Override - public String convertToString(Map context, Object o) { - - if (o instanceof BarChartData) { - - BarChartData barChartData = (BarChartData) o; - - barChartData.computeAxises(); - - String data = toData(barChartData); - - String options = toOptions(barChartData); - - String result = data + ", " + options; - - return result; - - } else { - throw new WaoTechnicalException("unable to convert " + o); - } - } - - protected String toOptions(BarChartData barChartData) { - String options = ""; - options +="{\n"; - options +=" title: \"" + barChartData.getTitle() + "\",\n"; - options +=" seriesDefaults: {\n"; - options +=" renderer: $.jqplot.BarRenderer, \n"; - options +=" rendererOptions: { \n"; - options +=" highlightMouseOver: true, \n"; - options +=" barWidth: 10 \n"; - options +=" } \n"; - options +=" },\n"; -// options +=" axesDefaults: {\n"; -// options +=" tickRenderer: $.jqplot.CanvasAxisTickRenderer, \n"; -// options +=" tickOptions: { \n"; -// options +=" angle: -90, \n"; -// options +=" fontSize: '10pt' \n"; -// options +=" } \n"; -// options +=" },\n"; - options +=" axes: {\n"; - options +=" xaxis: {\n"; - options +=" renderer: $.jqplot.CategoryAxisRenderer, \n"; - options +=" ticks: [\"" + Joiner.on("\", \"").join(barChartData.getTicks()) + "\"]" ; - options +=" },\n"; - - ChartDataAxis yaxis = barChartData.getYAxis(); - options +=" yaxis:{\n "; - options +=" min: " + yaxis.getMin() + ",\n"; - options +=" max: " + yaxis.getMax() + ",\n"; - options +=" numberTicks: " + yaxis.getNumberTicks() + ",\n"; - options +=" label: \"" + yaxis.getLabel() + "\"\n"; - options +=" },\n"; - - if (barChartData.isTwoYAxis()) { - - ChartDataAxis y2axis = barChartData.getY2Axis(); - options +=" y2axis:{\n "; - options +=" min: " + y2axis.getMin() + ",\n"; - options +=" max: " + y2axis.getMax() + ",\n"; - options +=" numberTicks: " + y2axis.getNumberTicks() + ",\n"; - options +=" label: \"" + y2axis.getLabel() + "\"\n"; - options +=" },\n"; - - } - - options +=" },\n"; - options +=" series: [\n"; - - for (BarChartData.BarChartDataSeries series : barChartData.getBarChartDataSeriesForYAxis()) { - - options +=" {\n"; - options +=" yaxis:\"yaxis\",\n"; - options +=" label: \"" + series.getLabel() + "\"\n"; - options +=" },\n"; - } - - for (BarChartData.BarChartDataSeries series : barChartData.getBarChartDataSeriesForY2Axis()) { - - options +=" {\n"; - options +=" yaxis:\"y2axis\",\n"; - options +=" label: \"" + series.getLabel() + "\"\n"; - options +=" },\n"; - } - - options +=" ],\n"; - options +=" legend: {\n"; - options +=" show: true,\n"; - options +=" placement: \"outsideGrid\",\n"; - options +=" location: \"s\",\n"; - options +=" rendererOptions: {\n"; - options +=" numberColumns: 2\n"; - options +=" },\n"; - options +=" renderer: $.jqplot.EnhancedLegendRenderer\n"; - options +=" }\n"; - options +="}\n"; - - return options; - } - - protected String toData(BarChartData barChartData) { - - Set<String> ticks = barChartData.getTicks(); - - List<String> series = new LinkedList<>(); - - List<BarChartData.BarChartDataSeries> barChartDataSeriesList = Lists.newLinkedList(); - barChartDataSeriesList.addAll(barChartData.getBarChartDataSeriesForYAxis()); - barChartDataSeriesList.addAll(barChartData.getBarChartDataSeriesForY2Axis()); - - for (BarChartData.BarChartDataSeries BarChartDataSeries : barChartDataSeriesList) { - List<String> bars = Lists.newLinkedList(); - for (String tick : ticks) { - Double value = BarChartDataSeries.getValue(tick); - if (value == null) { - bars.add("0"); - } else { - bars.add(value.toString()); - } - } - series.add("[" + StringUtils.join(bars, ", ") + "]"); - } - return "[" + StringUtils.join(series, ", ") + "]"; - } - -} \ No newline at end of file

1 0

r2027 - trunk
by bleny＠users.forge.codelutin.com June 12, 2014

June 12, 2014

Author: bleny Date: 2014-06-12 11:10:25 +0200 (Thu, 12 Jun 2014) New Revision: 2027 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2027 Log: use topia snapshot Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-12 08:39:34 UTC (rev 2026) +++ trunk/pom.xml 2014-06-12 09:10:25 UTC (rev 2027) @@ -119,9 +119,9 @@ <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> <nuitonCsvVersion>3.0-rc-2</nuitonCsvVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> - <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-rc-3</nuitonUtilsVersion> <eugeneVersion>2.10</eugeneVersion> - <topiaVersion>3.0-beta-5</topiaVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion>  <locales>fr</locales>

1 0

r2026 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com June 12, 2014

June 12, 2014

Author: bleny Date: 2014-06-12 10:39:34 +0200 (Thu, 12 Jun 2014) New Revision: 2026 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2026 Log: refs #4493 fix label in synthesis fisrt chart Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-12 08:28:52 UTC (rev 2025) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-12 08:39:34 UTC (rev 2026) @@ -197,10 +197,16 @@ Integer expected = entry.getValue(); dataset.setValue(expected, I18n.l(locale, "wao.synthesis.planned"), WaoUtils.formatMonth(locale, month)); } + String rowKey; + if (filter.isRealVsEstimated()) { + rowKey = I18n.l(locale, "wao.ui.samplingPlan.Actual"); + } else { + rowKey = I18n.l(locale, "wao.synthesis.estimated"); + } for (Map.Entry<Date, Integer> entry : actualObservationsMyMonths.entrySet()) { Date month = entry.getKey(); Integer actual = entry.getValue(); - dataset.setValue(actual, I18n.l(locale, "wao.ui.samplingPlan.Actual"), WaoUtils.formatMonth(locale, month)); + dataset.setValue(actual, rowKey, WaoUtils.formatMonth(locale, month)); } // Axises

1 0

r2025 - trunk/wao-web/src/main/webapp
by bleny＠users.forge.codelutin.com June 12, 2014

June 12, 2014

Author: bleny Date: 2014-06-12 10:28:52 +0200 (Thu, 12 Jun 2014) New Revision: 2025 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2025 Log: remove jqplot: no longer used Removed: trunk/wao-web/src/main/webapp/jqplot-1.0.8/

1 0

r2024 - in trunk: . wao-services wao-services/src/main/java/fr/ifremer/wao/services/service wao-web wao-web/src/main/java/fr/ifremer/wao/web/converter wao-web/src/main/resources/fr/ifremer/wao/services/service wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 12, 2014

June 12, 2014

Author: bleny Date: 2014-06-12 10:20:27 +0200 (Thu, 12 Jun 2014) New Revision: 2024 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2024 Log: fixes #4493 add printable synthesis charts made with jfreechart Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/JFreeChartToImgTagConverter.java Modified: trunk/pom.xml trunk/wao-services/pom.xml trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java trunk/wao-web/pom.xml trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/ObsMerSynthesis-conversion.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-12 07:21:00 UTC (rev 2023) +++ trunk/pom.xml 2014-06-12 08:20:27 UTC (rev 2024) @@ -112,6 +112,7 @@ <mustacheVersion>0.8.15</mustacheVersion> <commonsCodecVersion>1.9</commonsCodecVersion> <ehCacheVersion>2.6.9</ehCacheVersion> + <jFreeChartVersion>1.0.13</jFreeChartVersion> <nuitonWebVersion>1.16</nuitonWebVersion> <nuitonI18nVersion>3.1</nuitonI18nVersion> @@ -371,6 +372,12 @@ <version>${jsoupVersion}</version> </dependency> + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + <version>${jFreeChartVersion}</version> + </dependency> + </dependencies> </dependencyManagement> Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-06-12 07:21:00 UTC (rev 2023) +++ trunk/wao-services/pom.xml 2014-06-12 08:20:27 UTC (rev 2024) @@ -92,6 +92,11 @@ </dependency> <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + </dependency> + + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java 2014-06-12 07:21:00 UTC (rev 2023) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java 2014-06-12 08:20:27 UTC (rev 2024) @@ -1,7 +1,7 @@ package fr.ifremer.wao.services.service; import fr.ifremer.wao.entity.Boat; -import fr.ifremer.wao.services.utils.BarChartData; +import org.jfree.chart.JFreeChart; import java.util.HashMap; import java.util.LinkedHashSet; @@ -11,9 +11,9 @@ public class ObsMerSynthesis { - protected BarChartData expectedVsActualObservationsByMonthsBarChartData; + protected JFreeChart expectedVsActualObservationsByMonthsChart; - protected BarChartData boardingBoatsBarChartData; + protected JFreeChart boardingBoatsChart; protected int maxBoardingValue; @@ -33,20 +33,20 @@ return companySyntheses; } - public BarChartData getExpectedVsActualObservationsByMonthsBarChartData() { - return expectedVsActualObservationsByMonthsBarChartData; + public JFreeChart getExpectedVsActualObservationsByMonthsChart() { + return expectedVsActualObservationsByMonthsChart; } - public void setExpectedVsActualObservationsByMonthsBarChartData(BarChartData expectedVsActualObservationsByMonthsBarChartData) { - this.expectedVsActualObservationsByMonthsBarChartData = expectedVsActualObservationsByMonthsBarChartData; + public void setExpectedVsActualObservationsByMonthsChart(JFreeChart expectedVsActualObservationsByMonthsChart) { + this.expectedVsActualObservationsByMonthsChart = expectedVsActualObservationsByMonthsChart; } - public BarChartData getBoardingBoatsBarChartData() { - return boardingBoatsBarChartData; + public JFreeChart getBoardingBoatsChart() { + return boardingBoatsChart; } - public void setBoardingBoatsBarChartData(BarChartData boardingBoatsBarChartData) { - this.boardingBoatsBarChartData = boardingBoatsBarChartData; + public void setBoardingBoatsChart(JFreeChart boardingBoatsChart) { + this.boardingBoatsChart = boardingBoatsChart; } public int getMaxBoardingValue() { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-12 07:21:00 UTC (rev 2023) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-12 08:20:27 UTC (rev 2024) @@ -11,12 +11,21 @@ import fr.ifremer.wao.entity.SampleRowTopiaDao; import fr.ifremer.wao.entity.SynthesisId; import fr.ifremer.wao.services.AuthenticatedWaoUser; -import fr.ifremer.wao.services.utils.BarChartData; -import fr.ifremer.wao.services.utils.ChartDataAxis; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jfree.chart.JFreeChart; +import org.jfree.chart.axis.CategoryAxis; +import org.jfree.chart.axis.NumberAxis; +import org.jfree.chart.axis.ValueAxis; +import org.jfree.chart.labels.StandardCategoryItemLabelGenerator; +import org.jfree.chart.plot.CategoryPlot; +import org.jfree.chart.plot.PlotOrientation; +import org.jfree.chart.renderer.category.AbstractCategoryItemRenderer; +import org.jfree.chart.renderer.category.BarRenderer; +import org.jfree.data.category.DefaultCategoryDataset; +import org.jfree.ui.RectangleInsets; import org.nuiton.i18n.I18n; import org.nuiton.util.DateUtil; @@ -181,47 +190,39 @@ SortedMap<Date, Integer> actualObservationsMyMonths = contactDao.getActualObservationsByMonths(periodFromMonth, periodToMonth, filter); -// if (log.isTraceEnabled()) { -// DateFormat dateFormat = new SimpleDateFormat(monthsPeriod.getPattern()); -// for (Date month : monthsPeriod.getMonths()) { -// log.trace("for month " + dateFormat.format(month) -// + " expected is " + expectedObservationsByMonths.get(month) -// + " actual is " + actualObservationsMyMonths.get(month)); -// } -// } + DefaultCategoryDataset dataset = new DefaultCategoryDataset(); - BarChartData.BarChartDataSeries expectedObservationsByMonthsBarChartDataSeries = - new BarChartData.BarChartDataSeries(); - expectedObservationsByMonthsBarChartDataSeries.setLabel(I18n.l(locale, "wao.synthesis.planned")); - for (Map.Entry<Date, Integer> expectedObservationMonth : expectedObservationsByMonths.entrySet()) { - Date month = expectedObservationMonth.getKey(); - String tick = WaoUtils.formatMonth(locale, month); - double value = expectedObservationMonth.getValue().doubleValue(); - expectedObservationsByMonthsBarChartDataSeries.addValue(tick, value); + for (Map.Entry<Date, Integer> entry : expectedObservationsByMonths.entrySet()) { + Date month = entry.getKey(); + Integer expected = entry.getValue(); + dataset.setValue(expected, I18n.l(locale, "wao.synthesis.planned"), WaoUtils.formatMonth(locale, month)); } - - BarChartData.BarChartDataSeries actualObservationsMyMonthsBarChartDataSeries = - new BarChartData.BarChartDataSeries(); - actualObservationsMyMonthsBarChartDataSeries.setLabel(I18n.l(locale, "wao.ui.samplingPlan.Actual")); - for (Map.Entry<Date, Integer> actualObservationsMyMonth : actualObservationsMyMonths.entrySet()) { - Date month = actualObservationsMyMonth.getKey(); - String tick = WaoUtils.formatMonth(locale, month); - double value = actualObservationsMyMonth.getValue().doubleValue(); - actualObservationsMyMonthsBarChartDataSeries.addValue(tick, value); + for (Map.Entry<Date, Integer> entry : actualObservationsMyMonths.entrySet()) { + Date month = entry.getKey(); + Integer actual = entry.getValue(); + dataset.setValue(actual, I18n.l(locale, "wao.ui.samplingPlan.Actual"), WaoUtils.formatMonth(locale, month)); } - BarChartData expectedVsActualObservationsByMonthsBarChartData = - new BarChartData(I18n.l(locale, SynthesisId.GRAPH_SAMPLING.getI18nKey())); + // Axises + CategoryAxis categoryAxis = new CategoryAxis(""); - ChartDataAxis yAxis = expectedVsActualObservationsByMonthsBarChartData.getYAxis(); - yAxis.setLabel(I18n.l(locale, "wao.synthesis.observationsCount")); - yAxis.setStep(10); + ValueAxis valueAxis = new NumberAxis(I18n.l(locale, "wao.synthesis.observationsCount")); + valueAxis.setUpperMargin(0.15); - expectedVsActualObservationsByMonthsBarChartData.addDotChartDataSeries(expectedObservationsByMonthsBarChartDataSeries); - expectedVsActualObservationsByMonthsBarChartData.addDotChartDataSeries(actualObservationsMyMonthsBarChartDataSeries); + // Renderer for Category + AbstractCategoryItemRenderer renderer = new BarRenderer(); + // Show labels on each element + renderer.setBaseItemLabelGenerator(new StandardCategoryItemLabelGenerator()); + renderer.setBaseItemLabelsVisible(Boolean.TRUE); - obsMerSynthesis.setExpectedVsActualObservationsByMonthsBarChartData(expectedVsActualObservationsByMonthsBarChartData); + CategoryPlot plot = new CategoryPlot(dataset, categoryAxis, valueAxis, renderer); + plot.setOrientation(PlotOrientation.VERTICAL); + plot.setAxisOffset(RectangleInsets.ZERO_INSETS); + JFreeChart expectedVsActualObservationsByMonthsChart = + new JFreeChart(I18n.l(locale, SynthesisId.GRAPH_SAMPLING.getI18nKey()), JFreeChart.DEFAULT_TITLE_FONT, plot, true); + obsMerSynthesis.setExpectedVsActualObservationsByMonthsChart(expectedVsActualObservationsByMonthsChart); + } /** @@ -312,30 +313,38 @@ } } - BarChartData.BarChartDataSeries numberOfBoatsWithBoardingsBarChartDataSeries = - new BarChartData.BarChartDataSeries(); - numberOfBoatsWithBoardingsBarChartDataSeries.setLabel(I18n.l(locale, "wao.ui.chart.numberOfBoatsWithBoardings")); + obsMerSynthesis.setMaxBoardingValue(maxBoardingCount); + obsMerSynthesis.setMaxBoardingBoat(maxBoardingBoat); + obsMerSynthesis.setBoardingsCount(boardingTotal); + obsMerSynthesis.setInvalidBoardingsCount(invalidBoardingTotal); + obsMerSynthesis.setValidBoardingsCount(boardingTotal - invalidBoardingTotal); + DefaultCategoryDataset dataset = new DefaultCategoryDataset(); + for (Map.Entry<Integer, Integer> entry : mapBoarding.entrySet()) { - numberOfBoatsWithBoardingsBarChartDataSeries.addValue(String.valueOf(entry.getKey()), entry.getValue()); + dataset.setValue(entry.getValue(), I18n.l(locale, "wao.ui.chart.numberOfBoatsWithBoardings"), String.valueOf(entry.getKey())); } - BarChartData boardingBoatsBarChartData = - new BarChartData(I18n.l(locale, SynthesisId.GRAPH_BOARDING.getI18nKey())); + // Axises + CategoryAxis categoryAxis = new CategoryAxis(I18n.l(locale, "wao.ui.chart.numberOfBoatsWithBoardings")); - ChartDataAxis yAxis = boardingBoatsBarChartData.getYAxis(); - yAxis.setLabel(I18n.l(locale, "wao.ui.chart.numberBoats")); - yAxis.setStep(10); + ValueAxis valueAxis = new NumberAxis(I18n.l(locale, "wao.ui.chart.numberBoats")); + valueAxis.setUpperMargin(0.15); - boardingBoatsBarChartData.addDotChartDataSeries(numberOfBoatsWithBoardingsBarChartDataSeries); + // Renderer for Category + AbstractCategoryItemRenderer renderer = new BarRenderer(); + // Show labels on each element + renderer.setBaseItemLabelGenerator(new StandardCategoryItemLabelGenerator()); + renderer.setBaseItemLabelsVisible(Boolean.TRUE); - obsMerSynthesis.setMaxBoardingValue(maxBoardingCount); - obsMerSynthesis.setMaxBoardingBoat(maxBoardingBoat); - obsMerSynthesis.setBoardingsCount(boardingTotal); - obsMerSynthesis.setInvalidBoardingsCount(invalidBoardingTotal); - obsMerSynthesis.setValidBoardingsCount(boardingTotal - invalidBoardingTotal); + CategoryPlot plot = new CategoryPlot(dataset, categoryAxis, valueAxis, renderer); + plot.setOrientation(PlotOrientation.VERTICAL); + plot.setAxisOffset(RectangleInsets.ZERO_INSETS); - obsMerSynthesis.setBoardingBoatsBarChartData(boardingBoatsBarChartData); + JFreeChart boardingBoatsChart = + new JFreeChart(I18n.l(locale, SynthesisId.GRAPH_BOARDING.getI18nKey()), JFreeChart.DEFAULT_TITLE_FONT, plot, true); + obsMerSynthesis.setBoardingBoatsChart(boardingBoatsChart); + } } Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-06-12 07:21:00 UTC (rev 2023) +++ trunk/wao-web/pom.xml 2014-06-12 08:20:27 UTC (rev 2024) @@ -163,6 +163,11 @@ <artifactId>jsoup</artifactId> </dependency> + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + </dependency> + </dependencies> <build> Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/JFreeChartToImgTagConverter.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/JFreeChartToImgTagConverter.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/JFreeChartToImgTagConverter.java 2014-06-12 08:20:27 UTC (rev 2024) @@ -0,0 +1,48 @@ +package fr.ifremer.wao.web.converter; + +import com.google.common.io.BaseEncoding; +import fr.ifremer.wao.WaoTechnicalException; +import org.apache.struts2.util.StrutsTypeConverter; +import org.jfree.chart.ChartUtilities; +import org.jfree.chart.JFreeChart; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.Map; + +public class JFreeChartToImgTagConverter extends StrutsTypeConverter { + + @Override + public Object convertFromString(Map context, String[] values, Class toClass) { + throw new UnsupportedOperationException(); + } + + @Override + public String convertToString(Map context, Object o) { + + if (o instanceof JFreeChart) { + + JFreeChart chart = (JFreeChart) o; + + ByteArrayOutputStream output = new ByteArrayOutputStream(); + + try { + ChartUtilities.writeChartAsPNG(output, chart, 1000, 600); + } catch (IOException e) { + throw new WaoTechnicalException("unable to write chart to PNG", e); + } + + byte[] bytes = output.toByteArray(); + + String base64code = BaseEncoding.base64().encode(bytes); + + String html = "<img alt=\"" + chart.getTitle() + "\" src=\"data:image/png;base64," + base64code + "\" />"; + + return html; + + } else { + throw new WaoTechnicalException("unable to convert " + o); + } + } + +} Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/ObsMerSynthesis-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/ObsMerSynthesis-conversion.properties 2014-06-12 07:21:00 UTC (rev 2023) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/ObsMerSynthesis-conversion.properties 2014-06-12 08:20:27 UTC (rev 2024) @@ -1,2 +1,2 @@ -expectedVsActualObservationsByMonthsBarChartData=fr.ifremer.wao.web.converter.BarChartDataConverter -boardingBoatsBarChartData=fr.ifremer.wao.web.converter.BarChartDataConverter +expectedVsActualObservationsByMonthsChart=fr.ifremer.wao.web.converter.JFreeChartToImgTagConverter +boardingBoatsChart=fr.ifremer.wao.web.converter.JFreeChartToImgTagConverter Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-12 07:21:00 UTC (rev 2023) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-12 08:20:27 UTC (rev 2024) @@ -30,17 +30,6 @@ <s:text name="wao.ui.page.Synthesis.title"/> </title> - <script src="<s:url value="/jqplot-1.0.8/jquery.jqplot.js" />"></script> - <script src="<s:url value="/jqplot-1.0.8/plugins/jqplot.categoryAxisRenderer.js" />"></script> - <script src="<s:url value="/jqplot-1.0.8/plugins/jqplot.pointLabels.js" />"></script> - <script src="<s:url value="/jqplot-1.0.8/plugins/jqplot.canvasTextRenderer.js" />"></script> - <script src="<s:url value="/jqplot-1.0.8/plugins/jqplot.canvasAxisLabelRenderer.js" />"></script> - <script src="<s:url value="/jqplot-1.0.8/plugins/jqplot.canvasAxisTickRenderer.js" />"></script> - <script src="<s:url value="/jqplot-1.0.8/plugins/jqplot.enhancedLegendRenderer.js" />"></script> - <script src="<s:url value="/jqplot-1.0.8/plugins/jqplot.barRenderer.js" />"></script> - <script src="<s:url value="/jqplot-1.0.8/plugins/jqplot.barRenderer.js" />"></script> - <link rel="stylesheet" href="<s:url value="/jqplot-1.0.8/jquery.jqplot.css" />" /> - <script type="text/javascript"> $(document).ready(function() { @@ -106,9 +95,6 @@ contactsFilterController2 = new FilterController2(contactsFilterMappings, filter, WAO.OBSMER_CONTACTS_FILTER_VALUES_JSON_URL, $('#synthesis-filters-form fieldset.extra-filters')); contactsFilterController2.init(); - $.jqplot('expected-vs-actual-observations-by-months-chart', <s:property value="synthesis.expectedVsActualObservationsByMonthsBarChartData" escapeHtml="false"/>); - $.jqplot('boarding-boats-chart', <s:property value="synthesis.boardingBoatsBarChartData" escapeHtml="false"/>); - }); </script> @@ -181,7 +167,7 @@ <s:text name="SynthesisId.GRAPH_SAMPLING"/> </h2> - <div id="expected-vs-actual-observations-by-months-chart" class="chart"></div> + <s:property value="synthesis.expectedVsActualObservationsByMonthsChart" escapeHtml="false"/> </article> <article> @@ -189,7 +175,7 @@ <s:text name="SynthesisId.GRAPH_BOARDING"/> </h2> - <div id="boarding-boats-chart" class="chart"></div> + <s:property value="synthesis.boardingBoatsChart" escapeHtml="false"/> <p> <s:text name="wao.ui.synthesis.boarding.description"/>

1 0